From 2035f0f6bcfe739c509dfb5cbd7b84b4dcd1bfe1 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 23 二月 2021 02:21:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/inemployees.vue | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index 682c56b..5eb7345 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -172,9 +172,9 @@
</el-button>
</template>
</el-table-column>
- <el-table-column prop="empNumb" label="员工编号" width="100" />
<el-table-column prop="deptName" label="护卫点" width="100" />
<el-table-column prop="jobName" label="岗位" width="100" />
+ <el-table-column prop="empNumb" label="员工编号" width="100" />
<el-table-column prop="empName" label="姓名" width="100" />
<el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="sexName" label="性别" width="50" />
@@ -1934,17 +1934,23 @@
type: 'error'
})
} else {
- var empIds = []
- for (var i = 0; i < selection.length; i++) {
- var data = selection[i]
- empIds.push(data.empId)
- }
- this.$delete(`hr/empBaseInfo/` + empIds.join(',')).then(() => {
- this.$message({
- message: this.$t('tips.deleteSuccess'),
- type: 'success'
+ this.$confirm('您确认删除该员工么？', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ var empIds = []
+ for (var i = 0; i < selection.length; i++) {
+ var data = selection[i]
+ empIds.push(data.empId)
+ }
+ this.$delete(`hr/empBaseInfo/` + empIds.join(',')).then(() => {
+ this.$message({
+ message: this.$t('tips.deleteSuccess'),
+ type: 'success'
+ })
+ this.search()
})
- this.search()
})
}
},
--
Gitblit v1.8.0