格克

src/views/system/AttendanceRuleList.vue

@@ -253,6 +253,8 @@
     watch: {
       dataSource: {
         handler(newName, oldName) {
+          this.selectedRowKeys=[];
+          this.selectionRows=[];
           this.queryMothByCount();
         },
       }

src/views/system/modules/UserDetailModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-modal footer="" :width="1370" :dialogStyle="dialogStyle" title="员工信息详情" :visible="visible" @cancel="handleCancel"
+  <a-modal footer="" :width="1150" :dialogStyle="dialogStyle" title="员工信息详情" :visible="visible" @cancel="handleCancel"
     cancelText="关闭">
 
     <template slot="title">
@@ -12,11 +12,11 @@
     </template>
 
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form" style="overflow-y: auto;height: 700px;">
+      <a-form :form="form" style="overflow-y: auto;height: 650px;">
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
-             <a-upload disabled  :action="url.fileUpload" list-type="picture-card" :fileList="fileListt" :showUploadList="{
+             <a-upload disabled style="width: 70%"  :action="url.fileUpload" list-type="picture-card" :fileList="fileListt" :showUploadList="{
                          showRemoveIcon: false,
                          showDownloadIcon: true
                        }" @download="handleDownload" 
@@ -37,27 +37,27 @@
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input disabled v-decorator="[ 'realname']" />
+              <a-input style="width: 70%" disabled v-decorator="[ 'realname']" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="英文名" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input disabled v-decorator="[ 'egName']" />
+              <a-input style="width: 70%" disabled v-decorator="[ 'egName']" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input disabled v-decorator="[ 'email']" />
+              <a-input style="width: 70%" disabled v-decorator="[ 'email']" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
-            <a-form-item label="人员类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag disabled v-decorator="[ 'category']" :triggerChange="true" dictCode="category" />
+            <a-form-item  label="人员类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-dict-select-tag style="width: 70%" disabled v-decorator="[ 'category']" :triggerChange="true" dictCode="category" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="证件类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-select disabled v-model="sfzType">
+              <a-select style="width: 70%" disabled v-model="sfzType">
                 <a-select-option value="0">中国身份证</a-select-option>
                 <a-select-option value="1">其他</a-select-option>
               </a-select>
@@ -65,12 +65,12 @@
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="身份证" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input disabled v-decorator="[ 'sfzCode']" />
+              <a-input style="width: 70%" disabled v-decorator="[ 'sfzCode']" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-select disabled v-decorator="[ 'sex']" :getPopupContainer="(target) => target.parentNode">
+              <a-select style="width: 70%" disabled v-decorator="[ 'sex']" :getPopupContainer="(target) => target.parentNode">
                 <a-select-option :value="1">男</a-select-option>
                 <a-select-option :value="2">女</a-select-option>
               </a-select>
@@ -78,31 +78,31 @@
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-date-picker disabled style="width: 100%"
+              <a-date-picker disabled style="width: 70%"
                 v-decorator="['birthday', {initialValue:!model.birthday?null:moment(model.birthday,dateFormat)}]"
                 :getCalendarContainer="node => node.parentNode" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="年龄" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input disabled v-decorator="['age', {}]" />
+              <a-input style="width: 70%" disabled v-decorator="['age', {}]" />
             </a-form-item>
           </a-col>
         </a-row>
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="学历" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag v-decorator="['education', {}]" :triggerChange="true" disabled dictCode="education" />
+              <j-dict-select-tag style="width: 70%" v-decorator="['education', {}]" :triggerChange="true" disabled dictCode="education" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="毕业学校" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input disabled v-decorator="['school']" />
+              <a-input style="width: 70%" disabled v-decorator="['school']" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="国籍" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag v-decorator="['nationality']" :triggerChange="true" disabled dictCode="nationality" />
+              <j-dict-select-tag style="width: 70%" v-decorator="['nationality']" :triggerChange="true" disabled dictCode="nationality" />
             </a-form-item>
             </a-form-item>
           </a-col>
