From 9a7487a2f639728286528fd8afcaf8148b97cd7d Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Sat, 11 Oct 2025 18:03:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E6=9D=83=E9=99=90=E5=AD=97=E7=AC=A6=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/synthesize-query/person-count.js | 2 +- src/api/synthesize-query/three-and-one.js | 9 +++++++++ .../card-replacement-apply/index.vue | 8 ++++---- .../card-replacement-audit/index.vue | 4 ++-- .../synthesize-query/person-count/config.js | 16 ++++++++-------- .../synthesize-query/person-count/index.vue | 1 - .../detail/components/three-one-table.vue | 18 +++++++++++++++++- 7 files changed, 41 insertions(+), 17 deletions(-) diff --git a/src/api/synthesize-query/person-count.js b/src/api/synthesize-query/person-count.js index 06bea2a..c1044e6 100644 --- a/src/api/synthesize-query/person-count.js +++ b/src/api/synthesize-query/person-count.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 综合查询 获取人员统计列表 export const getPersonCountListAPI = (data) => { return request({ - url: '/bmw/workerLight/xxx', + url: '/bmw/workerStatistics/getWorkerStatisticsTable', method: 'GET', params: data, }) diff --git a/src/api/synthesize-query/three-and-one.js b/src/api/synthesize-query/three-and-one.js index 59f5d67..cc36533 100644 --- a/src/api/synthesize-query/three-and-one.js +++ b/src/api/synthesize-query/three-and-one.js @@ -99,3 +99,12 @@ export const saveThreeAndOneMonthlyWagePaymentAPI = (data) => { data, }) } + +// 综合查询 三表一册 农名工工资支付表 更新操作 +export const updateThreeAndOneMonthlyWagePaymentAPI = (data) => { + return request({ + url: '/bmw/pmProject/updateSalary', + method: 'POST', + data, + }) +} diff --git a/src/views/construction-person/attendance-manage/card-replacement-apply/index.vue b/src/views/construction-person/attendance-manage/card-replacement-apply/index.vue index 4a74ac0..c9115fa 100644 --- a/src/views/construction-person/attendance-manage/card-replacement-apply/index.vue +++ b/src/views/construction-person/attendance-manage/card-replacement-apply/index.vue @@ -25,7 +25,7 @@ size="mini" type="primary" icon="el-icon-plus" - v-hasPermi="['attendance:machine:add']" + v-hasPermi="['card:replacement:add']" @click="onHandleAddCardReplacementApply(1, null)" > 新增 @@ -39,7 +39,7 @@ type="primary" icon="el-icon-edit" v-if="data.checkStatus === 2" - v-hasPermi="['attendance:machine:unbind']" + v-hasPermi="['card:replacement:edit']" @click="onHandleEditCardReplacementApply(data)" > 修改 @@ -50,7 +50,7 @@ type="primary" icon="el-icon-view" v-if="data.checkStatus != 2" - v-hasPermi="['attendance:machine:delete']" + v-hasPermi="['card:replacement:details']" @click="onHandleAuditAndDetail(data)" > 详情 @@ -60,7 +60,7 @@ type="danger" icon="el-icon-delete" v-if="data.checkStatus === 2" - v-hasPermi="['attendance:machine:delete']" + v-hasPermi="['card:replacement:delete']" @click="onHandleDeleteCardReplacementApply(data)" > 删除 diff --git a/src/views/construction-person/attendance-manage/card-replacement-audit/index.vue b/src/views/construction-person/attendance-manage/card-replacement-audit/index.vue index ee6da9b..70a3d0e 100644 --- a/src/views/construction-person/attendance-manage/card-replacement-audit/index.vue +++ b/src/views/construction-person/attendance-manage/card-replacement-audit/index.vue @@ -28,7 +28,7 @@ type="warning" icon="el-icon-check" v-if="data.checkStatus === 0" - v-hasPermi="['attendance:machine:unbind']" + v-hasPermi="['card:replacement:audit']" @click="onHandleAuditAndDetail(data, 1, '补卡审核')" > 待审核 @@ -38,7 +38,7 @@ type="primary" icon="el-icon-view" @click="onHandleAuditAndDetail(data, 2, '补卡详情')" - v-hasPermi="['attendance:machine:delete']" + v-hasPermi="['card:replacement:details']" > 详情 diff --git a/src/views/synthesize-query/person-count/config.js b/src/views/synthesize-query/person-count/config.js index 13b4323..0f64e02 100644 --- a/src/views/synthesize-query/person-count/config.js +++ b/src/views/synthesize-query/person-count/config.js @@ -3,20 +3,20 @@ export const formLabel = [ isShow: false, // 是否展示label f_type: 'ipt', f_label: '姓名', - f_model: 'proName', + f_model: 'workerName', }, ] export const columnsList = [ - { t_props: 'mainProName', t_label: '姓名' }, - { t_label: '身份证', t_props: 'volLevel' }, + { t_props: 'workerName', t_label: '姓名' }, + { t_label: '身份证', t_props: 'idNumber' }, { t_label: '联系方式', - t_props: 'volLevel', + t_props: 'phone', }, - { t_slot: 'proStatus', t_label: '工种' }, - { t_slot: 'proStatus', t_label: '累计入场工程数量' }, - { t_slot: 'proStatus', t_label: '累计入场分包数量' }, - { t_slot: 'proStatus', t_label: '累计入场班组数量' }, + { t_props: 'postName', t_label: '工种' }, + { t_props: 'proNum', t_label: '累计入场工程数量' }, + { t_props: 'subNum', t_label: '累计入场分包数量' }, + { t_props: 'teamNum', t_label: '累计入场班组数量' }, ] diff --git a/src/views/synthesize-query/person-count/index.vue b/src/views/synthesize-query/person-count/index.vue index 9d78c18..9076f8b 100644 --- a/src/views/synthesize-query/person-count/index.vue +++ b/src/views/synthesize-query/person-count/index.vue @@ -7,7 +7,6 @@ :showRightTools="true" ref="personCountTableRef" :columnsList="columnsList" - :testTableList="testTableList" :request-api="getPersonCountListAPI" > - +