版本号：X1.1.0（存在数据库修改）

表cw_project_report_archive新增字段 audit_money（审计收费金额（元））
删除财务质量复核时的审计收费字段，在归档时添加审计收费字段，并在列表页面进行汇总操作展示
修复修改密码bug
登陆页面验证码展示优化

public/index.html

@@ -8,6 +8,9 @@
   <title>兴光系统平台</title>
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+  <!--清除浏览器中的缓存 -->
+  <meta http-equiv="pragram" content="no-cache">
+  <meta http-equiv="cache-control" content="no-cache, no-store, must-revalidate">
   <link rel="icon" href="/static/img/favicon.ico">
   <link rel="stylesheet" href="<%= BASE_URL %>cdn/animate/3.5.2/animate.css">
   <style>

src/api/cw/projectRecords/ProjectReportArchiveService.js

@@ -8,6 +8,13 @@ export default class ProjectReportArchiveService {
       params: params
     })
   }
+  getAllAuditMoney (params) {
+    return request({
+      url: '/cwProjectReportArchive/getAllAuditMoney',
+      method: 'get',
+      params: params
+    })
+  }
   reportList (params) {
     return request({
       url: '/cwProjectReportArchive/reportList',

src/router/index.js

@@ -26,7 +26,7 @@ const mainRoutes = {
   path: '/',
   component: _import('main'),
   name: 'main',
-  redirect: {name: 'casLogout'},
+  redirect: {name: 'home'},
   meta: {title: '整体布局'},
   children: [
     {path: '/casLogout', component: _import('common/CasLogout'), name: 'casLogout', meta: { title: 'CAS退出' }},

src/utils/httpRequest.js

@@ -76,7 +76,7 @@ axios.interceptors.response.use(response => {
   }
   if (error.response.status === 408 || error.response.status === 401) { // 需要重新登录
     clearLoginInfo()
-    router.push({ name: 'casLogin' })
+    router.push({ name: 'login' })
     Message({
       message: error.response.data,
       type: 'error',

src/views/common/CasLogin.vue

@@ -3,70 +3,23 @@
 
 </template>
 <script>
-  import UserService from '@/api/sys/UserService'
   export default {
-    userService: null,
-    created () {
-      // 解析URL中的查询参数
-      const urlParams = new URLSearchParams(window.location.search)
-      const resultMapParam = urlParams.get('resultMap')
-      console.log('resultMapParam', resultMapParam)
-      this.userService = new UserService()
-    },
     mounted: function () {
-      // 在页面加载时添加退出事件监听器
-      window.addEventListener('message', function (event) {
-        console.log('2222')
-        if (event.data === 'logout') {
-          console.log('进来了2')
-          // 执行退出操作，例如清除用户信息、跳转到登录页面等
-        }
-      })
       this.casLogin()
     },
     methods: {
+
       // cas登录
       casLogin () {
         let st = this.getTicket()
         let sevice = window.location.protocol + '//' + window.location.host + '/'
-        console.log('st', st)
-        console.log('service', sevice)
         this.$http({
           url: '/sys/casLogin',
           method: 'get',
           params: {'ticket': st, 'service': sevice}
         }).then(({data}) => {
-          console.log('data', data)
           this.$cookie.set('token', data.token)
-          // this.$router.push({name: 'home'})
-          this.userService.getMenus().then(({data}) => {
-            localStorage.setItem('routerList', JSON.stringify(data.routerList || '[]'))
-            localStorage.setItem('allMenuList', JSON.stringify(data.menuList || '[]'))
-            localStorage.setItem('permissions', JSON.stringify(data.permissions || '[]'))
-            localStorage.setItem('dictList', JSON.stringify(data.dictList || '[]'))
-            this.$router.push({name: 'home'})
-          }).catch(error => {
-            console.log('error', error)
-          })
-          // let Base64 = require('js-base64').Base64
-          // /* ------ 账号密码的存储 ------ */
-          // if (checked) {
-          //   // eslint-disable-next-line no-undef
-          //   // let password = Base64.encode(passwordLogin) // base64加密
-          //   this.setCookie(Base64.encode(username), Base64.encode(password), 7)
-          // } else {
-          //   this.setCookie('', '', -1) // 修改2值都为空，天数为负1天就好了
-          // }
-          /* ------ http登录请求 ------ */
-          this.$notify({
-            title: '登录成功',
-            message: `欢迎回来！<br/>你上次的登录IP是 ${data.oldLoginIp}，登录时间是 ${data.oldLoginDate}。`,
-            dangerouslyUseHTMLString: true,
-            duration: 10000,
-            type: 'success'
-          })
-        }).catch(err => {
-          console.log('error', err)
+          this.$router.push({name: 'home'})
         })
       },
       getTicket () {
@@ -75,5 +28,5 @@
       }
     }
 
-}
+  }
 </script>

src/views/layout/UpdatePassword.vue

@@ -18,9 +18,9 @@
       <el-form-item label="账号">
         <span>{{ userName }}</span>
       </el-form-item>
-<!--      <el-form-item label="原密码" prop="password">-->
-<!--        <el-input type="password" size="small" v-model="dataForm.password" ></el-input>-->
-<!--      </el-form-item>-->
+      <el-form-item label="原密码" prop="password">
+        <el-input type="password" size="small" v-model="dataForm.password" ></el-input>
+      </el-form-item>
       <el-form-item label="新密码" prop="newPassword">
         <el-input type="password" size="small" v-model="dataForm.newPassword" ></el-input>
       </el-form-item>
@@ -51,14 +51,14 @@
         visible: false,
         showTip: false,
         dataForm: {
-          // password: '',
+          password: '',
           newPassword: '',
           confirmPassword: ''
         },
         dataRule: {
-          // password: [
-          //   {required: true, message: '原密码不能为空', trigger: 'blur'}
-          // ],
+          password: [
+            {required: true, message: '原密码不能为空', trigger: 'blur'}
+          ],
           newPassword: [
             {required: true, message: '新密码不能为空', trigger: 'blur'}
           ],
@@ -106,7 +106,7 @@
         this.$refs['dataForm'].validate((valid) => {
           if (valid) {
             this.userService.savePwd({
-              // 'oldPassword': this.dataForm.password,
+              'oldPassword': this.dataForm.password,
               'newPassword': this.dataForm.newPassword
             }).then(({data}) => {
               this.$message({
@@ -118,7 +118,7 @@
               this.$nextTick(() => {
                 this.mainTabs = []
                 clearLoginInfo()
-                this.$router.replace({name: 'casLogin'})
+                this.$router.replace({name: 'login'})
               })
             })
           }

src/views/modules/cw/projectBusinessType/CwProjectBusinessTypeList.vue

@@ -41,6 +41,7 @@
           <vxe-column min-width="50" align="center" title="序号" field="sort"></vxe-column>
           <vxe-column min-width="50" align="center" title="级别" field="level"></vxe-column>
           <vxe-column min-width="50" align="center" title="备注" field="remarks"></vxe-column>
+
           <vxe-column title="操作" width="230px" fixed="right" align="center">
             <template  slot-scope="scope">
               <el-button v-if="hasPermission('cw_project_business_type:edit')" type="text"  size="small" @click="addChild(scope.row.id)">新建子类型</el-button>

src/views/modules/cw/projectBusinessType/CwProjectBusinessTypeListForm.vue

@@ -39,7 +39,7 @@
           @sort-change=""
           :sort-config="{remote:true}"
           :data="dataList"
-          :tree-config="{transform: true, rowField: 'id', parentField: 'parentId'}"
+          :tree-config="{transform: true, rowField: 'id', parentField: 'parentId', expandAll: true}"
           :checkbox-config="{}">
           <vxe-column type="radio" width="40" ></vxe-column>
           <vxe-column min-width="350" title="业务类型" field="name" align="left" tree-node></vxe-column>
@@ -141,6 +141,9 @@
           this.dataList = data.records
           this.tablePage.total = data.total
           this.loading = false
+          this.$nextTick(() => {
+            this.$refs.businessTypeTable.setAllTreeExpand(true)
+          })
         })
       },
       // 当前页

src/views/modules/cw/projectRecords/ProjectRecordsAddForm.vue

@@ -117,6 +117,7 @@
 <!--                <el-col :span="12">-->
 <!--                  <el-form-item label="业务类型" prop="businessTypeName"-->
 <!--                                :rules="[-->
+<!--                                 {required: true, message:'业务类型不能为空', trigger:'blur'}-->
 <!--                   ]">-->
 <!--                    <el-input :readonly="true" @focus="openBusinessTypeForm" v-model="inputForm.businessTypeName" placeholder="请填写业务类型" clearable></el-input>-->
 <!--                  </el-form-item>-->

src/views/modules/cw/projectReportArchive/ProjectReportArchiveForm.vue

@@ -111,6 +111,18 @@
                     </el-input-number>
                   </el-form-item>
                 </el-col>
+
+                <el-col :span="12">
+                  <el-form-item label="审计收费(元)" prop="auditMoney"
+                                :rules="[
+                  {required: true, message:'请输入审计收费(元)', trigger:'blur'}
+               ]">
+                    <el-input maxlength="15" v-model="inputForm.auditMoney" placeholder="请输入审计收费(元)"
+                              @keyup.native="inputForm.auditMoney = twoDecimalPlaces(inputForm.auditMoney)"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+
                 <el-col :span="12">
                   <el-form-item label="档案年度" prop="year"
                                 :rules="[
@@ -305,6 +317,7 @@
           auditedUnits: '',
           reportNum: '',
           papersNum: '',
+          auditMoney: '',
           year: '',
           number: '',
           isNumber: '',
@@ -416,6 +429,7 @@
           auditedUnits: '',
           reportNum: '',
           papersNum: '',
+          auditMoney: '',
           year: '',
           number: '',
           isNumber: '',
@@ -621,6 +635,7 @@
           auditedUnits: '',
           reportNum: '',
           papersNum: '',
+          auditMoney: '',
           year: '',
           number: '',
           isNumber: '',
@@ -736,6 +751,34 @@
             })
           }
         }
+      },
+      twoDecimalPlaces (num) {
+        let str = num.toString()
+        var len1 = str.substr(0, 1)
+        var len2 = str.substr(1, 1)
+        // eslint-disable-next-line eqeqeq
+        if (str.length > 1 && len1 == 0 && len2 != '.') {
+          str = str.substr(1, 1)
+        }
+        // eslint-disable-next-line eqeqeq
+        if (len1 == '.') {
+          str = ''
+        }
+        // eslint-disable-next-line eqeqeq
+        if (str.indexOf('.') != -1) {
+          var str_ = str.substr(str.indexOf('.') + 1)
+          // eslint-disable-next-line eqeqeq
+          if (str_.indexOf('.') != -1) {
+            str = str.substr(0, str.indexOf('.') + str_.indexOf('.') + 1)
+          }
+          if (str_.length > 2) {
+            this.$message.warning(`金额小数点后只能输入两位，请正确输入！`)
+            return (str = '')
+          }
+        }
+        // eslint-disable-next-line no-useless-escape
+        str = str.replace(/[^\d^\.]+/g, '') // 保留数字和小数点
+        return str
       }
     }
   }

src/views/modules/cw/projectReportArchive/ProjectReportArchiveList.vue

@@ -104,6 +104,7 @@
       <vxe-toolbar :refresh="{query: refreshList}" export custom>
         <template #buttons>
 <!--          <el-button v-if="hasPermission('cwProjectReportArchive:add')" type="primary" size="small" icon="el-icon-plus" @click="start()">新建</el-button>-->
+        <span style="color: #909399">审计总金额：{{allAuditMoney}}（元）</span>
         </template>
       </vxe-toolbar>
       <div style="height: calc(100% - 90px)">
@@ -153,6 +154,7 @@
           <vxe-column min-width="150" align="center" title="报告册数" field="reportNum"></vxe-column>
           <vxe-column min-width="150" align="center" title="底稿册数" field="papersNum"></vxe-column>
           <vxe-column min-width="150" align="center" title="档案年度" field="year"></vxe-column>
+          <vxe-column min-width="150" align="center" title="审计收费(元)" field="auditMoney"></vxe-column>
           <vxe-column min-width="230" align="center" title="案卷号" field="number"></vxe-column>
           <vxe-column min-width="150" align="center" title="报告日期" :formatter="formatDate" field="reportDate"></vxe-column>
           <vxe-column min-width="200" align="center" title="归档时间" :formatter="formatDate" field="auditDate"></vxe-column>
@@ -233,6 +235,7 @@
     data () {
       return {
         showHideItem: false,
+        allAuditMoney: '',
         showHideIcon: 'el-icon-arrow-down',
         showHideName: '展示',
         searchForm: {
@@ -401,6 +404,14 @@
           this.loading = false
         })
         this.checkIsAdmin()
+        // 获取当前登录人展示数据的所有的审计收费金额总额
+        this.projectReportArchiveService.getAllAuditMoney({
+          ...this.searchForm
+        }).then(({data}) => {
+          console.log(123423)
+          this.allAuditMoney = data
+          this.loading = false
+        })
         this.processService.getByName('会计-项目报告归档').then(({data}) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionAuditId = data.id

src/views/modules/cw/projectReportArchive/ProjectReportArchiveTaskForm.vue

@@ -102,6 +102,18 @@
                     </el-input-number>
                   </el-form-item>
                 </el-col>
+
+                <el-col :span="12">
+                  <el-form-item label="审计收费(元)" prop="auditMoney"
+                                :rules="[
+                  {required: true, message:'请输入审计收费(元)', trigger:'blur'}
+               ]">
+                    <el-input maxlength="15" v-model="inputForm.auditMoney" placeholder="请输入审计收费(元)"
+                              @keyup.native="inputForm.auditMoney = twoDecimalPlaces(inputForm.auditMoney)"
+                    ></el-input>
+                  </el-form-item>
+                </el-col>
+
                 <el-col :span="12">
                   <el-form-item label="档案年度" prop="year"
                                 :rules="[
@@ -293,6 +305,7 @@
           auditedUnits: '',
           reportNum: '',
           papersNum: '',
+          auditMoney: '',
           year: '',
           number: '',
           isNumber: '',
@@ -374,7 +387,6 @@
       },
       'loading': {
         handler (newVal) {
-          console.log(newVal)
           this.$emit('changeLoading', newVal)
           this.$refs.uploadComponent.changeLoading(newVal)
         }
@@ -411,6 +423,7 @@
           auditedUnits: '',
           reportNum: '',
           papersNum: '',
+          auditMoney: '',
           year: '',
           number: '',
           isNumber: '',
@@ -849,6 +862,34 @@
             })
           }
         }