@@ -111,18 +111,18 @@
 
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="银行卡" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input disabled v-decorator="['bankCard']" />
+              <a-input disabled style="width: 70%" v-decorator="['bankCard']" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="开户行" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input disabled v-decorator="['bankAddr', {}]" />
+              <a-input disabled style="width: 70%" v-decorator="['bankAddr', {}]" />
             </a-form-item>
           </a-col>
 
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="部门" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
-              <a-input-search disabled v-model="checkedDepartNameString" readOnly @search="onSearch">
+              <a-input-search disabled style="width: 70%" v-model="checkedDepartNameString" readOnly @search="onSearch">
               </a-input-search>
             </a-form-item>
           </a-col>
@@ -138,17 +138,17 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="工资" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input disabled v-decorator="['wagesOne']" />
+              <a-input disabled style="width: 70%" v-decorator="['wagesOne']" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input disabled v-decorator="[ 'phone']" />
+              <a-input disabled  style="width: 70%" v-decorator="[ 'phone']" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="职位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-search disabled v-model="zwName" readOnly @search="zw()">
+              <a-input-search style="width: 70%" disabled v-model="zwName" readOnly @search="zw()">
               </a-input-search>
             </a-form-item>
           </a-col>
@@ -158,17 +158,17 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="公积金" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input disabled v-decorator="['syFund']" />
+              <a-input disabled style="width: 70%" v-decorator="['syFund']" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="缴交基数" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input disabled controls="false" v-decorator="['wagesBase', {}]" />
+              <a-input disabled style="width: 70%" controls="false" v-decorator="['wagesBase', {}]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="入职日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-date-picker disabled style="width: 100%" disabled v-decorator="['entryDate']"
+              <a-date-picker disabled style="width: 70%" disabled v-decorator="['entryDate']"
                 :getCalendarContainer="node => node.parentNode" />
             </a-form-item>
           </a-col>
@@ -176,18 +176,18 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="试用期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input suffix="月" disabled v-decorator="['trialMoth']" />
+              <a-input suffix="月" style="width: 70%" disabled v-decorator="['trialMoth']" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="结束日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-date-picker style="width: 100%" v-decorator="['trialEndDate']" disabled
+              <a-date-picker style="width: 70%" v-decorator="['trialEndDate']" disabled
                 :getCalendarContainer="node => node.parentNode" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="工龄" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input suffix="月" v-model="workMoth" disabled />
+              <a-input suffix="月" style="width: 70%" v-model="workMoth" disabled />
             </a-form-item>
           </a-col>
 
@@ -196,34 +196,34 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="司龄" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input suffix="月" v-model="moth" disabled />
+              <a-input suffix="月" style="width: 70%" v-model="moth" disabled />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="[ 'urgentName',{}]" disabled />
+              <a-input style="width: 70%" v-decorator="[ 'urgentName',{}]" disabled />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="电话" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="[ 'urgentPhone', {}]" disabled />
+              <a-input style="width: 70%" v-decorator="[ 'urgentPhone', {}]" disabled />
             </a-form-item>
           </a-col>
         </a-row>
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="户口地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="[ 'homeAddr', {}]" disabled />
+              <a-input style="width: 70%" v-decorator="[ 'homeAddr', {}]" disabled />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="家庭住址" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input v-decorator="[ 'addr', {}]" disabled />
+              <a-input style="width: 70%" v-decorator="[ 'addr', {}]" disabled />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="分摊部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag disabled v-decorator="['shareDept', {}]" :triggerChange="true" dictCode="share_dept" />
+              <j-dict-select-tag style="width: 70%" disabled v-decorator="['shareDept', {}]" :triggerChange="true" dictCode="share_dept" />
             </a-form-item>
           </a-col>
 
