森语-用户档案登记

src/views/system/modules/UserModal.vue

@@ -18,12 +18,15 @@
 
     <a-spin :spinning="confirmLoading">
       <a-form :form="form" >
-        
-        <a-form-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol" >
-          <a-input placeholder="请输入工号" v-decorator="['workNo', validatorRules.workNo]"  @blur="changeWorkNo" />
+        <a-form-item label="所属公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <j-dict-select-tag
+            v-decorator="['belongingCompany', validatorRules.belongingCompany]"
+            placeholder="请选择所属公司"
+            :triggerChange="true"
+            dictCode="affiliated-company"
+          />
         </a-form-item>
-
-         <a-form-item label="用户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-form-item label="用户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入用户姓名" v-decorator="['realname', validatorRules.realname]" />
         </a-form-item>
 
@@ -31,12 +34,51 @@
           <a-input placeholder="请输入英文名" v-decorator="['nenName',validatorRules.nenName]" />
         </a-form-item>
 
-         <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <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>
         </a-form-item>
+        <a-form-item label="民族" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <j-dict-select-tag
+            v-decorator="['nnation', validatorRules.nnation]"
+            placeholder="请选择民族"
+            :triggerChange="true"
+            dictCode="nation"
+          />
+        </a-form-item>
+        <a-form-item label="政治面貌" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <j-dict-select-tag
+            v-decorator="['noutlook', validatorRules.noutlook]"
+            placeholder="请选择政治面貌"
+            :triggerChange="true"
+            dictCode="political-outlook"
+          />
+        </a-form-item>
+                  <!--部门分配-->
+        <a-form-item label="公司部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
+          <a-input-search
+            placeholder="点击右侧按钮选择公司和部门"
+            v-model="checkedDepartNameString"
+            disabled
+            @search="onSearch"
+          >
+            <a-button slot="enterButton" icon="search">选择</a-button>
+          </a-input-search>
+        </a-form-item>
+
+        <a-form-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol" >
+          <a-input placeholder="请输入工号" v-decorator="['workNo', validatorRules.workNo]"  @blur="changeWorkNo" />
+        </a-form-item>
+
+        <a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <j-select-position placeholder="请选择职务" :multiple="false" v-decorator="['post', validatorRules.post]" />
+        </a-form-item>
+
+        <a-form-item label="身份证号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input placeholder="请输入身份证号码" v-decorator="['nidNo', validatorRules.nidNo]" />
+        </a-form-item>
 
         <a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-date-picker
@@ -45,12 +87,15 @@
             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', validatorRules.nmarriage]" placeholder="请选择性别">
-            <a-select-option value="1">是</a-select-option>
-            <a-select-option value="0">否</a-select-option>
-          </a-select>
+        <a-form-item label="入司日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-date-picker
+            style="width: 100%"
+            placeholder="请选择入司日期"
+            v-decorator="['nInductionTime', { initialValue: !model.nInductionTime ? null : moment(model.nInductionTime, dateFormat) ,rules: [{ required: true, message: '请选择入司日期' }] }]"
+          />
+        </a-form-item>
+          <a-form-item label="籍贯" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input placeholder="请输入籍贯" v-decorator="['nnativePlace', validatorRules.nnativePlace]" />
         </a-form-item>
 
         <a-form-item label="户口" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -67,16 +112,7 @@
           <!-- <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', validatorRules.noutlook]"
-            placeholder="请选择政治面貌"
-            :triggerChange="true"
-            dictCode="political-outlook"
-          />
-        </a-form-item>
-
-         <a-form-item label="所学专业" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-form-item label="所学专业" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入所学专业" v-decorator="['nmajor', validatorRules.nmajor]" />
         </a-form-item>
 
@@ -97,35 +133,38 @@
           />
         </a-form-item>
 
