From 5e6bd002331aac3d748b85f843d5d7021dd88082 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 16 三月 2021 15:36:58 +0800
Subject: [PATCH] fix(bug修复): 员工智搜标签页显示部门全称，增加点击排序
---
src/views/user/search.vue | 184 ++++++++++++++++--------------
src/views/user/inemployees.vue | 123 ++++++++++++++++++-
src/views/user/outemployess.vue | 3
3 files changed, 215 insertions(+), 95 deletions(-)
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index 2b0f65b..d60901b 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -632,9 +632,10 @@
<el-radio-group v-model="gbdaForm.dimissionType" @change="changeDimissionType">
<el-radio :label="1">正常离职</el-radio>
<el-radio :label="2">自动离职</el-radio>
- <!-- <el-radio :label="3">公司劝退</el-radio>-->
<el-radio :label="3">公司辞退</el-radio>
- <!-- <el-radio :label="5">试用期内</el-radio>-->
+ <el-radio :label="7">合同期满</el-radio>
+ <el-radio :label="8">公司劝退</el-radio>
+ <el-radio :label="9">试用期内</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -878,6 +879,42 @@
:type="dialog.type"
@close="editClose"
/>
+ <el-dialog title="打开档案" :visible.sync="dialogShowDkda" width="50%">
+ <el-form
+ ref="openArchivesForm"
+ :model="openArchivesForm"
+ rules="openArchivesRules"
+ label-position="right"
+ label-width="120px"
+ >
+ <el-row>
+ <el-col span="24">
+ <el-form-item label="打开类型" prop="region">
+ <el-radio-group v-model="openArchivesForm.openType">
+ <el-radio :label="5">重新入职</el-radio>
+ <el-radio :label="6">返聘</el-radio>
+ </el-radio-group>
+ （主要对已退休员工返聘）
+ </el-form-item>
+ <el-form-item label="打开日期">
+ <el-date-picker
+ v-model="openArchivesForm.openDate"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="选择打开日期"
+ />
+ </el-form-item>
+ <el-form-item label="备注说明">
+ <el-input v-model="openArchivesForm.remark" type="textarea" :rows="4" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="showDkda(1, '')">取 消</el-button>
+ <el-button type="primary" @click="showDkda(2, 'openArchivesForm')">确 定</el-button>
+ </div>
+ </el-dialog>
</div>
</template>
<script>
@@ -1126,6 +1163,7 @@
dialogShowYgdg: false,
dialogShowDryg: false,
dialogShowGbda: false,
+ dialogShowDkda: false,
exportUrl: '',
checkAll: false,
isIndeterminate: false,
@@ -1997,7 +2035,22 @@
this.editEmpBase(r.data.data)
})
} else {
- this.$confirm('该员工已离职，是否重新打开档案？', '提示', {
+ let tempName
+ switch (r.data.data.dimissionType) {
+ case '1':
+ tempName = '正常离职'
+ break
+ case '2':
+ tempName = '自动离职'
+ break
+ case '3':
+ tempName = '公司辞退'
+ break
+ }
+ var msg = '该员工已存在，' + tempName + '状态!\n\r'
+ msg += r.data.data.remark + '\n\r'
+ msg += '由于' + r.data.data.empName + '已离职，是否重新打开档案？'
+ this.$confirm(msg, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -2010,12 +2063,13 @@
openDate: this.getDateString(),
remark: ''
}
- this.$post('hr/empOpenArchives', { ...this.openArchivesForm }).then(() => {
- this.$message({
- message: this.$t('员工档案打开成功'),
- type: 'success'
- })
- })
+ this.dialogShowDkda = true
+ // this.$post('hr/empOpenArchives', { ...this.openArchivesForm }).then(() => {
+ // this.$message({
+ // message: this.$t('员工档案打开成功'),
+ // type: 'success'
+ // })
+ // })
})
}
}
@@ -2035,8 +2089,57 @@
this.sort.field = val.prop
this.sort.order = val.order
this.search()
+ },
+ showDkda(operate, formName) {
+ switch (operate) {
+ // case 0:
+ // var selection = this.$refs.multipleTable.store.states.selection
+ // if (selection.length === 1) {
+ // var id = selection[0].empId
+ // var name = selection[0].empName
+ // var number = selection[0].certificateNumb
+ // const nowDate = new Date()
+ // const year = nowDate.getFullYear()
+ // const month = nowDate.getMonth() + 1
+ // const day = nowDate.getDate()
+ // this.baseicInformationForm = {
+ // empId: id,
+ // empName: name,
+ // certificateNumb: number,
+ // openType: 2,
+ // openDate: year + '-' + month + '-' + day,
+ // remark: ''
+ // }
+ // this.dialogShowDkda = true
+ // } else {
+ // this.$message({
+ // message: '请选中一个要打开档案的人员',
+ // type: 'error'
+ // })
+ // }
+ // break
+ case 1:
+ this.dialogShowDkda = false
+ break
+ case 2:
+ this.$refs[formName].validate((valid) => {
+ if (valid) {
+ this.$post('hr/empOpenArchives', { ...this.openArchivesForm }).then(() => {
+ this.dialogShowDkda = false
+ this.$message({
+ message: this.$t('员工档案打开成功'),
+ type: 'success'
+ })
+ this.fetch({
+ ...this.queryParams,
+ ...this.sort
+ })
+ })
+ }
+ })
+ break
+ }
}
-
}
}
</script>
diff --git a/src/views/user/outemployess.vue b/src/views/user/outemployess.vue
index 6f93420..4b028a5 100644
--- a/src/views/user/outemployess.vue
+++ b/src/views/user/outemployess.vue
@@ -180,6 +180,9 @@
<el-checkbox :label="1">正常离职</el-checkbox>
<el-checkbox :label="2">自动离职</el-checkbox>
<el-checkbox :label="3">公司辞退</el-checkbox>
+ <el-checkbox :label="7">合同期满</el-checkbox>
+ <el-checkbox :label="8">公司劝退</el-checkbox>
+ <el-checkbox :label="9">试用期内</el-checkbox>
<!-- <el-checkbox-->
<!-- v-for="data in dimissionTypeOptions"-->
<!-- :key="data.dicItemName"-->
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index 960fd25..c5048d1 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -629,16 +629,17 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;height: 70%;"
+ @sort-change="changeSort"
>
<el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="sex" label="性别" width="50" :formatter="sexFormat" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="200" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="sex" label="性别" width="50" />
<el-table-column show-overflow-tooltip prop="hospital" label="体检医院" width="100" />
- <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="100" />
+ <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="physicalExamType" label="体检类型" width="100" :formatter="typeFormat" />
<el-table-column show-overflow-tooltip prop="bloodPressure" label="血压" width="80" />
<el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" width="80" />
@@ -738,15 +739,16 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;height: 70%;"
+ @sort-change="changeSort"
>
<el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="140" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="200" sortable="custom" :sort-orders="['ascending', 'descending']" />
<!-- <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="180" /> -->
- <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" width="180" />
- <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" width="200" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" width="200" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" width="120" />
<el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" width="120" :formatter="contractStatusFormat" />
<el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" width="180" />
@@ -832,13 +834,14 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;height: 70%;"
+ @sort-change="changeSort"
>
<el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
- <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤年月" width="120" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤年月" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="attendDays" label="出勤天数" width="100" />
<el-table-column show-overflow-tooltip prop="overtimeDay" label="加班（天）" width="100" />
<el-table-column show-overflow-tooltip prop="overtimeHour" label="加班（小时）" width="120" />
@@ -940,17 +943,18 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;height: 70%;"
+ @sort-change="changeSort"
>
<el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
- <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="150" />
- <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="150" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" width="100" />
- <el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" width="100" :formatter="leaveTypeFormat" />
- <el-table-column show-overflow-tooltip prop="returnDate" label="到岗时间" width="150" />
+ <el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" width="120" :formatter="leaveTypeFormat" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="returnDate" label="返岗时间" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="100" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
@@ -987,7 +991,6 @@
</el-col>
</el-row>
<el-row>
-
<el-col :span="6">辞职事由：
<el-input v-model="queryParams.reason" size="small" maxlength="18" style="width:262px" />
</el-col>
@@ -1025,14 +1028,15 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;height: 70%;"
+ @sort-change="changeSort"
>
<el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="160" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="160" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="reason" label="辞职事由" />
<el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
@@ -1107,14 +1111,15 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;height: 70%;"
+ @sort-change="changeSort"
>
<el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" width="180" />
<el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
<el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="100" />
@@ -1197,14 +1202,15 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;height: 70%;"
+ @sort-change="changeSort"
>
<el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="150" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="proposer" label="申请人" width="100" />
<el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位" width="100" :formatter="insuranceGaersFormat" />
<el-table-column show-overflow-tooltip prop="reportStatus" label="是否已报告" width="100" :formatter="reportStatusFormat" />
@@ -1311,14 +1317,15 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;height: 70%;"
+ @sort-change="changeSort"
>
<el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
- <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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" />
@@ -1439,14 +1446,15 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;height: 70%;"
+ @sort-change="changeSort"
>
<el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
- <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="80" />
<el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
<el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="120" />
@@ -1554,20 +1562,21 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;height: 70%;"
+ @sort-change="changeSort"
>
<el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
- <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="150" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="arbitrationType" label="仲裁类型" width="100" :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="120" />
<el-table-column show-overflow-tooltip prop="arbitrationStatus" label="状态" width="100" :formatter="arbitrationStatusFormat" />
- <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="150" />
+ <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
</el-table></div>
<div v-show="showArr[12].show">
@@ -1638,6 +1647,7 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;height: 70%;"
+ @sort-change="changeSort"
>
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
@@ -1719,13 +1729,14 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;height: 70%;"
+ @sort-change="changeSort"
>
<el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="140" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="140" />
- <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="remarkContent" label="备注信息" />
</el-table>
</div>
@@ -1804,17 +1815,19 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;height: 70%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="55" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
<!-- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" /> -->
- <el-table-column show-overflow-tooltip prop="newDeptName" label="现部门" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="现部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="newJobName" label="现岗位" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
- <el-table-column show-overflow-tooltip prop="oldDeptName" label="原部门" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="oldDeptName" label="原部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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="changeDate" label="调岗日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="changeTypeName" label="调岗类型" />
+ <!-- <el-table-column show-overflow-tooltip prop="changeType" label="调岗类型" :formatter="changeTypeFormat" />-->
<el-table-column show-overflow-tooltip prop="changeReason" label="调岗理由描述" width="380" />
</el-table>
</div>
@@ -1908,14 +1921,15 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;height: 70%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="55" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
- <el-table-column show-overflow-tooltip prop="newDeptName" label="(部门)护卫点" width="200" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="newDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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="entryDate" label="入职日期" />
- <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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="备注" width="280" />
@@ -2508,97 +2522,97 @@
this.tableUrl = 'hr/empBaseInfo/zslist'
this.tableDataName = 'basicInformationData'
this.queryParams.delFlag = 0
- this.search()
+ this.resetSearch()
break
case 1:
this.tableUrl = 'hr/empWorkExperience/list'
this.tableDataName = 'workExperienceData'
this.queryParams.delFlag = 0
- this.search()
+ this.resetSearch()
break
case 2:
this.tableUrl = 'hr/empPhysicalExam/list'
this.tableDataName = 'physicalExamData'
this.queryParams.delFlag = 0
- this.search()
+ this.resetSearch()
break
case 3:
this.tableUrl = 'hr/empContractInfo/list'
this.tableDataName = 'contractInfoData'
this.queryParams.delFlag = 0
- this.search()
+ this.resetSearch()
break
case 4:
this.tableUrl = 'hr/empDimissionAttend/list'
this.tableDataName = 'dimissionAttendData'
this.queryParams.delFlag = 0
- this.search()
+ this.resetSearch()
break
case 5:
this.tableUrl = 'hr/empLeaveInfo/list'
this.tableDataName = 'leaveInfoData'
this.queryParams.delFlag = 0
- this.search()
+ this.resetSearch()
break
case 6:
this.tableUrl = 'hr/empResign/list'
this.tableDataName = 'resignData'
this.queryParams.delFlag = 0
- this.search()
+ this.resetSearch()
break
case 7:
this.tableUrl = 'hr/empUnemployment/list'
this.tableDataName = 'unemploymentData'
this.queryParams.delFlag = 0
- this.search()
+ this.resetSearch()
break
case 8:
this.tableUrl = 'hr/empInsurance/list'
this.tableDataName = 'insuranceData'
this.queryParams.delFlag = 0
- this.search()
+ this.resetSearch()
break
case 9:
this.tableUrl = 'hr/empAccidentCases/list'
this.tableDataName = 'accidentCasesData'
this.queryParams.delFlag = 0
- this.search()
+ this.resetSearch()
break
case 10:
this.tableUrl = 'hr/empOccupational/list'
this.tableDataName = 'occupationalData'
this.queryParams.delFlag = 0
- this.search()
+ this.resetSearch()
break
case 11:
this.tableUrl = 'hr/empLaborTrouble/list'
this.tableDataName = 'laborTroubleData'
this.queryParams.delFlag = 0
- this.search()
+ this.resetSearch()
break
case 12:
this.tableUrl = 'hr/empBadRecord/list'
this.tableDataName = 'badRecordData'
this.queryParams.delFlag = 0
- this.search()
+ this.resetSearch()
break
case 13:
this.tableUrl = 'hr/empRemarkInfo/list'
this.tableDataName = 'remarkInfoData'
this.queryParams.delFlag = 0
- this.search()
+ this.resetSearch()
break
case 14:
this.tableUrl = 'hr/empJobChange/list'
this.tableDataName = 'jobChangeData'
this.queryParams.delFlag = 0
- this.search()
+ this.resetSearch()
break
case 15:
this.tableUrl = 'hr/empDimissionlog/list'
this.tableDataName = 'dimissionLogData'
this.queryParams.delFlag = 0
- this.search()
+ this.resetSearch()
break
}
},
--
Gitblit v1.8.0