+      },
+      twoDecimalPlaces (num) {
+        let str = num.toString()
+        var len1 = str.substr(0, 1)
+        var len2 = str.substr(1, 1)
+        // eslint-disable-next-line eqeqeq
+        if (str.length > 1 && len1 == 0 && len2 != '.') {
+          str = str.substr(1, 1)
+        }
+        // eslint-disable-next-line eqeqeq
+        if (len1 == '.') {
+          str = ''
+        }
+        // eslint-disable-next-line eqeqeq
+        if (str.indexOf('.') != -1) {
+          var str_ = str.substr(str.indexOf('.') + 1)
+          // eslint-disable-next-line eqeqeq
+          if (str_.indexOf('.') != -1) {
+            str = str.substr(0, str.indexOf('.') + str_.indexOf('.') + 1)
+          }
+          if (str_.length > 2) {
+            this.$message.warning(`金额小数点后只能输入两位，请正确输入！`)
+            return (str = '')
+          }
+        }
+        // eslint-disable-next-line no-useless-escape
+        str = str.replace(/[^\d^\.]+/g, '') // 保留数字和小数点
+        return str
       }
     }
   }

src/views/modules/cw/reportCancellApply/ReportCancellApplyTaskForm.vue

@@ -149,7 +149,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <!--<el-col :span="12">
                 <el-form-item label="审计收费(税前、元)" prop="reportDetail.auditFees"
                               :rules="[
                    ]">
