111

src/views/system/modules/UserModal.vue

@@ -117,6 +117,24 @@
           </a-select>
         </a-form-item> -->
         <!-- update--end--autor:wangshuai-----date:20200108------for：新增身份和负责部门------ -->
+        
+        <a-form-item label="人员类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-select v-decorator="[ 'category', {}]" placeholder="请选择人员类别" :getPopupContainer= "(target) => target.parentNode">
+            <a-select-option :value="101">正式工</a-select-option>
+            <a-select-option :value="102">合同工</a-select-option>
+            <a-select-option :value="103">实习生</a-select-option>
+            <a-select-option :value="104">劳务工</a-select-option>
+          </a-select>
+        </a-form-item>
+        
+        <a-form-item label="雇佣状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-select v-decorator="[ 'employmentStatus', {}]" placeholder="请选择雇佣状态" :getPopupContainer= "(target) => target.parentNode">
+            <a-select-option :value="10">在职</a-select-option>
+            <a-select-option :value="20">离退</a-select-option>
+            <a-select-option :value="30">离职</a-select-option>
+          </a-select>
+        </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>
@@ -136,6 +154,14 @@
             v-decorator="['entryDate', {initialValue:!model.entryDate?null:moment(model.entryDate,dateFormat)}]"
             :getCalendarContainer="node => node.parentNode"/>
         </a-form-item>
+        
+        <a-form-item label="离职日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-date-picker
+            style="width: 100%"
+            placeholder="请选择离职日期"
+            v-decorator="['termDate', {initialValue:!model.termDate?null:moment(model.termDate,dateFormat)}]"
+            :getCalendarContainer="node => node.parentNode"/>
+        </a-form-item>
 
         <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-select v-decorator="[ 'sex', {}]" placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode">
@@ -385,7 +411,7 @@
         that.visible = true;
         that.model = Object.assign({}, record);
         that.$nextTick(() => {
-          that.form.setFieldsValue(pick(this.model,'username','sex','realname','email','phone','activitiSync','workNo','telephone','post','egName','urgentName','urgentPhone','infoSy'))
+          that.form.setFieldsValue(pick(this.model,'username','sex','realname','email','phone','activitiSync','workNo','telephone','post','egName','urgentName','urgentPhone','infoSy','category','employmentStatus','termDate'))
         });
         //身份为上级显示负责部门，否则不显示
         if(this.model.userIdentity=="2"){