Merge branch 'refs/heads/feature/v9.0/9.0.1' into test

张含笑

2025-12-09 5808f76456ca0d40de5074f132b73a5a488e3e13

 src/views/system/user.vue

@@ -26,9 +26,9 @@
            <el-button type="danger" plain icon="el-icon-delete" v-if="permission.user_delete && !auditMode"
              @click="handleDelete">删 除
            </el-button>
            <el-button type="primary" plain icon="el-icon-operation"
              v-if="userInfo.role_name.includes('admin') && !auditMode" @click="handleAudit">审 核
            </el-button>
<!--            <el-button type="primary" plain icon="el-icon-operation"-->
<!--              v-if="userInfo.role_name.includes('admin') && !auditMode" @click="handleAudit">审 核-->
<!--            </el-button>-->
            <el-button type="success" plain icon="el-icon-check"
              v-if="userInfo.role_name.includes('admin') && auditMode" @click="handleAuditPass">通 过
            </el-button>
@@ -44,9 +44,9 @@
            <el-button type="info" plain v-if="permission.user_reset && !auditMode" icon="el-icon-refresh"
              @click="handleReset">密码重置
            </el-button>
            <el-button type="info" plain v-if="userInfo.role_name.includes('admin') && !auditMode"
              icon="el-icon-setting" @click="handlePlatform">平台配置
            </el-button>
<!--            <el-button type="info" plain v-if="userInfo.role_name.includes('admin') && !auditMode"-->
<!--              icon="el-icon-setting" @click="handlePlatform">平台配置-->
<!--            </el-button>-->
            <el-button type="info" plain v-if="userInfo.role_name.includes('admin') && !auditMode"
              icon="el-icon-coordinate" @click="handleLock">账号解封
            </el-button>
@@ -227,7 +227,9 @@
      option: {
        tip: false,
        searchShow: true,
        searchMenuSpan: 6,
        searchGutter: 30,
        searchMenuPosition: 'left',
        searchMenuSpan: 4,
        border: true,
        index: true,
        selection: true,
@@ -243,6 +245,7 @@
            label: '登录账号',
            prop: 'account',
            search: true,
            searchSpan: 5,
            display: false,
          },
          // {
@@ -255,6 +258,7 @@
            label: '用户姓名',
            prop: 'realName',
            search: true,
            searchSpan: 5,
            display: false,
          },
          {
@@ -402,8 +406,8 @@
                  },
                  {
                    min: 2,
                    max: 10,
                    message: '姓名长度在2到5个字符',
                    max: 50,
                    message: '姓名长度在2到50个字符',
                  },
                ],
              },
@@ -486,7 +490,7 @@
                label: '所属部门',
                prop: 'deptId',
                type: 'tree',
                multiple: true,
                multiple: false,
                dicData: [],
                // props: {
                //   label: 'title',
@@ -515,6 +519,7 @@
            column: [
              {
                label: '到期时间',
                labelWidth: 110,
                prop: 'expireTime',
                type: 'datetime',
                format: 'YYYY-MM-DD HH:mm:ss',
@@ -522,12 +527,14 @@
              },
              {
                label: '次数限制',
                labelWidth: 110,
                prop: 'maxLoginNum',
                type: 'input',
              },

              {
                label: '飞行开始时间',
                labelWidth: 110,
                prop: 'flightStartTime',
                type: 'time',
                format: 'HH:mm',
@@ -542,6 +549,7 @@
              },
              {
                label: '飞行结束时间',
                labelWidth: 110,
                prop: 'flightEndTime',
                type: 'time',
                format: 'HH:mm',
@@ -785,7 +793,7 @@
        }
      }

      row.deptId = func.join(row.deptId)
      // row.deptId = func.join(row.deptId)
      row.roleId = func.join(row.roleId)
      row.postId = func.join(row.postId)
      row.name = row.realName
@@ -828,7 +836,7 @@
        }
      }

      row.deptId = func.join(row.deptId)
      // row.deptId = func.join(row.deptId)
      row.roleId = func.join(row.roleId)
      row.postId = func.join(row.postId)
      row.name = row.realName
@@ -1053,9 +1061,9 @@
      if (['edit', 'view'].includes(type)) {
        getUser(this.form.id).then(res => {
          this.form = res.data.data
          if (this.form.hasOwnProperty('deptId')) {
            this.form.deptId = func.split(this.form.deptId)
          }
          // if (this.form.hasOwnProperty('deptId')) {
          //   this.form.deptId = func.split(this.form.deptId)
          // }
          if (this.form.hasOwnProperty('roleId')) {
            this.form.roleId = func.split(this.form.roleId)
          }