@@ -157,7 +157,7 @@
                             @keyup.native="inputForm.reportDetail.auditFees = twoDecimalPlaces(inputForm.reportDetail.auditFees)"
                   ></el-input>
                 </el-form-item>
-              </el-col>
+              </el-col>-->
               <el-col :span="12">
                 <el-form-item label="报告实际制作人" prop="reportDetail.realCreate"
                               :rules="[

src/views/modules/cw/reportManagement/ReportManagementAddForm.vue

@@ -148,7 +148,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!--<el-col :span="12">
             <el-form-item label="审计收费(税前、元)" prop="auditFees"
                           :rules="[
                    ]">
@@ -156,7 +156,7 @@
                         @keyup.native="inputForm.auditFees = twoDecimalPlaces(inputForm.auditFees)"
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col>-->
 
           <el-col :span="12">
             <el-form-item label="报告实际制作人" prop="realCreate"

src/views/modules/cw/reportManagement/ReportManagementForm.vue

@@ -149,7 +149,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <!--<el-col :span="12">
                 <el-form-item label="审计收费(税前、元)" prop="auditFees"
                               :rules="[
                    ]">
@@ -157,7 +157,7 @@
                             @keyup.native="inputForm.auditFees = twoDecimalPlaces(inputForm.auditFees)"
                   ></el-input>
                 </el-form-item>
