From e9e7c2b4498042c43e5978f483abbbbdc6cd1480 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期一, 01 三月 2021 21:50:18 +0800
Subject: [PATCH] 提交 bug
---
src/views/user/Informationinput.vue | 1095 ++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 649 insertions(+), 446 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index 25a7d6d..f4ea0fb 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -16,7 +16,7 @@
<span :class="thisShowIndex===3?'selectedTimeline':''">合同信息</span>
</el-timeline-item>
<el-timeline-item @click.native="isShow(showArr[4].show, 4)">
- <span :class="thisShowIndex===4?'selectedTimeline':''">考勤情况</span>
+ <span :class="thisShowIndex===4?'selectedTimeline':''">离职当月考勤</span>
</el-timeline-item>
<el-timeline-item @click.native="isShow(showArr[5].show, 5)">
<span :class="thisShowIndex===5?'selectedTimeline':''">请假记录</span>
@@ -72,7 +72,6 @@
</el-button>
</template>
</el-table-column>
- <el-table-column prop="" label="照片" width="60" />
<el-table-column prop="empNumb" label="员工编号" width="100" />
<el-table-column prop="empName" label="姓名" width="100" />
<el-table-column prop="deptName" label="护卫点" width="100" />
@@ -110,7 +109,7 @@
</el-table-column>
<el-table-column prop="empNumb" label="员工编号" width="100" />
<el-table-column prop="empName" label="员工姓名" width="100" />
- <el-table-column prop="certificateNumb" label="证件号码" width="180" />
+ <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="workUnit" label="工作单位" width="240" />
<el-table-column prop="beginDate" label="开始日期" width="100" />
<el-table-column prop="endDate" label="结束日期" width="100" />
@@ -165,16 +164,16 @@
</el-button>
</template>
</el-table-column>
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <el-table-column prop="deptName" label="护卫点" width="180" />
- <el-table-column prop="jobName" label="岗位" width="180" />
- <el-table-column prop="empName" label="员工姓名" width="180" />
- <el-table-column prop="certificateNumb" label="证件号码" width="180" />
- <el-table-column prop="signingDate" label="合同签订日期" width="180" />
- <el-table-column prop="endDate" label="合同结束日期" width="180" />
- <el-table-column prop="contractPeriod" label="合同期限(年)" width="180" />
- <el-table-column prop="contractStatus" label="合同状态" width="180" />
- <el-table-column prop="transactor" label="合同办理人" width="180" />
+ <el-table-column prop="empNumb" label="员工编号" width="100" />
+ <el-table-column prop="deptName" label="护卫点" width="150" />
+ <el-table-column prop="empName" label="员工姓名" width="100" />
+ <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column prop="jobName" label="岗位" width="120" />
+ <el-table-column prop="signingDate" label="合同签订日期" width="120" />
+ <el-table-column prop="endDate" label="合同结束日期" width="120" />
+ <el-table-column prop="contractPeriod" label="合同期限(年)" width="120" />
+ <el-table-column prop="contractStatusName" label="合同状态" width="100" />
+ <el-table-column prop="transactor" label="合同办理人" width="100" />
</el-table>
<el-table
v-show="showArr[4].show"
@@ -188,18 +187,18 @@
<el-button type="text" size="small" @click="editDimissionAttend(scope.row)">编辑</el-button>
</template>
</el-table-column>
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <el-table-column prop="deptName" label="护卫点" width="180" />
- <el-table-column prop="jobName" label="岗位名称" width="180" />
- <el-table-column prop="empName" label="员工姓名" width="180" />
- <el-table-column prop="certificateNumb" label="证件号码" width="180" />
- <el-table-column prop="attendMonth" label="离职考勤月份" width="180" />
- <el-table-column prop="attendDays" label="出勤天数" width="180" />
- <el-table-column prop="overtimeDay" label="加班（天）" width="180" />
- <el-table-column prop="overtimeHour" label="加班（小时）" width="180" />
+ <el-table-column prop="empNumb" label="员工编号" width="100" />
+ <el-table-column prop="deptName" label="护卫点" width="150" />
+ <el-table-column prop="empName" label="员工姓名" width="100" />
+ <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column prop="jobName" label="岗位" width="120" />
+ <el-table-column prop="attendMonth" label="离职考勤月份" width="120" />
+ <el-table-column prop="attendDays" label="出勤天数" width="120" />
+ <el-table-column prop="overtimeDay" label="加班（天）" width="120" />
+ <el-table-column prop="overtimeHour" label="加班（小时）" width="120" />
<el-table-column prop="deduct" label="有无代扣款项" width="180" />
- <el-table-column prop="leaveDay" label="请假（天）" width="180" />
- <el-table-column prop="absenteeism" label="旷工（天）" width="180" />
+ <el-table-column prop="leaveDay" label="请假（天）" width="120" />
+ <el-table-column prop="absenteeism" label="旷工（天）" width="120" />
<el-table-column prop="remark" label="备注" width="180" />
</el-table>
<el-table v-show="showArr[5].show" ref="leaveInfoTable" :data="leaveInfoData" style="width: 100%;">
@@ -209,17 +208,17 @@
<el-button type="text" size="small" @click="editLeaveInfo(scope.row)">编辑</el-button>
</template>
</el-table-column>
- <el-table-column prop="empNumb" label="员工编号" width="180" />
+ <el-table-column prop="empNumb" label="员工编号" width="120" />
<el-table-column prop="deptName" label="护卫点" width="180" />
- <el-table-column prop="jobName" label="岗位名称" width="180" />
- <el-table-column prop="empName" label="员工姓名" width="180" />
- <el-table-column prop="certificateNumb" label="证件号码" width="180" />
- <el-table-column prop="beginTime" label="开始时间" width="180" />
- <el-table-column prop="endTime" label="结束时间" width="180" />
- <el-table-column prop="leaveDay" label="请假天数" width="180" />
- <el-table-column prop="leaveType" label="请假类型" width="180" />
- <el-table-column prop="returnDate" label="到岗时间" width="180" />
- <el-table-column prop="reporter" label="报备人" width="180" />
+ <el-table-column prop="jobName" label="岗位名称" width="120" />
+ <el-table-column prop="empName" label="员工姓名" width="120" />
+ <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column prop="beginTime" label="开始时间" width="150" />
+ <el-table-column prop="endTime" label="结束时间" width="150" />
+ <el-table-column prop="leaveDay" label="请假天数" width="100" />
+ <el-table-column prop="leaveTypeName" label="请假类型" width="120" />
+ <el-table-column prop="returnDate" label="到岗时间" width="150" />
+ <el-table-column prop="reporter" label="报备人" width="120" />
<el-table-column prop="remark" label="备注" width="180" />
</el-table>
<el-table v-show="showArr[6].show" ref="resignTable" :data="resignData" style="width: 100%;">
@@ -233,7 +232,7 @@
<el-table-column prop="jobName" label="岗位名" width="180" />
<el-table-column prop="empNumb" label="员工编号" width="180" />
<el-table-column prop="empName" label="员工姓名" width="180" />
- <el-table-column prop="certificateNumb" label="证件号码" width="180" />
+ <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="applayDate" label="辞职申请日期" width="180" />
<el-table-column prop="reason" label="辞职事由" width="180" />
<el-table-column prop="reporter" label="汇报人" width="180" />
@@ -276,9 +275,21 @@
<el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="applayDate" label="社保申请日期" width="180" />
<el-table-column prop="proposer" label="申请人" width="180" />
- <el-table-column prop="insuranceGaers" label="社保档位" width="180" />
- <el-table-column prop="reportStatus " label="是否已报告" width="180" />
- <el-table-column prop="applayStatus" label="状态" width="180" />
+ <el-table-column prop="insuranceGaers" label="社保档位" width="250">
+ <template slot-scope="{row}">
+ {{ transinsuranceGaers(row.insuranceGaers) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="reportStatus " label="是否已报告" width="180">
+ <template slot-scope="{row}">
+ {{ row.reportStatus === 0?'未报告':'已报告' }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="applayStatus" label="状态">
+ <template slot-scope="{row}">
+ {{ row.applayStatus === 0?'未申请':'已申请' }}
+ </template>
+ </el-table-column>
<el-table-column prop="auditor" label="审核人" width="180" />
<el-table-column prop="remark" label="备注" width="280" />
</el-table>
@@ -306,7 +317,11 @@
<el-table-column prop="injuredDiacrisis" label="意外险诊断" width="180" />
<el-table-column prop="hospitalName" label="就诊医院" width="180" />
<el-table-column prop="treatmentName" label="就诊科室" width="180" />
- <el-table-column prop="hospitalizatioFlag" label="是否住院" width="180" />
+ <el-table-column prop="hospitalizatioFlag" label="是否住院" width="180">
+ <template slot-scope="scope">
+ {{ scope.row.hospitalizatioFlag ===1?'已住院':'未住院' }}
+ </template>
+ </el-table-column>
<el-table-column prop="bedNumb" label="床号" width="180" />
<el-table-column prop="reprotTime" label="报案时间" width="180" />
<el-table-column prop="submitTime" label="递交资料时间" width="180" />
@@ -338,7 +353,11 @@
<el-table-column prop="injuredDiacrisis" label="工伤诊断" width="180" />
<el-table-column prop="hospitalName" label="就诊医院" width="180" />
<el-table-column prop="treatmentName" label="就诊科室" width="180" />
- <el-table-column prop="hospitalizatioFlag" label="是否住院" width="180" />
+ <el-table-column prop="hospitalizatioFlag" label="是否住院" width="180">
+ <template slot-scope="scope">
+ {{ scope.row.hospitalizatioFlag ===1?'已住院':'未住院' }}
+ </template>
+ </el-table-column>
<el-table-column prop="bedNumb" label="床号" width="180" />
<el-table-column prop="reportTime" label="报案时间" width="180" />
<el-table-column prop="submitTime" label="递交资料时间" width="180" />
@@ -365,7 +384,7 @@
<el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="arbitrationDate" label="仲裁日期" width="180" />
<el-table-column prop="arbitrationDate" label="仲裁日期" width="180" />
- <el-table-column prop="arbitrationType" label="仲裁类型" width="180" />
+ <el-table-column prop="arbitrationTypeName" label="仲裁类型" width="180" />
<el-table-column prop="arbitrationReason" label="仲裁事由" width="180" />
<el-table-column prop="reporter" label="报备人" width="180" />
<el-table-column prop="remark" label="备注" width="180" />
@@ -435,276 +454,297 @@
</el-col>
</el-main>
</el-container>
- <el-dialog title="基本信息" :visible.sync="dialogshowArr[0].show" width="50%">
- <el-form ref="empBaseInfoForm" :model="empBaseInfoForm" :rules="rules" label-position="right" label-width="120px">
- <el-row>
- <el-col :span="12">
- <el-form-item label="档案号" prop="archivesNumb">
- <el-input v-model="empBaseInfoForm.archivesNumb" />
- </el-form-item>
- <el-form-item label="员工编号" prop="empNumb">
- <el-input v-model="empBaseInfoForm.empNumb" />
- </el-form-item>
- <el-form-item label="身份证号码" prop="certificateNumb">
- <el-input
- v-model="empBaseInfoForm.certificateNumb"
- @input="generateUserInfo(0,empBaseInfoForm.certificateNumb)"
- />
- </el-form-item>
- <el-form-item label="员工类别" prop="empType">
- <el-select v-model="empBaseInfoForm.empType" placeholder="请选择员工类型">
- <el-option label="正式工" value="1" />
- <el-option label="临时工" value="2" />
- </el-select>
- </el-form-item>
- <el-form-item label="民族" prop="nation">
- <el-select v-model="empBaseInfoForm.nation" placeholder="请选择民族">
- <el-option label="汉族" value="01" />
- <el-option label="蒙古族" value="02" />
- <el-option label="回族" value="03" />
- <el-option label="藏族" value="04" />
- <el-option label="维吾尔族" value="05" />
- <el-option label="苗族" value="06" />
- <el-option label="彝族" value="07" />
- <el-option label="壮族" value="08" />
- <el-option label="布衣族" value="09" />
- <el-option label="朝鲜族" value="10" />
- <el-option label="满族" value="11" />
- <el-option label="侗族" value="12" />
- <el-option label="瑶族" value="13" />
- <el-option label="白族" value="14" />
- <el-option label="土家族" value="15" />
- <el-option label="哈尼族" value="16" />
- <el-option label="哈萨克族" value="17" />
- <el-option label="傣族" value="18" />
- <el-option label="黎族" value="19" />
- <el-option label="傈傈族" value="20" />
- <el-option label="瓦族" value="21" />
- <el-option label="畲族" value="22" />
- <el-option label="高山族" value="23" />
- <el-option label="拉祜族" value="24" />
- <el-option label="水族" value="25" />
- <el-option label="东乡族" value="26" />
- <el-option label="纳西族" value="27" />
- <el-option label="景颇族" value="28" />
- <el-option label="柯尔克孜族" value="29" />
- <el-option label="土族" value="30" />
- <el-option label="达斡尔族" value="31" />
- <el-option label="仫佬族" value="32" />
- <el-option label="羌族" value="33" />
- <el-option label="布朗族" value="34" />
- <el-option label="撒拉族" value="35" />
- <el-option label="毛难族" value="36" />
- <el-option label="仡佬族" value="37" />
- <el-option label="锡伯族" value="38" />
- <el-option label="阿昌族" value="39" />
- <el-option label="普米族" value="40" />
- <el-option label="塔吉克族" value="41" />
- <el-option label="怒族" value="42" />
- <el-option label="乌孜别克族" value="43" />
- <el-option label="俄罗斯族" value="44" />
- <el-option label="鄂温克族" value="45" />
- <el-option label="崩龙族" value="46" />
- <el-option label="保安族" value="47" />
- <el-option label="裕固族" value="48" />
- <el-option label="京族" value="49" />
- <el-option label="塔塔尔族" value="50" />
- <el-option label="独龙族" value="51" />
- <el-option label="鄂伦春" value="52" />
- <el-option label="郝哲族" value="53" />
- <el-option label="门巴族" value="54" />
- <el-option label="珞巴族" value="55" />
- <el-option label="基诺族" value="56" />
- <el-option label="其他族" value="91" />
- <el-option label="外国民族" value="98" />
- </el-select>
- </el-form-item>
- <el-form-item label="婚姻状态" prop="marriage">
- <el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态">
- <el-option label="未婚" value="1" />
- <el-option label="已婚" value="2" />
- <el-option label="丧偶" value="3" />
- <el-option label="离婚" value="4" />
- <el-option label="再婚" value="5" />
- <el-option label="其它" value="9" />
- </el-select>
- </el-form-item>
- <el-form-item label="身高(cm)" prop="stature">
- <el-input v-model="empBaseInfoForm.stature" />
- </el-form-item>
- <el-form-item label="政治面貌" prop="politics">
- <el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌">
- <el-option label="中共党员" value="01" />
- <el-option label="预备党员" value="02" />
- <el-option label="共青团员" value="03" />
- <el-option label="民革会员" value="04" />
- <el-option label="民盟盟员" value="05" />
- <el-option label="民建会员" value="06" />
- <el-option label="民进会员" value="07" />
- <el-option label="农工党员" value="08" />
- <el-option label="致公党员" value="09" />
- <el-option label="九三社员" value="10" />
- <el-option label="台盟盟员" value="11" />
- <el-option label="民主人士" value="12" />
- <el-option label="群众" value="13" />
- </el-select>
- </el-form-item>
- <el-form-item label="最高学历" prop="education">
- <el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历">
- <el-option label="博士" value="10" />
- <el-option label="硕士" value="11" />
- <el-option label="大学本科" value="21" />
- <el-option label="大学专科" value="31" />
- <el-option label="中专" value="41" />
- <el-option label="中技" value="42" />
- <el-option label="高中" value="61" />
- <el-option label="初中" value="71" />
- <el-option label="小学" value="81" />
- <el-option label="无学历" value="91" />
- </el-select>
- </el-form-item>
- <el-form-item label="籍贯" prop="nativePlaceName">
- <el-autocomplete
- v-model="empBaseInfoForm.nativePlaceName"
- class="inline-input"
- :fetch-suggestions="querySearch"
- placeholder="请输入籍贯"
- @select="placeNameSelect"
- />
- </el-form-item>
- <el-form-item label="现住址" prop="currentAddress">
- <el-input v-model="empBaseInfoForm.currentAddress" />
- </el-form-item>
- <el-form-item label="电话号码" prop="telePhone">
- <el-input v-model="empBaseInfoForm.telePhone" />
- </el-form-item>
- <el-form-item label="招聘介绍人" prop="introducer">
- <el-input v-model="empBaseInfoForm.introducer" />
- </el-form-item>
- <el-form-item label="银行名称" prop="bankName">
- <el-input v-model="empBaseInfoForm.bankName" />
- </el-form-item>
- <el-form-item label="保险类型" prop="insuranceType">
- <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型">
- <el-option label="（深户）五险一档" value="1" />
- <el-option label="（非深户）五险一档" value="2" />
- <el-option label="（非深户）五险二档" value="3" />
- <el-option label="（非深户）五险三档" value="4" />
- <el-option label="（非深户）四险一档" value="5" />
- </el-select>
- </el-form-item>
- <el-form-item label="家庭成员及关系" prop="family">
- <el-input v-model="empBaseInfoForm.family" />
- </el-form-item>
- <el-form-item label="紧急联系电话" prop="urgencyPhone">
- <el-input v-model="empBaseInfoForm.urgencyPhone" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="姓名" prop="empName">
- <el-input v-model="empBaseInfoForm.empName" />
- </el-form-item>
- <el-form-item label="部门(护卫点)" required message="请选择护卫点" prop="deptId">
- <treeselect
- v-model="empBaseInfoForm.deptId"
- :multiple="false"
- :options="depts"
- :clear-value-text="$t('common.clear')"
- placeholder="请选择部门(护卫点)"
- style="width:100%"
- />
- </el-form-item>
- <el-form-item label="岗位" prop="jobName">
- <el-autocomplete
- v-model="empBaseInfoForm.jobName"
- class="inline-input"
- :fetch-suggestions="querySearchJob"
- placeholder="请输入岗位"
- @select="jobNameSelect"
- />
- </el-form-item>
- <el-form-item label="性别" prop="sex">
- <el-select v-model="empBaseInfoForm.sex" placeholder="请选择性别">
- <el-option label="男" value="1" />
- <el-option label="女" value="2" />
- </el-select>
- </el-form-item>
- <el-form-item label="身份证有效期" prop="certificateValidity">
- <el-date-picker
- v-model="empBaseInfoForm.certificateValidity"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="选择日期"
- />
- </el-form-item>
- <el-form-item label="年龄" prop="age">
- <el-input v-model="empBaseInfoForm.age" />
- </el-form-item>
- <el-form-item label="出生日期" prop="birthdate">
- <el-date-picker
- v-model="empBaseInfoForm.birthdate"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="选择日期"
- />
- </el-form-item>
- <el-form-item label="入职日期" prop="entryDate">
- <el-date-picker
- v-model="empBaseInfoForm.entryDate"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="选择日期"
- @input="calculateSeniority"
- />
- </el-form-item>
- <el-form-item label="入司工龄" prop="seniority">
- <el-input v-model="empBaseInfoForm.seniority" />
- </el-form-item>
- <el-form-item label="户籍地址" prop="censusAddress">
- <el-input v-model="empBaseInfoForm.censusAddress" />
- </el-form-item>
- <el-form-item label="保安员证号" prop="guardNumb">
- <el-input v-model="empBaseInfoForm.guardNumb" />
- </el-form-item>
- <el-form-item label="保安员回执" prop="returnReceipt">
- <el-input v-model="empBaseInfoForm.returnReceipt" />
- </el-form-item>
- <el-form-item label="档案情况" prop="archivesStatus">
- <el-select v-model="empBaseInfoForm.archivesStatus" placeholder="请选择档案情况">
- <el-option label="未移交" value="0" />
- <el-option label="已移交" value="1" />
- </el-select>
- </el-form-item>
- <el-form-item label="银行账号" prop="bankNumb">
- <el-input v-model="empBaseInfoForm.bankNumb" />
- </el-form-item>
- <el-form-item label="社保电脑号" prop="socialNumb">
- <el-input v-model="empBaseInfoForm.socialNumb" />
- </el-form-item>
- <el-form-item label="员工手册" prop="handbookStatus">
- <el-select v-model="empBaseInfoForm.handbookStatus" placeholder="请选择员工手册">
- <el-option label="未发" value="0" />
- <el-option label="已发" value="1" />
- </el-select>
- </el-form-item>
- <el-form-item label="工作证" prop="empCardStatus">
- <el-select v-model="empBaseInfoForm.empCardStatus" placeholder="请选择工作证">
- <el-option label="未发" value="0" />
- <el-option label="已发" value="1" />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="24">
- <el-form-item label="相关证件" prop="certificateList">
- <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件">
- <el-option label="高中毕业证" value="1" />
- <el-option label="专科毕业证" value="2" />
- <el-option label="本科毕业证" value="3" />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- </el-form>
+ <el-dialog title="基本信息" :visible.sync="dialogshowArr[0].show" width="50%" class="baseinfo">
+ <el-container>
+ <el-aside width="200px">
+ <el-upload
+ class="avatar-uploader"
+ action="#"
+ :show-file-list="false"
+ :on-change="handlePictureCardPreview"
+ :auto-upload="false"
+ >
+ <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过4MB</div>
+ <img v-if="empBaseInfoImageUrl" :src="empBaseInfoImageUrl" class="avatar">
+ <i v-else class="el-icon-plus avatar-uploader-icon" />
+ </el-upload>
+ </el-aside>
+ <el-main> <el-form ref="empBaseInfoForm" :model="empBaseInfoForm" :rules="rules" label-position="right" label-width="120px">
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="档案号" prop="archivesNumb">
+ <el-input v-model="empBaseInfoForm.archivesNumb" />
+ </el-form-item>
+ <el-form-item label="员工编号" prop="empNumb">
+ <el-input v-model="empBaseInfoForm.empNumb" />
+ </el-form-item>
+ <el-form-item label="身份证号码" prop="certificateNumb">
+ <el-input
+ v-model="empBaseInfoForm.certificateNumb"
+ @input="generateUserInfo(0,empBaseInfoForm.certificateNumb)"
+ />
+ </el-form-item>
+ <el-form-item label="员工类别" prop="empType">
+ <el-select v-model="empBaseInfoForm.empType" placeholder="请选择员工类型">
+ <el-option label="高层" value="01" />
+ <el-option label="高级管理人员" value="02" />
+ <el-option label="中级管理人员" value="03" />
+ <el-option label="初级管理人员" value="04" />
+ <el-option label="文职人员" value="05" />
+ <el-option label="一般人员" value="06" />
+ <el-option label="其他" value="07" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="民族" prop="nation">
+ <el-select v-model="empBaseInfoForm.nation" placeholder="请选择民族">
+ <el-option label="汉族" value="01" />
+ <el-option label="蒙古族" value="02" />
+ <el-option label="回族" value="03" />
+ <el-option label="藏族" value="04" />
+ <el-option label="维吾尔族" value="05" />
+ <el-option label="苗族" value="06" />
+ <el-option label="彝族" value="07" />
+ <el-option label="壮族" value="08" />
+ <el-option label="布衣族" value="09" />
+ <el-option label="朝鲜族" value="10" />
+ <el-option label="满族" value="11" />
+ <el-option label="侗族" value="12" />
+ <el-option label="瑶族" value="13" />
+ <el-option label="白族" value="14" />
+ <el-option label="土家族" value="15" />
+ <el-option label="哈尼族" value="16" />
+ <el-option label="哈萨克族" value="17" />
+ <el-option label="傣族" value="18" />
+ <el-option label="黎族" value="19" />
+ <el-option label="傈傈族" value="20" />
+ <el-option label="瓦族" value="21" />
+ <el-option label="畲族" value="22" />
+ <el-option label="高山族" value="23" />
+ <el-option label="拉祜族" value="24" />
+ <el-option label="水族" value="25" />
+ <el-option label="东乡族" value="26" />
+ <el-option label="纳西族" value="27" />
+ <el-option label="景颇族" value="28" />
+ <el-option label="柯尔克孜族" value="29" />
+ <el-option label="土族" value="30" />
+ <el-option label="达斡尔族" value="31" />
+ <el-option label="仫佬族" value="32" />
+ <el-option label="羌族" value="33" />
+ <el-option label="布朗族" value="34" />
+ <el-option label="撒拉族" value="35" />
+ <el-option label="毛难族" value="36" />
+ <el-option label="仡佬族" value="37" />
+ <el-option label="锡伯族" value="38" />
+ <el-option label="阿昌族" value="39" />
+ <el-option label="普米族" value="40" />
+ <el-option label="塔吉克族" value="41" />
+ <el-option label="怒族" value="42" />
+ <el-option label="乌孜别克族" value="43" />
+ <el-option label="俄罗斯族" value="44" />
+ <el-option label="鄂温克族" value="45" />
+ <el-option label="崩龙族" value="46" />
+ <el-option label="保安族" value="47" />
+ <el-option label="裕固族" value="48" />
+ <el-option label="京族" value="49" />
+ <el-option label="塔塔尔族" value="50" />
+ <el-option label="独龙族" value="51" />
+ <el-option label="鄂伦春" value="52" />
+ <el-option label="郝哲族" value="53" />
+ <el-option label="门巴族" value="54" />
+ <el-option label="珞巴族" value="55" />
+ <el-option label="基诺族" value="56" />
+ <el-option label="其他族" value="91" />
+ <el-option label="外国民族" value="98" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="婚姻状态" prop="marriage">
+ <el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态">
+ <el-option label="未婚" value="1" />
+ <el-option label="已婚" value="2" />
+ <el-option label="丧偶" value="3" />
+ <el-option label="离婚" value="4" />
+ <el-option label="再婚" value="5" />
+ <el-option label="其它" value="9" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="身高(cm)" prop="stature">
+ <el-input v-model="empBaseInfoForm.stature" />
+ </el-form-item>
+ <el-form-item label="政治面貌" prop="politics">
+ <el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌">
+ <el-option label="中共党员" value="01" />
+ <el-option label="预备党员" value="02" />
+ <el-option label="共青团员" value="03" />
+ <el-option label="民革会员" value="04" />
+ <el-option label="民盟盟员" value="05" />
+ <el-option label="民建会员" value="06" />
+ <el-option label="民进会员" value="07" />
+ <el-option label="农工党员" value="08" />
+ <el-option label="致公党员" value="09" />
+ <el-option label="九三社员" value="10" />
+ <el-option label="台盟盟员" value="11" />
+ <el-option label="民主人士" value="12" />
+ <el-option label="群众" value="13" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="最高学历" prop="education">
+ <el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历">
+ <el-option label="博士" value="10" />
+ <el-option label="硕士" value="11" />
+ <el-option label="大学本科" value="21" />
+ <el-option label="大学专科" value="31" />
+ <el-option label="中专" value="41" />
+ <el-option label="中技" value="42" />
+ <el-option label="高中" value="61" />
+ <el-option label="初中" value="71" />
+ <el-option label="小学" value="81" />
+ <el-option label="无学历" value="91" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="籍贯" prop="nativePlaceName">
+ <el-autocomplete
+ v-model="empBaseInfoForm.nativePlaceName"
+ class="inline-input"
+ :fetch-suggestions="querySearch"
+ placeholder="请输入籍贯"
+ @select="placeNameSelect"
+ />
+ </el-form-item>
+ <el-form-item label="现住址" prop="currentAddress">
+ <el-input v-model="empBaseInfoForm.currentAddress" />
+ </el-form-item>
+ <el-form-item label="电话号码" prop="telePhone">
+ <el-input v-model="empBaseInfoForm.telePhone" />
+ </el-form-item>
+ <el-form-item label="招聘介绍人" prop="introducer">
+ <el-input v-model="empBaseInfoForm.introducer" />
+ </el-form-item>
+ <el-form-item label="银行名称" prop="bankName">
+ <el-input v-model="empBaseInfoForm.bankName" />
+ </el-form-item>
+ <el-form-item label="保险类型" prop="insuranceType">
+ <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型">
+ <el-option label="（深户）五险一档" value="1" />
+ <el-option label="（非深户）五险一档" value="2" />
+ <el-option label="（非深户）五险二档" value="3" />
+ <el-option label="（非深户）五险三档" value="4" />
+ <el-option label="（非深户）四险一档" value="5" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="家庭成员及关系" prop="family">
+ <el-input v-model="empBaseInfoForm.family" />
+ </el-form-item>
+ <el-form-item label="紧急联系电话" prop="urgencyPhone">
+ <el-input v-model="empBaseInfoForm.urgencyPhone" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="姓名" prop="empName">
+ <el-input v-model="empBaseInfoForm.empName" />
+ </el-form-item>
+ <el-form-item label="部门(护卫点)" required message="请选择护卫点" prop="deptId">
+ <treeselect
+ v-model="empBaseInfoForm.deptId"
+ :multiple="false"
+ :options="depts"
+ :clear-value-text="$t('common.clear')"
+ placeholder="请选择部门(护卫点)"
+ style="width:100%"
+ />
+ </el-form-item>
+ <el-form-item label="岗位" prop="jobName">
+ <el-autocomplete
+ v-model="empBaseInfoForm.jobName"
+ class="inline-input"
+ :fetch-suggestions="querySearchJob"
+ placeholder="请输入岗位"
+ @select="jobNameSelect"
+ />
+ </el-form-item>
+ <el-form-item label="性别" prop="sex">
+ <el-select v-model="empBaseInfoForm.sex" placeholder="请选择性别">
+ <el-option label="男" value="1" />
+ <el-option label="女" value="2" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="身份证有效期" prop="certificateValidity">
+ <el-date-picker
+ v-model="empBaseInfoForm.certificateValidity"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="选择日期"
+ />
+ </el-form-item>
+ <el-form-item label="年龄" prop="age">
+ <el-input v-model="empBaseInfoForm.age" />
+ </el-form-item>
+ <el-form-item label="出生日期" prop="birthdate">
+ <el-date-picker
+ v-model="empBaseInfoForm.birthdate"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="选择日期"
+ />
+ </el-form-item>
+ <el-form-item label="入职日期" prop="entryDate">
+ <el-date-picker
+ v-model="empBaseInfoForm.entryDate"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="选择日期"
+ @input="calculateSeniority"
+ />
+ </el-form-item>
+ <el-form-item label="入司工龄" prop="seniority">
+ <el-input v-model="empBaseInfoForm.seniority" />
+ </el-form-item>
+ <el-form-item label="户籍地址" prop="censusAddress">
+ <el-input v-model="empBaseInfoForm.censusAddress" />
+ </el-form-item>
+ <el-form-item label="保安员证号" prop="guardNumb">
+ <el-input v-model="empBaseInfoForm.guardNumb" />
+ </el-form-item>
+ <el-form-item label="保安员回执" prop="returnReceipt">
+ <el-input v-model="empBaseInfoForm.returnReceipt" />
+ </el-form-item>
+ <el-form-item label="档案情况" prop="archivesStatus">
+ <el-select v-model="empBaseInfoForm.archivesStatus" placeholder="请选择档案情况">
+ <el-option label="未移交" value="0" />
+ <el-option label="已移交" value="1" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="银行账号" prop="bankNumb">
+ <el-input v-model="empBaseInfoForm.bankNumb" />
+ </el-form-item>
+ <el-form-item label="社保电脑号" prop="socialNumb">
+ <el-input v-model="empBaseInfoForm.socialNumb" />
+ </el-form-item>
+ <el-form-item label="员工手册" prop="handbookStatus">
+ <el-select v-model="empBaseInfoForm.handbookStatus" placeholder="请选择员工手册">
+ <el-option label="未发" value="0" />
+ <el-option label="已发" value="1" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="工作证" prop="empCardStatus">
+ <el-select v-model="empBaseInfoForm.empCardStatus" placeholder="请选择工作证">
+ <el-option label="未发" value="0" />
+ <el-option label="已发" value="1" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="相关证件" prop="certificateList">
+ <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件">
+ <el-option label="高中毕业证" value="1" />
+ <el-option label="专科毕业证" value="2" />
+ <el-option label="本科毕业证" value="3" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form></el-main>
+ </el-container>
+
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putEmpBase('empBaseInfoForm')">保 存</el-button>
<el-button type="primary" @click="putEmpBaseContinue('empBaseInfoForm')">保存并继续新增</el-button>
@@ -811,6 +851,7 @@
>
<el-option label="普通体检" value="1" />
<el-option label="员工体检" value="2" />
+ <el-option label="入职体检" value="03" />
</el-select>
</el-form-item>
<el-form-item label="转氨酶" prop="transaminase">
@@ -889,15 +930,6 @@
<el-form-item label="性别" prop="sex">
<el-input v-model="contractInfoForm.sex" />
</el-form-item>
- <el-form-item label="合同状态" prop="contractStatus">
- <el-select
- v-model="contractInfoForm.contractStatus"
- placeholder="请选择合同状态"
- >
- <el-option label="新签" value="1" />
- <el-option label="老签" value="2" />
- </el-select>
- </el-form-item>
<el-form-item label="合同签订日期" prop="signingDate">
<el-date-picker
v-model="contractInfoForm.signingDate"
@@ -906,7 +938,16 @@
placeholder="选择日期"
/>
</el-form-item>
- <el-form-item label="合同办理人">
+ <el-form-item label="合同状态" prop="contractStatus">
+ <el-select
+ v-model="contractInfoForm.contractStatus"
+ placeholder="请选择合同状态"
+ >
+ <el-option label="新签" value="1" />
+ <el-option label="续签" value="2" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="合同办理人" prop="transactor">
<el-input v-model="contractInfoForm.transactor" />
</el-form-item>
</el-col>
@@ -928,14 +969,14 @@
placeholder="选择日期"
/>
</el-form-item>
- <el-form-item label="合同期限（年）">
+ <el-form-item label="合同期限（年）" prop="contractPeriod">
<el-input v-model="contractInfoForm.contractPeriod" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="备注">
+ <el-form-item label="备注" prop="remark">
<el-input v-model="contractInfoForm.remark" type="textarea" />
</el-form-item>
</el-col>
@@ -974,13 +1015,13 @@
placeholder="选择考勤月份"
/>
</el-form-item>
- <el-form-item label="加班（天）">
+ <el-form-item label="加班（天）" prop="overtimeDay">
<el-input v-model="dimissionAttendForm.overtimeDay" />
</el-form-item>
<el-form-item label="有无代扣款项" prop="deduct">
<el-input v-model="dimissionAttendForm.deduct" />
</el-form-item>
- <el-form-item label="旷工（天）">
+ <el-form-item label="旷工（天）" prop="absenteeism">
<el-input v-model="dimissionAttendForm.absenteeism" />
</el-form-item>
</el-col>
@@ -998,18 +1039,18 @@
<el-input v-model="dimissionAttendForm.attendDays" />
</el-form-item>
- <el-form-item label="加班（小时）">
+ <el-form-item label="加班（小时）" prop="overtimeHour">
<el-input v-model="dimissionAttendForm.overtimeHour" />
</el-form-item>
- <el-form-item label="请假（天）">
+ <el-form-item label="请假（天）" prop="leaveDay">
<el-input v-model="dimissionAttendForm.leaveDay" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
- <el-form-item label="备注">
+ <el-form-item label="备注" prop="remark">
<el-input v-model="dimissionAttendForm.remark" type="textarea" />
</el-form-item>
</el-col>
@@ -1048,8 +1089,20 @@
<el-form-item label="请假类型" prop="leaveType">
<el-select v-model="leaveInfoForm.leaveType" placeholder="请选择请假类型">
- <el-option label="事假" value="1" />
- <el-option label="病假" value="2" />
+ <el-option label="事假" value="05" />
+ <el-option label="病假" value="06" />
+ <el-option label="公假" value="07" />
+ <el-option label="婚假" value="08" />
+ <el-option label="孕假" value="09" />
+ <el-option label="产假" value="10" />
+ <el-option label="陪产假" value="11" />
+ <el-option label="探亲假" value="12" />
+ <el-option label="探配偶假" value="13" />
+ <el-option label="丧假" value="14" />
+ <el-option label="工伤假" value="15" />
+ <el-option label="节育假" value="16" />
+ <el-option label="年休假" value="17" />
+ <el-option label="其它假" value="18" />
</el-select>
</el-form-item>
@@ -1260,8 +1313,8 @@
</el-form-item>
<el-form-item label="状态" prop="applayStatus">
<el-select v-model="insuranceForm.applayStatus" placeholder="请选择状态">
- <el-option label="未申请" value="1" />
- <el-option label="已申请" value="2" />
+ <el-option label="未申请" value="0" />
+ <el-option label="已申请" value="1" />
</el-select>
</el-form-item>
</el-col>
@@ -1280,8 +1333,8 @@
</el-form-item>
<el-form-item label="是否已经报告">
<el-select v-model="insuranceForm.reportStatus" placeholder="是否已经报告">
- <el-option label="未报告" value="1" />
- <el-option label="已报告" value="2" />
+ <el-option label="未报告" value="0" />
+ <el-option label="已报告" value="1" />
</el-select>
</el-form-item>
<el-form-item label="审批人">
@@ -1812,7 +1865,8 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
- <el-dialog title="选择员工" :visible.sync="dialogShowXzyg">
+
+ <el-dialog title="选择员工" :visible.sync="dialogShowXzyg" width="60%">
<Selectuser @selectedUser="selectedUser" @cancleChooseUser="cancleChooseUser" />
</el-dialog>
</div>
@@ -1822,16 +1876,18 @@
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Pagination from '@/components/Pagination'
+import { pages } from '@/settings'
export default {
components: { Treeselect, Pagination },
data() {
return {
+ empBaseInfoImageUrl: '',
total: 0, // 总数量
queryParams: {}, // 查询参数
sort: {}, // 排序
pagination: { // 分页参数
- size: 20,
+ size: 10,
num: 1
},
tableUrl: '',
@@ -1892,18 +1948,23 @@
},
contractInfoRules: {
empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
- signingDate: [{ required: true, message: '请选择合同签订日期', trigger: 'change' }],
+ signingDate: [{ required: true, validator: this.startDate }],
contractStatus: [{ required: true, message: '请选择合同状态', trigger: 'change' }],
transactor: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
beginDate: [{ required: true, message: '请选择合同开始日期', trigger: 'change' }],
- endDate: [{ required: true, message: '请选择合同结束日期', trigger: 'change' }],
+ endDate: [{ required: true, validator: this.endDate }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
},
dimissionAttendRules: {
empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
attendMonth: [{ required: true, message: '请选择出勤月份', trigger: 'change' }],
- deduct: [{ required: true, message: '请输入代扣填款项', trigger: 'blur' }],
- attendDays: [{ required: true, message: '请输入出勤天数', trigger: 'blur' }]
+ deduct: [{ required: true, message: '请输入代扣填款项', trigger: 'blur' }, { max: 100, message: '长度不超过100个字符', trigger: 'blur' }],
+ attendDays: [{ required: true, message: '请输入出勤天数', trigger: 'blur' }, { pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '出勤天数精确到1位小数' }],
+ overtimeDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班（天）精确到1位小数' }],
+ overtimeHour: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班（小时）精确到1位小数' }],
+ leaveDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '请假（天）精确到1位小数' }],
+ absenteeism: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '旷工（天）精确到1位小数' }],
+ remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
},
leaveInfoRules: {
empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
@@ -2507,17 +2568,18 @@
version: ''
},
empBaseInfoForm: {
+ imagePath: '',
empId: '',
customerId: '',
archivesNumb: '',
- deptId: '',
+ deptId: '1',
deptName: '',
empNumb: '',
empName: '',
sex: '1',
JobId: '',
jobName: '',
- empType: '1',
+ empType: '01',
certificateType: '',
certificateNumb: '',
nation: '01',
@@ -2587,6 +2649,50 @@
this.isShow(false, 0)
},
methods: {
+ // 获取图片的Blob值
+ getImageBlob(url, cb) {
+ var xhr = new XMLHttpRequest()
+ xhr.open('get', url, true)
+ xhr.responseType = 'blob'
+ xhr.onload = function() {
+ if (this.status === 200) {
+ if (cb) cb(this.response)
+ }
+ }
+ xhr.send()
+ },
+ preView(url) {
+ var this_ = this
+ const reader = new FileReader()
+ this.getImageBlob(url, function(blob) {
+ reader.readAsDataURL(blob)
+ })
+ reader.onload = function(e) {
+ // 获取bolb里面数据时,生成预览
+ var img = document.createElement('img')
+ img.src = e.target.result
+ this_.empBaseInfoForm.imagePath = e.target.result
+ }
+ },
+ // 图片预览
+ handlePictureCardPreview(file) {
+ this.empBaseInfoImageUrl = URL.createObjectURL(file.raw) // 获取URL
+ // 判断图片大小
+ if (file.size < 4400000) {
+ // 判断图片格式是否为jpg,png,jepg,gif
+ var fileName = file.name
+ // var suffixIndex=fileName.lastIndexOf(".")
+ // var suffix=fileName.substring(suffixIndex+1).toUpperCase()
+ var suffix = fileName.substring(fileName.lastIndexOf('.') + 1).toUpperCase()
+ if (suffix === 'JPG' || suffix === 'PNG') {
+ this.preView(this.empBaseInfoImageUrl)
+ } else {
+ this.$message.error('只能上传jpg/png文件，且不超过4MB,请重新上传！')
+ }
+ } else {
+ this.$message.error('图片大小超过4M,请重新上传')
+ }
+ },
// 翻页插件翻页方法
search() {
this.fetch({
@@ -2741,6 +2847,11 @@
})
this.selectEmpBase()
})
+ } else {
+ this.$message({
+ message: '请先选中需要删除的记录',
+ type: 'error'
+ })
}
break
case 1:
@@ -2756,6 +2867,11 @@
type: 'success'
})
this.selectWorkExperience()
+ })
+ } else {
+ this.$message({
+ message: '请先选中需要删除的记录',
+ type: 'error'
})
}
break
@@ -2773,6 +2889,11 @@
})
this.selectPhysicalExam()
})
+ } else {
+ this.$message({
+ message: '请先选中需要删除的记录',
+ type: 'error'
+ })
}
break
case 3:
@@ -2788,6 +2909,11 @@
type: 'success'
})
this.selectContractInfo()
+ })
+ } else {
+ this.$message({
+ message: '请先选中需要删除的记录',
+ type: 'error'
})
}
break
@@ -2821,6 +2947,11 @@
})
this.selectLeaveInfo()
})
+ } else {
+ this.$message({
+ message: '请先选中需要删除的记录',
+ type: 'error'
+ })
}
break
case 6:
@@ -2836,6 +2967,11 @@
type: 'success'
})
this.selectResign()
+ })
+ } else {
+ this.$message({
+ message: '请先选中需要删除的记录',
+ type: 'error'
})
}
break
@@ -2853,6 +2989,11 @@
})
this.selectUnemployment()
})
+ } else {
+ this.$message({
+ message: '请先选中需要删除的记录',
+ type: 'error'
+ })
}
break
case 8:
@@ -2868,6 +3009,11 @@
type: 'success'
})
this.selectInsurance()
+ })
+ } else {
+ this.$message({
+ message: '请先选中需要删除的记录',
+ type: 'error'
})
}
break
@@ -2885,6 +3031,11 @@
})
this.selectAccidentCases()
})
+ } else {
+ this.$message({
+ message: '请先选中需要删除的记录',
+ type: 'error'
+ })
}
break
case 10:
@@ -2900,6 +3051,11 @@
type: 'success'
})
this.selectOccupational()
+ })
+ } else {
+ this.$message({
+ message: '请先选中需要删除的记录',
+ type: 'error'
})
}
break
@@ -2917,6 +3073,11 @@
})
this.selectLaborTrouble()
})
+ } else {
+ this.$message({
+ message: '请先选中需要删除的记录',
+ type: 'error'
+ })
}
break
case 12:
@@ -2932,6 +3093,11 @@
type: 'success'
})
this.selectBadRecord()
+ })
+ } else {
+ this.$message({
+ message: '请先选中需要删除的记录',
+ type: 'error'
})
}
break
@@ -2949,6 +3115,11 @@
})
this.selectBadRecord()
})
+ } else {
+ this.$message({
+ message: '请先选中需要删除的记录',
+ type: 'error'
+ })
}
break
}
@@ -2965,6 +3136,20 @@
} else {
// 结束日期有，进行判断
if (this.compareDate(value, this.workExperienceForm.endDate)) {
+ // 如果起始在结束之前
+ callback()
+ } else {
+ callback(new Error('开始日期不能在结束日期之后，请重新选择'))
+ }
+ }
+ break
+ case 3:
+ // 如果结束日期没选，cb
+ if (!this.contractInfoForm.endDate) {
+ callback()
+ } else {
+ // 结束日期有，进行判断
+ if (this.compareDate(value, this.contractInfoForm.endDate)) {
// 如果起始在结束之前
callback()
} else {
@@ -3003,6 +3188,21 @@
if (this.compareDate(this.workExperienceForm.beginDate, value)) {
// 如果起始在结束之前
this.leaveInfoForm.leaveDay = dateDifference(this.leaveInfoForm.beginTime, this.leaveInfoForm.endTime, 'd')
+ callback()
+ } else {
+ callback(new Error('结束日期不能在开始始日期之前，请重新选择'))
+ }
+ }
+ break
+ case 3:
+ // 如果起始日期没选，cb
+ if (!this.contractInfoForm.signingDate) {
+ callback()
+ } else {
+ // 起始日期有，进行判断
+ if (this.compareDate(this.contractInfoForm.signingDate, value)) {
+ // 如果起始在结束之前
+ this.contractInfoForm.contractPeriod = dateDifference(this.contractInfoForm.signingDate, this.contractInfoForm.endDate, 'y')
callback()
} else {
callback(new Error('结束日期不能在开始始日期之前，请重新选择'))
@@ -3053,6 +3253,11 @@
this.queryParams.delFlag = 2
this.search()
})
+ } else {
+ this.$message({
+ message: '请先选中需要提交的记录',
+ type: 'error'
+ })
}
break
case 1:
@@ -3071,6 +3276,11 @@
this.tableDataName = 'workExperienceData'
this.queryParams.delFlag = 2
this.search()
+ })
+ } else {
+ this.$message({
+ message: '请先选中需要提交的记录',
+ type: 'error'
})
}
break
@@ -3091,6 +3301,11 @@
this.queryParams.delFlag = 2
this.search()
})
+ } else {
+ this.$message({
+ message: '请先选中需要提交的记录',
+ type: 'error'
+ })
}
break
case 3:
@@ -3109,6 +3324,11 @@
this.tableDataName = 'contractInfoData'
this.queryParams.delFlag = 2
this.search()
+ })
+ } else {
+ this.$message({
+ message: '请先选中需要提交的记录',
+ type: 'error'
})
}
break
@@ -3129,6 +3349,11 @@
this.queryParams.delFlag = 2
this.search()
})
+ } else {
+ this.$message({
+ message: '请先选中需要提交的记录',
+ type: 'error'
+ })
}
break
case 5:
@@ -3147,6 +3372,11 @@
this.tableDataName = 'leaveInfoData'
this.queryParams.delFlag = 2
this.search()
+ })
+ } else {
+ this.$message({
+ message: '请先选中需要提交的记录',
+ type: 'error'
})
}
break
@@ -3167,6 +3397,11 @@
this.queryParams.delFlag = 2
this.search()
})
+ } else {
+ this.$message({
+ message: '请先选中需要提交的记录',
+ type: 'error'
+ })
}
break
case 7:
@@ -3185,6 +3420,11 @@
this.tableDataName = 'unemploymentData'
this.queryParams.delFlag = 2
this.search()
+ })
+ } else {
+ this.$message({
+ message: '请先选中需要提交的记录',
+ type: 'error'
})
}
break
@@ -3205,6 +3445,11 @@
this.queryParams.delFlag = 2
this.search()
})
+ } else {
+ this.$message({
+ message: '请先选中需要提交的记录',
+ type: 'error'
+ })
}
break
case 9:
@@ -3223,6 +3468,11 @@
this.tableDataName = 'accidentCasesData'
this.queryParams.delFlag = 2
this.search()
+ })
+ } else {
+ this.$message({
+ message: '请先选中需要提交的记录',
+ type: 'error'
})
}
break
@@ -3243,6 +3493,11 @@
this.queryParams.delFlag = 2
this.search()
})
+ } else {
+ this.$message({
+ message: '请先选中需要提交的记录',
+ type: 'error'
+ })
}
break
case 11:
@@ -3261,6 +3516,11 @@
this.tableDataName = 'laborTroubleData'
this.queryParams.delFlag = 2
this.search()
+ })
+ } else {
+ this.$message({
+ message: '请先选中需要提交的记录',
+ type: 'error'
})
}
break
@@ -3281,6 +3541,11 @@
this.queryParams.delFlag = 2
this.search()
})
+ } else {
+ this.$message({
+ message: '请先选中需要提交的记录',
+ type: 'error'
+ })
}
break
case 13:
@@ -3299,6 +3564,11 @@
this.tableDataName = 'remarkInfoData'
this.queryParams.delFlag = 2
this.search()
+ })
+ } else {
+ this.$message({
+ message: '请先选中需要提交的记录',
+ type: 'error'
})
}
break
@@ -3358,6 +3628,8 @@
this.empBaseInfoForm.modifier = ''
this.empBaseInfoForm.delFlag = ''
this.empBaseInfoForm.version = ''
+ this.empBaseInfoForm.imagePath = ''
+ this.empBaseInfoImageUrl = ''
},
editEmpBase(row) {
this.isAdd = false
@@ -3385,6 +3657,7 @@
this.empBaseInfoForm.education = row.education
this.empBaseInfoForm.seniority = row.seniority
this.empBaseInfoForm.nativePlace = row.nativePlace
+ this.empBaseInfoForm.nativePlaceName = row.nativePlaceName
this.empBaseInfoForm.censusAddress = row.censusAddress
this.empBaseInfoForm.currentAddress = row.currentAddress
this.empBaseInfoForm.guardNumb = row.guardNumb
@@ -3408,6 +3681,7 @@
this.empBaseInfoForm.delFlag = row.delFlag
this.empBaseInfoForm.version = row.version
this.dialogshowArr[0].show = true
+ this.empBaseInfoImageUrl = pages.getEmpBaseInfoImage + row.empId
},
putEmpBase(formName) {
this.$refs[formName].validate((valid) => {
@@ -3686,15 +3960,6 @@
},
cleanContractInfo() {
this.contractInfoForm.contractId = ''
- this.contractInfoForm.empId = ''
- this.contractInfoForm.empNumb = ''
- this.contractInfoForm.empName = ''
- this.contractInfoForm.certificateNumb = ''
- this.contractInfoForm.sex = ''
- this.contractInfoForm.deptId = ''
- this.contractInfoForm.deptName = ''
- this.contractInfoForm.JobId = ''
- this.contractInfoForm.jobName = ''
this.contractInfoForm.beginDate = ''
this.contractInfoForm.endDate = ''
this.contractInfoForm.contractStatus = ''
@@ -3791,15 +4056,6 @@
},
cleanDimissionAttend() {
this.dimissionAttendForm.dimissionAttendId = ''
- this.dimissionAttendForm.empId = ''
- this.dimissionAttendForm.empNumb = ''
- this.dimissionAttendForm.empName = ''
- this.dimissionAttendForm.sex = ''
- this.dimissionAttendForm.certificateNumb = ''
- this.dimissionAttendForm.deptId = ''
- this.dimissionAttendForm.deptName = ''
- this.dimissionAttendForm.JobId = ''
- this.dimissionAttendForm.jobName = ''
this.dimissionAttendForm.attendMonth = ''
this.dimissionAttendForm.overtimeHour = ''
this.dimissionAttendForm.overtimeDay = ''
@@ -3894,15 +4150,6 @@
},
cleanLeaveInfo() {
this.leaveInfoForm.leaveId = ''
- this.leaveInfoForm.empId = ''
- this.leaveInfoForm.empNumb = ''
- this.leaveInfoForm.empName = ''
- this.leaveInfoForm.sex = ''
- this.leaveInfoForm.certificateNumb = ''
- this.leaveInfoForm.deptId = ''
- this.leaveInfoForm.deptName = ''
- this.leaveInfoForm.JobId = ''
- this.leaveInfoForm.jobName = ''
this.leaveInfoForm.beginTime = ''
this.leaveInfoForm.endTime = ''
this.leaveInfoForm.leaveType = ''
@@ -3999,15 +4246,6 @@
},
cleanResign() {
this.resignForm.resignId = ''
- this.resignForm.empId = ''
- this.resignForm.empNumb = ''
- this.resignForm.empName = ''
- this.resignForm.sex = ''
- this.resignForm.certificateNumb = ''
- this.resignForm.deptId = ''
- this.resignForm.deptName = ''
- this.resignForm.JobId = ''
- this.resignForm.jobName = ''
this.resignForm.applayDate = ''
this.resignForm.reporter = ''
this.resignForm.reason = ''
@@ -4098,15 +4336,6 @@
},
cleanUnemployment() {
this.unemploymentForm.unemploymentId = ''
- this.unemploymentForm.empId = ''
- this.unemploymentForm.empNumb = ''
- this.unemploymentForm.empName = ''
- this.unemploymentForm.sex = ''
- this.unemploymentForm.certificateNumb = ''
- this.unemploymentForm.deptId = ''
- this.unemploymentForm.deptName = ''
- this.unemploymentForm.JobId = ''
- this.unemploymentForm.jobName = ''
this.unemploymentForm.applayDate = ''
this.unemploymentForm.applayReason = ''
this.unemploymentForm.reporter = ''
@@ -4199,15 +4428,6 @@
},
cleanInsurance() {
this.insuranceForm.insuranceId = ''
- this.insuranceForm.empId = ''
- this.insuranceForm.empNumb = ''
- this.insuranceForm.empName = ''
- this.insuranceForm.sex = ''
- this.insuranceForm.certificateNumb = ''
- this.insuranceForm.deptId = ''
- this.insuranceForm.deptName = ''
- this.insuranceForm.JobId = ''
- this.insuranceForm.jobName = ''
this.insuranceForm.applayDate = ''
this.insuranceForm.proposer = ''
this.insuranceForm.insuranceGaers = ''
@@ -4304,15 +4524,6 @@
},
cleanAccidentCases() {
this.accidentCasesForm.accidentId = ''
- this.accidentCasesForm.empId = ''
- this.accidentCasesForm.empNumb = ''
- this.accidentCasesForm.empName = ''
- this.accidentCasesForm.sex = ''
- this.accidentCasesForm.certificateNumb = ''
- this.accidentCasesForm.deptId = ''
- this.accidentCasesForm.deptName = ''
- this.accidentCasesForm.JobId = ''
- this.accidentCasesForm.jobName = ''
this.accidentCasesForm.injuredTime = ''
this.accidentCasesForm.injuredAddress = ''
this.accidentCasesForm.injuredPart = ''
@@ -4359,7 +4570,7 @@
this.accidentCasesForm.injuredDescribe = row.injuredDescribe
this.accidentCasesForm.hospitalName = row.hospitalName
this.accidentCasesForm.treatmentName = row.treatmentName
- this.accidentCasesForm.hospitalizatioFlag = row.hospitalizatioFlag
+ this.accidentCasesForm.hospitalizatioFlag = row.hospitalizatioFlag + ''
this.accidentCasesForm.bedNumb = row.bedNumb
this.accidentCasesForm.reprotTime = row.reprotTime
this.accidentCasesForm.submitTime = row.submitTime
@@ -4433,15 +4644,6 @@
},
cleanOccupational() {
this.occupationalForm.occupationalId = ''
- this.occupationalForm.empId = ''
- this.occupationalForm.empNumb = ''
- this.occupationalForm.empName = ''
- this.occupationalForm.sex = ''
- this.occupationalForm.certificateNumb = ''
- this.occupationalForm.deptId = ''
- this.occupationalForm.deptName = ''
- this.occupationalForm.JobId = ''
- this.occupationalForm.jobName = ''
this.occupationalForm.injuredTime = ''
this.occupationalForm.injuredAddress = ''
this.occupationalForm.injuredPart = ''
@@ -4497,7 +4699,7 @@
this.occupationalForm.injuredDescribe = row.injuredDescribe
this.occupationalForm.hospitalName = row.hospitalName
this.occupationalForm.treatmentName = row.treatmentName
- this.occupationalForm.hospitalizatioFlag = row.hospitalizatioFlag
+ this.occupationalForm.hospitalizatioFlag = row.hospitalizatioFlag + ''
this.occupationalForm.bedNumb = row.bedNumb
this.occupationalForm.reportTime = row.reportTime
this.occupationalForm.submitTime = row.submitTime
@@ -4524,7 +4726,6 @@
this.occupationalForm.delFlag = row.delFlag
this.occupationalForm.version = row.version
this.occupationalForm.remark = row.remark
-
this.dialogshowArr[10].show = true
},
selectLaborTrouble() {
@@ -4583,15 +4784,6 @@
},
cleanLaborTrouble() {
this.laborTroubleForm.arbitrationId = ''
- this.laborTroubleForm.empId = ''
- this.laborTroubleForm.empNumb = ''
- this.laborTroubleForm.empName = ''
- this.laborTroubleForm.sex = ''
- this.laborTroubleForm.certificateNumb = ''
- this.laborTroubleForm.deptId = ''
- this.laborTroubleForm.deptName = ''
- this.laborTroubleForm.JobId = ''
- this.laborTroubleForm.jobName = ''
this.laborTroubleForm.arbitrationDate = ''
this.laborTroubleForm.arbitrationType = ''
this.laborTroubleForm.arbitrationReason = ''
@@ -4609,7 +4801,6 @@
},
editLaborTrouble(row) {
this.isAdd = false
-
this.laborTroubleForm.arbitrationId = row.arbitrationId
this.laborTroubleForm.empId = row.empId
this.laborTroubleForm.empNumb = row.empNumb
@@ -4625,7 +4816,7 @@
this.laborTroubleForm.arbitrationReason = row.arbitrationReason
this.laborTroubleForm.reporter = row.reporter
this.laborTroubleForm.arbitrationPay = row.arbitrationPay
- this.laborTroubleForm.arbitrationStatus = row.arbitrationStatus
+ this.laborTroubleForm.arbitrationStatus = row.arbitrationStatus + ''
this.laborTroubleForm.settleDate = row.settleDate
this.laborTroubleForm.createTime = row.createTime
this.laborTroubleForm.creator = row.creator
@@ -4645,15 +4836,6 @@
},
cleanBadRecord() {
this.badRecordForm.badId = ''
- this.badRecordForm.empId = ''
- this.badRecordForm.empName = ''
- this.badRecordForm.empNumb = ''
- this.badRecordForm.sex = ''
- this.badRecordForm.certificateNumb = ''
- this.badRecordForm.deptId = ''
- this.badRecordForm.deptName = ''
- this.badRecordForm.JobId = ''
- this.badRecordForm.jobName = ''
this.badRecordForm.badDate = ''
this.badRecordForm.reporter = ''
this.badRecordForm.badContent = ''
@@ -4787,15 +4969,6 @@
},
cleanRemarkInfo() {
this.remarkInfoForm.remarkId = ''
- this.remarkInfoForm.empId = ''
- this.remarkInfoForm.empNumb = ''
- this.remarkInfoForm.empName = ''
- this.remarkInfoForm.sex = ''
- this.remarkInfoForm.certificateNumb = ''
- this.remarkInfoForm.JobId = ''
- this.remarkInfoForm.deptId = ''
- this.remarkInfoForm.deptName = ''
- this.remarkInfoForm.jobName = ''
this.remarkInfoForm.remarkContent = ''
this.remarkInfoForm.remarkDate = ''
this.remarkInfoForm.createTime = ''
@@ -4927,11 +5100,35 @@
},
calculateSeniority(val) {
this.empBaseInfoForm.seniority = calculateSeniority(val)
+ },
+ transinsuranceGaers(val) {
+ switch (val) {
+ case '1':
+ return '（深户）五险一档'
+ case '2':
+ return '（非深户）五险一档'
+ case '3':
+ return '（非深户）五险二档'
+ case '4':
+ return '（非深户）五险三档'
+ case '5':
+ return '（非深户）四险一档'
+ }
}
}
}
</script>
<style lang="scss" scoped>
+.baseinfo .el-container{
+ .el-aside {
+ background-color: #fff;
+ }
+
+ .el-main {
+ background-color: #fff;
+ }
+
+}
.el-container {
height: 770px;
@@ -4946,6 +5143,12 @@
background-color: #e9eef3;
color: #333;
height: 100%;
+ .el-table{
+ margin-top: 10px;
+ }
+ }
+ .el-timeline-item{
+ padding-bottom: 5px;
}
}
--
Gitblit v1.8.0