@@ -252,7 +252,7 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="是否打卡" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-select @change="isAttes" v-decorator="[ 'isAttendance']" disabled :getPopupContainer="(target) => target.parentNode">
+              <a-select @change="isAttes" style="width: 70%" v-decorator="[ 'isAttendance']" disabled :getPopupContainer="(target) => target.parentNode">
                 <a-select-option value="0">是</a-select-option>
                 <a-select-option value="1">否</a-select-option>
               </a-select>
@@ -261,13 +261,13 @@
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="上班类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag v-decorator="['type']" disabled :triggerChange="true" dictCode="type" />
+              <j-dict-select-tag style="width: 70%" v-decorator="['type']" disabled :triggerChange="true" dictCode="type" />
             </a-form-item>
 
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="雇佣状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag disabled v-decorator="[ 'employmentStatus']" dictCode="employmentStatus"
+              <j-dict-select-tag disabled style="width: 70%" v-decorator="[ 'employmentStatus']" dictCode="employmentStatus"
                 :triggerChange="true" />
             </a-form-item>
           </a-col>
@@ -277,26 +277,26 @@
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="附件上传" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-badge :count="count" show-zero :number-style="{ backgroundColor: '#52c41a' }">
-                <a-button icon="search" @click="uploads()" style="width: 210px;">查看</a-button>
+                <a-button icon="search" @click="uploads()" >查看</a-button>
               </a-badge>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8" v-if="isQuit">
             <a-form-item label="预计离职日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-date-picker style="width: 100%" disabled v-decorator="['endDate']"
+              <a-date-picker style="width: 70%" disabled v-decorator="['endDate']"
                 :getCalendarContainer="node => node.parentNode" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8" v-if="isQuit">
             <a-form-item label="实际离职日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-date-picker style="width: 100%" disabled v-decorator="['newDate']"
+              <a-date-picker style="width: 70%" disabled v-decorator="['newDate']"
                 :getCalendarContainer="node => node.parentNode" />
             </a-form-item>
           </a-col>
         </a-row>
         <a-row>
           <a-col :lg="24">
-            <a-form-item style="margin-left: -230px;" label="同步信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-item style="margin-left: -240px;" label="同步信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag v-decorator="['infoSy']" :type="'radio'" disabled :triggerChange="true"
                 dictCode="info_sy" />
             </a-form-item>
@@ -304,7 +304,7 @@
         </a-row>
         <a-row>
           <a-col :md="6" :sm="8" :lg="24" v-if="isQuit">
-            <a-form-item style="margin-left: -230px;" label="离职原因" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-item style="margin-left: -240px;" label="离职原因" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-textarea style="height: 100px;" v-decorator="['demo']" disabled />
             </a-form-item>
           </a-col>
@@ -312,7 +312,7 @@
 
         <a-row>
           <a-col :md="6" :sm="8" :lg="24">
-            <a-form-item style="margin-left: -230px;" label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-item style="margin-left: -250px;" label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-textarea style="height: 100px;" v-decorator="[ 'remarks', {}]" disabled />
             </a-form-item>
           </a-col>
@@ -682,7 +682,7 @@ const uidGenerator=()=>{
             span: 24
           },
           sm: {
-            span: 5
+            span: 6
           },
         },
         wrapperCol: {
@@ -690,7 +690,7 @@ const uidGenerator=()=>{
             span: 24
           },
           sm: {
-            span: 16
+            span: 18
           },
         },
         uploadLoading: false,

src/views/system/modules/UserModal.vue

@@ -1,5 +1,5 @@
 <template>
-  <a-modal :width="1380" :dialogStyle="dialogStyle" title="员工信息" :visible="visible" @ok="handleSubmit()"
+  <a-modal :width="1150" :dialogStyle="dialogStyle" title="员工信息" :visible="visible" @ok="handleSubmit()"
     @cancel="handleCancel" cancelText="关闭">
 
     <template slot="title">