-              </el-col>
+              </el-col>-->
               <el-col :span="12">
                 <el-form-item label="报告实际制作人" prop="realCreate"
                               :rules="[

src/views/modules/cw/reportManagement/ReportManagementList.vue

@@ -36,11 +36,11 @@
       <el-form-item v-if="showHideItem" label="报告文号" prop="reportNo">
         <el-input size="small" v-model="searchForm.reportNo" placeholder="请输入报告文号" clearable></el-input>
       </el-form-item>
-      <el-form-item v-if="showHideItem" label="审计收费(税前、元)" prop="contractAmounts">
+      <!--<el-form-item v-if="showHideItem" label="审计收费(税前、元)" prop="contractAmounts">
         <InputNumber :disabled="false" :precision="num" v-model="searchForm.contractAmounts"></InputNumber>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item v-if="showHideItem" label="报备类型" prop="filingType">
-        <el-select v-model="searchForm.filingType" placeholder="请选择" style="width:100%;">
+        <el-select v-model="searchForm.filingType" clearable placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in $dictUtils.getDictList('cw_work_client_report_type')"
             :key="item.value"
@@ -50,7 +50,7 @@
         </el-select>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="复核状态" prop="reviewStatus">
-        <el-select v-model="searchForm.reviewStatus" placeholder="请选择" style="width:100%;">
+        <el-select v-model="searchForm.reviewStatus" clearable placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in $dictUtils.getDictList('cw_status')"
             :key="item.value"
@@ -60,7 +60,7 @@
         </el-select>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="签章状态" prop="status1">
-        <el-select v-model="searchForm.status1" placeholder="请选择" style="width:100%;">
+        <el-select v-model="searchForm.status1" clearable placeholder="请选择" style="width:100%;">
           <el-option
             v-for="item in $dictUtils.getDictList('cw_status')"
             :key="item.value"
@@ -69,6 +69,18 @@
           </el-option>
         </el-select>
       </el-form-item>
+
+      <el-form-item v-if="showHideItem" label="是否已生成报告号" prop="existReportNumber">
+        <el-select v-model="searchForm.existReportNumber" clearable placeholder="请选择" style="width:100%;">
+          <el-option
+            v-for="item in $dictUtils.getDictList('yes_no')"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
       <el-form-item v-if="showHideItem" label="创建时间" prop="contractDates">
         <el-date-picker
           placement="bottom-start"
@@ -82,6 +94,19 @@
         </el-date-picker>
       </el-form-item>
 
+      <!--<el-form-item v-if="showHideItem" label="审核通过时间" prop="auditPassDates">
+        <el-date-picker
+          placement="bottom-start"
+          format="yyyy-MM-dd HH:mm:ss"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          v-model="searchForm.auditPassDates"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </el-form-item>-->
+
       <el-form-item>
         <el-button type="default" @click="showHide" size="small" :icon="showHideIcon">{{showHideName}}</el-button>
         <el-button type="primary" @click="refreshList()" size="small" icon="el-icon-search">查询</el-button>
@@ -281,6 +306,7 @@
           contractAmounts: [],
           reportNo: '',
           reviewStatus: '',
+          existReportNumber: '',
           status1: '',
           projectNumber: '',
           projectName: '',
@@ -288,6 +314,7 @@
           projectMaster2Id: '',
           createBy: '',
           contractDates: [],
+          auditPassDates: [],
           projectMasterName: '', // 项目经理1
           realHeaderName: '', // 项目经理2
           filingType: ''

src/views/modules/cw/reportManagement/ReportManagementSignatureForm.vue

@@ -158,7 +158,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!--<el-col :span="12">
             <el-form-item label="审计收费(税前、元)" prop="auditFees"
                           :rules="[
                    ]">
@@ -166,7 +166,7 @@
                         @keyup.native="inputForm.auditFees = twoDecimalPlaces(inputForm.auditFees)"
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col>-->
 
           <el-col :span="12">
             <el-form-item label="报告实际制作人" prop="realCreate"

src/views/modules/cw/reportManagement/ReportManagementTaskForm.vue

@@ -117,7 +117,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
+          <!--<el-col :span="12">
             <el-form-item label="审计收费(税前、元)" prop="auditFees"
                           :rules="[
                    ]">
@@ -125,7 +125,7 @@
                         @keyup.native="inputForm.auditFees = twoDecimalPlaces(inputForm.auditFees)"
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col>-->
 
           <el-col :span="12">
             <el-form-item label="报告实际制作人" prop="realCreate"

src/views/modules/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -134,7 +134,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <!--<el-col :span="12">
               <el-form-item label="审计收费(税前、元)" prop="auditFees"
                             :rules="[
                    ]">
@@ -142,7 +142,7 @@
                           @keyup.native="inputForm.auditFees = twoDecimalPlaces(inputForm.auditFees)"
                 ></el-input>
               </el-form-item>
-            </el-col>
+            </el-col>-->
 
             <el-col :span="12">
               <el-form-item label="报告实际制作人" prop="realCreate"

src/views/modules/reimbursement/info/ReimbursementForm.vue

@@ -658,7 +658,6 @@
             {required: true, message: '报销合同不能为空'}
           ],
           reportNumber: [
-            {required: true, message: '报告号不能为空'}
           ],
           number: [
             {required: true, message: '费用(元)不能为空'}

src/views/modules/roster/RosterForm.vue

@@ -11,7 +11,7 @@
       <el-row>
         <el-col :span="24">
           <el-tabs v-model="activeName" @tab-click="tabHandleClick" :before-leave="tabBeforeLeave">
-            <el-tab-pane v-for="(item, index) in $dictUtils.getDictList('roster_person_type2')" :label="item.label" :name="item.value">
+            <el-tab-pane v-for="(item, index) in $dictUtils.getDictList('roster_person_type')" :label="item.label" :name="item.value">
 
             </el-tab-pane>
           </el-tabs>
@@ -53,7 +53,7 @@
             <el-form-item label="姓名" prop="name"
                           :rules="[{required: true, message: '姓名不能为空', trigger: 'blur'}
                  ]">