-                  <!--部门分配-->
-        <a-form-item label="公司部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
-          <a-input-search
-            placeholder="点击右侧按钮选择公司和部门"
-            v-model="checkedDepartNameString"
-            disabled
-            @search="onSearch"
-          >
-            <a-button slot="enterButton" icon="search">选择</a-button>
-          </a-input-search>
+        <a-form-item label="婚否" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <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>
         </a-form-item>
 
-        <a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-select-position placeholder="请选择职务" :multiple="false" v-decorator="['post', validatorRules.post]" />
+        <a-form-item label="人员类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <j-dict-select-tag
+            v-decorator="['npersonnelType',validatorRules.npersonnelType]"
+            placeholder="请选择人员类型"
+            :triggerChange="true"
+            dictCode="personnel-status"
+          />
         </a-form-item>
-
-        
-        <a-form-item label="入司日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-date-picker
-            style="width: 100%"
-            placeholder="请选择入司日期"
-            v-decorator="['nInductionTime', { initialValue: !model.nInductionTime ? null : moment(model.nInductionTime, dateFormat) ,rules: [{ required: true, message: '请选择入司日期' }] }]"
+        <a-form-item label="雇佣状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <j-dict-select-tag
+            v-decorator="['syHireType',{rules: [{ required: true, message: '请选择雇佣状态' }] }]"
+            placeholder="请选择雇佣状态"
+            :triggerChange="true"
+            dictCode="employment-status"
           />
         </a-form-item>
-        <a-form-item label="离职日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-date-picker
-            style="width: 100%"
-            placeholder="请选择离职日期"
-            v-decorator="['syResignationTime', { initialValue: !model.syResignationTime ? null : moment(model.syResignationTime, dateFormat)}]"
+        <a-form-item label="家庭住址" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input placeholder="请输入家庭住址" v-decorator="['nhomeAddress', {}]" />
+        </a-form-item>
+
+        <a-form-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input
+            placeholder="请输入手机号码"
+            :disabled="isDisabledAuth('user:form:phone')"
+            v-decorator="['phone', validatorRules.phone]"
           />
         </a-form-item>
 
@@ -133,10 +172,14 @@
           <a-input placeholder="请输入家庭电话" v-decorator="['telephone', validatorRules.telephone]" />
         </a-form-item>
 
-          <a-form-item label="公司座机" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入公司座机" v-decorator="['ncompanyPhone', {}]" />
+        <a-form-item label="虚拟网号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input placeholder="请输入虚拟网号" v-decorator="['nvirtualNo', {}]" />
         </a-form-item>
 
+        <a-form-item label="公司座机" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input placeholder="请输入公司座机" v-decorator="['ncompanyPhone', {}]" />
+        </a-form-item> 
+
         <a-form-item label="公司内线" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入公司内线" v-decorator="['ncompanyLine', {}]" />
         </a-form-item>
@@ -148,9 +191,8 @@
          <a-form-item label="工资卡号" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入工资卡号" v-decorator="['ncardNo', validatorRules.ncardNo]" />
         </a-form-item>
-
-        <a-form-item label="虚拟网号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入虚拟网号" v-decorator="['nvirtualNo', {}]" />
+        <a-form-item label="车牌号" :labelCol="labelCol" :wrapperCol="wrapperCol">
+             <a-input placeholder="请输入" v-decorator="['licenseCar', {}]" />
         </a-form-item>
         
         <a-form-item label="转正日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -162,6 +204,22 @@
           />
         </a-form-item>
 
+        <a-form-item label="离职日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-date-picker
+            style="width: 100%"
+            placeholder="请选择离职日期"
+            v-decorator="['syResignationTime', { initialValue: !model.syResignationTime ? null : moment(model.syResignationTime, dateFormat)}]"
+          />
+        </a-form-item>
+
+        <a-form-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <j-image-upload class="avatar-uploader" text="上传" v-model="fileList"></j-image-upload>
+        </a-form-item>
+
+        <a-form-item label="社保基数" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input placeholder="请输入社保基数" v-decorator="['nsocialBase',{}]" />
+        </a-form-item>            
+                
         <a-form-item label="社保申报日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-date-picker
             style="width: 100%"
