Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

liuyg

2021-07-07 24987ceb6d179ba00e1f43761a3f3ed9330213e3

 src/views/system/dept.vue

@@ -88,6 +88,7 @@
            {
              label: "机构名称",
              prop: "deptName",
              searchSpan:5,
              search: true,
              rules: [{
                required: true,
@@ -96,7 +97,7 @@
              }]
            },
            {
              label: "所属租户",
              label: "所属保安单位",
              prop: "tenantId",
              type: "tree",
              dicUrl: "/api/blade-system/tenant/select",
@@ -110,15 +111,18 @@
              },
              hide: !website.tenantMode,
              search: website.tenantMode,
              searchSpan:5,
              searchLabelWidth:"110",
              rules: [{
                required: true,
                message: "请输入所属租户",
                message: "请输入所属保安单位",
                trigger: "click"
              }]
            },
            {
              label: "机构全称",
              prop: "fullName",
              searchSpan:5,
              search: true,
              rules: [{
                required: true,
@@ -144,6 +148,7 @@
            },
            {
              label: "机构类型",
              searchSpan:5,
              type: "select",
              dicUrl: "/api/blade-system/dict/dictionary?code=org_category",
              props: {