|
@@ -43,7 +43,7 @@
|
|
|
>
|
|
>
|
|
|
<el-table-column type="selection" min-width="2%" />
|
|
<el-table-column type="selection" min-width="2%" />
|
|
|
<el-table-column type="index" label="序号" min-width="5%" />
|
|
<el-table-column type="index" label="序号" min-width="5%" />
|
|
|
- <el-table-column label="入职时间" min-width="15%">
|
|
|
|
|
|
|
+ <el-table-column :label="startEnd ? '开始时间': '入职时间'" min-width="15%">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<div v-if="judgeTag()">
|
|
<div v-if="judgeTag()">
|
|
|
<el-tooltip
|
|
<el-tooltip
|
|
@@ -86,7 +86,7 @@
|
|
|
</div>
|
|
</div>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column label="离职时间" min-width="15%">
|
|
|
|
|
|
|
+ <el-table-column :label="startEnd ? '结束时间' : '离职时间'" min-width="15%">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
<div v-if="judgeTag()">
|
|
<div v-if="judgeTag()">
|
|
|
<el-tooltip
|
|
<el-tooltip
|
|
@@ -392,6 +392,10 @@ export default {
|
|
|
// return callback(new Error('请选择时间'))
|
|
// return callback(new Error('请选择时间'))
|
|
|
// }
|
|
// }
|
|
|
}
|
|
}
|
|
|
|
|
+ const {
|
|
|
|
|
+ setting
|
|
|
|
|
+ } = this.$store.getters || {}
|
|
|
|
|
+
|
|
|
return {
|
|
return {
|
|
|
activeName: 'first',
|
|
activeName: 'first',
|
|
|
nowData: [],
|
|
nowData: [],
|
|
@@ -407,7 +411,17 @@ export default {
|
|
|
},
|
|
},
|
|
|
multipleSelection: [],
|
|
multipleSelection: [],
|
|
|
currentPage: 1,
|
|
currentPage: 1,
|
|
|
- isShowTooltip: true
|
|
|
|
|
|
|
+ isShowTooltip: true,
|
|
|
|
|
+ startEnd: setting?.ryda?.startEnd || false,
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
|
|
+ computed: {
|
|
|
|
|
+ gzjl() {
|
|
|
|
|
+ return {
|
|
|
|
|
+ ...fieldLabelMaps.gzjl,
|
|
|
|
|
+ ruZhiShiJian: this.startEnd ? '开始时间' : '入职时间',
|
|
|
|
|
+ liZhiShiJian: this.startEnd ? '结束时间' : '离职时间'
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
watch: {
|
|
watch: {
|
|
@@ -469,7 +483,7 @@ export default {
|
|
|
console.log('error submit!!')
|
|
console.log('error submit!!')
|
|
|
const fields = getInvalidFieldTips(
|
|
const fields = getInvalidFieldTips(
|
|
|
invalidFields,
|
|
invalidFields,
|
|
|
- fieldLabelMaps.gzjl
|
|
|
|
|
|
|
+ this.gzjl
|
|
|
)
|
|
)
|
|
|
this.$emit('tipsShowTab', true, '工作经历', fields)
|
|
this.$emit('tipsShowTab', true, '工作经历', fields)
|
|
|
return false
|
|
return false
|