@@ -176,7 +234,10 @@
             v-decorator="['sySecurityOutTime', { initialValue: !model.sySecurityOutTime ? null : moment(model.sySecurityOutTime, dateFormat) }]"
           />
         </a-form-item>
-
+        
+        <a-form-item label="公积金基数" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-input placeholder="请输入公积金基数" v-decorator="['nfundBase', {}]" />
+        </a-form-item>
         <a-form-item label="公积金申报日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-date-picker
             style="width: 100%"
@@ -192,13 +253,9 @@
           />
         </a-form-item>
 
-        <a-form-item label="公积金基数" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入公积金基数" v-decorator="['nfundBase', {}]" />
-        </a-form-item>
+       
 
-        <a-form-item label="社保基数" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入社保基数" v-decorator="['nsocialBase',{}]" />
-        </a-form-item>
+       
 
         <a-form-item label="年假" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入年假" v-decorator="['nannualNum', {}]" />
@@ -212,34 +269,13 @@
           <a-input placeholder="请输入剩余年假" v-decorator="['nannualNowNum', {}]" />
         </a-form-item>
         
-        <a-form-item label="民族" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-dict-select-tag
-            v-decorator="['nnation', validatorRules.nnation]"
-            placeholder="请选择民族"
-            :triggerChange="true"
-            dictCode="nation"
-          />
-        </a-form-item>
-
-        <a-form-item label="籍贯" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <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', validatorRules.nidNo]" />
-        </a-form-item>
+       
 
-        <a-form-item label="家庭住址" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input placeholder="请输入家庭住址" v-decorator="['nhomeAddress', {}]" />
-        </a-form-item>
+        
 
-        <a-form-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-input
-            placeholder="请输入手机号码"
-            :disabled="isDisabledAuth('user:form:phone')"
-            v-decorator="['phone', validatorRules.phone]"
-          />
-        </a-form-item>
+        
         
        <!-- <a-form-item label="对本企业要求" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入" v-decorator="['nrequirement', {}]" />
@@ -253,33 +289,9 @@
           <a-input placeholder="请输入" v-decorator="['nrelationshipFor', {}]" />
         </a-form-item> -->
 
-         <a-form-item label="人员类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <j-dict-select-tag
-            v-decorator="['npersonnelType',validatorRules.npersonnelType]"
-            placeholder="请选择人员类型"
-            :triggerChange="true"
-            dictCode="personnel-status"
-          />
-        </a-form-item>
-        <a-form-item label="雇佣状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <j-dict-select-tag
-            v-decorator="['syHireType',{rules: [{ required: true, message: '请选择雇佣状态' }] }]"
-            placeholder="请选择雇佣状态"
-            :triggerChange="true"
-            dictCode="employment-status"
-          />
-        </a-form-item>
-         <a-form-item label="所属公司" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-dict-select-tag
-            v-decorator="['belongingCompany', validatorRules.belongingCompany]"
-            placeholder="请选择所属公司"
-            :triggerChange="true"
-            dictCode="affiliated-company"
-          />
-        </a-form-item>
-         <a-form-item label="车牌号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-             <a-input placeholder="请输入" v-decorator="['licenseCar', {}]" />
-        </a-form-item>
+         
+
+       
         <!-- update--begin--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
         <a-form-item label="身份" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-radio-group v-model="identity" @change="identityChange">
@@ -320,9 +332,7 @@
             dictCode="activiti_sync"
           />
         </a-form-item>
-         <a-form-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-image-upload class="avatar-uploader" text="上传" v-model="fileList"></j-image-upload>
-        </a-form-item>
+       
 
          <a-form-item label="工作简历" :labelCol="labelCol" :wrapperCol="wrapperCol" class="nresume">
           <a-input type="textarea" placeholder="请输入" v-decorator="['nresume', {}]" />