-              <el-input v-model="inputForm.name" :disabled="true" :readonly="true" placeholder="请填写姓名"     clearable></el-input>
+              <el-input v-model="inputForm.name" placeholder="请填写姓名"     clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12" >
@@ -68,8 +68,6 @@
                 size="middle"
                 :url="`/sys/office/treeData?type=2`"
                 :value="inputForm.officeId"
-                :disabled="true"
-                :readonly="true"
                 :clearable="true"
                 :accordion="true"
                 @getValue="(value) => {inputForm.officeId=value}"/>
@@ -77,7 +75,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="公司" prop="companyId">
-              <el-select v-model="inputForm.companyId" :disabled="true" :readonly="true" style="width:100%" placeholder="请选择">
+              <el-select v-model="inputForm.companyId" :readonly="true" style="width:100%" placeholder="请选择">
                 <el-option
                   v-for="company in companyList"
                   :key="company.id"
@@ -89,7 +87,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="角色" prop="roleIdList">
-              <el-select v-model="inputForm.roleIdList" :disabled="true" :readonly="true" size="middle" style="width:100%" multiple placeholder="请选择">
+              <el-select v-model="inputForm.roleIdList" size="middle" style="width:100%" multiple placeholder="请选择">
                 <el-option
                   v-for="role in roleList"
                   :key="role.id"
@@ -102,7 +100,7 @@
           <el-col :span="12">
             <el-form-item label="岗位" prop="postIdList">
               <el-select v-model="inputForm.postIdList" @change="$forceUpdate()"
-                         :disabled="true" :readonly="true" style="width:100%" multiple placeholder="请选择">
+                          style="width:100%" multiple placeholder="请选择">
                 <el-option
                   v-for="item in postList"
                   :key="item.id"
@@ -126,8 +124,6 @@
                 :value="inputForm.manageOfficeIds"
                 :clearable="false"
                 :accordion="true"
-                :disabled="true"
-                :readonly="true"
                 :showCheckbox="true"
                 :checkStrictly="true"
                 :checkOnClickNode="true"
@@ -138,7 +134,7 @@
             <el-form-item label="职位" prop="jobPositionId"
                           :rules="[
                  ]">
-              <el-select v-model="inputForm.jobPositionId" :disabled="true" :readonly="true" style="width:100%" placeholder="请选择职位">
+              <el-select v-model="inputForm.jobPositionId" style="width:100%" placeholder="请选择职位">
                 <el-option
                   v-for="item in jobPositionList"
                   :key="item.id"
@@ -152,7 +148,7 @@
             <el-form-item label="职务" prop="positionId"
                           :rules="[
                  ]">
-              <el-select v-model="inputForm.positionId" :disabled="true" :readonly="true" style="width:100%" placeholder="请选择职务">
+              <el-select v-model="inputForm.positionId" style="width:100%" placeholder="请选择职务">
                 <el-option
                   v-for="item in positionList"
                   :key="item.id"
@@ -166,7 +162,7 @@
             <el-form-item label="职级" prop="rankId"
                           :rules="[
                  ]">
-              <el-select v-model="inputForm.rankId" :disabled="true" :readonly="true" style="width:100%" placeholder="请选择职级">
+              <el-select v-model="inputForm.rankId" style="width:100%" placeholder="请选择职级">
                 <el-option
                   v-for="item in rankList"
                   :key="item.id"
@@ -180,14 +176,14 @@
             <el-form-item label="工号" prop="jobNo"
                           :rules="[
                  ]">
-              <el-input :disabled="true" :readonly="true" v-model="inputForm.jobNo" placeholder="请填写工号"     clearable></el-input>
+              <el-input v-model="inputForm.jobNo" placeholder="请填写工号"     clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="证件类型" prop="certificatesType"
                           :rules="[{required: true, message: '证件类型不能为空', trigger: 'blur'}
                  ]">
-              <el-select v-model="inputForm.certificatesType" :disabled="true" :readonly="true" placeholder="请选择证件类型" style="width:100%;">
+              <el-select v-model="inputForm.certificatesType" placeholder="请选择证件类型" style="width:100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('certificates_type')"
                   :key="item.value"
@@ -203,7 +199,7 @@
                     {validator: checkIdCardRule, trigger: 'change'},
                     {validator: checkIdCardRule, trigger: 'blur'}
                   ]">
-              <el-input v-model="inputForm.idCard" :disabled="true" :readonly="true" placeholder="请填写证件号"  clearable></el-input>
+              <el-input v-model="inputForm.idCard" placeholder="请填写证件号"  clearable></el-input>
             </el-form-item>
           </el-col>
 
@@ -214,9 +210,8 @@
               <el-popover
                 placement="left"
                 trigger="hover">
-                <el-button style="width: 100%" @click="onPreview(inputForm.certificatesFrontLsUrl)" :disabled="true" icon="el-icon-zoom-in"></el-button>
+                <el-button style="width: 100%" @click="onPreview(inputForm.certificatesFrontLsUrl)" icon="el-icon-zoom-in"></el-button>
                 <el-upload
-                  :disabled="true"
                   slot="reference"
                   class="avatar-uploader"
                   :action="`${$http.BASE_URL}/roster/base/webUpload/upload`"
@@ -242,9 +237,8 @@
               <el-popover
                 placement="left"
                 trigger="hover">
-                <el-button style="width: 100%" @click="onPreview(inputForm.certificatesBackLsUrl)" :disabled="true" icon="el-icon-zoom-in"></el-button>
+                <el-button style="width: 100%" @click="onPreview(inputForm.certificatesBackLsUrl)" icon="el-icon-zoom-in"></el-button>
                 <el-upload
