From 99563684fb0432f5d755b9b99aaf95fa32634b96 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 03 三月 2024 19:28:43 +0800
Subject: [PATCH] 入离职记录增加部门护卫点信息： - 信息录入：写入入职的部门信息 - 在职员工：关闭档案时写入离职时的部门信息 - 离职员工：打开档案时写入打开时的部门信息 - 档案导出：在职员工和离职员工模板导出档案时的入离职记录的部门信息导出 上传左边的标签面是动态生成，调整数据库中标签数据，使生成的标签和更改的要求一致
---
src/views/user/inemployees.vue | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index 2581289..5b856b2 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -417,10 +417,10 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="家庭成员及关系" prop="family">
+ <el-form-item label="家庭成员及关系1" prop="family">
<el-input v-model="empBaseInfoForm.family" />
</el-form-item>
- <el-form-item label="紧急联系电话" prop="urgencyPhone">
+ <el-form-item label="家庭成员及关系2" prop="urgencyPhone">
<el-input v-model="empBaseInfoForm.urgencyPhone" />
</el-form-item>
</el-col>
@@ -819,7 +819,7 @@
</td>
</tr>
<tr>
- <td>家庭成员及关系</td>
+ <td>家庭成员及关系1</td>
<td>
<el-checkbox label="family"><span /></el-checkbox>
</td>
@@ -865,7 +865,7 @@
<td>
<el-checkbox label="certificateListName"><span /></el-checkbox>
</td>
- <td>紧急联系电话</td>
+ <td>家庭成员及关系2</td>
<td>
<el-checkbox label="urgencyPhone"><span /></el-checkbox>
</td>
@@ -925,8 +925,8 @@
<el-col span="24">
<el-form-item label="打开类型" prop="region">
<el-radio-group v-model="openArchivesForm.openType">
- <el-radio :label="20">重新入职</el-radio>
- <el-radio :label="21">返聘</el-radio>
+ <el-radio :label="21">重新入职</el-radio>
+ <el-radio :label="22">返聘</el-radio>
</el-radio-group>
（主要对已退休员工返聘）
</el-form-item>
@@ -1919,12 +1919,14 @@
var names = []
var dates = []
var numbers = []
+ var deptNames = []
for (var i = 0; i < selection.length; i++) {
var data = selection[i]
ids.push(data.empId)
names.push(data.empName)
dates.push(data.entryDate)
numbers.push(data.certificateNumb)
+ deptNames.push(data.allDeptName)
}
const nowDate = new Date()
const year = nowDate.getFullYear()
@@ -1938,7 +1940,8 @@
dimissionDate: year + '-' + month + '-' + day,
remark: '',
afterOperation: ['1'],
- certificateNumb: numbers.join(',')
+ certificateNumb: numbers.join(','),
+ deptNames: deptNames.join(',')
}
this.dialogShowGbda = true
}
@@ -2134,7 +2137,7 @@
empId: r.data.data.empId,
empName: r.data.data.empName,
certificateNumb: r.data.data.certificateNumb,
- openType: 20,
+ openType: 21,
openDate: this.getDateString(),
remark: ''
}
--
Gitblit v1.8.0