@@ -16,28 +16,28 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar"></j-image-upload>
+              <j-image-upload style="width: 70%" class="avatar-uploader" text="上传" v-model="model.avatar"></j-image-upload>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="姓名" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :maxLength="10" placeholder="请输入员工姓名" v-decorator="[ 'realname', validatorRules.realname]" />
+              <a-input :maxLength="10" style="width: 70%"  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  :maxLength="10" placeholder="请输入英文名" v-decorator="[ 'egName', validatorRules.egName]" />
+              <a-input  :maxLength="10" style="width: 70%"  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 :disabled="isEdit" :maxLength="30" placeholder="请输入邮箱" v-decorator="[ 'email', validatorRules.email]" />
+              <a-input :disabled="isEdit" style="width: 70%"  :maxLength="30" placeholder="请输入邮箱" v-decorator="[ 'email', validatorRules.email]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="人员类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag v-decorator="[ 'category', {initialValue:101,rules: [{ required: true, message: '请选择人员类别'}]}]" placeholder="请选择人员类别"
+              <j-dict-select-tag style="width: 70%"  v-decorator="[ 'category', {initialValue:101,rules: [{ required: true, message: '请选择人员类别'}]}]" placeholder="请选择人员类别"
                 :triggerChange="true" @change="handleChangeStatus" dictCode="category"/>
                
               
@@ -45,7 +45,7 @@
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="证件类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-select v-model="sfzType" placeholder="请选择证件类型">
+              <a-select style="width: 70%"  v-model="sfzType" placeholder="请选择证件类型">
                 <a-select-option value="0">中国身份证</a-select-option>
                 <a-select-option value="1">其他</a-select-option>
               </a-select>
@@ -53,7 +53,7 @@
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="身份证" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :maxLength="40" placeholder="请输入身份证号码" v-decorator="[ 'sfzCode', validatorRules.sfzCode]" />
+              <a-input style="width: 70%"  :maxLength="40" placeholder="请输入身份证号码" v-decorator="[ 'sfzCode', validatorRules.sfzCode]" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -61,7 +61,7 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-select v-decorator="[ 'sex',validatorRules.sex]" placeholder="请选择性别"
+              <a-select style="width: 70%"  v-decorator="[ 'sex',validatorRules.sex]" placeholder="请选择性别"
                 :getPopupContainer="(target) => target.parentNode">
                 <a-select-option :value="1">男</a-select-option>
                 <a-select-option :value="2">女</a-select-option>
@@ -71,14 +71,14 @@
 
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-date-picker style="width: 100%" placeholder="请选择生日"
+              <a-date-picker  style="width: 70%"  placeholder="请选择生日"
                 v-decorator="['birthday', {initialValue:!model.birthday?null:moment(model.birthday,dateFormat)}]"
                 :getCalendarContainer="node => node.parentNode" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="年龄" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :maxLength="3" placeholder="请输入年龄" v-model="age" />
+              <a-input style="width: 70%"  :maxLength="3" placeholder="请输入年龄" v-model="age" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -86,18 +86,18 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="学历" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag v-decorator="['education', {}]" :triggerChange="true" placeholder="请选择学历"
+              <j-dict-select-tag style="width: 70%"  v-decorator="['education', {}]" :triggerChange="true" placeholder="请选择学历"
                 dictCode="education" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="毕业学校" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :maxLength="30" placeholder="请输入毕业学校" v-decorator="['school']" />
+              <a-input style="width: 70%"  :maxLength="30" placeholder="请输入毕业学校" v-decorator="['school']" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="国籍" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag v-decorator="['nationality', {initialValue:101}]" :triggerChange="true"
+              <j-dict-select-tag style="width: 70%"  v-decorator="['nationality', {initialValue:101}]" :triggerChange="true"
                 placeholder="请选择国籍" dictCode="nationality" />
             </a-form-item>
             </a-form-item>
