用户，机构字段调整

zrj

2024-07-17 9379060588dc889207e2fa3d0cba93cbced2bd8a

用户，机构字段调整

 src/views/system/dept.vue

@@ -84,6 +84,7 @@
            label: '机构名称',
            prop: 'deptName',
            search: true,
            labelWidth:120,
            rules: [
              {
                required: true,
@@ -92,33 +93,34 @@
              },
            ],
          },
          {
            label: '所属租户',
            prop: 'tenantId',
            type: 'tree',
            dicUrl: '/blade-system/tenant/select',
            addDisplay: false,
            editDisplay: false,
            viewDisplay: website.tenantMode,
            span: 24,
            props: {
              label: 'tenantName',
              value: 'tenantId',
            },
            hide: !website.tenantMode,
            search: website.tenantMode,
            rules: [
              {
                required: true,
                message: '请输入所属租户',
                trigger: 'click',
              },
            ],
          },
          // {
          //   label: '所属租户',
          //   prop: 'tenantId',
          //   type: 'tree',
          //   dicUrl: '/blade-system/tenant/select',
          //   addDisplay: false,
          //   editDisplay: false,
          //   viewDisplay: website.tenantMode,
          //   span: 24,
          //   props: {
          //     label: 'tenantName',
          //     value: 'tenantId',
          //   },
          //   hide: !website.tenantMode,
          //   search: website.tenantMode,
          //   rules: [
          //     {
          //       required: true,
          //       message: '请输入所属租户',
          //       trigger: 'click',
          //     },
          //   ],
          // },
          {
            label: '机构全称',
            prop: 'fullName',
            search: true,
            labelWidth:120,
            rules: [
              {
                required: true,
@@ -137,6 +139,7 @@
            props: {
              label: 'title',
            },
            labelWidth:120,
            rules: [
              {
                required: false,
@@ -155,6 +158,7 @@
            },
            dataType: 'number',
            width: 120,
            labelWidth:120,
            prop: 'deptCategory',
            slot: true,
            rules: [
@@ -166,10 +170,24 @@
            ],
          },
          {
            label: '设备绑定编码',
            prop: 'bindCode',
            search: true,
            labelWidth:120,
            rules: [
              {
                required: true,
                message: '请输入设备绑定编码',
                trigger: 'blur',
              },
            ],
          },
          {
            label: '排序',
            prop: 'sort',
            type: 'number',
            align: 'right',
            labelWidth:120,
            width: 80,
            rules: [
              {
@@ -182,6 +200,7 @@
          {
            label: '备注',
            prop: 'remark',
            labelWidth:120,
            rules: [
              {
                required: false,

 src/views/system/user.vue

@@ -327,12 +327,12 @@
            search: true,
            display: false,
          },
          {
            label: '所属租户',
            prop: 'tenantName',
            slot: true,
            display: false,
          },
          // {
          //   label: '所属租户',
          //   prop: 'tenantName',
          //   slot: true,
          //   display: false,
          // },
          {
            label: '用户姓名',
            prop: 'realName',
@@ -351,33 +351,33 @@
            slot: true,
            display: false,
          },
          {
            label: '用户平台',
            prop: 'userTypeName',
            slot: true,
            display: false,
          },
          {
            label: '用户平台',
            type: 'select',
            dicUrl: '/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: 'userTypeName',
          //   slot: true,
          //   display: false,
          // },
          // {
          //   label: '用户平台',
          //   type: 'select',
          //   dicUrl: '/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',
          //     },
          //   ],
          // },
        ],
        group: [
          {
@@ -385,28 +385,28 @@
            prop: 'baseInfo',
            icon: 'el-icon-user-solid',
            column: [
              {
                label: '所属租户',
                prop: 'tenantId',
                type: 'tree',
                dicUrl: '/blade-system/tenant/select',
                props: {
                  label: 'tenantName',
                  value: 'tenantId',
                },
                hide: !website.tenantMode,
                addDisplay: website.tenantMode,
                editDisplay: website.tenantMode,
                viewDisplay: website.tenantMode,
                rules: [
                  {
                    required: true,
                    message: '请输入所属租户',
                    trigger: 'click',
                  },
                ],
                span: 24,
              },
              // {
              //   label: '所属租户',
              //   prop: 'tenantId',
              //   type: 'tree',
              //   dicUrl: '/blade-system/tenant/select',
              //   props: {
              //     label: 'tenantName',
              //     value: 'tenantId',
              //   },
              //   hide: !website.tenantMode,
              //   addDisplay: website.tenantMode,
              //   editDisplay: website.tenantMode,
              //   viewDisplay: website.tenantMode,
              //   rules: [
              //     {
              //       required: true,
              //       message: '请输入所属租户',
              //       trigger: 'click',
              //     },
              //   ],
              //   span: 24,
              // },
              {
                label: '登录账号',
                prop: 'account',
@@ -418,25 +418,25 @@
                  },
                ],
              },
              {
                label: '用户平台',
                type: 'select',
                dicUrl: '/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: '/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',
@@ -582,24 +582,24 @@
                  },
                ],
              },
              {
                label: '所属岗位',
                prop: 'postId',
                type: 'tree',
                multiple: true,
                dicData: [],
                props: {
                  label: 'postName',
                  value: 'id',
                },
                rules: [
                  {
                    required: true,
                    message: '请选择所属岗位',
                    trigger: 'click',
                  },
                ],
              },
              // {
              //   label: '所属岗位',
              //   prop: 'postId',
              //   type: 'tree',
              //   multiple: true,
              //   dicData: [],
              //   props: {
              //     label: 'postName',
              //     value: 'id',
              //   },
              //   rules: [
              //     {
              //       required: true,
              //       message: '请选择所属岗位',
              //       trigger: 'click',
              //     },
              //   ],
              // },
            ],
          },
        ],