liuyg
2021-07-10 8ef98bfd45d97a4c7d494d5a4e51b573df8da268
src/views/system/user.vue
@@ -273,7 +273,7 @@
              display: false
            },
            {
              label: "所属保安单位",
              label: "所属组织机构",
              prop: "tenantName",
              slot: true,
              display: false
@@ -290,37 +290,43 @@
              slot: true,
              display: false
            },
            {
              label: "所属部门",
              prop: "deptName",
              slot: true,
              display: false
            },
            {
              label: "用户平台",
              prop: "userTypeName",
              slot: true,
              display: false
            },
            {
              label: "用户平台",
              type: "select",
              dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
              props: {
                label: "dictValue",
                value: "dictKey"
              },
              dataType: "number",
              search: true,
              hide: true,
              display: false,
              prop: "userType",
              rules: [{
                required: true,
                message: "请选择用户平台",
                trigger: "blur"
              }]
            },
            // {
            //   label: "所属部门",
            //   prop: "deptName",
            //   slot: true,
            //   display: false
            // },
            // {
            //   label: "用户平台",
            //   prop: "userTypeName",
            //   addDisplay:false,
            //   viewDisplay:false,
            //   editDisplay:false,
            //   slot: true,
            //   display: false
            // },
            // {
            //   label: "用户平台",
            //   type: "select",
            //   dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
            //   props: {
            //     label: "dictValue",
            //     value: "dictKey"
            //   },
            //   dataType: "number",
            //   search: true,
            //   hide: true,
            //   addDisplay:false,
            //   viewDisplay:false,
            //   editDisplay:false,
            //   display: false,
            //   prop: "userType",
            //   rules: [{
            //     required: true,
            //     message: "请选择用户平台",
            //     trigger: "blur"
            //   }]
            // },
          ],
          group: [
            {
@@ -330,13 +336,13 @@
              icon: 'el-icon-user-solid',
              column: [
                {
                  label: "所属保安单位",
                  prop: "tenantId",
                  label: "所属组织机构",
                  prop: "deptId",
                  type: "tree",
                  dicUrl: "/api/blade-system/tenant/select",
                  dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
                  props: {
                    label: "tenantName",
                    value: "tenantId"
                    label: "title",
                    value: "id",
                  },
                  hide: !website.tenantMode,
                  addDisplay: website.tenantMode,
@@ -344,7 +350,7 @@
                  viewDisplay: website.tenantMode,
                  rules: [{
                    required: true,
                    message: "请输入所属保安单位",
                    message: "所属组织机构",
                    trigger: "click"
                  }],
                  span: 24,
@@ -358,23 +364,23 @@
                    trigger: "blur"
                  }],
                },
                {
                  label: "用户平台",
                  type: "select",
                  dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
                  props: {
                    label: "dictValue",
                    value: "dictKey"
                  },
                  dataType: "number",
                  slot: true,
                  prop: "userType",
                  rules: [{
                    required: true,
                    message: "请选择用户平台",
                    trigger: "blur"
                  }]
                },
                // {
                //   label: "用户平台",
                //   type: "select",
                //   dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
                //   props: {
                //     label: "dictValue",
                //     value: "dictKey"
                //   },
                //   dataType: "number",
                //   slot: true,
                //   prop: "userType",
                //   rules: [{
                //     required: true,
                //     message: "请选择用户平台",
                //     trigger: "blur"
                //   }]
                // },
                {
                  label: '密码',
                  prop: 'password',
@@ -496,23 +502,23 @@
                    trigger: "click"
                  }]
                },
                {
                  label: "所属部门",
                  prop: "deptId",
                  type: "tree",
                  multiple: true,
                  dicData: [],
                  props: {
                    label: "title"
                  },
                  checkStrictly: true,
                  slot: true,
                  rules: [{
                    required: true,
                    message: "请选择所属部门",
                    trigger: "click"
                  }]
                },
                // {
                //   label: "所属部门",
                //   prop: "deptId",
                //   type: "tree",
                //   multiple: true,
                //   dicData: [],
                //   props: {
                //     label: "title"
                //   },
                //   checkStrictly: true,
                //   slot: true,
                //   rules: [{
                //     required: true,
                //     message: "请选择所属部门",
                //     trigger: "click"
                //   }]
                // },
                {
                  label: "所属岗位",
                  prop: "postId",
@@ -523,11 +529,11 @@
                    label: "postName",
                    value: "id"
                  },
                  rules: [{
                    required: true,
                    message: "请选择所属岗位",
                    trigger: "click"
                  }],
                  // rules: [{
                  //   required: true,
                  //   message: "请选择所属岗位",
                  //   trigger: "click"
                  // }],
                },
              ]
            },