格克

src/views/system/UserList.vue

@@ -75,7 +75,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator" style="border-top: 5px">
       <a-button @click="handleAdd()" type="primary" icon="plus" v-has="'user:add'" >添加员工</a-button>
-      <a-button @click="handleExportXltx()"type="primary" icon="plus"  >模板</a-button>
+      <a-button @click="handleExportXltx()"type="primary" icon="plus"  v-has="'user:mb'" >模板</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('用户信息')" v-has='"user:export"'>导出</a-button>
       <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel" v-has='"user:import"'>
         <a-button type="primary" icon="import">导入</a-button>
@@ -148,8 +148,8 @@
               更多 <a-icon type="down"/>
             </a>
             <a-menu slot="overlay">
-              <a-menu-item v-has='"user:details"'>
-                <a href="javascript:;" @click="handleDetail(record)">详情</a>
+              <a-menu-item v-has="'user:details'" >
+                <a href="javascript:;" @click="handleDetails(record)">详情</a>
               </a-menu-item>
 
 
@@ -170,7 +170,7 @@
 
   
     <user-modal ref="modalForm" @ok="modalFormOk"></user-modal>
-
+    <user-detail-modal ref="userdetailmodal"></user-detail-modal>
     <password-modal ref="passwordmodal" @ok="passwordModalOk"></password-modal>
 
     <!-- 用户回收站 -->
@@ -182,6 +182,7 @@
 
 <script>
   import UserModal from './modules/UserModal'
+  import UserDetailModal from './modules/UserDetailModal'
   import PasswordModal from './modules/PasswordModal'
   import {putAction,getFileAccessHttpUrl} from '@/api/manage';
   import {frozenBatch} from '@/api/api'
@@ -198,7 +199,7 @@
       PasswordModal,
       JInput,
       UserRecycleBinModal,
-      
+      UserDetailModal,
       JSuperQuery
     },
     data() {
@@ -392,6 +393,10 @@
           this.batchFrozen(1);
         }
       },
+      handleDetails(e){
+        console.log(this.$refs)
+        this.$refs.userdetailmodal.edit(e);
+      },
       handleFrozen: function (id, status, username) {
         let that = this;
         //TODO 后台校验管理员角色

src/views/system/UserPrizeList.vue

@@ -8,7 +8,7 @@
 
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="员工姓名">
-              <a-input placeholder="请输入员工姓名" v-model="queryParam.userId"></a-input>
+              <a-input placeholder="请输入员工姓名" v-model="queryParam.realname"></a-input>
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">

src/views/system/modules/UserModal.vue

@@ -15,18 +15,18 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入员工姓名" v-decorator="[ 'realname', validatorRules.realname]" />
+              <a-input maxLength="10" placeholder="请输入员工姓名" v-decorator="[ 'realname', validatorRules.realname]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="英文名" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入英文名" v-decorator="[ 'egName', validatorRules.egName]" />
+              <a-input maxLength="10" placeholder="请输入英文名" v-decorator="[ 'egName', validatorRules.egName]" />
             </a-form-item>
           </a-col>
           
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入邮箱" v-decorator="[ 'email', validatorRules.email]" />
+              <a-input maxLength="30" placeholder="请输入邮箱" v-decorator="[ 'email', validatorRules.email]" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -42,7 +42,7 @@
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="身份证" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input  placeholder="请输入身份证号码" v-decorator="[ 'sfzCode', validatorRules.sfzCode]" />
+              <a-input maxLength="20" placeholder="请输入身份证号码" v-decorator="[ 'sfzCode', validatorRules.sfzCode]" />
             </a-form-item>
             </a-col>
             <a-col :md="6" :sm="8" :lg="8">
@@ -66,26 +66,25 @@
           </a-col>
             <a-col :md="6" :sm="8" :lg="8">
                 <a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input placeholder="请输入手机号码" v-decorator="[ 'phone', validatorRules.phone]" />
+                  <a-input maxLength="20" placeholder="请输入手机号码" v-decorator="[ 'phone', validatorRules.phone]" />
                 </a-form-item>
             </a-col>
             <a-col :md="6" :sm="8" :lg="8">
               <a-form-item label="公积金" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input  placeholder="请输入公积金账号"  v-decorator="['syFund',validatorRules.syFund]" />
+                  <a-input maxLength="20" placeholder="请输入公积金账号"  v-decorator="['syFund',validatorRules.syFund]" />
                 </a-form-item>
               </a-col>
-            </a-col>
         </a-row>
 
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="银行卡" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入银行卡号"  v-decorator="['bankCard', validatorRules.bankCard]" />
+              <a-input maxLength="20" placeholder="请输入银行卡号"  v-decorator="['bankCard', validatorRules.bankCard]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入开户行" v-decorator="['bankAddr', {}]" />
+              <a-input maxLength="30" placeholder="请输入开户行" v-decorator="['bankAddr', {}]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
@@ -100,12 +99,12 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="工资一" :labelCol="labelCol" :wrapperCol="wrapperCol" >
-              <a-input-number id="inputNumber" placeholder="请输入基本工资" style="width: 210px;" v-decorator="['wagesOne',validatorRules.wagesOne]" />
+              <a-input-number min="0" max="999999" id="inputNumber" placeholder="请输入基本工资" style="width: 210px;" v-decorator="['wagesOne',validatorRules.wagesOne]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="工资二" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-number placeholder="请输入基本工资" style="width: 210px;" v-decorator="['wagesTwo', {}]" />
+              <a-input-number min="0" max="999999" placeholder="请输入基本工资" style="width: 210px;" v-decorator="['wagesTwo', {}]" />
             </a-form-item>
           </a-col>
           <!-- <a-col :md="6" :sm="8" :lg="8">
@@ -138,7 +137,7 @@
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="缴交基数" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-number :disabled="personType" controls="false" style="width: 210px;" placeholder="请输入缴交基数" v-decorator="['wagesBase', {}]" />
+              <a-input-number min="0" max="10" :disabled="personType" controls="false" style="width: 210px;" placeholder="请输入缴交基数" v-decorator="['wagesBase', {}]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
@@ -153,12 +152,12 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入紧急联系人" v-decorator="[ 'urgentName',{}]" />
+              <a-input maxLength="10" placeholder="请输入紧急联系人" v-decorator="[ 'urgentName',{}]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入紧急联系人电话" v-decorator="[ 'urgentPhone', {}]" />
+              <a-input maxLength="20" placeholder="请输入紧急联系人电话" v-decorator="[ 'urgentPhone', {}]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
@@ -173,7 +172,7 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="家庭住址" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input placeholder="请输入家庭住址" v-decorator="[ 'addr', {}]" />
+              <a-input maxLength="50" placeholder="请输入家庭住址" v-decorator="[ 'addr', {}]" />
             </a-form-item>
           </a-col>
          <a-col :md="6" :sm="8" :lg="8">
@@ -201,7 +200,7 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-textarea placeholder="请输备注" v-decorator="[ 'remarks', {}]" />
+              <a-textarea maxLength="255" placeholder="请输备注" v-decorator="[ 'remarks', {}]" />
             </a-form-item>
           </a-col>
          <a-col :md="6" :sm="8" :lg="8">
@@ -538,9 +537,9 @@
            this.dataSources = res.result.records||res.result;
            if(res.result.total)
            {
-             this.ipaginations.total = res.result.total+1;
+             this.ipaginations.total = res.result.total;
            }else{
-             this.ipaginationstotal = 0+1;
+             this.ipaginationstotal = 0;
            }
           } 
         }).finally(() => {