@@ -107,17 +107,17 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="银行卡" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :maxLength="19" placeholder="请输入银行卡号" v-decorator="['bankCard', validatorRules.bankCard]" />
+              <a-input style="width: 70%"  :maxLength="19" 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 :maxLength="30" placeholder="请输入开户行" v-decorator="['bankAddr', {initialValue:'招商银行'}]" />
+              <a-input style="width: 70%"  :maxLength="30" placeholder="请输入开户行" v-decorator="['bankAddr', {initialValue:'招商银行'}]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="部门" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
-              <a-input-search placeholder="点击选择部门" v-decorator="['checkedDepartNameString', validatorRules.deptName]"
+              <a-input-search style="width: 70%"  placeholder="点击选择部门" v-decorator="['checkedDepartNameString', validatorRules.deptName]"
                 readOnly @search="onSearch">
                 <a-button slot="enterButton" icon="search">选择</a-button>
               </a-input-search>
@@ -128,12 +128,12 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="工资" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :maxLength="8" placeholder="请输入基本工资" v-decorator="['wagesOne',validatorRules.wagesOne]" />
+              <a-input style="width: 70%"  :maxLength="8" placeholder="请输入基本工资" 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 :maxLength="11" placeholder="请输入手机号码" v-decorator="[ 'phone', validatorRules.phone]" />
+              <a-input style="width: 70%"  :maxLength="11" placeholder="请输入手机号码" v-decorator="[ 'phone', validatorRules.phone]" />
             </a-form-item>
           </a-col>
 
@@ -144,7 +144,7 @@
           </a-col> -->
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="职位" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-search placeholder="点击选择职位" v-model="zwName" readOnly @search="onSearchs">
+              <a-input-search style="width: 70%"  placeholder="点击选择职位" v-model="zwName" readOnly @search="onSearchs">
                 <a-button slot="enterButton" icon="search">选择</a-button>
               </a-input-search>
               <!-- <j-select-position placeholder="请选择职位" :multiple="false" v-model="model.post"/> -->
@@ -155,17 +155,17 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="公积金" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :maxLength="20" placeholder="请输入公积金账号" v-model="syFund"/>
+              <a-input style="width: 70%"  :maxLength="20" placeholder="请输入公积金账号" v-model="syFund"/>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="缴交基数" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :maxLength="8" :disabled="personType" v-model="wagesBase" placeholder="请输入缴交基数"  />
+              <a-input style="width: 70%"  :maxLength="8" :disabled="personType" v-model="wagesBase" placeholder="请输入缴交基数"  />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="入职日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-date-picker style="width: 100%" placeholder="请选择入职日期"
+              <a-date-picker style="width: 70%"  placeholder="请选择入职日期"
                 v-decorator="['entryDate',{initialValue:!model.entryDate?moment(new Date(),dateFormat):moment(model.entryDate,dateFormat),rules: [{ required: true, message: '请选择入职时间'},{validator: this.validateentryDate}]}]"
                 :getCalendarContainer="node => node.parentNode" />
             </a-form-item>
@@ -176,20 +176,20 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="试用期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :maxLength="5" placeholder="请输入试用期" suffix="月"
+              <a-input style="width: 70%"  :maxLength="5" placeholder="请输入试用期" suffix="月"
                 v-decorator="['trialMoth',{initialValue:6,rules: [{ required: true, message: '请输入试用期'},{validator: this.validatetrialMoth}]}]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="结束日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-date-picker style="width: 100%" placeholder="请选择试用结束日期"
+              <a-date-picker style="width: 70%"  placeholder="请选择试用结束日期"
                 v-decorator="['trialEndDate',{initialValue:moment(wkEndDate,dateFormat)}]"
                 :getCalendarContainer="node => node.parentNode" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="工龄" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :maxLength="5" placeholder="请输入工龄" suffix="月" v-model="workMoth"  />
+              <a-input style="width: 70%"  :maxLength="5" placeholder="请输入工龄" suffix="月" v-model="workMoth"  />
             </a-form-item>
           </a-col>
 
