员工档案登记表表单验证补充

src/views/system/modules/UserModal.vue

@@ -28,11 +28,11 @@
         </a-form-item>
 
          <a-form-item label="英文名" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入英文名" v-decorator="['nenName',{}]" />
+          <a-input placeholder="请输入英文名" v-decorator="['nenName',validatorRules.nenName]" />
         </a-form-item>
 
          <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-select v-decorator="['sex', {}]" placeholder="请选择性别">
+          <a-select v-decorator="['sex', validatorRules.sex]" placeholder="请选择性别">
             <a-select-option :value="1">男</a-select-option>
             <a-select-option :value="2">女</a-select-option>
           </a-select>
@@ -42,12 +42,12 @@
           <a-date-picker
             style="width: 100%"
             placeholder="请选择生日"
-            v-decorator="['birthday', { initialValue: !model.birthday ? null : moment(model.birthday, dateFormat) }]"
+            v-decorator="['birthday',{ initialValue: !model.birthday ? null : moment(model.birthday, dateFormat),rules: [{ required: true, message: '请选择生日日期' }] }]"
           />
         </a-form-item>
 
         <a-form-item label="婚否" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-select v-decorator="['nmarriage', {}]" placeholder="请选择性别">
+          <a-select v-decorator="['nmarriage', validatorRules.nmarriage]" placeholder="请选择性别">
             <a-select-option value="1">是</a-select-option>
             <a-select-option value="0">否</a-select-option>
           </a-select>
@@ -55,7 +55,7 @@
 
         <a-form-item label="户口" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-dict-select-tag
-            v-decorator="['nregistered', {}]"
+            v-decorator="['nregistered',validatorRules.nregistered]"
             placeholder="请选择户口"
             :triggerChange="true"
             dictCode="registered-residence"
@@ -63,12 +63,12 @@
         </a-form-item>
 
         <a-form-item label="户口所在地" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入户口所在地" v-decorator="['nregisteredAddr', {}]" />
+          <a-input placeholder="请输入户口所在地" v-decorator="['nregisteredAddr', validatorRules.nregisteredAddr]" />
         </a-form-item>
 
          <a-form-item label="政治面貌" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-dict-select-tag
-            v-decorator="['noutlook', {}]"
+            v-decorator="['noutlook', validatorRules.noutlook]"
             placeholder="请选择政治面貌"
             :triggerChange="true"
             dictCode="political-outlook"
@@ -76,12 +76,12 @@
         </a-form-item>
 
          <a-form-item label="所学专业" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入所学专业" v-decorator="['nmajor', {}]" />
+          <a-input placeholder="请输入所学专业" v-decorator="['nmajor', validatorRules.nmajor]" />
         </a-form-item>
 
          <a-form-item label="学历" :labelCol="labelCol" :wrapperCol="wrapperCol">
            <j-dict-select-tag
-            v-decorator="['neducation', {}]"
+            v-decorator="['neducation',validatorRules.neducation]"
             placeholder="请选择学历"
             :triggerChange="true"
             dictCode="education"
@@ -92,12 +92,12 @@
           <a-date-picker
             style="width: 100%"
             placeholder="请选择毕业时间"
-            v-decorator="['nGraduationTime', { initialValue: !model.nGraduationTime ? null : moment(model.nGraduationTime, dateFormat) }]"
+            v-decorator="['nGraduationTime', { initialValue: !model.nGraduationTime ? null : moment(model.nGraduationTime, dateFormat),rules: [{ required: true, message: '请选择毕业时间' }]  }]"
           />
         </a-form-item>
 
         <a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-select-position placeholder="请选择职务" :multiple="false" v-decorator="['post', {}]" />
+          <j-select-position placeholder="请选择职务" :multiple="false" v-decorator="['post', validatorRules.post]" />
         </a-form-item>
 
         
@@ -105,7 +105,7 @@
           <a-date-picker
             style="width: 100%"
             placeholder="请选择入司日期"
-            v-decorator="['nInductionTime', { initialValue: !model.nInductionTime ? null : moment(model.nInductionTime, dateFormat) }]"
+            v-decorator="['nInductionTime', { initialValue: !model.nInductionTime ? null : moment(model.nInductionTime, dateFormat) ,rules: [{ required: true, message: '请选择入司日期' }] }]"
           />
         </a-form-item>
 
@@ -126,7 +126,7 @@
         </a-form-item>
 
          <a-form-item label="工资卡号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入工资卡号" v-decorator="['ncardNo', {}]" />
