admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev

Browse Source
This commit is contained in:
kun 2024-05-13 21:23:38 +08:00
commit 78064d6392
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/js/api/laborPerson.js
View File

@ -163,6 +163,8 @@ export const rejectWorkerInfoApi = data => post('xmgl/workerInfoAuditRecord/reje
export const selectWorkerInfoAuditListApi = data => post('xmgl/workerInfoAuditRecord/selectWorkerInfoAuditList', data); export const selectWorkerInfoAuditListApi = data => post('xmgl/workerInfoAuditRecord/selectWorkerInfoAuditList', data);
export const selectWorkerInfoAuditListSupplierApi = data => post('xmgl/xzWorkerInfoAuditRecord/selectWorkerInfoAuditList', data); export const selectWorkerInfoAuditListSupplierApi = data => post('xmgl/xzWorkerInfoAuditRecord/selectWorkerInfoAuditList', data);
export const deleteWorkerInfoAuditApi = data => post('xmgl/workerInfoAuditRecord/delete', data); export const deleteWorkerInfoAuditApi = data => post('xmgl/workerInfoAuditRecord/delete', data);
//鞍钢人员登记培训删除按钮
export const deleteAgWorkerInfoAuditApi = data => post('xmgl/xzWorkerInfoAuditRecord/delete', data);
//lED大屏 //lED大屏

15
src/views/projectFront/laborManage/personAuditAg.vue
View File

@ -192,10 +192,10 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column prop="sex" label="" align="center"> <el-table-column prop="sex" label="" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="flex" style="width: 40%; margin: auto"> <div class="flex" style="width: 40%; margin: auto">
<div class="flex" style="cursor: pointer;" @click="editStaffInfo(scope.row)"> <!-- <div class="flex" style="cursor: pointer;" @click="editStaffInfo(scope.row)">
<img src="@/assets/images/icon-edit.png" style="margin-right:8px" /> <img src="@/assets/images/icon-edit.png" style="margin-right:8px" />
<span>{{$t('message.laborMange.edit')}}</span> <span>{{$t('message.laborMange.edit')}}</span>
</div> </div>
@ -212,8 +212,9 @@
@click="auditFn(scope.row.id, 2)" @click="auditFn(scope.row.id, 2)"
> >
<el-button type="primary" size="medium">{{ $t("message.laborMange.pass") }}</el-button> <el-button type="primary" size="medium">{{ $t("message.laborMange.pass") }}</el-button>
</div> </div> -->
<div class="flex" style="cursor: pointer;" @click="deteleStaffInfo(scope.row)"> <div class="flex" style="cursor: pointer;" @click="deteleStaffInfo(scope.row)"
v-permission="{key: 'rydjpx_delete', menuPath: '/project/labor/personAuditAg'}">
<img <img
src="@/assets/images/icon-delete.png" src="@/assets/images/icon-delete.png"
style="margin-right:8px;margin-top:-2px" style="margin-right:8px;margin-top:-2px"
@ -222,7 +223,7 @@
</div> </div>
</div> </div>
</template> </template>
</el-table-column> --> </el-table-column>
</el-table> </el-table>
</vue-scroll> </vue-scroll>
<!-- <el-pagination <!-- <el-pagination
@ -680,6 +681,7 @@ import {
adoptWorkerInfoApi, adoptWorkerInfoApi,
rejectWorkerInfoApi, rejectWorkerInfoApi,
deleteWorkerInfoAuditApi, deleteWorkerInfoAuditApi,
deleteAgWorkerInfoAuditApi,
selectWorkerInfoAuditListSupplierApi, selectWorkerInfoAuditListSupplierApi,
ufaceDevList, ufaceDevList,
getEnterpriseInfoList, getEnterpriseInfoList,
@ -1033,7 +1035,8 @@ export default {
let data = { let data = {
id: value.id, id: value.id,
}; };
deleteWorkerInfoAuditApi(data).then((res) => { // deleteWorkerInfoAuditApi(data).then((res) => {
deleteAgWorkerInfoAuditApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
type: "success", type: "success",