-                  :disabled="true"
                   slot="reference"
                   class="avatar-uploader"
                   :action="`${$http.BASE_URL}/roster/base/webUpload/upload`"
@@ -264,14 +258,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="手机号码" prop="mobile">
-              <el-input v-model="inputForm.mobile" :disabled="true" placeholder="请填写手机号码"     clearable></el-input>
+              <el-input v-model="inputForm.mobile" placeholder="请填写手机号码"     clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12" >
             <el-form-item label="合同类型" prop="contractType"
                           :rules="[
                  ]">
-              <el-select v-model="inputForm.contractType" :disabled="true" placeholder="请选择合同类型" style="width:100%;">
+              <el-select v-model="inputForm.contractType" placeholder="请选择合同类型" style="width:100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('roster_contract_type')"
                   :key="item.value"
@@ -285,7 +279,7 @@
             <el-form-item label="员工类型" prop="workerType"
                           :rules="[{required: true, message: '员工类型不能为空', trigger: 'blur'}
                  ]">
-              <el-select v-model="inputForm.workerType" :disabled="true" placeholder="请选择员工类型" style="width:100%;">
+              <el-select v-model="inputForm.workerType" placeholder="请选择员工类型" style="width:100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('worker_type')"
                   :key="item.value"
@@ -298,7 +292,6 @@
           <el-col :span="12" >
             <el-form-item label="入职日期" prop="onboardingDate">
               <el-date-picker
-                :disabled="true"
                 placement="bottom-start"
                 style="width: 100%"
                 v-model="inputForm.onboardingDate"
@@ -309,21 +302,21 @@
           </el-col>
           <el-col :span="12" >
             <el-form-item label="历史工龄" prop="seniority">
-              <el-input v-model="inputForm.seniority" :disabled="true" placeholder="请填写历史工龄"     clearable></el-input>
+              <el-input v-model="inputForm.seniority" placeholder="请填写历史工龄"     clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12" >
             <el-form-item label="合同公司" prop="contractCompany"
                           :rules="[
                  ]">
-              <el-input v-model="inputForm.contractCompany" placeholder="请填写合同公司"  :disabled="true"   clearable></el-input>
+              <el-input v-model="inputForm.contractCompany" placeholder="请填写合同公司" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="性别" prop="sex"
                           :rules="[
                  ]">
-              <el-select v-model="inputForm.sex" placeholder="请选择性别" :disabled="true" style="width:100%;">
+              <el-select v-model="inputForm.sex" placeholder="请选择性别" style="width:100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('sex')"
                   :key="item.value"
@@ -336,7 +329,6 @@
           <el-col :span="12" >
             <el-form-item label="出生日期" prop="birthDate">
               <el-date-picker
-                :disabled="true"
                 placement="bottom-start"
                 style="width: 100%"
                 v-model="inputForm.birthDate"
@@ -349,21 +341,21 @@
             <el-form-item label="工作地点" prop="workPlace"
                           :rules="[
                  ]">
-              <el-input v-model="inputForm.workPlace" placeholder="请填写工作地点"  :disabled="true"   clearable></el-input>
+              <el-input v-model="inputForm.workPlace" placeholder="请填写工作地点" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12" >
             <el-form-item label="联系地址" prop="contactAddress"
                           :rules="[
                  ]">
-              <el-input v-model="inputForm.contactAddress" placeholder="请填写联系地址"  :disabled="true"   clearable></el-input>
+              <el-input v-model="inputForm.contactAddress" placeholder="请填写联系地址" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12" >
             <el-form-item label="入职年度就业情形" prop="employmentSituation"
                           :rules="[
                  ]">
-              <el-select v-model="inputForm.employmentSituation" :disabled="true" placeholder="请选择入职年度就业情形" style="width:100%;">
+              <el-select v-model="inputForm.employmentSituation" placeholder="请选择入职年度就业情形" style="width:100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('employment_situation')"
                   :key="item.value"
@@ -377,7 +369,7 @@
             <el-form-item label="工时制度" prop="workingHour"
                           :rules="[
                  ]">
-              <el-select v-model="inputForm.workingHour" :disabled="true" placeholder="请选择入职年度就业情形" style="width:100%;">
+              <el-select v-model="inputForm.workingHour" placeholder="请选择入职年度就业情形" style="width:100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('working_hour_type')"
                   :key="item.value"
@@ -391,7 +383,7 @@
             <el-form-item label="民族" prop="ethnic"
                           :rules="[
                  ]">
-              <el-select v-model="inputForm.ethnic" :disabled="true" filterable placeholder="请选择民族" style="width:100%;">
+              <el-select v-model="inputForm.ethnic" filterable placeholder="请选择民族" style="width:100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('ethnic')"
                   :key="item.value"
@@ -405,7 +397,7 @@
             <el-form-item label="户口类型" prop="accountType"
                           :rules="[
                  ]">
-              <el-select v-model="inputForm.accountType" :disabled="true" placeholder="请选择户口类型" style="width:100%;">
+              <el-select v-model="inputForm.accountType" placeholder="请选择户口类型" style="width:100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('account_type')"
                   :key="item.value"
@@ -419,28 +411,28 @@
             <el-form-item label="户口所在地" prop="accountAddr"
                           :rules="[
                  ]">
-              <el-input v-model="inputForm.accountAddr" placeholder="请填写户口所在地"  :disabled="true"   clearable></el-input>
+              <el-input v-model="inputForm.accountAddr" placeholder="请填写户口所在地" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12" >
             <el-form-item label="籍贯" prop="origin"
                           :rules="[
                  ]">
-              <el-input v-model="inputForm.origin" placeholder="请填写籍贯"  :disabled="true"   clearable></el-input>
+              <el-input v-model="inputForm.origin" placeholder="请填写籍贯" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12" >
             <el-form-item label="居住地址" prop="liveAddr"
                           :rules="[
                  ]">
