|
|
@@ -1,5 +1,6 @@
|
|
|
<template>
|
|
|
- <a-modal :width="1000" :dialogStyle="dialogStyle" title="员工信息" :visible="visible" @ok="handleSubmit()" @cancel="handleCancel" cancelText="关闭">
|
|
|
+ <a-modal :width="1150" :dialogStyle="dialogStyle" title="员工信息" :visible="visible" @ok="handleSubmit()"
|
|
|
+ @cancel="handleCancel" cancelText="关闭">
|
|
|
|
|
|
<template slot="title">
|
|
|
<div style="width: 100%;">
|
|
|
@@ -15,8 +16,8 @@
|
|
|
<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>
|
|
|
- </a-form-model-item>
|
|
|
+ <j-image-upload 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">
|
|
|
@@ -28,7 +29,7 @@
|
|
|
<a-input :maxLength="20" 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 :maxLength="30" placeholder="请输入邮箱" v-decorator="[ 'email', validatorRules.email]" />
|
|
|
@@ -59,38 +60,59 @@
|
|
|
<a-form-item label="身份证" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
<a-input :maxLength="20" placeholder="请输入身份证号码" v-decorator="[ 'sfzCode', validatorRules.sfzCode]" />
|
|
|
</a-form-item>
|
|
|
- </a-col>
|
|
|
+ </a-col>
|
|
|
</a-row>
|
|
|
|
|
|
<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="请选择性别"
|
|
|
- :getPopupContainer="(target) => target.parentNode">
|
|
|
- <a-select-option :value="1">男</a-select-option>
|
|
|
- <a-select-option :value="2">女</a-select-option>
|
|
|
- </a-select>
|
|
|
- </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="请选择生日"
|
|
|
- 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="20" placeholder="请输入手机号码" v-decorator="[ 'phone', validatorRules.phone]" />
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
+ <a-col :md="6" :sm="8" :lg="8">
|
|
|
+ <a-form-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
+ <a-select 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>
|
|
|
+ </a-select>
|
|
|
+ </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="请选择生日"
|
|
|
+ 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-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" 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-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"
|
|
|
+ placeholder="请选择国籍" dictCode="nationality" />
|
|
|
+ </a-form-item>
|
|
|
+ </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="20" placeholder="请输入银行卡号" v-decorator="['bankCard', validatorRules.bankCard]" />
|
|
|
+ <a-input :maxLength="20" placeholder="请输入银行卡号" v-decorator="['bankCard', validatorRules.bankCard]" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="8" :lg="8">
|
|
|
@@ -99,8 +121,9 @@
|
|
|
</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-model="checkedDepartNameString" readOnly @search="onSearch">
|
|
|
+ <a-form-item label="部门" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
|
|
|
+ <a-input-search placeholder="点击选择部门" v-decorator="['checkedDepartNameString', validatorRules.deptName]"
|
|
|
+ readOnly @search="onSearch">
|
|
|
<a-button slot="enterButton" icon="search">选择</a-button>
|
|
|
</a-input-search>
|
|
|
</a-form-item>
|
|
|
@@ -109,23 +132,27 @@
|
|
|
|
|
|
<a-row>
|
|
|
<a-col :md="6" :sm="8" :lg="8">
|
|
|
- <a-form-item label="工资一" :labelCol="labelCol" :wrapperCol="wrapperCol" >
|
|
|
- <a-input :maxLength="6" placeholder="请输入基本工资" style="width: 210px;" v-decorator="['wagesOne',validatorRules.wagesOne]" />
|
|
|
+ <a-form-item label="工资" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
+ <a-input :maxLength="6" 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="6" placeholder="请输入基本工资" style="width: 210px;" v-decorator="['wagesTwo', {}]" />
|
|
|
+ <a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
+ <a-input :maxLength="20" placeholder="请输入手机号码" v-decorator="[ 'phone', validatorRules.phone]" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
+
|
|
|
<!-- <a-col :md="6" :sm="8" :lg="8">
|
|
|
<a-form-item label="社保基数" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
<a-input-number placeholder="请输入社保基数" style="width: 210px;" v-decorator="['security', {}]" />
|
|
|
</a-form-item>
|
|
|
</a-col> -->
|
|
|
<a-col :md="6" :sm="8" :lg="8">
|
|
|
- <a-form-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
- <j-select-position placeholder="请选择职务" :multiple="false" v-model="model.post"/>
|
|
|
+ <a-form-item label="职位" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
+ <a-input-search 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"/> -->
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
@@ -133,24 +160,50 @@
|
|
|
<a-row>
|
|
|
<a-col :md="6" :sm="8" :lg="8">
|
|
|
<a-form-item label="公积金" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
- <a-input :maxLength="20" placeholder="请输入公积金账号" v-decorator="['syFund',validatorRules.syFund]" />
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
+ <a-input :maxLength="20" placeholder="请输入公积金账号" v-decorator="['syFund',validatorRules.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="2" :disabled="personType" style="width: 210px;" placeholder="请输入缴交基数" v-decorator="['wagesBase', {}]" />
|
|
|
+ <a-input :maxLength="2" :disabled="personType" placeholder="请输入缴交基数" 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 style="width: 100%" placeholder="请选择入职日期"
|
|
|
- v-decorator="['entryDate', {initialValue:!model.entryDate?moment(new Date(),dateFormat):moment(model.entryDate,dateFormat)}]"
|
|
|
+ <a-date-picker style="width: 100%" 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>
|
|
|
+ </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="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="请选择试用结束日期"
|
|
|
+ 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-decorator="['workMoth']" />
|
|
|
+ </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="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="20" placeholder="请输入紧急联系人" v-decorator="[ 'urgentName',{}]" />
|
|
|
@@ -161,33 +214,45 @@
|
|
|
<a-input :maxLength="20" placeholder="请输入紧急联系人电话" v-decorator="[ '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-radio-group v-model="identity" @change="identityChange">
|
|
|
- <a-radio value="1">普通员工</a-radio>
|
|
|
- <a-radio value="2">上级</a-radio>
|
|
|
- </a-radio-group>
|
|
|
+ <a-form-item label="户口地址" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
+ <a-input :maxLength="200" placeholder="请输入户口地址" v-decorator="[ 'homeAddr', {}]" />
|
|
|
</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="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">
|
|
|
- <a-select v-decorator="[ 'employmentStatus', {initialValue:40}]" 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-option :value="40">待入职</a-select-option>
|
|
|
- </a-select>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :md="6" :sm="8" :lg="8">
|
|
|
+ <a-col :md="6" :sm="8" :lg="8">
|
|
|
+ <a-form-item label="分摊部门" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
+ <a-input :maxLength="20" placeholder="请输入分摊部门" v-decorator="['shareDept', {}]" />
|
|
|
+ </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-date-picker style="width: 100%" placeholder="请选择合同日期" v-decorator="['contractDate']" :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-date-picker style="width: 100%" placeholder="请选择合同日期" v-decorator="['contractDate2']" :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-date-picker style="width: 100%" placeholder="请选择合同日期" v-decorator="['contractDate3']" :getCalendarContainer="node => node.parentNode" />
|
|
|
+ </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-select v-decorator="[ 'isAttendance', {initialValue:'0'}]" placeholder="请选择"
|
|
|
:getPopupContainer="(target) => target.parentNode">
|
|
|
@@ -195,9 +260,26 @@
|
|
|
<a-select-option value="1">否</a-select-option>
|
|
|
</a-select>
|
|
|
</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="['type', {initialValue:2}]" :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">
|
|
|
+ <a-select v-decorator="[ 'employmentStatus', {initialValue:40}]" 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-option :value="40">待入职</a-select-option>
|
|
|
+ </a-select>
|
|
|
+ </a-form-item>
|
|
|
</a-col>
|
|
|
-
|
|
|
</a-row>
|
|
|
<a-row>
|
|
|
<a-col :md="6" :sm="8" :lg="8">
|
|
|
@@ -205,19 +287,19 @@
|
|
|
<a-textarea :maxLength="255" placeholder="请输备注" v-decorator="[ 'remarks', {}]" />
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col :md="6" :sm="8" :lg="8">
|
|
|
- <a-form-item label="附件上传" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
- <a-button icon="search" @click="uploads()" style="width: 210px;">选择</a-button>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :lg="8">
|
|
|
- <a-form-item 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>
|
|
|
- </a-col>
|
|
|
+ <a-col :md="6" :sm="8" :lg="8">
|
|
|
+ <a-form-item label="附件上传" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
+ <a-button icon="search" @click="uploads()" style="width: 210px;">选择</a-button>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
+ <a-col :lg="8">
|
|
|
+ <a-form-item 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>
|
|
|
+ </a-col>
|
|
|
</a-row>
|
|
|
-
|
|
|
+
|
|
|
<!-- <a-row>
|
|
|
<a-col :lg="8">
|
|
|
<a-form-item label="同步信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
|
|
@@ -227,36 +309,34 @@
|
|
|
</a-col>
|
|
|
|
|
|
</a-row> -->
|
|
|
-
|
|
|
+
|
|
|
|
|
|
</a-form>
|
|
|
</a-spin>
|
|
|
<depart-window ref="departWindow" @ok="modalFormOk"></depart-window>
|
|
|
|
|
|
<a-modal title="附件" :visible="visiblet" @ok="saveUpload()" @cancel="handleCancelts()" footer="">
|
|
|
- <a-upload action="http://58.34.141.138:8085/jeecg-boot/sys/common/upload" list-type="picture" :file-list="fileLists"
|
|
|
- @change="t" method="post" @download="handleDownload" :showUploadList="{
|
|
|
+ <a-upload action="http://58.34.141.138:8085/jeecg-boot/sys/common/upload" list-type="picture"
|
|
|
+ :file-list="fileLists" @change="t" method="post" @download="handleDownload" :showUploadList="{
|
|
|
showRemoveIcon: true,
|
|
|
showDownloadIcon: true
|
|
|
- }"
|
|
|
- :remove="handleRemove"
|
|
|
- >
|
|
|
-
|
|
|
+ }" :remove="handleRemove">
|
|
|
+
|
|
|
<a-button>
|
|
|
<a-icon type="upload" />上传
|
|
|
</a-button>
|
|
|
</a-upload>
|
|
|
</a-modal>
|
|
|
- <a-modal v-model="visibles" title="职务" @ok="zwOk()">
|
|
|
- <a-table rowKey="id" bordered :data-source="dataSources" :columns="columnst" :pagination="ipaginations" @change="handleTableChanges"
|
|
|
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChanges,type: 'radio'}"
|
|
|
- >
|
|
|
-
|
|
|
- </a-table>
|
|
|
+ <a-modal v-model="visibles" title="职位" @ok="zwOk()">
|
|
|
+ <a-table rowKey="code" bordered :data-source="dataSources" :columns="columnst" :pagination="ipaginations"
|
|
|
+ @change="handleTableChanges"
|
|
|
+ :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChanges,type: 'radio'}">
|
|
|
+
|
|
|
+ </a-table>
|
|
|
</a-modal>
|
|
|
</a-modal>
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
@@ -297,17 +377,18 @@
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- selectedRowKeys:[],
|
|
|
- selectionRows:[],
|
|
|
+ selectedRowKeys: [],
|
|
|
+ selectionRows: [],
|
|
|
departDisabled: false, //是否是我的部门调用该页面
|
|
|
roleDisabled: false, //是否是角色维护调用该页面
|
|
|
modalWidth: 800,
|
|
|
drawerWidth: 700,
|
|
|
titles: "新增员工",
|
|
|
- visibles:false,
|
|
|
- personType:false,
|
|
|
- dataSources:[],
|
|
|
+ visibles: false,
|
|
|
+ personType: false,
|
|
|
+ dataSources: [],
|
|
|
modaltoggleFlag: true,
|
|
|
+ moth:0,
|
|
|
sfzCode: "",
|
|
|
bankCard: "",
|
|
|
bankAddr: "",
|
|
|
@@ -317,10 +398,10 @@
|
|
|
isSalary: "0",
|
|
|
email: "",
|
|
|
isAttendance: "0",
|
|
|
- zwName:"",
|
|
|
- zwCode:"",
|
|
|
+ zwName: "",
|
|
|
+ zwCode: "",
|
|
|
sfzType: "0",
|
|
|
- ipaginations:{
|
|
|
+ ipaginations: {
|
|
|
current: 1,
|
|
|
pageSize: 10,
|
|
|
pageSizeOptions: ['10', '20', '30'],
|
|
|
@@ -339,6 +420,9 @@
|
|
|
checkedDepartNames: [], // 保存部门的名称 =>title
|
|
|
checkedDepartNameString: "", // 保存部门的名称 =>title
|
|
|
resultDepartOptions: [],
|
|
|
+ wkDate: new Date,
|
|
|
+ wkMoth: 6,
|
|
|
+ wkEndDate: null,
|
|
|
userId: "", //保存用户id
|
|
|
disableSubmit: false,
|
|
|
userDepartModel: {
|
|
|
@@ -363,6 +447,12 @@
|
|
|
validator: this.validateEmail
|
|
|
}]
|
|
|
},
|
|
|
+ deptName: {
|
|
|
+ rules: [{
|
|
|
+ required: true,
|
|
|
+ message: '请选择部门'
|
|
|
+ }]
|
|
|
+ },
|
|
|
realname: {
|
|
|
rules: [{
|
|
|
required: true,
|
|
|
@@ -395,46 +485,50 @@
|
|
|
},
|
|
|
bankCard: {
|
|
|
rules: [{
|
|
|
- required: true,
|
|
|
- message: '请输入银行账号'
|
|
|
- },
|
|
|
- {validator: this.validatebankCard}
|
|
|
+ required: true,
|
|
|
+ message: '请输入银行账号'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ validator: this.validatebankCard
|
|
|
+ }
|
|
|
]
|
|
|
},
|
|
|
syFund: {
|
|
|
rules: [{
|
|
|
- required: true,
|
|
|
- message: '请输入公积金账号'
|
|
|
- },
|
|
|
- {validator: this.validatesyFund}
|
|
|
+ required: true,
|
|
|
+ message: '请输入公积金账号'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ validator: this.validatesyFund
|
|
|
+ }
|
|
|
]
|
|
|
},
|
|
|
wagesOne: {
|
|
|
rules: [{
|
|
|
- required: true,
|
|
|
- message: '请输入基本工资'
|
|
|
- }
|
|
|
-
|
|
|
+ required: true,
|
|
|
+ message: '请输入基本工资'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ validator: this.validatewages
|
|
|
+ }
|
|
|
+
|
|
|
]
|
|
|
- }
|
|
|
+ },
|
|
|
+
|
|
|
},
|
|
|
- columnst:[{
|
|
|
+ columnst: [{
|
|
|
title: '职位编码',
|
|
|
dataIndex: 'code',
|
|
|
- },{
|
|
|
+ }, {
|
|
|
title: '职位名称',
|
|
|
dataIndex: 'name',
|
|
|
- },{
|
|
|
- title: '部门',
|
|
|
- dataIndex: 'deptName',
|
|
|
- },
|
|
|
- ],
|
|
|
+ }],
|
|
|
departIdShow: false,
|
|
|
departIds: [], //负责部门id
|
|
|
title: "操作",
|
|
|
visible: false,
|
|
|
- dialogStyle:{
|
|
|
- top:"15px"
|
|
|
+ dialogStyle: {
|
|
|
+ top: "15px"
|
|
|
},
|
|
|
model: {},
|
|
|
roleList: [],
|
|
|
@@ -470,8 +564,8 @@
|
|
|
queryTenantList: '/sys/tenant/queryList',
|
|
|
xzupload: '/sys/common/static',
|
|
|
sysFile: '/sysFile/sysFile/queryByUserId',
|
|
|
- delSysFile:'/sysFile/sysFile/deleteById',
|
|
|
- post:'/sys/position/listByDept'
|
|
|
+ delSysFile: '/sysFile/sysFile/deleteById',
|
|
|
+ post: '/sys/position/listByDept'
|
|
|
},
|
|
|
identity: "1",
|
|
|
fileList: [],
|
|
|
@@ -494,64 +588,72 @@
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
- zwOk(){
|
|
|
- if(this.selectionRows!=null&&this.selectionRows.length>0){
|
|
|
- this.zwName=this.selectionRows[0].name;
|
|
|
- this.zwCode=this.selectionRows[0].code;
|
|
|
+ zwOk() {
|
|
|
+ console.log(this.selectedRowKeys)
|
|
|
+ if (this.selectionRows != null && this.selectionRows.length > 0) {
|
|
|
+ this.zwName = this.selectionRows[0].name;
|
|
|
+ this.zwCode = this.selectionRows[0].code;
|
|
|
+ } else {
|
|
|
+ this.zwCode = "";
|
|
|
+ this.zwName = "";
|
|
|
}
|
|
|
- this.visibles=false;
|
|
|
+ this.visibles = false;
|
|
|
},
|
|
|
onSelectChanges(selectedRowKeys, selectionRows) {
|
|
|
this.selectedRowKeys = selectedRowKeys;
|
|
|
- this.selectionRows=selectionRows;
|
|
|
+ this.selectionRows = selectionRows;
|
|
|
},
|
|
|
- handleTableChanges(pagination, filters, sorter) {
|
|
|
- //分页、排序、筛选变化时触发
|
|
|
- //TODO 筛选
|
|
|
- if (Object.keys(sorter).length > 0) {
|
|
|
- this.isorter.column = sorter.field;
|
|
|
- this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
|
|
|
- }
|
|
|
- this.ipaginations = pagination;
|
|
|
- this.queryzw();
|
|
|
- },
|
|
|
- zw(){
|
|
|
- if(this.userDepartModel.departIdList==null||this.userDepartModel.departIdList.length<1){
|
|
|
+ handleTableChanges(pagination, filters, sorter) {
|
|
|
+ //分页、排序、筛选变化时触发
|
|
|
+ //TODO 筛选
|
|
|
+ if (Object.keys(sorter).length > 0) {
|
|
|
+ this.isorter.column = sorter.field;
|
|
|
+ this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
|
|
|
+ }
|
|
|
+ this.ipaginations = pagination;
|
|
|
+ this.queryzw();
|
|
|
+ },
|
|
|
+ onSearchs() {
|
|
|
+ if (this.userDepartModel.departIdList == null || this.userDepartModel.departIdList.length < 1) {
|
|
|
this.$message.warning('请先选择部门!');
|
|
|
return;
|
|
|
}
|
|
|
- this.visibles=true;
|
|
|
- this.queryzw();
|
|
|
+ this.selectedRowKeys.push(this.zwCode);
|
|
|
+ this.visibles = true;
|
|
|
+ this.queryzw();
|
|
|
+ console.log(this.selectedRowKeys)
|
|
|
+
|
|
|
},
|
|
|
- queryzw(){
|
|
|
+ queryzw() {
|
|
|
getAction(this.url.post, {
|
|
|
- pageNo:this.ipaginations.current,
|
|
|
+ pageNo: this.ipaginations.current,
|
|
|
pageSize: this.ipaginations.pageSize,
|
|
|
- deptId:this.userDepartModel.departIdList.join(",")
|
|
|
+ deptId: this.userDepartModel.departIdList.join(",")
|
|
|
}).then((res) => {
|
|
|
if (res.success) {
|
|
|
- this.dataSources = res.result.records||res.result;
|
|
|
- if(res.result.total)
|
|
|
- {
|
|
|
- this.ipaginations.total = res.result.total;
|
|
|
- }else{
|
|
|
- this.ipaginationstotal = 0;
|
|
|
- }
|
|
|
- }
|
|
|
- }).finally(() => {
|
|
|
- });
|
|
|
+ this.dataSources = res.result.records || res.result;
|
|
|
+ if (res.result.total) {
|
|
|
+ this.ipaginations.total = res.result.total;
|
|
|
+ } else {
|
|
|
+ this.ipaginations.total = 0;
|
|
|
+ this.selectionRows = [];
|
|
|
+ this.selectedRowKeys = [];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }).finally(() => {});
|
|
|
},
|
|
|
- handleRemove(file){
|
|
|
- if(this.userId!=null&&this.userId!=""){
|
|
|
- deleteAction(this.url.delSysFile, {userid:this.userId,name:file.name}).then((res) => {
|
|
|
- if (res.success) {
|
|
|
- }
|
|
|
- }).finally(() => {
|
|
|
- });
|
|
|
+ handleRemove(file) {
|
|
|
+ if (this.userId != null && this.userId != "") {
|
|
|
+ deleteAction(this.url.delSysFile, {
|
|
|
+ userid: this.userId,
|
|
|
+ name: file.name
|
|
|
+ }).then((res) => {
|
|
|
+ if (res.success) {}
|
|
|
+ }).finally(() => {});
|
|
|
}
|
|
|
},
|
|
|
handleCancelts() {
|
|
|
- // this.fileList = [];
|
|
|
+ // this.fileList = [];
|
|
|
this.visiblet = false;
|
|
|
},
|
|
|
// 文件下载
|
|
|
@@ -595,6 +697,14 @@
|
|
|
}
|
|
|
|
|
|
if (birthday != "" && birthday != null) {
|
|
|
+ let birthdays = new Date(birthday.replace(/(.{4})(.{2})/, "$1-$2-"));
|
|
|
+ let d = new Date();
|
|
|
+ let age = d.getFullYear() - birthdays.getFullYear() - (d.getMonth() < birthdays.getMonth() || (d.getMonth() ==
|
|
|
+ birthdays.getMonth() && d.getDate() < birthdays.getDate()) ? 1 : 0);
|
|
|
+
|
|
|
+ this.form.setFieldsValue({
|
|
|
+ age: age
|
|
|
+ })
|
|
|
this.form.setFieldsValue({
|
|
|
birthday: birthday.replace(/(.{4})(.{2})/, "$1-$2-")
|
|
|
})
|
|
|
@@ -613,11 +723,11 @@
|
|
|
|
|
|
|
|
|
},
|
|
|
- handleChangeStatus(e){
|
|
|
- if(e==101){
|
|
|
- this.personType=false;
|
|
|
- }else{
|
|
|
- this.personType=true;
|
|
|
+ handleChangeStatus(e) {
|
|
|
+ if (e == 101) {
|
|
|
+ this.personType = false;
|
|
|
+ } else {
|
|
|
+ this.personType = true;
|
|
|
this.form.setFieldsValue({
|
|
|
wagesBase: null
|
|
|
})
|
|
|
@@ -703,10 +813,10 @@
|
|
|
this.bankCard = "";
|
|
|
this.phone = "";
|
|
|
this.email = "";
|
|
|
- this.zwCode="";
|
|
|
- this.zwName="";
|
|
|
- this.selectedRowKeys=[];
|
|
|
- this.selectionRows=[];
|
|
|
+ this.zwCode = "";
|
|
|
+ this.zwName = "";
|
|
|
+ this.selectedRowKeys = [];
|
|
|
+ this.selectionRows = [];
|
|
|
},
|
|
|
add() {
|
|
|
this.picUrl = "";
|
|
|
@@ -715,6 +825,10 @@
|
|
|
this.edit({
|
|
|
activitiSync: '1'
|
|
|
});
|
|
|
+ var date = new Date();
|
|
|
+ date.setMonth(date.getMonth() + 6)
|
|
|
+ this.wkEndDate = date;
|
|
|
+ this.wkMoth=6;
|
|
|
},
|
|
|
edit(record) {
|
|
|
this.realname = record.realname;
|
|
|
@@ -733,15 +847,21 @@
|
|
|
}
|
|
|
if (record.sfzType != null && record.sfzType != "") {
|
|
|
this.sfzType = record.sfzType;
|
|
|
+ }if(record.entryDate!=null){
|
|
|
+ this.moth=this.countMoth(record.entryDate)
|
|
|
}
|
|
|
that.visible = true;
|
|
|
that.model = Object.assign({}, record);
|
|
|
- this.zwCode=record.post;
|
|
|
- this.zwName=record.post_dictText;
|
|
|
+ this.zwCode = record.post;
|
|
|
+ this.zwName = record.post_dictText;
|
|
|
+ this.wkDate = record.entryDate;
|
|
|
+ this.wkMoth = record.trialMoth - 0;
|
|
|
that.$nextTick(() => {
|
|
|
that.form.setFieldsValue(pick(this.model, 'sex', 'email', 'phone', 'urgentName', 'urgentPhone',
|
|
|
- 'bankAddr', 'bankCard', 'realname', 'egName', 'sfzCode','isAttendance','remarks','addr','post',
|
|
|
- 'infoSy', 'syFund', 'category', 'employmentStatus', 'wagesOne', 'wagesTwo', 'security','wagesBase'))
|
|
|
+ 'bankAddr', 'bankCard', 'realname', 'egName', 'age', 'sfzCode', 'isAttendance', 'remarks', 'addr',
|
|
|
+ 'nationality', 'trialMoth', 'trialEndDate', 'workMoth', 'divisionMoth',
|
|
|
+ 'infoSy', 'syFund', 'category', 'employmentStatus', 'wagesOne', 'wagesTwo', 'security', 'wagesBase',
|
|
|
+ 'homeAddr', 'education', 'school','contractDate','contractDate2','type','contractDate3','shareDept'))
|
|
|
});
|
|
|
//身份为上级显示负责部门，否则不显示
|
|
|
if (this.model.userIdentity == "2") {
|
|
|
@@ -751,7 +871,7 @@
|
|
|
this.identity = "1";
|
|
|
this.departIdShow = false;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//update-begin-author:taoyan date:2020710 for:多租户配置
|
|
|
if (!record.relTenantIds || record.relTenantIds.length == 0) {
|
|
|
this.currentTenant = []
|
|
|
@@ -763,7 +883,7 @@
|
|
|
this.userId = record.id;
|
|
|
this.queryFiles(record.id)
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
// 调用查询用户对应的部门信息的方法
|
|
|
that.checkedDepartKeys = [];
|
|
|
that.loadCheckedDeparts();
|
|
|
@@ -773,7 +893,7 @@
|
|
|
},
|
|
|
//
|
|
|
loadCheckedDeparts() {
|
|
|
- var id= this.userId
|
|
|
+ var id = this.userId
|
|
|
let that = this;
|
|
|
if (!that.userId) {
|
|
|
return
|
|
|
@@ -787,7 +907,10 @@
|
|
|
var departId = [];
|
|
|
for (let i = 0; i < res.result.length; i++) {
|
|
|
that.checkedDepartNames.push(res.result[i].title);
|
|
|
- this.checkedDepartNameString = this.checkedDepartNames.join(",");
|
|
|
+ this.form.setFieldsValue({
|
|
|
+ checkedDepartNameString: this.checkedDepartNames.join(",")
|
|
|
+ })
|
|
|
+ //this.checkedDepartNameString = this.checkedDepartNames.join(",");
|
|
|
that.checkedDepartKeys.push(res.result[i].key);
|
|
|
//新增负责部门选择下拉框
|
|
|
depart.push({
|
|
|
@@ -825,18 +948,22 @@
|
|
|
this.resultDepartOptions = [];
|
|
|
this.departIds = [];
|
|
|
this.departIdShow = false;
|
|
|
- this.fileLists=[];
|
|
|
+ this.fileLists = [];
|
|
|
this.identity = "1";
|
|
|
this.bankAddr = "";
|
|
|
this.bankCard = "";
|
|
|
this.syFund = "";
|
|
|
+ this.zwCode = "";
|
|
|
+ this.zwName = "";
|
|
|
+ this.selectedRowKeys = [];
|
|
|
+ this.selectionRows = [];
|
|
|
},
|
|
|
moment,
|
|
|
handleSubmit() {
|
|
|
- if (this.userDepartModel.departIdList.join(",") == "" || this.userDepartModel.departIdList.join(",") == null) {
|
|
|
- this.$message.warning('请选择部门!');
|
|
|
- return;
|
|
|
- }
|
|
|
+ // if (this.userDepartModel.departIdList.join(",") == "" || this.userDepartModel.departIdList.join(",") == null) {
|
|
|
+ // this.$message.warning('请选择部门!');
|
|
|
+ // return;
|
|
|
+ // }
|
|
|
const that = this;
|
|
|
// 触发表单验证
|
|
|
this.form.validateFields((err, values) => {
|
|
|
@@ -863,18 +990,22 @@
|
|
|
}
|
|
|
formData.txt = txt.join(",");
|
|
|
}
|
|
|
- //formData.post=this.zwCode;
|
|
|
+ if (formData.trialEndDate != null) {
|
|
|
+ formData.trialEndDate = moment(formData.trialEndDate).format('YYYY-MM-DD');
|
|
|
+ }
|
|
|
+ formData.post = this.zwCode;
|
|
|
//formData.selectedroles = this.selectedRole.length>0?this.selectedRole.join(","):'';
|
|
|
formData.selecteddeparts = this.userDepartModel.departIdList.length > 0 ? this.userDepartModel
|
|
|
.departIdList.join(",") : '';
|
|
|
formData.userIdentity = this.identity;
|
|
|
formData.departIds = this.userDepartModel.departIdList.join(",");
|
|
|
+
|
|
|
//如果是上级择传入departIds,否则为空
|
|
|
- if (this.identity === "2") {
|
|
|
- formData.departIds = this.departIds.join(",");
|
|
|
- } else {
|
|
|
- formData.departIds = "";
|
|
|
- }
|
|
|
+ // if (this.identity === "2") {
|
|
|
+ // formData.departIds = this.departIds.join(",");
|
|
|
+ // } else {
|
|
|
+ // formData.departIds = "";
|
|
|
+ // }
|
|
|
|
|
|
// that.addDepartsToUser(that,formData); // 调用根据当前用户添加部门信息的方法
|
|
|
let obj;
|
|
|
@@ -924,19 +1055,84 @@
|
|
|
callback()
|
|
|
}
|
|
|
},
|
|
|
+ validatetrialMoth(rule, value, callback) {
|
|
|
+ if (!value) {
|
|
|
+ callback()
|
|
|
+ } else {
|
|
|
+ if (!RegExp(/^[0-9]*$/).test(value)) {
|
|
|
+ callback("请输入数字!");
|
|
|
+ } else {
|
|
|
+ this.wkMoth = value - 0;
|
|
|
+ if (this.wkDate != null && this.wkDate != "") {
|
|
|
+ var date = new Date(this.wkDate)
|
|
|
+ var num = value - 0;
|
|
|
+ date.setMonth(date.getMonth() + num)
|
|
|
+ var d = moment(date).format('YYYY-MM-DD');
|
|
|
+ this.form.setFieldsValue({
|
|
|
+ trialEndDate: d
|
|
|
+ })
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ callback()
|
|
|
+ }
|
|
|
+ },
|
|
|
+ countMoth(e){
|
|
|
+ var date = new Date(e)
|
|
|
+ var newDate = new Date();
|
|
|
+ var seconds = Math.floor((newDate.getTime() - date.getTime()) / 1000);
|
|
|
+ var minutes = Math.floor(seconds / 60);
|
|
|
+ var hours = Math.floor(minutes / 60);
|
|
|
+ var days = Math.floor(hours / 24);
|
|
|
+ var months = Math.floor(days / 30);
|
|
|
+ var diffValue = 0;
|
|
|
+ if (months > 0) {
|
|
|
+ diffValue = months;
|
|
|
+ }
|
|
|
+ return diffValue;
|
|
|
+ },
|
|
|
+ validateentryDate(rule, value, callback) {
|
|
|
+ if (!value) {
|
|
|
+ callback()
|
|
|
+ } else {
|
|
|
+ var date=new Date(value);
|
|
|
+ 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).format('YYYY-MM-DD');
|
|
|
+ this.form.setFieldsValue({
|
|
|
+ trialEndDate: d
|
|
|
+ })
|
|
|
+ }
|
|
|
+ callback()
|
|
|
+ }
|
|
|
+ },
|
|
|
validateSfzCode(rule, value, callback) {
|
|
|
if (!value) {
|
|
|
callback()
|
|
|
} else {
|
|
|
if (this.sfzType == "0") {
|
|
|
- if (value.length==15&&RegExp(/^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$/).test(value)) {
|
|
|
+ if (value.length == 15 && RegExp(/^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$/).test(value)) {
|
|
|
this.getBirth(value)
|
|
|
- }else if(value.length==18&&RegExp(/^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/).test(value)){
|
|
|
+ } else if (value.length == 18 && RegExp(
|
|
|
+ /^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/).test(value)) {
|
|
|
this.getBirth(value)
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
callback("请输入正确格式的身份证号码!");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+ }
|
|
|
+ callback()
|
|
|
+ }
|
|
|
+ },
|
|
|
+ validatewages(rule, value, callback) {
|
|
|
+ if (!value) {
|
|
|
+ callback()
|
|
|
+ } else {
|
|
|
+ if (!RegExp(/^[0-9]*$/).test(value)) {
|
|
|
+ callback("请输入数字!");
|
|
|
}
|
|
|
callback()
|
|
|
}
|
|
|
@@ -945,7 +1141,7 @@
|
|
|
if (!value) {
|
|
|
callback()
|
|
|
} else {
|
|
|
- this.egName =value.substr(0,1).toLowerCase()+value.substr(1,value.length);
|
|
|
+ this.egName = value.substr(0, 1).toLowerCase() + value.substr(1, value.length);
|
|
|
if (this.realname != null && this.realname != "") {
|
|
|
var emil = "@gksports.com.cn";
|
|
|
var name = py.chineseToPinYin(this.realname.substr(0, 1))
|
|
|
@@ -960,8 +1156,8 @@
|
|
|
if (!value) {
|
|
|
callback()
|
|
|
} else {
|
|
|
- if(value.length!=9&&value.length!=12){
|
|
|
- callback('请输入正确格式的公积金账号');
|
|
|
+ if (value.length != 9 && value.length != 12) {
|
|
|
+ callback('请输入正确格式的公积金账号');
|
|
|
}
|
|
|
callback()
|
|
|
}
|
|
|
@@ -995,8 +1191,8 @@
|
|
|
if (!value) {
|
|
|
callback()
|
|
|
} else {
|
|
|
- if(value.length!=19&&value.length!=17&&value.length!=16){
|
|
|
- callback('请输入正确格式的银行卡账号');
|
|
|
+ if (value.length != 19 && value.length != 17 && value.length != 16) {
|
|
|
+ callback('请输入正确格式的银行卡账号');
|
|
|
}
|
|
|
callback()
|
|
|
}
|
|
|
@@ -1069,6 +1265,7 @@
|
|
|
onSearch() {
|
|
|
console.log(this.$refs.departWindow)
|
|
|
this.$refs.departWindow.add(this.checkedDepartKeys, this.userId);
|
|
|
+
|
|
|
},
|
|
|
|
|
|
// 获取用户对应部门弹出框提交给返回的数据
|
|
|
@@ -1084,7 +1281,10 @@
|
|
|
for (let i = 0; i < formData.departIdList.length; i++) {
|
|
|
this.selectedDepartKeys.push(formData.departIdList[i].key);
|
|
|
this.checkedDepartNames.push(formData.departIdList[i].title);
|
|
|
- this.checkedDepartNameString = this.checkedDepartNames.join(",");
|
|
|
+ this.form.setFieldsValue({
|
|
|
+ checkedDepartNameString: this.checkedDepartNames.join(",")
|
|
|
+ })
|
|
|
+ //this.checkedDepartNameString = this.checkedDepartNames.join(",");
|
|
|
//新增部门选择，如果上面部门选择后不为空直接付给负责部门
|
|
|
depart.push({
|
|
|
key: formData.departIdList[i].key,
|
|
|
@@ -1095,6 +1295,10 @@
|
|
|
this.resultDepartOptions = depart;
|
|
|
this.userDepartModel.departIdList = this.selectedDepartKeys;
|
|
|
this.checkedDepartKeys = this.selectedDepartKeys //更新当前的选择keys
|
|
|
+ this.zwCode = "";
|
|
|
+ this.zwName = "";
|
|
|
+ this.selectionRows = [];
|
|
|
+ this.selectedRowKeys = [];
|
|
|
},
|
|
|
// 根据屏幕变化,设置抽屉尺寸
|
|
|
resetScreenSize() {
|
LiGuang