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/inemployees.vue | 123 +++++++++++++++++++++++++++++++++++++---
1 files changed, 113 insertions(+), 10 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>
--
Gitblit v1.8.0