From 99563684fb0432f5d755b9b99aaf95fa32634b96 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 03 三月 2024 19:28:43 +0800
Subject: [PATCH] 入离职记录增加部门护卫点信息： - 信息录入：写入入职的部门信息 - 在职员工：关闭档案时写入离职时的部门信息 - 离职员工：打开档案时写入打开时的部门信息 - 档案导出：在职员工和离职员工模板导出档案时的入离职记录的部门信息导出 上传左边的标签面是动态生成，调整数据库中标签数据，使生成的标签和更改的要求一致
---
.env.development | 2 +-
src/views/user/archivesChange.vue | 1 +
src/views/user/inemployees.vue | 5 ++++-
src/views/user/archivesEdit.vue | 1 +
src/views/user/outemployess.vue | 4 +++-
5 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/.env.development b/.env.development
index d3bbf98..616f8d1 100644
--- a/.env.development
+++ b/.env.development
@@ -2,7 +2,7 @@
ENV = 'development'
# base api
-VUE_APP_BASE_API = ''
+VUE_APP_BASE_API = 'http://127.0.0.1:8301/'
# vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
# to control whether the babel-plugin-dynamic-import-node plugin is enabled.
diff --git a/src/views/user/archivesChange.vue b/src/views/user/archivesChange.vue
index 9588d3f..8320fa9 100644
--- a/src/views/user/archivesChange.vue
+++ b/src/views/user/archivesChange.vue
@@ -809,6 +809,7 @@
<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" />
diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index 9afa760..3edbdcb 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -887,6 +887,7 @@
<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" />
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index 713f799..5b856b2 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -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
}
diff --git a/src/views/user/outemployess.vue b/src/views/user/outemployess.vue
index 1a5cf5b..b08233c 100644
--- a/src/views/user/outemployess.vue
+++ b/src/views/user/outemployess.vue
@@ -1518,6 +1518,7 @@
var id = selection[0].empId
var name = selection[0].empName
var number = selection[0].certificateNumb
+ var deptName = selection[0].allDeptName
const nowDate = new Date()
const year = nowDate.getFullYear()
const month = nowDate.getMonth() + 1
@@ -1528,7 +1529,8 @@
certificateNumb: number,
openType: 21,
openDate: year + '-' + month + '-' + day,
- remark: ''
+ remark: '',
+ allDeptName: deptName
}
this.dialogShowDkda = true
} else {
--
Gitblit v1.8.0