From 18b6eb51898598c25c0873c145e7bbec65c048df Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 06 四月 2024 09:47:43 +0800
Subject: [PATCH] feat: 信息录入的合同信息中的性别使用数据字典下拉选择
---
src/views/user/archivesChange.vue | 2
vue.config.js | 47 +-
src/utils/myUtil.js | 32 ++
src/views/user/inemployees.vue | 11
package.json | 3
src/views/user/archivesEdit.vue | 815 ++++++++++++++++++++++++++++----------------------
src/views/user/outemployess.vue | 8
src/views/user/Informationinput.vue | 12
8 files changed, 536 insertions(+), 394 deletions(-)
diff --git a/package.json b/package.json
index 4c34cbe..527f6b5 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
"package": "vue-cli-service build",
"preview": "node build/index.js --preview",
"lint": "eslint --ext .js,.vue src",
- "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml"
+ "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
+ "test": "vue-cli-service serve --mode test"
},
"husky": {
"hooks": {
diff --git a/src/utils/myUtil.js b/src/utils/myUtil.js
index 92504fd..1304bc2 100644
--- a/src/utils/myUtil.js
+++ b/src/utils/myUtil.js
@@ -93,6 +93,38 @@
case 'y':
iReturn = Math.floor(dateSpan / (365 * 24 * 3600 * 1000))
break
+ case 'o':
+ var sDate = new Date(begin)
+ var eDate = new Date(end)
+
+ // 获得各自的年、月、日
+ var sY = sDate.getFullYear()
+ var sM = sDate.getMonth() + 1
+ var sD = sDate.getDate()
+ var eY = eDate.getFullYear()
+ var eM = eDate.getMonth() + 1
+ var eD = eDate.getDate()
+
+ // var flagD = 0
+ var flagM = 0
+ var flagY = 0
+ // var months = 0
+ var d = eD - sD
+ if (d > 0 && d >= 15) {
+ flagM = 1
+ }
+ if (d < 0 && 30 + d < 15) {
+ flagM = -1
+ }
+
+ var m = eM + flagM - sM
+ if (m < 0) {
+ flagY = -1
+ m = 12 + m
+ }
+
+ var y = eY + flagY - sY
+ iReturn = y + '年' + m + '月'
}
return iReturn
}
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index 234b926..d4c8dfc 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -1138,7 +1138,15 @@
/>
</el-form-item>
<el-form-item label="性别" prop="sex">
- <el-input v-model="contractInfoForm.sex" />
+<!-- <el-input v-model="contractInfoForm.sex" />-->
+ <el-select v-model="contractInfoForm.sex" placeholder="请选择性别">
+ <el-option
+ v-for="dict in sexOptions"
+ :key="dict.dicItemCode"
+ :label="dict.dicItemName"
+ :value="dict.dicItemCode"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="合同签订日期" prop="signingDate">
<el-date-picker
@@ -3861,7 +3869,7 @@
// 起始日期有，进行判断
if (this.compareDate(this.contractInfoForm.signingDate, value)) {
// 如果起始在结束之前
- this.contractInfoForm.contractPeriod = dateDifference(this.contractInfoForm.signingDate, this.contractInfoForm.endDate, 'y')
+ this.contractInfoForm.contractPeriod = dateDifference(this.contractInfoForm.signingDate, this.contractInfoForm.endDate, 'o')
callback()
} else {
callback(new Error('结束日期不能在开始始日期之前，请重新选择'))
diff --git a/src/views/user/archivesChange.vue b/src/views/user/archivesChange.vue
index 8320fa9..4286a70 100644
--- a/src/views/user/archivesChange.vue
+++ b/src/views/user/archivesChange.vue
@@ -657,7 +657,7 @@
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="newDeptName" label="现部门" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="现部门" />
<el-table-column show-overflow-tooltip prop="newJobName" label="现岗位" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="180" />
<el-table-column show-overflow-tooltip prop="oldDeptName" label="原部门" />
diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index 3edbdcb..37ae5dc 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -23,7 +23,7 @@
>
<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" />
+ <i v-else class="el-icon-plus avatar-uploader-icon"/>
</el-upload>
<!-- <img src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=1333074204,3035391839&fm=26&gp=0.jpg" class="jbxxImg">-->
<div class="title-da">
@@ -32,8 +32,8 @@
</div>
<ul class="jbxx-ul" style="height: 68vh;overflow: auto">
<li>
- <div />
- <div class="item-node" />
+ <div/>
+ <div class="item-node"/>
<div>
<a href="javascript:void(0)" :class="item=='jbxx'?'light':''" @click="goAnchor('jbxx')">
基本信息
@@ -41,8 +41,8 @@
</div>
</li>
<li>
- <div />
- <div class="item-node" />
+ <div/>
+ <div class="item-node"/>
<div>
<a href="javascript:void(0)" :class="item=='gzjl'?'light':''" @click="goAnchor('gzjl')">
工作经历
@@ -50,8 +50,8 @@
</div>
</li>
<li>
- <div />
- <div class="item-node" />
+ <div/>
+ <div class="item-node"/>
<div>
<a href="javascript:void(0)" :class="item=='tjxx'?'light':''" @click="goAnchor('tjxx')">
体检信息
@@ -59,8 +59,8 @@
</div>
</li>
<li>
- <div />
- <div class="item-node" />
+ <div/>
+ <div class="item-node"/>
<div>
<a href="javascript:void(0)" :class="item=='htxx'?'light':''" @click="goAnchor('htxx')">
合同信息
@@ -68,8 +68,8 @@
</div>
</li>
<li>
- <div />
- <div class="item-node" />
+ <div/>
+ <div class="item-node"/>
<div>
<a href="javascript:void(0)" :class="item=='tgjl'?'light':''" @click="goAnchor('tgjl')">
调岗记录
@@ -77,8 +77,8 @@
</div>
</li>
<li>
- <div />
- <div class="item-node" />
+ <div/>
+ <div class="item-node"/>
<div>
<a href="javascript:void(0)" :class="item=='qjjl'?'light':''" @click="goAnchor('qjjl')">
请假记录
@@ -86,8 +86,8 @@
</div>
</li>
<li>
- <div />
- <div class="item-node" />
+ <div/>
+ <div class="item-node"/>
<div>
<a href="javascript:void(0)" :class="item=='czsq'?'light':''" @click="goAnchor('czsq')">
辞职申请
@@ -95,8 +95,8 @@
</div>
</li>
<li>
- <div />
- <div class="item-node" />
+ <div/>
+ <div class="item-node"/>
<div>
<a href="javascript:void(0)" :class="item=='lzdykq'?'light':''" @click="goAnchor('lzdykq')">
离职当月考勤
@@ -104,8 +104,8 @@
</div>
</li>
<li>
- <div />
- <div class="item-node" />
+ <div/>
+ <div class="item-node"/>
<div>
<a href="javascript:void(0)" :class="item=='rlzjl'?'light':''" @click="goAnchor('rlzjl')">
入离职记录
@@ -113,8 +113,8 @@
</div>
</li>
<li>
- <div />
- <div class="item-node" />
+ <div/>
+ <div class="item-node"/>
<div>
<a href="javascript:void(0)" :class="item=='syjlq'?'light':''" @click="goAnchor('syjlq')">
失业金领取
@@ -122,8 +122,8 @@
</div>
</li>
<li>
- <div />
- <div class="item-node" />
+ <div/>
+ <div class="item-node"/>
<div>
<a href="javascript:void(0)" :class="item=='sbsq'?'light':''" @click="goAnchor('sbsq')">
社保申请
@@ -131,8 +131,8 @@
</div>
</li>
<li>
- <div />
- <div class="item-node" />
+ <div/>
+ <div class="item-node"/>
<div>
<a href="javascript:void(0)" :class="item=='ywxaj'?'light':''" @click="goAnchor('ywxaj')">
意外险案件
@@ -140,8 +140,8 @@
</div>
</li>
<li>
- <div />
- <div class="item-node" />
+ <div/>
+ <div class="item-node"/>
<div>
<a href="javascript:void(0)" :class="item=='gsaj'?'light':''" @click="goAnchor('gsaj')">
工伤案件
@@ -149,8 +149,8 @@
</div>
</li>
<li>
- <div />
- <div class="item-node" />
+ <div/>
+ <div class="item-node"/>
<div>
<a href="javascript:void(0)" :class="item=='lzaj'?'light':''" @click="goAnchor('lzaj')">
劳资案件
@@ -158,8 +158,8 @@
</div>
</li>
<li>
- <div />
- <div class="item-node" />
+ <div/>
+ <div class="item-node"/>
<div>
<a href="javascript:void(0)" :class="item=='bljl'?'light':''" @click="goAnchor('bljl')">
不良记录
@@ -167,8 +167,8 @@
</div>
</li>
<li>
- <div />
- <div class="item-node" />
+ <div/>
+ <div class="item-node"/>
<div>
<a href="javascript:void(0)" :class="item=='bz'?'light':''" @click="goAnchor('bz')">
备注
@@ -176,8 +176,8 @@
</div>
</li>
<li>
- <div />
- <div class="item-node" />
+ <div/>
+ <div class="item-node"/>
<div>
<a href="javascript:void(0)" :class="item=='jljt'?'light':''" @click="goAnchor('jljt')">
记录截图及相关附件
@@ -222,12 +222,14 @@
<el-row style="width: 100%;">
<el-col :span="8">
<el-form-item label="编号" prop="empNumb">
- <el-input v-model="empBaseInfoForm.empNumb" style="width: 100%;" :disabled="readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.empNumb" style="width: 100%;"
+ :disabled="readon ? false : true"
+ />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="姓名" prop="empName">
- <el-input v-model="empBaseInfoForm.empName" :disabled="readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.empName" :disabled="readon ? false : true"/>
</el-form-item>
</el-col>
@@ -244,7 +246,9 @@
<el-row>
<el-col :span="8">
<el-form-item label="性别" prop="sex">
- <el-select v-model="empBaseInfoForm.sex" placeholder="请选择性别" :disabled="readon ? false : true">
+ <el-select v-model="empBaseInfoForm.sex" placeholder="请选择性别"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in sexOptions"
:key="dict.dicItemCode"
@@ -284,7 +288,9 @@
<el-row>
<el-col :span="8">
<el-form-item label="员工类别" prop="empType">
- <el-select v-model="empBaseInfoForm.empType" placeholder="请选择员工类型" :disabled="readon ? false : true">
+ <el-select v-model="empBaseInfoForm.empType" placeholder="请选择员工类型"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in empTypeOptions"
:key="dict.dicItemCode"
@@ -296,7 +302,9 @@
</el-col>
<el-col :span="8">
<el-form-item label="民族" prop="nation">
- <el-select v-model="empBaseInfoForm.nation" filterable placeholder="请选择民族" :disabled="readon ? false : true">
+ <el-select v-model="empBaseInfoForm.nation" filterable placeholder="请选择民族"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in nationOptions"
:key="dict.dicItemCode"
@@ -308,7 +316,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="年龄" prop="age">
- <el-input v-model="empBaseInfoForm.age" :disabled="readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.age" :disabled="readon ? false : true"/>
</el-form-item>
</el-col>
@@ -316,7 +324,9 @@
<el-row>
<el-col :span="8">
<el-form-item label="婚姻状态" prop="marriage">
- <el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态" :disabled="readon ? false : true">
+ <el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in marriageOptions"
:key="dict.dicItemCode"
@@ -339,7 +349,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="身高(cm)" prop="stature">
- <el-input v-model="empBaseInfoForm.stature" :disabled="readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.stature" :disabled="readon ? false : true"/>
</el-form-item>
</el-col>
@@ -347,7 +357,9 @@
<el-row>
<el-col :span="8">
<el-form-item label="政治面貌" prop="politics">
- <el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌" :disabled="readon ? false : true">
+ <el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in statusOptions"
:key="dict.dicItemCode"
@@ -370,7 +382,9 @@
</el-col>
<el-col :span="8">
<el-form-item label="最高学历" prop="education">
- <el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历" :disabled="readon ? false : true">
+ <el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in educationOptions"
:key="dict.dicItemCode"
@@ -385,7 +399,9 @@
<el-row>
<el-col :span="8">
<el-form-item label="籍贯" prop="nativePlaceName">
- <el-select v-model="empBaseInfoForm.nativePlace" placeholder="请选择籍贯" :disabled="readon ? false : true">
+ <el-select v-model="empBaseInfoForm.nativePlace" placeholder="请选择籍贯"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in nativePlaceOptions"
:key="dict.dicItemCode"
@@ -397,12 +413,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="户籍地址" prop="censusAddress">
- <el-input v-model="empBaseInfoForm.censusAddress" :disabled="readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.censusAddress" :disabled="readon ? false : true"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="现住址" prop="currentAddress">
- <el-input v-model="empBaseInfoForm.currentAddress" :disabled="readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.currentAddress" :disabled="readon ? false : true"/>
</el-form-item>
</el-col>
@@ -410,17 +426,19 @@
<el-row>
<el-col :span="8">
<el-form-item label="保安员回执" prop="returnReceipt">
- <el-input v-model="empBaseInfoForm.returnReceipt" :disabled="readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.returnReceipt" :disabled="readon ? false : true"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="保安员证号" prop="guardNumb">
- <el-input v-model="empBaseInfoForm.guardNumb" :disabled="readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.guardNumb" :disabled="readon ? false : true"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="档案情况" prop="archivesStatus">
- <el-select v-model="empBaseInfoForm.archivesStatus" placeholder="请选择档案情况" :disabled="readon ? false : true">
+ <el-select v-model="empBaseInfoForm.archivesStatus" placeholder="请选择档案情况"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in archivesStatusOptions"
:key="dict.dicItemCode"
@@ -435,17 +453,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="银行名称" prop="bankName">
- <el-input v-model="empBaseInfoForm.bankName" :disabled="readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.bankName" :disabled="readon ? false : true"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="银行账号" prop="bankNumb">
- <el-input v-model="empBaseInfoForm.bankNumb" :disabled="readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.bankNumb" :disabled="readon ? false : true"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="电话号码" prop="telePhone">
- <el-input v-model="empBaseInfoForm.telePhone" :disabled="readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.telePhone" :disabled="readon ? false : true"/>
</el-form-item>
</el-col>
@@ -465,7 +483,9 @@
</el-col>
<el-col :span="8">
<el-form-item label="社保档位" prop="insuranceType">
- <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择社保档位" :disabled="readon ? false : true">
+ <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择社保档位"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in insuranceTypeOptions"
:key="dict.dicItemCode"
@@ -477,7 +497,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="社保电脑号" prop="socialNumb">
- <el-input v-model="empBaseInfoForm.socialNumb" :disabled="readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.socialNumb" :disabled="readon ? false : true"/>
</el-form-item>
</el-col>
@@ -485,17 +505,19 @@
<el-row>
<el-col :span="8">
<el-form-item label="招聘介绍人" prop="introducer">
- <el-input v-model="empBaseInfoForm.introducer" :disabled="readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.introducer" :disabled="readon ? false : true"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="入司工龄" prop="seniority">
- <el-input v-model="empBaseInfoForm.seniority" :disabled="readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.seniority" :disabled="readon ? false : true"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="工作证" prop="empCardStatus">
- <el-select v-model="empBaseInfoForm.empCardStatus" placeholder="请选择工作证" :disabled="readon ? false : true">
+ <el-select v-model="empBaseInfoForm.empCardStatus" placeholder="请选择工作证"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in empCardStatusOptions"
:key="dict.dicItemCode"
@@ -510,17 +532,19 @@
<el-row>
<el-col :span="8">
<el-form-item label="家庭成员及关系1" prop="family">
- <el-input v-model="empBaseInfoForm.family" :disabled="readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.family" :disabled="readon ? false : true"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="家庭成员及关系2" prop="urgencyPhone">
- <el-input v-model="empBaseInfoForm.urgencyPhone" :disabled="readon ? false : true" />
+ <el-input v-model="empBaseInfoForm.urgencyPhone" :disabled="readon ? false : true"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="员工手册" prop="handbookStatus">
- <el-select v-model="empBaseInfoForm.handbookStatus" placeholder="请选择员工手册" :disabled="readon ? false : true">
+ <el-select v-model="empBaseInfoForm.handbookStatus" placeholder="请选择员工手册"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in handbookStatusOptions"
:key="dict.dicItemCode"
@@ -532,7 +556,9 @@
</el-col>
<el-col :span="8">
<el-form-item label="相关证件" prop="certificateList">
- <el-select v-model="empBaseInfoForm.certificateList" multiple placeholder="请选择相关证件" :disabled="readon ? false : true">
+ <el-select v-model="empBaseInfoForm.certificateList" multiple placeholder="请选择相关证件"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in certificateListOptions"
:key="dict.dicItemCode"
@@ -568,18 +594,19 @@
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
- <span v-text="getIndex(scope.$index)" />
+ <span v-text="getIndex(scope.$index)"/>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="workExperienceId" label="工作单位" />
- <el-table-column show-overflow-tooltip prop="beginDate" label="开始日期" />
- <el-table-column show-overflow-tooltip prop="endDate" label="结束日期" />
- <el-table-column show-overflow-tooltip prop="workUnit" label="工作单位" />
- <el-table-column show-overflow-tooltip prop="jobContent" label="主要工作内容" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="workExperienceId" label="工作单位"/>
+ <el-table-column show-overflow-tooltip prop="beginDate" label="开始日期"/>
+ <el-table-column show-overflow-tooltip prop="endDate" label="结束日期"/>
+ <el-table-column show-overflow-tooltip prop="workUnit" label="工作单位"/>
+ <el-table-column show-overflow-tooltip prop="jobContent" label="主要工作内容"/>
<el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
<template slot-scope="scope">
<span class="table-button" @click="editWorkExperience(scope.row,1)">编辑</span>
- <span class="table-button" @click="singleDelete(scope.row, 'workExperienceDataselection')">删除</span>
+ <span class="table-button" @click="singleDelete(scope.row, 'workExperienceDataselection')"
+ >删除</span>
</template>
</el-table-column>
</el-table>
@@ -613,7 +640,7 @@
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
- <span v-text="getIndex(scope.$index)" />
+ <span v-text="getIndex(scope.$index)"/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
@@ -622,16 +649,20 @@
<span class="table-button" @click="singleDelete(scope.row, 'physicalExamDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="physicalExamId" label="" />
- <el-table-column show-overflow-tooltip prop="hospital" label="体检医院" width="150" />
- <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="140" />
- <el-table-column show-overflow-tooltip prop="physicalExamType" label="体检类型" width="140" :formatter="typeFormat" />
- <el-table-column show-overflow-tooltip prop="bloodPressure" label="血压" width="140" />
- <el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" width="140" />
- <el-table-column show-overflow-tooltip prop="ecg" label="心电图" width="140" :formatter="ecgNameFormat" />
- <el-table-column show-overflow-tooltip prop="conclusion" label="体检结论" />
- <el-table-column show-overflow-tooltip prop="reviewRecord" label="复查记录" width="140" />
- <el-table-column show-overflow-tooltip prop="remark" label="备注" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="physicalExamId" label=""/>
+ <el-table-column show-overflow-tooltip prop="hospital" label="体检医院" width="150"/>
+ <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="140"/>
+ <el-table-column show-overflow-tooltip prop="physicalExamType" label="体检类型" width="140"
+ :formatter="typeFormat"
+ />
+ <el-table-column show-overflow-tooltip prop="bloodPressure" label="血压" width="140"/>
+ <el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" width="140"/>
+ <el-table-column show-overflow-tooltip prop="ecg" label="心电图" width="140"
+ :formatter="ecgNameFormat"
+ />
+ <el-table-column show-overflow-tooltip prop="conclusion" label="体检结论"/>
+ <el-table-column show-overflow-tooltip prop="reviewRecord" label="复查记录" width="140"/>
+ <el-table-column show-overflow-tooltip prop="remark" label="备注"/>
</el-table>
<pagination
v-show="physicalExamDatatotal>0"
@@ -663,7 +694,7 @@
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
- <span v-text="getIndex(scope.$index)" />
+ <span v-text="getIndex(scope.$index)"/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
@@ -672,13 +703,15 @@
<span class="table-button" @click="singleDelete(scope.row, 'contractInfoDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="contractId" label="" />
- <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" />
- <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" />
- <el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" />
- <el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" :formatter="contractStatusFormat" />
- <el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" />
- <el-table-column show-overflow-tooltip prop="remark" label="备注" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="contractId" label=""/>
+ <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期"/>
+ <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期"/>
+ <el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)"/>
+ <el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态"
+ :formatter="contractStatusFormat"
+ />
+ <el-table-column show-overflow-tooltip prop="transactor" label="合同办理人"/>
+ <el-table-column show-overflow-tooltip prop="remark" label="备注"/>
</el-table>
<pagination
v-show="contractInfoDatatotal>0"
@@ -705,17 +738,19 @@
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
- <span v-text="getIndex(scope.$index)" />
+ <span v-text="getIndex(scope.$index)"/>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="newDeptName" label="现部门" />
- <el-table-column show-overflow-tooltip prop="newJobName" label="现岗位" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="180" />
- <el-table-column show-overflow-tooltip prop="oldDeptName" label="原部门" />
- <el-table-column show-overflow-tooltip prop="oldJobName" label="原岗位" />
- <el-table-column show-overflow-tooltip prop="changeDate" label="调岗日期" />
- <el-table-column show-overflow-tooltip prop="changeType" label="调岗类型" :formatter="changeTypeFormat" />
- <el-table-column show-overflow-tooltip prop="changeReason" label="调岗理由" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="现部门"/>
+ <el-table-column show-overflow-tooltip prop="newJobName" label="现岗位"/>
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="180"/>
+ <el-table-column show-overflow-tooltip prop="oldDeptName" label="原部门"/>
+ <el-table-column show-overflow-tooltip prop="oldJobName" label="原岗位"/>
+ <el-table-column show-overflow-tooltip prop="changeDate" label="调岗日期"/>
+ <el-table-column show-overflow-tooltip prop="changeType" label="调岗类型"
+ :formatter="changeTypeFormat"
+ />
+ <el-table-column show-overflow-tooltip prop="changeReason" label="调岗理由"/>
</el-table>
<pagination
v-show="jobChangeDatatotal>0"
@@ -747,7 +782,7 @@
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
- <span v-text="getIndex(scope.$index)" />
+ <span v-text="getIndex(scope.$index)"/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
@@ -756,14 +791,14 @@
<span class="table-button" @click="singleDelete(scope.row, 'leaveInfoDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="leaveId" label="" />
- <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="180" />
- <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="180" />
- <el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" width="100" />
- <el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" :formatter="leaveTypeFormat" />
- <el-table-column show-overflow-tooltip prop="returnDate" label="到岗时间" width="180" />
- <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="100" />
- <el-table-column show-overflow-tooltip prop="remark" label="备注" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="leaveId" label=""/>
+ <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="180"/>
+ <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="180"/>
+ <el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" width="100"/>
+ <el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" :formatter="leaveTypeFormat"/>
+ <el-table-column show-overflow-tooltip prop="returnDate" label="到岗时间" width="180"/>
+ <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="100"/>
+ <el-table-column show-overflow-tooltip prop="remark" label="备注"/>
</el-table>
<pagination
v-show="leaveInfoDatatotal>0"
@@ -795,7 +830,7 @@
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
- <span v-text="getIndex(scope.$index)" />
+ <span v-text="getIndex(scope.$index)"/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
@@ -804,11 +839,11 @@
<span class="table-button" @click="singleDelete(scope.row, 'resignDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="resignId" label="" />
- <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" />
- <el-table-column show-overflow-tooltip prop="reason" label="辞职事由" />
- <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" />
- <el-table-column show-overflow-tooltip prop="remark" label="备注" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="resignId" label=""/>
+ <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期"/>
+ <el-table-column show-overflow-tooltip prop="reason" label="辞职事由"/>
+ <el-table-column show-overflow-tooltip prop="reporter" label="汇报人"/>
+ <el-table-column show-overflow-tooltip prop="remark" label="备注"/>
</el-table>
<pagination
v-show="resignDatatotal>0"
@@ -840,24 +875,25 @@
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
- <span v-text="getIndex(scope.$index)" />
+ <span v-text="getIndex(scope.$index)"/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
<template slot-scope="scope">
<span class="table-button" @click="editDimissionAttend(scope.row,6)">编辑</span>
- <span class="table-button" @click="singleDelete(scope.row, 'dimissionAttendDataselection')">删除</span>
+ <span class="table-button" @click="singleDelete(scope.row, 'dimissionAttendDataselection')"
+ >删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="dimissionAttendId" label="" />
- <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" />
- <el-table-column show-overflow-tooltip prop="attendDays" label="出勤天数" width="150" />
- <el-table-column show-overflow-tooltip prop="overtimeDay" label="加班（天）" width="150" />
- <el-table-column show-overflow-tooltip prop="overtimeHour" label="加班（小时）" />
- <el-table-column show-overflow-tooltip prop="deduct" label="有无代扣款项" width="180" />
- <el-table-column show-overflow-tooltip prop="leaveDay" label="请假（天）" />
- <el-table-column show-overflow-tooltip prop="absenteeism" label="旷工（天）" />
- <el-table-column show-overflow-tooltip prop="remark" label="备注" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="dimissionAttendId" label=""/>
+ <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份"/>
+ <el-table-column show-overflow-tooltip prop="attendDays" label="出勤天数" width="150"/>
+ <el-table-column show-overflow-tooltip prop="overtimeDay" label="加班（天）" width="150"/>
+ <el-table-column show-overflow-tooltip prop="overtimeHour" label="加班（小时）"/>
+ <el-table-column show-overflow-tooltip prop="deduct" label="有无代扣款项" width="180"/>
+ <el-table-column show-overflow-tooltip prop="leaveDay" label="请假（天）"/>
+ <el-table-column show-overflow-tooltip prop="absenteeism" label="旷工（天）"/>
+ <el-table-column show-overflow-tooltip prop="remark" label="备注"/>
</el-table>
<pagination
v-show="dimissionAttendDatatotal>0"
@@ -884,16 +920,19 @@
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
- <span v-text="getIndex(scope.$index)" />
- </template>EmpLeaveInfo
+ <span v-text="getIndex(scope.$index)"/>
+ </template>
+ EmpLeaveInfo
</el-table-column>
- <el-table-column show-overflow-tooltip prop="deptName" label="部门/护卫点" />
- <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" />
- <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" />
- <el-table-column show-overflow-tooltip prop="dimissionType" label="离职类型" :formatter="dimissionTypeFormat" />
- <el-table-column show-overflow-tooltip prop="selfLeaveDay" label="自离天数" />
- <el-table-column show-overflow-tooltip prop="reporter" label="报备人" />
- <el-table-column show-overflow-tooltip prop="remark" label="备注" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="部门/护卫点"/>
+ <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期"/>
+ <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期"/>
+ <el-table-column show-overflow-tooltip prop="dimissionType" label="离职类型"
+ :formatter="dimissionTypeFormat"
+ />
+ <el-table-column show-overflow-tooltip prop="selfLeaveDay" label="自离天数"/>
+ <el-table-column show-overflow-tooltip prop="reporter" label="报备人"/>
+ <el-table-column show-overflow-tooltip prop="remark" label="备注"/>
</el-table>
<pagination
v-show="dimissionLogDatatotal>0"
@@ -925,7 +964,7 @@
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
- <span v-text="getIndex(scope.$index)" />
+ <span v-text="getIndex(scope.$index)"/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
@@ -934,12 +973,12 @@
<span class="table-button" @click="singleDelete(scope.row, 'unemploymentDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="unemploymentId" label="" />
- <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="180" />
- <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" />
- <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="180" />
- <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="180" />
- <el-table-column show-overflow-tooltip prop="remark" label="备注" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="unemploymentId" label=""/>
+ <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="180"/>
+ <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由"/>
+ <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="180"/>
+ <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="180"/>
+ <el-table-column show-overflow-tooltip prop="remark" label="备注"/>
</el-table>
<pagination
v-show="unemploymentDatatotal>0"
@@ -971,7 +1010,7 @@
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
- <span v-text="getIndex(scope.$index)" />
+ <span v-text="getIndex(scope.$index)"/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
@@ -980,14 +1019,20 @@
<span class="table-button" @click="singleDelete(scope.row, 'insuranceDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="insuranceId" label="" />
- <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="180" />
- <el-table-column show-overflow-tooltip prop="proposer" label="申请人" width="180" />
- <el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位" :formatter="insuranceGaersFormat" />
- <el-table-column show-overflow-tooltip prop="reportStatus" label="是否已报告" :formatter="reportStatusFormat" />
- <el-table-column show-overflow-tooltip prop="applayStatus" label="状态" :formatter="applayStatusFormat" />
- <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="180" />
- <el-table-column show-overflow-tooltip prop="remark" label="备注" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="insuranceId" label=""/>
+ <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="180"/>
+ <el-table-column show-overflow-tooltip prop="proposer" label="申请人" width="180"/>
+ <el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位"
+ :formatter="insuranceGaersFormat"
+ />
+ <el-table-column show-overflow-tooltip prop="reportStatus" label="是否已报告"
+ :formatter="reportStatusFormat"
+ />
+ <el-table-column show-overflow-tooltip prop="applayStatus" label="状态"
+ :formatter="applayStatusFormat"
+ />
+ <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="180"/>
+ <el-table-column show-overflow-tooltip prop="remark" label="备注"/>
</el-table>
<pagination
v-show="insuranceDatatotal>0"
@@ -1019,31 +1064,36 @@
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
- <span v-text="getIndex(scope.$index)" />
+ <span v-text="getIndex(scope.$index)"/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
<template slot-scope="scope">
<span class="table-button" @click="editAccidentCases(scope.row,9)">编辑</span>
- <span class="table-button" @click="singleDelete(scope.row, 'accidentCasesDataselection')">删除</span>
+ <span class="table-button" @click="singleDelete(scope.row, 'accidentCasesDataselection')"
+ >删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="accidentId" label="" />
- <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="100" />
- <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="100" />
- <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
- <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="120" />
- <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" width="100" />
- <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="100" />
- <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="100" />
- <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="80" :formatter="hospitalizatioFlagFormat" />
- <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="60" />
- <el-table-column show-overflow-tooltip prop="reprotTime" label="报案时间" width="100" />
- <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="120" />
- <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="100" />
- <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="100" />
- <el-table-column show-overflow-tooltip prop="innsureFee" label="保险赔付费用" width="120" />
- <el-table-column show-overflow-tooltip prop="settleStatus" label="是否结案" width="120" :formatter="settleStatusFormat" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="accidentId" label=""/>
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="100"/>
+ <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="100"/>
+ <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80"/>
+ <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="120"/>
+ <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" width="100"/>
+ <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="100"/>
+ <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="100"/>
+ <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="80"
+ :formatter="hospitalizatioFlagFormat"
+ />
+ <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="60"/>
+ <el-table-column show-overflow-tooltip prop="reprotTime" label="报案时间" width="100"/>
+ <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="120"/>
+ <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="100"/>
+ <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="100"/>
+ <el-table-column show-overflow-tooltip prop="innsureFee" label="保险赔付费用" width="120"/>
+ <el-table-column show-overflow-tooltip prop="settleStatus" label="是否结案" width="120"
+ :formatter="settleStatusFormat"
+ />
</el-table>
<pagination
v-show="accidentCasesDatatotal>0"
@@ -1075,7 +1125,7 @@
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
- <span v-text="getIndex(scope.$index)" />
+ <span v-text="getIndex(scope.$index)"/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
@@ -1084,22 +1134,26 @@
<span class="table-button" @click="singleDelete(scope.row, 'occupationalDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="occupationalId" label="" />
- <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="120" />
- <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="100" />
- <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="100" />
- <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="140" />
- <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="工伤诊断" width="80" />
- <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="120" />
- <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="100" />
- <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="80" :formatter="hospitalizatioFlagFormat" />
- <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="80" />
- <el-table-column show-overflow-tooltip prop="reportTime" label="报案时间" width="100" />
- <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="120" />
- <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="80" />
- <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="100" />
- <el-table-column show-overflow-tooltip prop="compensated" label="已赔付医药费用" width="120" />
- <el-table-column show-overflow-tooltip prop="settleStatus" label="是否结案" width="120" :formatter="settleStatusFormat" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="occupationalId" label=""/>
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="120"/>
+ <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="100"/>
+ <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="100"/>
+ <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="140"/>
+ <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="工伤诊断" width="80"/>
+ <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="120"/>
+ <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="100"/>
+ <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="80"
+ :formatter="hospitalizatioFlagFormat"
+ />
+ <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="80"/>
+ <el-table-column show-overflow-tooltip prop="reportTime" label="报案时间" width="100"/>
+ <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="120"/>
+ <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="80"/>
+ <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="100"/>
+ <el-table-column show-overflow-tooltip prop="compensated" label="已赔付医药费用" width="120"/>
+ <el-table-column show-overflow-tooltip prop="settleStatus" label="是否结案" width="120"
+ :formatter="settleStatusFormat"
+ />
</el-table>
<pagination
v-show="occupationalDatatotal>0"
@@ -1131,7 +1185,7 @@
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
- <span v-text="getIndex(scope.$index)" />
+ <span v-text="getIndex(scope.$index)"/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
@@ -1140,15 +1194,19 @@
<span class="table-button" @click="singleDelete(scope.row, 'laborTroubleDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="arbitrationId" label="" />
- <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="100" />
- <el-table-column show-overflow-tooltip prop="arbitrationType" label="仲裁类型" :formatter="arbitrationTypeFormat" />
- <el-table-column show-overflow-tooltip prop="arbitrationReason" label="仲裁事由" />
- <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="100" />
- <el-table-column show-overflow-tooltip prop="remark" label="备注" />
- <el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付（元）" width="180" />
- <el-table-column show-overflow-tooltip prop="arbitrationStatus" label="是否结案" width="100" :formatter="arbitrationStatusFormat" />
- <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="100" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="arbitrationId" label=""/>
+ <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="100"/>
+ <el-table-column show-overflow-tooltip prop="arbitrationType" label="仲裁类型"
+ :formatter="arbitrationTypeFormat"
+ />
+ <el-table-column show-overflow-tooltip prop="arbitrationReason" label="仲裁事由"/>
+ <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="100"/>
+ <el-table-column show-overflow-tooltip prop="remark" label="备注"/>
+ <el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付（元）" width="180"/>
+ <el-table-column show-overflow-tooltip prop="arbitrationStatus" label="是否结案" width="100"
+ :formatter="arbitrationStatusFormat"
+ />
+ <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="100"/>
</el-table>
<pagination
v-show="laborTroubleDatatotal>0"
@@ -1180,7 +1238,7 @@
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
- <span v-text="getIndex(scope.$index)" />
+ <span v-text="getIndex(scope.$index)"/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
@@ -1189,11 +1247,11 @@
<span class="table-button" @click="singleDelete(scope.row, 'badRecordDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="badId" label="" />
- <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="180" />
- <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" />
- <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="180" />
- <el-table-column show-overflow-tooltip prop="remark" label="备注" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="badId" label=""/>
+ <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="180"/>
+ <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述"/>
+ <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="180"/>
+ <el-table-column show-overflow-tooltip prop="remark" label="备注"/>
</el-table>
<pagination
v-show="badRecordDatatotal>0"
@@ -1225,7 +1283,7 @@
>
<el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
- <span v-text="getIndex(scope.$index)" />
+ <span v-text="getIndex(scope.$index)"/>
</template>
</el-table-column>
<el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
@@ -1241,9 +1299,9 @@
<span class="table-button" @click="singleDelete(scope.row, 'remarkInfoDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="remarkId" label="" />
- <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="180" />
- <el-table-column show-overflow-tooltip prop="remarkContent" label="备注信息" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="remarkId" label=""/>
+ <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="180"/>
+ <el-table-column show-overflow-tooltip prop="remarkContent" label="备注信息"/>
</el-table>
<pagination
v-show="remarkInfoDatatotal>0"
@@ -1385,12 +1443,19 @@
:preview-src-list="srcList"
@click="clickImg(node)"
/>
- <el-tooltip v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) == -1" class="item" effect="dark" :content="node.filesname" placement="bottom">
+ <el-tooltip v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) == -1" class="item"
+ effect="dark" :content="node.filesname" placement="bottom"
+ >
<div style="padding-top: 14px;text-align: center">
- <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">{{ node.filesname }}</el-checkbox>
+ <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked"
+ class="myRedCheckBox"
+ >{{ node.filesname }}
+ </el-checkbox>
</div>
</el-tooltip>
- <el-tooltip v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) != -1" class="item" effect="dark" :content="node.filesname" placement="bottom">
+ <el-tooltip v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) != -1" class="item"
+ effect="dark" :content="node.filesname" placement="bottom"
+ >
<div style="padding-top: 14px;">
<el-image
style="width: 100px; height: 80px;margin-top: -10px;"
@@ -1398,7 +1463,9 @@
:preview-src-list="srcList"
@click="clickImg(node)"
/>
- <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">
+ <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked"
+ class="myRedCheckBox"
+ >
{{ node.filesname }}
</el-checkbox>
@@ -1421,7 +1488,7 @@
:limit="10"
drag
>
- <i class="el-icon-upload" />
+ <i class="el-icon-upload"/>
</el-upload>
</el-card>
</el-col>
@@ -1447,7 +1514,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
- <el-input v-model="workExperienceForm.empName" />
+ <el-input v-model="workExperienceForm.empName"/>
</el-form-item>
<el-form-item label="身份证号码" prop="certificateNumb">
<el-input
@@ -1467,20 +1534,20 @@
</el-col>
<el-col :span="12">
<el-form-item label="员工编号" prop="empNumb">
- <el-input v-model="workExperienceForm.empNumb" />
+ <el-input v-model="workExperienceForm.empNumb"/>
</el-form-item>
<el-form-item label="部门(护卫点)" prop="allDeptName">
- <el-input v-model="workExperienceForm.allDeptName" />
+ <el-input v-model="workExperienceForm.allDeptName"/>
</el-form-item>
<el-form-item label="岗位" prop="jobName">
- <el-input v-model="workExperienceForm.jobName" />
+ <el-input v-model="workExperienceForm.jobName"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="工作单位" prop="workUnit">
- <el-input v-model="workExperienceForm.workUnit" />
+ <el-input v-model="workExperienceForm.workUnit"/>
</el-form-item>
</el-col>
</el-row>
@@ -1509,7 +1576,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="主要工作内容" prop="jobContent">
- <el-input v-model="workExperienceForm.jobContent" type="textarea" />
+ <el-input v-model="workExperienceForm.jobContent" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
@@ -1530,7 +1597,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
- <el-input v-model="physicalExamForm.empName" />
+ <el-input v-model="physicalExamForm.empName"/>
</el-form-item>
<el-form-item label="身份证号码" prop="certificateNumb">
<el-input
@@ -1548,7 +1615,7 @@
</el-select>
</el-form-item>
<el-form-item label="体检医院" prop="hospital">
- <el-input v-model="physicalExamForm.hospital" />
+ <el-input v-model="physicalExamForm.hospital"/>
</el-form-item>
<el-form-item label="体检类型" prop="physicalExamType">
<el-select
@@ -1564,18 +1631,18 @@
</el-select>
</el-form-item>
<el-form-item label="转氨酶" prop="transaminase">
- <el-input v-model="physicalExamForm.transaminase" />
+ <el-input v-model="physicalExamForm.transaminase"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="员工编号" prop="empNumb">
- <el-input v-model="physicalExamForm.empNumb" />
+ <el-input v-model="physicalExamForm.empNumb"/>
</el-form-item>
<el-form-item label="部门(护卫点)" prop="allDeptName">
- <el-input v-model="physicalExamForm.allDeptName" />
+ <el-input v-model="physicalExamForm.allDeptName"/>
</el-form-item>
<el-form-item label="岗位" prop="jobName">
- <el-input v-model="physicalExamForm.jobName" />
+ <el-input v-model="physicalExamForm.jobName"/>
</el-form-item>
<el-form-item label="体检日期" prop="physicalExamDate">
<el-date-picker
@@ -1586,7 +1653,7 @@
/>
</el-form-item>
<el-form-item label="血压" prop="bloodPressure">
- <el-input v-model="physicalExamForm.bloodPressure" />
+ <el-input v-model="physicalExamForm.bloodPressure"/>
</el-form-item>
<el-form-item label="心电图" prop="ecg">
<el-select v-model="physicalExamForm.ecg" placeholder="ecg">
@@ -1603,17 +1670,17 @@
<el-row>
<el-col :span="24">
<el-form-item label="体检结论" prop="conclusion">
- <el-input v-model="physicalExamForm.conclusion" />
+ <el-input v-model="physicalExamForm.conclusion"/>
</el-form-item>
<el-form-item label="复查记录" prop="reviewRecord">
- <el-input v-model="physicalExamForm.reviewRecord" />
+ <el-input v-model="physicalExamForm.reviewRecord"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
- <el-input v-model="physicalExamForm.remark" type="textarea" />
+ <el-input v-model="physicalExamForm.remark" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
@@ -1634,7 +1701,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
- <el-input v-model="contractInfoForm.empName" />
+ <el-input v-model="contractInfoForm.empName"/>
</el-form-item>
<el-form-item label="身份证号码" prop="certificateNumb">
<el-input
@@ -1673,18 +1740,18 @@
</el-select>
</el-form-item>
<el-form-item label="合同办理人" prop="transactor">
- <el-input v-model="contractInfoForm.transactor" />
+ <el-input v-model="contractInfoForm.transactor"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="员工编号" prop="empNumb">
- <el-input v-model="contractInfoForm.empNumb" />
+ <el-input v-model="contractInfoForm.empNumb"/>
</el-form-item>
<el-form-item label="部门(护卫点)" prop="allDeptName">
- <el-input v-model="contractInfoForm.allDeptName" />
+ <el-input v-model="contractInfoForm.allDeptName"/>
</el-form-item>
<el-form-item label="岗位" prop="jobName">
- <el-input v-model="contractInfoForm.jobName" />
+ <el-input v-model="contractInfoForm.jobName"/>
</el-form-item>
<el-form-item label="合同结束日期" prop="endDate">
<el-date-picker
@@ -1695,14 +1762,14 @@
/>
</el-form-item>
<el-form-item label="合同期限（年）" prop="contractPeriod">
- <el-input v-model="contractInfoForm.contractPeriod" />
+ <el-input v-model="contractInfoForm.contractPeriod"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
- <el-input v-model="contractInfoForm.remark" type="textarea" />
+ <el-input v-model="contractInfoForm.remark" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
@@ -1723,7 +1790,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
- <el-input v-model="dimissionAttendForm.empName" />
+ <el-input v-model="dimissionAttendForm.empName"/>
</el-form-item>
<el-form-item label="身份证号码" prop="certificateNumb">
<el-input
@@ -1749,42 +1816,42 @@
/>
</el-form-item>
<el-form-item label="加班（天）" prop="overtimeDay">
- <el-input v-model="dimissionAttendForm.overtimeDay" />
+ <el-input v-model="dimissionAttendForm.overtimeDay"/>
</el-form-item>
<el-form-item label="有无代扣款项" prop="deduct">
- <el-input v-model="dimissionAttendForm.deduct" />
+ <el-input v-model="dimissionAttendForm.deduct"/>
</el-form-item>
<el-form-item label="旷工（天）" prop="absenteeism">
- <el-input v-model="dimissionAttendForm.absenteeism" />
+ <el-input v-model="dimissionAttendForm.absenteeism"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="员工编号" prop="empNumb">
- <el-input v-model="dimissionAttendForm.empNumb" />
+ <el-input v-model="dimissionAttendForm.empNumb"/>
</el-form-item>
<el-form-item label="部门(护卫点)" prop="allDeptName">
- <el-input v-model="dimissionAttendForm.allDeptName" />
+ <el-input v-model="dimissionAttendForm.allDeptName"/>
</el-form-item>
<el-form-item label="岗位" prop="jobName">
- <el-input v-model="dimissionAttendForm.jobName" />
+ <el-input v-model="dimissionAttendForm.jobName"/>
</el-form-item>
<el-form-item label="出勤天数" prop="attendDays">
- <el-input v-model="dimissionAttendForm.attendDays" />
+ <el-input v-model="dimissionAttendForm.attendDays"/>
</el-form-item>
<el-form-item label="加班（小时）" prop="overtimeHour">
- <el-input v-model="dimissionAttendForm.overtimeHour" />
+ <el-input v-model="dimissionAttendForm.overtimeHour"/>
</el-form-item>
<el-form-item label="请假（天）" prop="leaveDay">
- <el-input v-model="dimissionAttendForm.leaveDay" />
+ <el-input v-model="dimissionAttendForm.leaveDay"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
- <el-input v-model="dimissionAttendForm.remark" type="textarea" />
+ <el-input v-model="dimissionAttendForm.remark" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
@@ -1805,7 +1872,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
- <el-input v-model="leaveInfoForm.empName" />
+ <el-input v-model="leaveInfoForm.empName"/>
</el-form-item>
<el-form-item label="身份证号码" prop="certificateNumb">
<el-input
@@ -1844,18 +1911,18 @@
</el-form-item>
<el-form-item label="报备人" prop="reporter">
- <el-input v-model="leaveInfoForm.reporter" />
+ <el-input v-model="leaveInfoForm.reporter"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="员工编号" prop="empNumb">
- <el-input v-model="leaveInfoForm.empNumb" />
+ <el-input v-model="leaveInfoForm.empNumb"/>
</el-form-item>
<el-form-item label="部门(护卫点)" prop="allDeptName">
- <el-input v-model="leaveInfoForm.allDeptName" />
+ <el-input v-model="leaveInfoForm.allDeptName"/>
</el-form-item>
<el-form-item label="岗位" prop="jobName">
- <el-input v-model="leaveInfoForm.jobName" />
+ <el-input v-model="leaveInfoForm.jobName"/>
</el-form-item>
<el-form-item label="请假结束时间" prop="endTime">
<el-date-picker
@@ -1868,7 +1935,7 @@
</el-form-item>
<el-form-item label="请假天数" prop="leaveDay">
- <el-input v-model="leaveInfoForm.leaveDay" />
+ <el-input v-model="leaveInfoForm.leaveDay"/>
</el-form-item>
<el-form-item label="到岗时间" prop="returnDate">
@@ -1885,7 +1952,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注">
- <el-input v-model="leaveInfoForm.remark" type="textarea" />
+ <el-input v-model="leaveInfoForm.remark" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
@@ -1900,7 +1967,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
- <el-input v-model="resignForm.empName" />
+ <el-input v-model="resignForm.empName"/>
</el-form-item>
<el-form-item label="身份证号码" prop="certificateNumb">
<el-input
@@ -1928,30 +1995,30 @@
</el-col>
<el-col :span="12">
<el-form-item label="员工编号" prop="empNumb">
- <el-input v-model="resignForm.empNumb" />
+ <el-input v-model="resignForm.empNumb"/>
</el-form-item>
<el-form-item label="部门(护卫点)" prop="allDeptName">
- <el-input v-model="resignForm.allDeptName" />
+ <el-input v-model="resignForm.allDeptName"/>
</el-form-item>
<el-form-item label="岗位" prop="jobName">
- <el-input v-model="resignForm.jobName" />
+ <el-input v-model="resignForm.jobName"/>
</el-form-item>
<el-form-item label="报备人">
- <el-input v-model="resignForm.reporter" />
+ <el-input v-model="resignForm.reporter"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="辞职事由" prop="reason">
- <el-input v-model="resignForm.reason" />
+ <el-input v-model="resignForm.reason"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注">
- <el-input v-model="resignForm.remark" type="textarea" />
+ <el-input v-model="resignForm.remark" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
@@ -1972,7 +2039,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
- <el-input v-model="unemploymentForm.empName" />
+ <el-input v-model="unemploymentForm.empName"/>
</el-form-item>
<el-form-item label="身份证号码" prop="certificateNumb">
<el-input
@@ -1998,24 +2065,24 @@
/>
</el-form-item>
<el-form-item label="申报事由" prop="applayReason">
- <el-input v-model="unemploymentForm.applayReason" />
+ <el-input v-model="unemploymentForm.applayReason"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="员工编号" prop="empNumb">
- <el-input v-model="unemploymentForm.empNumb" />
+ <el-input v-model="unemploymentForm.empNumb"/>
</el-form-item>
<el-form-item label="部门(护卫点)" prop="allDeptName">
- <el-input v-model="unemploymentForm.allDeptName" />
+ <el-input v-model="unemploymentForm.allDeptName"/>
</el-form-item>
<el-form-item label="岗位" prop="jobName">
- <el-input v-model="unemploymentForm.jobName" />
+ <el-input v-model="unemploymentForm.jobName"/>
</el-form-item>
<el-form-item label="汇报人">
- <el-input v-model="unemploymentForm.reporter" />
+ <el-input v-model="unemploymentForm.reporter"/>
</el-form-item>
<el-form-item label="审批人">
- <el-input v-model="unemploymentForm.auditor" />
+ <el-input v-model="unemploymentForm.auditor"/>
</el-form-item>
</el-col>
</el-row>
@@ -2023,7 +2090,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注">
- <el-input v-model="unemploymentForm.remark" type="textarea" />
+ <el-input v-model="unemploymentForm.remark" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
@@ -2044,7 +2111,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
- <el-input v-model="insuranceForm.empName" />
+ <el-input v-model="insuranceForm.empName"/>
</el-form-item>
<el-form-item label="身份证号码" prop="certificateNumb">
<el-input
@@ -2092,16 +2159,16 @@
</el-col>
<el-col :span="12">
<el-form-item label="员工编号" prop="empNumb">
- <el-input v-model="insuranceForm.empNumb" />
+ <el-input v-model="insuranceForm.empNumb"/>
</el-form-item>
<el-form-item label="部门(护卫点)" prop="allDeptName">
- <el-input v-model="insuranceForm.allDeptName" />
+ <el-input v-model="insuranceForm.allDeptName"/>
</el-form-item>
<el-form-item label="岗位" prop="jobName">
- <el-input v-model="insuranceForm.jobName" />
+ <el-input v-model="insuranceForm.jobName"/>
</el-form-item>
<el-form-item label="申请人" prop="proposer">
- <el-input v-model="insuranceForm.proposer" />
+ <el-input v-model="insuranceForm.proposer"/>
</el-form-item>
<el-form-item label="是否已经报告">
<el-select v-model="insuranceForm.reportStatus" placeholder="是否已经报告">
@@ -2114,14 +2181,14 @@
</el-select>
</el-form-item>
<el-form-item label="审批人">
- <el-input v-model="insuranceForm.auditor" />
+ <el-input v-model="insuranceForm.auditor"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注">
- <el-input v-model="insuranceForm.remark" type="textarea" />
+ <el-input v-model="insuranceForm.remark" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
@@ -2142,7 +2209,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
- <el-input v-model="accidentCasesForm.empName" />
+ <el-input v-model="accidentCasesForm.empName"/>
</el-form-item>
<el-form-item label="身份证号码" prop="certificateNumb">
<el-input
@@ -2168,24 +2235,24 @@
/>
</el-form-item>
<el-form-item label="受伤部位" prop="injuredPart">
- <el-input v-model="accidentCasesForm.injuredPart" />
+ <el-input v-model="accidentCasesForm.injuredPart"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="员工编号" prop="empNumb">
- <el-input v-model="accidentCasesForm.empNumb" />
+ <el-input v-model="accidentCasesForm.empNumb"/>
</el-form-item>
<el-form-item label="部门(护卫点)" prop="allDeptName">
- <el-input v-model="accidentCasesForm.allDeptName" />
+ <el-input v-model="accidentCasesForm.allDeptName"/>
</el-form-item>
<el-form-item label="岗位" prop="jobName">
- <el-input v-model="accidentCasesForm.jobName" />
+ <el-input v-model="accidentCasesForm.jobName"/>
</el-form-item>
<el-form-item label="受伤地点">
- <el-input v-model="accidentCasesForm.injuredAddress" />
+ <el-input v-model="accidentCasesForm.injuredAddress"/>
</el-form-item>
<el-form-item label="意外险诊断">
- <el-input v-model="accidentCasesForm.injuredDiacrisis" />
+ <el-input v-model="accidentCasesForm.injuredDiacrisis"/>
</el-form-item>
</el-col>
</el-row>
@@ -2193,14 +2260,14 @@
<el-row>
<el-col :span="24">
<el-form-item label="受伤经过描述" prop="injuredDescribe">
- <el-input v-model="accidentCasesForm.injuredDescribe" type="textarea" />
+ <el-input v-model="accidentCasesForm.injuredDescribe" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="就诊医院" prop="hospitalName">
- <el-input v-model="accidentCasesForm.hospitalName" />
+ <el-input v-model="accidentCasesForm.hospitalName"/>
</el-form-item>
<el-form-item label="是否住院" prop="hospitalizatioFlag">
<el-select v-model="accidentCasesForm.hospitalizatioFlag" placeholder="是否住院">
@@ -2221,10 +2288,10 @@
/>
</el-form-item>
<el-form-item label="递交人">
- <el-input v-model="accidentCasesForm.sbumitBy" />
+ <el-input v-model="accidentCasesForm.sbumitBy"/>
</el-form-item>
<el-form-item label="保险赔付费用" prop="innsureFee">
- <el-input v-model="accidentCasesForm.innsureFee" />
+ <el-input v-model="accidentCasesForm.innsureFee"/>
</el-form-item>
<el-form-item label="人事处理时间">
<el-date-picker
@@ -2246,10 +2313,10 @@
</el-col>
<el-col :span="12">
<el-form-item label="就诊科室">
- <el-input v-model="accidentCasesForm.treatmentName" />
+ <el-input v-model="accidentCasesForm.treatmentName"/>
</el-form-item>
<el-form-item label="床号">
- <el-input v-model="accidentCasesForm.bedNumb" />
+ <el-input v-model="accidentCasesForm.bedNumb"/>
</el-form-item>
<el-form-item label="递交资料时间">
<el-date-picker
@@ -2260,10 +2327,10 @@
/>
</el-form-item>
<el-form-item label="医疗总费用" prop="expensesFee">
- <el-input v-model="accidentCasesForm.expensesFee" />
+ <el-input v-model="accidentCasesForm.expensesFee"/>
</el-form-item>
<el-form-item label="报单号">
- <el-input v-model="accidentCasesForm.expenseReport" />
+ <el-input v-model="accidentCasesForm.expenseReport"/>
</el-form-item>
<el-form-item label="状态" prop="settleStatus">
<el-select v-model="accidentCasesForm.settleStatus" placeholder="">
@@ -2294,7 +2361,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
- <el-input v-model="occupationalForm.empName" />
+ <el-input v-model="occupationalForm.empName"/>
</el-form-item>
<el-form-item label="身份证号码" prop="certificateNumb">
<el-input
@@ -2320,24 +2387,24 @@
/>
</el-form-item>
<el-form-item label="受伤部位" prop="injuredPart">
- <el-input v-model="occupationalForm.injuredPart" />
+ <el-input v-model="occupationalForm.injuredPart"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="员工编号" prop="empNumb">
- <el-input v-model="occupationalForm.empNumb" />
+ <el-input v-model="occupationalForm.empNumb"/>
</el-form-item>
<el-form-item label="部门(护卫点)" prop="allDeptName">
- <el-input v-model="occupationalForm.allDeptName" />
+ <el-input v-model="occupationalForm.allDeptName"/>
</el-form-item>
<el-form-item label="岗位" prop="jobName">
- <el-input v-model="occupationalForm.jobName" />
+ <el-input v-model="occupationalForm.jobName"/>
</el-form-item>
<el-form-item label="受伤地点" prop="injuredAddress">
- <el-input v-model="occupationalForm.injuredAddress" />
+ <el-input v-model="occupationalForm.injuredAddress"/>
</el-form-item>
<el-form-item label="工伤诊断" prop="injuredDiacrisis">
- <el-input v-model="occupationalForm.injuredDiacrisis" />
+ <el-input v-model="occupationalForm.injuredDiacrisis"/>
</el-form-item>
</el-col>
</el-row>
@@ -2345,14 +2412,14 @@
<el-row>
<el-col :span="24">
<el-form-item label="受伤经过描述" prop="injuredDescribe">
- <el-input v-model="occupationalForm.injuredDescribe" type="textarea" />
+ <el-input v-model="occupationalForm.injuredDescribe" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="就诊医院" prop="hospitalName">
- <el-input v-model="occupationalForm.hospitalName" />
+ <el-input v-model="occupationalForm.hospitalName"/>
</el-form-item>
<el-form-item label="是否住院" prop="hospitalizatioFlag">
<el-select v-model="occupationalForm.hospitalizatioFlag" placeholder="是否住院">
@@ -2373,15 +2440,15 @@
/>
</el-form-item>
<el-form-item label="递交人" prop="'sbumitBy">
- <el-input v-model="occupationalForm.sbumitBy" />
+ <el-input v-model="occupationalForm.sbumitBy"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="就诊科室" prop="'treatmentName">
- <el-input v-model="occupationalForm.treatmentName" />
+ <el-input v-model="occupationalForm.treatmentName"/>
</el-form-item>
<el-form-item label="床号" prop="bedNumb">
- <el-input v-model="occupationalForm.bedNumb" />
+ <el-input v-model="occupationalForm.bedNumb"/>
</el-form-item>
<el-form-item label="递交资料时间" prop="submitTime">
<el-date-picker
@@ -2402,57 +2469,57 @@
</el-col>
</el-row>
社保赔偿费用
- <el-divider />
+ <el-divider/>
<el-row>
<el-col :span="12">
<el-form-item label="医疗总费用" prop="expensesFee">
- <el-input v-model="occupationalForm.expensesFee" />
+ <el-input v-model="occupationalForm.expensesFee"/>
</el-form-item>
<el-form-item label="一次性伤残补助金" prop="socialDisability">
- <el-input v-model="occupationalForm.socialDisability" />
+ <el-input v-model="occupationalForm.socialDisability"/>
</el-form-item>
<el-form-item label="一次性医疗补助金" prop="socialSubsidy">
- <el-input v-model="occupationalForm.socialSubsidy" />
+ <el-input v-model="occupationalForm.socialSubsidy"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="剔除总额">
- <el-input v-model="occupationalForm.eliminate" />
+ <el-input v-model="occupationalForm.eliminate"/>
</el-form-item>
<el-form-item label="住院伙食补贴">
- <el-input v-model="occupationalForm.socialAllowance" />
+ <el-input v-model="occupationalForm.socialAllowance"/>
</el-form-item>
<el-form-item label="社保赔偿总费用">
- <el-input v-model="occupationalForm.socialCompensation" />
+ <el-input v-model="occupationalForm.socialCompensation"/>
</el-form-item>
</el-col>
</el-row>
公司赔偿费用
- <el-divider />
+ <el-divider/>
<el-row>
<el-col :span="12">
<el-form-item label="已赔付医药费用" prop="compensated">
- <el-input v-model="occupationalForm.compensated" />
+ <el-input v-model="occupationalForm.compensated"/>
</el-form-item>
<el-form-item label="一次性伤残补助金">
- <el-input v-model="occupationalForm.companylDisability" />
+ <el-input v-model="occupationalForm.companylDisability"/>
</el-form-item>
<el-form-item label="一次性医疗补助金">
- <el-input v-model="occupationalForm.companySubsidy" />
+ <el-input v-model="occupationalForm.companySubsidy"/>
</el-form-item>
<el-form-item label="一次性就业补助金">
- <el-input v-model="occupationalForm.jobSubsidy" />
+ <el-input v-model="occupationalForm.jobSubsidy"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="其他赔偿报销">
- <el-input v-model="occupationalForm.otherCompensated" />
+ <el-input v-model="occupationalForm.otherCompensated"/>
</el-form-item>
<el-form-item label="工伤生活补贴">
- <el-input v-model="occupationalForm.companyAllowance" />
+ <el-input v-model="occupationalForm.companyAllowance"/>
</el-form-item>
<el-form-item label="公司赔偿总费用" prop="companyCompensation">
- <el-input v-model="occupationalForm.companyCompensation" />
+ <el-input v-model="occupationalForm.companyCompensation"/>
</el-form-item>
<el-form-item label="是否结案" prop="settleStatus">
<el-select v-model="occupationalForm.settleStatus" placeholder="">
@@ -2470,7 +2537,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="备注">
- <el-input v-model="occupationalForm.remark" type="textarea" />
+ <el-input v-model="occupationalForm.remark" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
@@ -2491,7 +2558,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
- <el-input v-model="laborTroubleForm.empName" />
+ <el-input v-model="laborTroubleForm.empName"/>
</el-form-item>
<el-form-item label="身份证号码" prop="certificateNumb">
<el-input
@@ -2517,7 +2584,7 @@
/>
</el-form-item>
<el-form-item label="汇报人" prop="reporter">
- <el-input v-model="laborTroubleForm.reporter" />
+ <el-input v-model="laborTroubleForm.reporter"/>
</el-form-item>
<el-form-item label="是否结案" prop="arbitrationStatus">
<el-select v-model="laborTroubleForm.arbitrationStatus" placeholder="">
@@ -2532,13 +2599,13 @@
</el-col>
<el-col :span="12">
<el-form-item label="员工编号" prop="empNumb">
- <el-input v-model="laborTroubleForm.empNumb" />
+ <el-input v-model="laborTroubleForm.empNumb"/>
</el-form-item>
<el-form-item label="部门(护卫点)" prop="allDeptName">
- <el-input v-model="laborTroubleForm.allDeptName" />
+ <el-input v-model="laborTroubleForm.allDeptName"/>
</el-form-item>
<el-form-item label="岗位" prop="jobName">
- <el-input v-model="laborTroubleForm.jobName" />
+ <el-input v-model="laborTroubleForm.jobName"/>
</el-form-item>
<el-form-item label="仲裁类型" prop="arbitrationType">
<el-select v-model="laborTroubleForm.arbitrationType" placeholder="请选择仲裁类型">
@@ -2570,14 +2637,14 @@
<el-row>
<el-col :span="24">
<el-form-item label="仲裁事由" prop="arbitrationReason">
- <el-input v-model="laborTroubleForm.arbitrationReason" />
+ <el-input v-model="laborTroubleForm.arbitrationReason"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
- <el-input v-model="laborTroubleForm.remark" type="textarea" />
+ <el-input v-model="laborTroubleForm.remark" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
@@ -2598,7 +2665,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
- <el-input v-model="badRecordForm.empName" />
+ <el-input v-model="badRecordForm.empName"/>
</el-form-item>
<el-form-item label="身份证号码" prop="certificateNumb">
<el-input
@@ -2626,30 +2693,30 @@
</el-col>
<el-col :span="12">
<el-form-item label="员工编号" prop="empNumb">
- <el-input v-model="badRecordForm.empNumb" />
+ <el-input v-model="badRecordForm.empNumb"/>
</el-form-item>
<el-form-item label="部门(护卫点)" prop="allDeptName">
- <el-input v-model="badRecordForm.allDeptName" />
+ <el-input v-model="badRecordForm.allDeptName"/>
</el-form-item>
<el-form-item label="岗位" prop="jobName">
- <el-input v-model="badRecordForm.jobName" />
+ <el-input v-model="badRecordForm.jobName"/>
</el-form-item>
<el-form-item label="汇报人" prop="reporter">
- <el-input v-model="badRecordForm.reporter" />
+ <el-input v-model="badRecordForm.reporter"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="不良记录描述" prop="badContent">
- <el-input v-model="badRecordForm.badContent" />
+ <el-input v-model="badRecordForm.badContent"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注">
- <el-input v-model="badRecordForm.remark" type="textarea" />
+ <el-input v-model="badRecordForm.remark" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
@@ -2670,7 +2737,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
- <el-input v-model="remarkInfoForm.empName" />
+ <el-input v-model="remarkInfoForm.empName"/>
</el-form-item>
<el-form-item label="身份证号码" prop="certificateNumb">
<el-input
@@ -2698,20 +2765,20 @@
</el-col>
<el-col :span="12">
<el-form-item label="员工编号" prop="empNumb">
- <el-input v-model="remarkInfoForm.empNumb" />
+ <el-input v-model="remarkInfoForm.empNumb"/>
</el-form-item>
<el-form-item label="部门(护卫点)" prop="allDeptName">
- <el-input v-model="remarkInfoForm.allDeptName" />
+ <el-input v-model="remarkInfoForm.allDeptName"/>
</el-form-item>
<el-form-item label="岗位" prop="jobName">
- <el-input v-model="remarkInfoForm.jobName" />
+ <el-input v-model="remarkInfoForm.jobName"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remarkContent">
- <el-input v-model="remarkInfoForm.remarkContent" type="textarea" />
+ <el-input v-model="remarkInfoForm.remarkContent" type="textarea"/>
</el-form-item>
</el-col>
</el-row>
@@ -2725,7 +2792,7 @@
</div>
</template>
<script>
-import { calculateSeniority, toCardGetUserInfo } from '@/utils/myUtil'
+import { calculateSeniority, dateDifference, toCardGetUserInfo } from '@/utils/myUtil'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Pagination from '@/components/Pagination'
@@ -2939,11 +3006,11 @@
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
},
contractInfoRules: {
- signingDate: [{ required: true, message: '请选择合同签订时间', trigger: 'change' }],
+ signingDate: [{ required: true, message: '请选择合同签订时间', trigger: 'change', 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, message: '请选择合同结束时间', trigger: 'change', validator: this.endDate }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
},
dimissionAttendRules: {
@@ -5933,6 +6000,39 @@
}
this.sysConfig = this.initSysConfig()
+ },
+ startDate(rule, value, callback) {
+ // 如果结束日期没选，cb
+ if (!this.contractInfoForm.endDate) {
+ callback()
+ } else {
+ // 结束日期有，进行判断
+ if (this.compareDate(value, this.contractInfoForm.endDate)) {
+ // 如果起始在结束之前
+ callback()
+ } else {
+ callback(new Error('开始日期不能在结束日期之后，请重新选择'))
+ }
+ }
+ },
+ // 验证合同结束日期
+ endDate(rule, value, callback) {
+ // 如果起始日期没选，cb
+ if (!this.contractInfoForm.signingDate) {
+ callback()
+ } else {
+ // 起始日期有，进行判断
+ if (this.compareDate(this.contractInfoForm.signingDate, value)) {
+ // 如果起始在结束之前
+ this.contractInfoForm.contractPeriod = dateDifference(this.contractInfoForm.signingDate, this.contractInfoForm.endDate, 'o')
+ callback()
+ } else {
+ callback(new Error('结束日期不能在开始始日期之前，请重新选择'))
+ }
+ }
+ },
+ compareDate(start, end) {
+ return new Date(end).getTime() > new Date(start).getTime()
}
}
}
@@ -5969,7 +6069,7 @@
height: 90vh;
overflow-y: scroll;
- .jbxxTitle,.jbxxTitle2 {
+ .jbxxTitle, .jbxxTitle2 {
height: 30px;
line-height: 30px;
padding-left: 15px;
@@ -5984,7 +6084,7 @@
}
.jbxxTitle::before,
- .jbxxTitle2::before{
+ .jbxxTitle2::before {
content: '';
position: absolute;
left: -10px;
@@ -6167,7 +6267,7 @@
.myRedCheckBox .el-checkbox__label {
width: 90%;
overflow: hidden;
- text-overflow:ellipsis;
+ text-overflow: ellipsis;
white-space: nowrap;
}
@@ -6227,7 +6327,7 @@
list-style: none;
padding-left: 10px !important;
- >li:last-of-type {
+ > li:last-of-type {
> div:first-of-type {
position: absolute;
left: 4px;
@@ -6256,10 +6356,12 @@
height: 35px;
box-sizing: border-box;
padding-left: 28px !important;
- &:hover {
- color: #a00515;
- cursor: pointer;
- }
+
+ &:hover {
+ color: #a00515;
+ cursor: pointer;
+ }
+
.light {
color: #a00515;
}
@@ -6289,38 +6391,46 @@
<style lang="scss">
.da-dialog {
button.el-dialog__headerbtn {
- height: 30px;
- width: 30px;
+ height: 30px;
+ width: 30px;
background-color: #a00515;
opacity: 0.8;
- line-height: 30px;
- border-radius: 50%;
+ line-height: 30px;
+ border-radius: 50%;
+
i {
color: #fff !important;
}
+
&:hover {
opacity: 0.5;
}
}
+
.el-pagination {
width: 98%;
text-align: right;
}
+
.el-aside {
height: 750px;
overflow: hidden;
}
+
li.el-timeline-item {
padding-bottom: 1px;
height: 35px;
}
-.el-dialog__title {
- font-weight: 700;
-}
+
+ .el-dialog__title {
+ font-weight: 700;
+ }
+
.el-dialog__body {
padding: 10px 20px;
}
}
+
.el-dialog.is-fullscreen {
overflow: hidden;
}
@@ -6331,6 +6441,7 @@
color: #333 !important;
}
}
+
.pri-del-btn {
background-color: rgb(64, 158, 255) !important;
border-color: rgb(64, 158, 255) !important;
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index 5b856b2..51e5ef4 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -245,14 +245,6 @@
<el-table-column type="selection" width="55" />
<el-table-column label="操作" width="130">
<template slot-scope="scope">
- <!-- <el-button-->
- <!-- type="text"-->
- <!-- size="small"-->
- <!-- @click="editArchives(scope.row)"-->
- <!-- >-->
- <!-- 档案</el-button>-->
- <!-- <el-button type="text" size="small" @click="editEmpBase(scope.row)">编辑</el-button>-->
-
<span
style="color: #a00515;display: inline-block;width: 40%;cursor: pointer"
@click="editArchives(scope.row)"
@@ -643,7 +635,7 @@
<el-button type="primary" @click="showDryg(2)">确 定</el-button>
</div>
</el-dialog>
- <el-dialog title="关闭档案" :visible.sync="dialogShowGbda" width="50%">
+ <el-dialog title="关闭档案" :visible.sync="dialogShowGbda" width="70%">
<el-form ref="gbdaForm" :model="gbdaForm" :rules="gbdaRules" label-position="right" label-width="120px">
<el-row>
<el-col span="24">
@@ -655,6 +647,7 @@
<el-radio :label="4">自动离职</el-radio>
<el-radio :label="5">试用期内</el-radio>
<el-radio :label="6">正常离职</el-radio>
+ <el-radio :label="7">到龄退休</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
diff --git a/src/views/user/outemployess.vue b/src/views/user/outemployess.vue
index b08233c..e560235 100644
--- a/src/views/user/outemployess.vue
+++ b/src/views/user/outemployess.vue
@@ -183,13 +183,7 @@
<el-checkbox :label="1">合同期满</el-checkbox>
<el-checkbox :label="3">公司辞退</el-checkbox>
<el-checkbox :label="5">试用期内</el-checkbox>
- <!-- <el-checkbox-->
- <!-- v-for="data in dimissionTypeOptions"-->
- <!-- :key="data.dicItemName"-->
- <!-- :label="data.dicItemCode"-->
- <!-- >-->
- <!-- {{ data.dicItemName }}-->
- <!-- </el-checkbox>-->
+ <el-checkbox :label="7">到龄退休</el-checkbox>
</el-checkbox-group>
</td>
</tr>
diff --git a/vue.config.js b/vue.config.js
index 5179c22..e8c710a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,6 +1,7 @@
'use strict'
const settings = require('./src/settings.js')
const path = require('path')
+
function resolve(dir) {
return path.join(__dirname, dir)
}
@@ -28,6 +29,7 @@
devServer: {
port: port,
open: false,
+ disableHostCheck: true,
overlay: {
warnings: false,
errors: true
@@ -49,6 +51,7 @@
// provide the app's title in webpack's name field, so that
// it can be accessed in index.html to inject the correct title.
name: name,
+ devtool: 'source-map',
resolve: {
alias: {
'@': resolve('src')
@@ -100,34 +103,34 @@
.plugin('ScriptExtHtmlWebpackPlugin')
.after('html')
.use('script-ext-html-webpack-plugin', [{
- // `runtime` must same as runtimeChunk name. default is `runtime`
+ // `runtime` must same as runtimeChunk name. default is `runtime`
inline: /runtime\..*\.js$/
}])
.end()
config
.optimization.splitChunks({
- chunks: 'all',
- cacheGroups: {
- libs: {
- name: 'chunk-libs',
- test: /[\\/]node_modules[\\/]/,
- priority: 10,
- chunks: 'initial' // only package third parties that are initially dependent
- },
- elementUI: {
- name: 'chunk-elementUI', // split elementUI into a single package
- priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
- test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
- },
- commons: {
- name: 'chunk-commons',
- test: resolve('src/components'), // can customize your rules
- minChunks: 3, // minimum common number
- priority: 5,
- reuseExistingChunk: true
- }
+ chunks: 'all',
+ cacheGroups: {
+ libs: {
+ name: 'chunk-libs',
+ test: /[\\/]node_modules[\\/]/,
+ priority: 10,
+ chunks: 'initial' // only package third parties that are initially dependent
+ },
+ elementUI: {
+ name: 'chunk-elementUI', // split elementUI into a single package
+ priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+ test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+ },
+ commons: {
+ name: 'chunk-commons',
+ test: resolve('src/components'), // can customize your rules
+ minChunks: 3, // minimum common number
+ priority: 5,
+ reuseExistingChunk: true
}
- })
+ }
+ })
config.optimization.runtimeChunk('single')
}
)
--
Gitblit v1.8.0