-              <el-input v-model="inputForm.liveAddr" placeholder="请填写居住地址"  :disabled="true"   clearable></el-input>
+              <el-input v-model="inputForm.liveAddr" placeholder="请填写居住地址" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12" >
             <el-form-item label="最高学历" prop="highestEducation"
                           :rules="[
                  ]">
-              <el-select v-model="inputForm.highestEducation" placeholder="请选择最高学历" :disabled="true" style="width:100%;">
+              <el-select v-model="inputForm.highestEducation" placeholder="请选择最高学历" style="width:100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('highest_education')"
                   :key="item.value"
@@ -454,7 +446,7 @@
             <el-form-item label="政治面貌" prop="politicalFace"
                           :rules="[
                  ]">
-              <el-select v-model="inputForm.politicalFace" :disabled="true" placeholder="请选择政治面貌" style="width:100%;">
+              <el-select v-model="inputForm.politicalFace" placeholder="请选择政治面貌" style="width:100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('political_face')"
                   :key="item.value"
@@ -468,7 +460,7 @@
             <el-form-item label="婚姻状况" prop="maritalStatus"
                           :rules="[
                  ]">
-              <el-select v-model="inputForm.maritalStatus" :disabled="true" placeholder="请选择婚姻状况" style="width:100%;">
+              <el-select v-model="inputForm.maritalStatus" placeholder="请选择婚姻状况" style="width:100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('marital_status')"
                   :key="item.value"
@@ -482,7 +474,7 @@
             <el-form-item label="血型" prop="bloodType"
                           :rules="[
                  ]">
-              <el-select v-model="inputForm.bloodType" :disabled="true" placeholder="请选择血型" style="width:100%;">
+              <el-select v-model="inputForm.bloodType" placeholder="请选择血型" style="width:100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('blood_type')"
                   :key="item.value"
@@ -496,52 +488,52 @@
             <el-form-item label="紧急联系人姓名" prop="emergencyContactName"
                           :rules="[
                  ]">
-              <el-input v-model="inputForm.emergencyContactName" placeholder="请填写紧急联系人姓名"   :disabled="true"  clearable></el-input>
+              <el-input v-model="inputForm.emergencyContactName" placeholder="请填写紧急联系人姓名" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12" >
             <el-form-item label="紧急联系人电话" prop="emergencyContactTel"
                           :rules="[
                  ]">
-              <el-input v-model="inputForm.emergencyContactTel" placeholder="请填写紧急联系人电话"  :disabled="true"   clearable></el-input>
+              <el-input v-model="inputForm.emergencyContactTel" placeholder="请填写紧急联系人电话" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12" >
             <el-form-item label="配偶姓名" prop="spouseName"
                           :rules="[
                  ]">
-              <el-input v-model="inputForm.spouseName" placeholder="请填写配偶姓名"  :disabled="true"   clearable></el-input>
+              <el-input v-model="inputForm.spouseName" placeholder="请填写配偶姓名" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12" >
             <el-form-item label="孩子姓名" prop="childName"
                           :rules="[
                  ]">
-              <el-input v-model="inputForm.childName" placeholder="请填写孩子姓名"  :disabled="true"   clearable></el-input>
+              <el-input v-model="inputForm.childName" placeholder="请填写孩子姓名" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="QQ" prop="qq">
-              <el-input v-model="inputForm.qq" placeholder="请填写QQ"   :disabled="true"  clearable></el-input>
+              <el-input v-model="inputForm.qq" placeholder="请填写QQ" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="微信" prop="wechat"
                           :rules="[
                  ]">
-              <el-input v-model="inputForm.wechat" placeholder="请填写微信"  :disabled="true"   clearable></el-input>
+              <el-input v-model="inputForm.wechat" placeholder="请填写微信" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="个人邮箱" prop="email">
-              <el-input v-model="inputForm.email" placeholder="请填写个人邮箱"  :disabled="true"   clearable></el-input>
+              <el-input v-model="inputForm.email" placeholder="请填写个人邮箱" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="备注" prop="remarks"
                           :rules="[
                  ]">
-              <el-input type="textarea" style="width:100%" maxlength="1000" :disabled="true" v-model="inputForm.remarks" placeholder="请填写备注"     ></el-input>
+              <el-input type="textarea" style="width:100%" maxlength="1000" v-model="inputForm.remarks" placeholder="请填写备注"     ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -552,7 +544,6 @@
                           :rules="[
                ]">
               <el-date-picker
-                :disabled="true"
                 placement="bottom-start"
                 style="width: 100%"
                 v-model="inputForm.rosterContractDTO.beginDate"
@@ -566,7 +557,6 @@
                           :rules="[
                ]">
               <el-date-picker
-                :disabled="true"
                 placement="bottom-start"
                 style="width: 100%"
                 v-model="inputForm.rosterContractDTO.endDate"
@@ -577,14 +567,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="工作邮箱" prop="rosterContractDTO.workEmail">
-              <el-input v-model="inputForm.rosterContractDTO.workEmail" placeholder="请填写工作邮箱"  :disabled="true"   clearable></el-input>
+              <el-input v-model="inputForm.rosterContractDTO.workEmail" placeholder="请填写工作邮箱" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="工作电话" prop="rosterContractDTO.workMobile"
                           :rules="[
                ]">
-              <el-input v-model="inputForm.rosterContractDTO.workMobile" placeholder="请填写工作电话" :disabled="true"    clearable></el-input>
+              <el-input v-model="inputForm.rosterContractDTO.workMobile" placeholder="请填写工作电话" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -592,7 +582,6 @@
                           :rules="[
                ]">
               <el-date-picker
-                :disabled="true"
                 placement="bottom-start"
                 style="width: 100%"
                 v-model="inputForm.rosterContractDTO.probationPeriodEndDate"
