森语-员工档案

src/views/system/UserList.vue

@@ -23,7 +23,7 @@
 
           <template v-if="toggleSearchStatus">
           <a-col :md="6" :sm="12">
-            <a-form-item label="真实名字">
+            <a-form-item label="员工名字">
                <j-input placeholder="请输入" v-model="queryParam.realname"></j-input>
             </a-form-item>
           </a-col>
@@ -243,7 +243,7 @@
             dataIndex: 'orgCode'
           },
           {
-            title: '用户姓名',
+            title: '员工姓名',
             align: "center",
             width: 100,
             dataIndex: 'realname',

src/views/system/modules/UserModal.vue

@@ -77,7 +77,7 @@
         </a-form-item>
 
         <a-form-item label="身份证号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入身份证号码" v-decorator="['nidNo', validatorRules.nidNo]" />
+          <a-input placeholder="请输入身份证号码" v-decorator="['nidNo', validatorRules.nidNo]"  @blur="changeNidNo"/>
         </a-form-item>
 
         <a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -332,6 +332,9 @@
             dictCode="activiti_sync"
           />
         </a-form-item>
+        <a-form-model-item label="附件上传" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-upload v-model="fileName" ></j-upload>
+        </a-form-model-item>
        
 
          <a-form-item label="工作简历" :labelCol="labelCol" :wrapperCol="wrapperCol" class="nresume">
@@ -406,7 +409,7 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
 import { getAction } from '@/api/manage'
 import { addUser, editUser, queryUserRole, queryall, duplicateCheck } from '@/api/api'
 import { disabledAuthFilter } from '@/utils/authFilter'
-
+import JUpload from '../../../components/jeecg/JUpload'
 import JImageUpload from '../../../components/jeecg/JImageUpload'
 
 export default {
@@ -414,7 +417,8 @@ export default {
     components: {
         JImageUpload,
         departWindow,
-        JSelectPosition
+        JSelectPosition,
+        JUpload
     },
     data () {
         return {
@@ -496,7 +500,7 @@ export default {
                     rules: [{ required: true, message: '请选择性别' }]
                 },
                 nidNo:{
-                    rules: [{ required: true, message: '输入身份证号码' }]
+                    rules: [{ required: true, message: '输入身份证号码'},{validator: this.validateIdCard}]
                 },
                 nmarriage:{
                     rules: [{ required: true, message: '请选择婚否' }]
@@ -565,6 +569,7 @@ export default {
             identity: '1',
             ifOa:'0',
             fileList: [],
+            fileName:[],
             orgObject: {
                 pkOrg: '', // 选中的公司id
                 pkOrgName: '' // 选中的公司名称
@@ -582,6 +587,13 @@ export default {
         }
     },
     methods: {
+       validateIdCard(rule, value, callback) {
+        if (!value || new RegExp(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/).test(value)) {
+          callback();
+        } else {
+          callback("您的身份证号码格式不正确!");
+        }
+      },
         isDisabledAuth (code) {
             return disabledAuthFilter(code)
         },
@@ -638,6 +650,7 @@ export default {
                 setTimeout(() => {
                     this.fileList = record.avatar
                     this.ifOa = record.ifOa
+                    this.fileName = record.fileName
                 }, 5)
             }
             that.userId = record.id
@@ -767,9 +780,10 @@ export default {
             this.departIdShow = false
             this.identity = '1'
             this.fileList = []
+            this.fileName = []
             this.orgObject = []
             this.userObject = {}
-            this.validatorRules.username.rules[0].required = false
+            // this.validatorRules.username.rules[0].required = false
             this.validatorRules.confirmpassword.rules[0].required = false
         },
         moment,
@@ -793,12 +807,12 @@ export default {
                     formData.pkOrg = this.orgObject.pkOrg
                     formData.pkOrgName = this.orgObject.pkOrgName
                     formData.avatar = that.fileList
+                    formData.fileName = that.fileName
                     formData.ifOa = this.ifOa
                     formData.selectedroles = this.selectedRole.length > 0 ? this.selectedRole.join(',') : ''
                     formData.selecteddeparts =
                     this.userDepartModel.departIdList.length > 0 ? this.userDepartModel.departIdList.join(',') : ''
                     formData.identity = this.identity
-                    debugger
                     // 如果是上级择传入departIds,否则为空
                     if (this.identity === '2') {
                         formData.departIds = this.departIds.join(',')
@@ -1029,24 +1043,32 @@ export default {
             }
         },
         changeOa(e){
-            if(e.target.value !== '1'){ 
-              var text =this.form.getFieldValue('workNo')
-              var text1 =this.form.getFieldValue('username')
-              if(text1==''||!text1){
-                this.form.setFieldsValue({username:text})
-              }
-            }
+            // if(e.target.value !== '1'){ 
+            //   var text =this.form.getFieldValue('workNo')
+            //   var text1 =this.form.getFieldValue('username')
+            //   if(text1==''||!text1){
+            //     this.form.setFieldsValue({username:text})
+            //   }
+            // }
+        },
+        changeNidNo(e){
+          var year =  e.target.value.slice(6,10),
+          month = e.target.value.slice(10,12),
+          day = e.target.value.slice(12,14),
+          data = year+'-'+month+'-'+day
+          data = moment(data)
+          this.form.setFieldsValue({birthday:data})
         },
         changeWorkNo(e){
-          var that = this
-           setTimeout(function(){
-              var text1 =that.form.getFieldValue('workNo')
-              var text =that.form.getFieldValue('username')
-              if((text==''||!text)&& that.ifOa =='0'){
-                 that.form.setFieldsValue({username:''})
-                  that.form.setFieldsValue({username:text1})
-                }
-                },0) 
+          // var that = this
+          //  setTimeout(function(){
+          //     var text1 =that.form.getFieldValue('workNo')
+          //     var text =that.form.getFieldValue('username')
+          //     if((text==''||!text)&& that.ifOa =='0'){
+          //        that.form.setFieldsValue({username:''})
+          //         that.form.setFieldsValue({username:text1})
+          //       }
+          //       },0) 
           
          
         },