+          <a-input placeholder="请输入工资卡号" v-decorator="['ncardNo', validatorRules.ncardNo]" />
         </a-form-item>
 
         <a-form-item label="虚拟网号" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -137,7 +137,7 @@
           <a-date-picker
             style="width: 100%"
             placeholder="请选择转正日期"
-            v-decorator="['nbecomeTime', { initialValue: !model.nbecomeTime ? null : moment(model.nbecomeTime, dateFormat) }]"
+            v-decorator="['nBecomeTime', { initialValue: !model.nBecomeTime ? null : moment(model.nBecomeTime, dateFormat) ,rules: [{ required: true, message: '请选择转正日期' }] }]"
           />
         </a-form-item>
 
@@ -179,7 +179,7 @@
         
         <a-form-item label="民族" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-dict-select-tag
-            v-decorator="['nnation', {}]"
+            v-decorator="['nnation', validatorRules.nnation]"
             placeholder="请选择民族"
             :triggerChange="true"
             dictCode="nation"
@@ -187,11 +187,11 @@
         </a-form-item>
 
         <a-form-item label="籍贯" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入籍贯" v-decorator="['nnativePlace', {}]" />
+          <a-input placeholder="请输入籍贯" v-decorator="['nnativePlace', validatorRules.nnativePlace]" />
         </a-form-item>
 
         <a-form-item label="身份证号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入身份证号码" v-decorator="['nidNo', {}]" />
+          <a-input placeholder="请输入身份证号码" v-decorator="['nidNo', validatorRules.nidNo]" />
         </a-form-item>
 
         <a-form-item label="家庭住址" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -220,7 +220,7 @@
 
          <a-form-item label="人员类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <j-dict-select-tag
-            v-decorator="['npersonnelType', {}]"
+            v-decorator="['npersonnelType',validatorRules.npersonnelType]"
             placeholder="请选择人员类型"
             :triggerChange="true"
             dictCode="personnel-status"
@@ -428,7 +428,7 @@ export default {
                     ]
                 },
                 realname: { rules: [{ required: true, message: '请输入用户名称!' }] },
-                phone: { rules: [{ validator: this.validatePhone }] },
+                phone: { rules: [{ validator: this.validatePhone },{ required: true, message: '请输入手机号码!' }] },
                 email: {
                     rules: [
                         {
@@ -442,7 +442,49 @@ export default {
                     rules: [{ required: true, message: '请输入工号' }, { validator: this.validateWorkNo }]
                 },
                 telephone: {
-                    rules: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' }]
+                    rules: [{ required: true, message: '请输入座机' },{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' }]
+                },
+                nenName:{
+                    rules: [{ required: true, message: '请输入英文名' }]
+                },
+                sex:{
+                    rules: [{ required: true, message: '请选择性别' }]
+                },
+                nidNo:{
+                    rules: [{ required: true, message: '输入身份证号码' }]
+                },
+                nmarriage:{
+                    rules: [{ required: true, message: '请选择婚否' }]
+                },
+                nregisteredAddr:{
+                    rules: [{ required: true, message: '请输入户口所在地' }]
+                },
+                nmajor:{
+                    rules: [{ required: true, message: '请输入所学专业' }]
+                },
+                noutlook:{
+                   rules: [{ required: true, message: '请选择政治面貌' }]
+                },
+                neducation:{
+                   rules: [{ required: true, message: '请选择政学历' }]
+                },
+                nregistered:{
+                    rules: [{ required: true, message: '请选择户口' }]
+                },
+                post:{
+                    rules: [{ required: true, message: '请选择职位' }]
+                },
+                ncardNo:{
+                    rules: [{ required: true, message: '请输入工资卡号' }]
+                },
+                nnation:{
+                    rules: [{ required: true, message: '请选择民族' }]
+                },
+                nnativePlace:{
+                    rules: [{ required: true, message: '请输入籍贯' }]
+                },
+                npersonnelType:{
+                    rules: [{ required: true, message: '请选择人员类型' }]
                 },
                 checkedDepartNameString:{
                    rules: [{ required: true, message: '请选择部门!' }] 
@@ -584,7 +626,7 @@ export default {
                         'ncompanyLine',
                         'ncardNo',
                         'nvirtualNo',
-                        'nbecomeTime',
+                        'nBecomeTime',
                         'nsocialTime',
                         'nfundTime',
                         'nfundBase',