@@ -198,34 +198,34 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="司龄" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :maxLength="5" placeholder="请输入司龄" suffix="月" v-model="moth" />
+              <a-input style="width: 70%"  :maxLength="5" placeholder="请输入司龄" suffix="月" v-model="moth" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :maxLength="10" placeholder="请输入紧急联系人" v-decorator="[ 'urgentName',{}]" />
+              <a-input style="width: 70%"  :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 :maxLength="11" placeholder="请输入紧急联系人电话" v-model="urgentPhone" />
+              <a-input style="width: 70%"  :maxLength="11" placeholder="请输入紧急联系人电话" v-model="urgentPhone" />
             </a-form-item>
           </a-col>
         </a-row>
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="户口地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :maxLength="100" placeholder="请输入户口地址" v-decorator="[ 'homeAddr', {}]" />
+              <a-input style="width: 70%"  :maxLength="100" placeholder="请输入户口地址" v-decorator="[ 'homeAddr', {}]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="家庭住址" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :maxLength="50" placeholder="请输入家庭住址" v-decorator="[ 'addr', {}]" />
+              <a-input style="width: 70%"  :maxLength="50" placeholder="请输入家庭住址" v-decorator="[ 'addr', {}]" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="分摊部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag v-decorator="['shareDept', {}]" :triggerChange="true" placeholder="请选择分摊部门"
+              <j-dict-select-tag style="width: 70%"  v-decorator="['shareDept', {}]" :triggerChange="true" placeholder="请选择分摊部门"
                 dictCode="share_dept" />
             </a-form-item>
           </a-col>
@@ -235,7 +235,7 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="是否打卡" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-select @change="isAttes" v-decorator="['isAttendance',{initialValue:'0'}]" placeholder="请选择"
+              <a-select style="width: 70%"  @change="isAttes" v-decorator="['isAttendance',{initialValue:'0'}]" placeholder="请选择"
                 :getPopupContainer="(target) => target.parentNode">
                 <a-select-option value="0">是</a-select-option>
                 <a-select-option value="1">否</a-select-option>
@@ -245,14 +245,14 @@
           </a-col>
           <a-col :md="6" :sm="8" :lg="8" v-if="isAttendance=='0'||isAttendance==0">
             <a-form-item label="上班类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag v-decorator="['type', {initialValue:2,rules: [{ required: true, message: '请选择类型'}]}]" :triggerChange="true" placeholder="请选择上班类型"
+              <j-dict-select-tag style="width: 70%"  v-decorator="['type', {initialValue:2,rules: [{ required: true, message: '请选择类型'}]}]" :triggerChange="true" placeholder="请选择上班类型"
                 dictCode="type" />
             </a-form-item>
 
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="雇佣状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <j-dict-select-tag v-decorator="[ 'employmentStatus', {initialValue:40,rules: [{ required: true, message: '请选择状态'}]}]" placeholder="请选择人员类别"
+              <j-dict-select-tag style="width: 70%"  v-decorator="[ 'employmentStatus', {initialValue:40,rules: [{ required: true, message: '请选择状态'}]}]" placeholder="请选择人员类别"
                 dictCode="employmentStatus" :triggerChange="true"/>
               
             </a-form-item>
@@ -261,20 +261,20 @@
         <a-row>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item label="附件上传" :labelCol="labelCol" :wrapperCol="wrapperCol">
-             <a-badge :count="fileLists.length" show-zero :number-style="{ backgroundColor: '#52c41a' }">
-               <a-button icon="search" @click="uploads()" style="width: 290px;">选择</a-button>
+             <a-badge  :count="fileLists.length" show-zero :number-style="{ backgroundColor: '#52c41a' }">
+               <a-button icon="search" @click="uploads()" >选择</a-button>
              </a-badge>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item v-if="!isEdit" label="合同类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
-             <j-dict-select-tag  :disabled="isEdit" v-decorator="['contractType',{rules: [{ required: true, message: '请选择入合同类型'}]}]" :triggerChange="true" placeholder="请选择合同类型"
+             <j-dict-select-tag  :disabled="isEdit" style="width: 70%" v-decorator="['contractType',validatorRules.contractType]" :triggerChange="true" placeholder="请选择合同类型"
                dictCode="contract_type" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="8" :lg="8">
             <a-form-item v-if="!isEdit" label="合同结束日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