@@ -603,7 +592,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="试用期(月)" prop="rosterContractDTO.probationPeriodMonth">
-              <el-input v-model="inputForm.rosterContractDTO.probationPeriodMonth" :disabled="true" placeholder="请填写试用期(月)" clearable></el-input>
+              <el-input v-model="inputForm.rosterContractDTO.probationPeriodMonth" placeholder="请填写试用期(月)" clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -706,7 +695,7 @@
           <el-row :gutter="15">
             <el-col :span="24">
               <el-form-item label="" >
-                <el-button style="width: 100%" type="primary" :disabled="true" @click="addRow('bank')" plain>新增银行卡</el-button>
+                <el-button style="width: 100%" type="primary" @click="addRow('bank')" plain>新增银行卡</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -842,7 +831,7 @@
           <el-row :gutter="15">
             <el-col :span="24">
               <el-form-item label="" >
-                <el-button style="width: 100%" :disabled="true" type="primary" @click="addRow('educate')" plain>新增教育经历</el-button>
+                <el-button style="width: 100%" type="primary" @click="addRow('educate')" plain>新增教育经历</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -911,7 +900,7 @@
           <el-row :gutter="15">
             <el-col :span="24">
               <el-form-item label="" >
-                <el-button style="width: 100%" type="primary" :disabled="true" @click="addRow('work')" plain>新增工作经历</el-button>
+                <el-button style="width: 100%" type="primary" @click="addRow('work')" plain>新增工作经历</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -993,7 +982,7 @@
           <el-row :gutter="15">
             <el-col :span="24">
               <el-form-item label="" >
-                <el-button style="width: 100%" type="primary" :disabled="true" @click="addRow('family')" plain>新增家庭成员</el-button>
+                <el-button style="width: 100%" type="primary" @click="addRow('family')" plain>新增家庭成员</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -1123,7 +1112,7 @@
           <el-row :gutter="15">
             <el-col :span="24">
               <el-form-item label="" >
-                <el-button style="width: 100%" type="primary" :disabled="true" @click="addRow('certificate')" plain>新增员工证书</el-button>
+                <el-button style="width: 100%" type="primary" @click="addRow('certificate')" plain>新增员工证书</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -1262,7 +1251,7 @@
           <el-row :gutter="15">
             <el-col :span="24">
               <el-form-item label="" >
-                <el-button style="width: 100%" type="primary" :disabled="true" @click="addRow('certDto')" plain>新增人员资质</el-button>
+                <el-button style="width: 100%" type="primary" @click="addRow('certDto')" plain>新增人员资质</el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -1755,7 +1744,7 @@
                   item.professionList = this.$dictUtils.getDictList('sys_cert_profession_accounting')
                 }
               })
-              this.$refs.uploadComponent.newUpload('view', this.inputForm.rosterFilesDTOList, 'roster', '', '附件')
+              this.$refs.uploadComponent.newUpload(method, this.inputForm.rosterFilesDTOList, 'roster', '', '附件')
               this.loading = false
             })
           }

src/views/modules/roster/RosterList.vue

@@ -92,9 +92,9 @@
       <div class="bg-white top">
         <vxe-toolbar :refresh="{query: refreshList}" import export custom>
           <template #buttons>
-<!--            <el-button v-if="hasPermission('roster:base:add')" type="primary" size="small" icon="el-icon-plus" @click="add()">新建</el-button>-->
-<!--            <el-button v-if="hasPermission('roster:base:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.rosterTable && $refs.rosterTable.getCheckboxRecords().length === 0" plain>删除</el-button>-->
-<!--            <el-button v-if="hasPermission('roster:base:import')" size="small"  @click="template()" plain>模板下载</el-button>-->
+            <el-button v-if="hasPermission('roster:base:add')" type="primary" size="small" icon="el-icon-plus" @click="add()">新建</el-button>
+            <el-button v-if="hasPermission('roster:base:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.rosterTable && $refs.rosterTable.getCheckboxRecords().length === 0" plain>删除</el-button>
+            <el-button v-if="hasPermission('roster:base:import')" size="small"  @click="template()" plain>模板下载</el-button>
             <el-button v-if="showButton" type="primary" size="small" icon="el-icon-arrow-down" @click="showTabs()" plain>展示分类</el-button>
             <el-button v-if="disableButton" type="primary" size="small" icon="el-icon-arrow-up" @click="disableTabs()" plain>收起分类</el-button>
           </template>
@@ -145,7 +145,7 @@
             <vxe-column min-width="150px"  title="证件号" field="idCard" align="center"> </vxe-column>
             <vxe-column min-width="150px"  title="人员类型" field="personType" align="center">
               <template slot-scope="scope">
-                <span> {{$dictUtils.getDictLabel("roster_person_type2", scope.row.personType)}} </span>
+                <span> {{$dictUtils.getDictLabel("roster_person_type", scope.row.personType)}} </span>
               </template>
             </vxe-column>
             <vxe-column min-width="150px"  title="员工类型" field="workerType" align="center">

src/views/modules/sys/login/login.vue

@@ -24,7 +24,7 @@
             <el-form size="small" ref="inputForm" :model="inputForm" :rules="rules" class="login-form"  @keyup.enter.native="login()" @submit.native.prevent>
 
               <el-form-item  prop="username">
-                <el-input type="text" placeholder="请输入账号" v-model="inputForm.username">
+                <el-input type="text" placeholder="请输入账号" v-model="inputForm.username" @blur="getLoginCodeNumber($event.target.value)">
                    <i slot="prefix" class="el-input__icon el-icon-user-solid"></i>
                 </el-input>
               </el-form-item>
@@ -251,9 +251,10 @@
       // 获取验证码
       getLoginCodeNumber (username) {
         this.loginService.getLoginCodeNumber(username).then(({data}) => {
-          console.log(11111)
           if (data.redisLoginNumber >= data.loginNumber) {
-            this.getCaptcha()
+            if (!this.isShow) {
+              this.getCaptcha()
+            }
             this.isShow = true
           }
         })