-             <a-date-picker :disabled="isEdit" style="width: 100%" placeholder="请选择试合同结束日期"
+             <a-date-picker disabled style="width: 70%" placeholder="请选择试合同结束日期"
                v-model="cEndDate"
                />
             </a-form-item>
@@ -282,7 +282,7 @@
         </a-row>
         <a-row>
           <a-col :lg="24">
-            <a-form-item style="margin-left: -235px;" label="同步信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-item style="margin-left: -245px;" label="同步信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <j-dict-select-tag v-decorator="['infoSy', {initialValue:3}]" placeholder="请选择同步" :type="'radio'"
                 :triggerChange="true" dictCode="info_sy" />
             </a-form-item>
@@ -290,7 +290,7 @@
         </a-row>
         <a-row>
           <a-col :md="6" :sm="8" :lg="24">
-            <a-form-item style="margin-left: -240px;" label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-item style="margin-left: -250px;" label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-textarea :maxLength="255" placeholder="请输备注" v-decorator="[ 'remarks', {}]" style="height: 100px;"/>
             </a-form-item>
           </a-col>
@@ -447,6 +447,14 @@
               message: '请选择部门'
             }]
           },
+          contractType: {
+            rules: [{
+              required: true,
+              message: '请选择合同类型'
+            }, {
+              validator: this.contractType
+            }]
+          },
           realname: {
             rules: [{
               required: true,
@@ -534,7 +542,7 @@
             span: 24
           },
           sm: {
-            span: 5
+            span: 6
           },
         },
         wrapperCol: {
@@ -542,7 +550,7 @@
             span: 24
           },
           sm: {
-            span: 16
+            span: 18
           },
         },
         uploadLoading: false,
@@ -850,9 +858,6 @@
       add() {
         this.picUrl = "";
         this.refresh();
-        var da=new Date();
-        da.setFullYear(da.getFullYear()+3)
-        this.cEndDate=moment(da).subtract(1, "days");
         this.edit({
           activitiSync: '1'
         });
@@ -1192,11 +1197,22 @@
         } else {
           var date = new Date(value);
           var da=new Date(value);
-          da.setFullYear(da.getFullYear()+3)
-          this.cEndDate=moment(da).subtract(1, "days");
+          var type= this.form.getFieldValue('contractType');
+          if(type!=null){
+            if(type==1){
+              da.setFullYear(da.getFullYear()+3)
+              this.cEndDate=moment(da).subtract(1, "days");
+            }else if(type==2){
+              da.setMonth(da.getMonth()+6)
+              this.cEndDate=moment(da).subtract(1, "days");
+            }else{
+              da.setFullYear(da.getFullYear()+1)
+              this.cEndDate=moment(da).subtract(1, "days");
+            }
+          }
+
           this.wkDate = value;
           this.moth = this.countMoth(value);
-          console.log(this.wkMoth)
           if (this.wkMoth != null && this.wkMoth != "") {
             date.setMonth(date.getMonth() + this.wkMoth)
             var d = moment(date).subtract(1, "days");
@@ -1224,6 +1240,30 @@
           callback()
         }
       },
+      contractType(rule, value, callback) {
+        if (!value) {
+          callback()
+        } else {
+         var date= this.form.getFieldValue('entryDate');
+         if(date!=null){
+           var da=new Date(date);
+           if(value==1){
+             da.setFullYear(da.getFullYear()+3)
+             this.cEndDate=moment(da).subtract(1, "days");
+           }else if(value==2){
+             da.setMonth(da.getMonth()+6)
+             this.cEndDate=moment(da).subtract(1, "days");
+           }else {
+             da.setFullYear(da.getFullYear()+1)
+             this.cEndDate=moment(da).subtract(1, "days");
+           }
+            
+         }else{
+           callback("请输入入职日期!")
+         }
+        callback()
+         }
+      },
       validatewages(rule, value, callback) {
         if (!value) {
           callback()