From d4c9beff5ed90d5bbce5740c968dbcb3cce73ac0 Mon Sep 17 00:00:00 2001 From: zhouzy062 Date: Mon, 26 Feb 2024 18:43:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=AE=A1=E6=89=B9=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/api/cost/cost.js | 11 +- sgzb-ui/src/views/base/comeAndGo/index.vue | 2 +- sgzb-ui/src/views/base/comeAndGo/people.vue | 6 +- sgzb-ui/src/views/base/project/index.vue | 2 +- sgzb-ui/src/views/base/section/index.vue | 4 +- .../claimAndRefund/receive/agreement.vue | 10 +- .../claimAndRefund/receive/receiveApply.vue | 4 +- .../receive/receiveApplyAdd.vue | 4 +- .../claimAndRefund/receive/receiveExamine.vue | 80 ++++++------ .../claimAndRefund/receive/receiveManage.vue | 19 ++- .../receive/receiveManageAdd.vue | 6 +- .../claimAndRefund/return/returnApply.vue | 6 +- .../claimAndRefund/return/returnApplyAdd.vue | 4 +- .../claimAndRefund/return/returnExamine.vue | 6 +- .../cost/csotSettlement/costApplyAdd.vue | 2 + .../cost/csotSettlement/costApplyList.vue | 8 +- .../views/cost/csotSettlement/costList.vue | 6 +- sgzb-ui/src/views/index.vue | 2 +- sgzb-ui/src/views/monitor/job/index.vue | 6 +- sgzb-ui/src/views/monitor/job/log.vue | 4 +- .../views/repairTest/brokenExamine/index.vue | 6 +- .../views/repairTest/repair/dialogOneForm.vue | 4 +- .../views/repairTest/repair/dialogTwoForm.vue | 13 +- sgzb-ui/src/views/repairTest/repair/index.vue | 6 +- .../views/repairTest/testExamine/index.vue | 6 +- .../src/views/store/label/labelBinding.vue | 10 +- .../views/store/label/labelBindingHistory.vue | 2 +- .../newAccessory/newAccessoryAccept.vue | 6 +- .../newBuy/newDevices/newDevicesArrival.vue | 6 +- .../newDevices/newDevicesWarehousing.vue | 117 +----------------- .../store/newBuy/newTools/newToolsArrival.vue | 6 +- .../newBuy/newTools/newToolsWarehousing.vue | 64 ---------- .../src/views/store/shelves/shelvesConfig.vue | 4 +- sgzb-ui/src/views/store/tools/keeper.vue | 4 +- sgzb-ui/src/views/store/tools/toolsType.vue | 8 +- .../warehousing/accessoryWarehousing.vue | 2 +- .../store/warehousing/devicesWarehousing.vue | 6 +- .../store/warehousing/repairWarehousing.vue | 2 +- sgzb-ui/src/views/system/config/index.vue | 2 +- sgzb-ui/src/views/system/dept/index.vue | 2 +- sgzb-ui/src/views/system/dict/index.vue | 2 +- sgzb-ui/src/views/system/logininfor/index.vue | 2 +- sgzb-ui/src/views/system/notice/index.vue | 4 +- sgzb-ui/src/views/system/operlog/index.vue | 4 +- sgzb-ui/src/views/system/post/index.vue | 2 +- sgzb-ui/src/views/system/user/index.vue | 8 +- 46 files changed, 169 insertions(+), 321 deletions(-) diff --git a/sgzb-ui/src/api/cost/cost.js b/sgzb-ui/src/api/cost/cost.js index 5c818162..d093128c 100644 --- a/sgzb-ui/src/api/cost/cost.js +++ b/sgzb-ui/src/api/cost/cost.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询费用结算列表 +// 查询费用结算申请列表 export function getSltAgreementInfo(query) { return request({ url: '/material/sltAgreementInfo/getSltAgreementInfo', @@ -10,7 +10,14 @@ export function getSltAgreementInfo(query) { } - +// 查询费用结算申请详情 +export function getSltInfo(query) { + return request({ + url: '/material/sltAgreementInfo/getSltInfo', + method: 'get', + params: query + }) +} diff --git a/sgzb-ui/src/views/base/comeAndGo/index.vue b/sgzb-ui/src/views/base/comeAndGo/index.vue index 716f85c5..892556ce 100644 --- a/sgzb-ui/src/views/base/comeAndGo/index.vue +++ b/sgzb-ui/src/views/base/comeAndGo/index.vue @@ -165,7 +165,7 @@ - + - + @@ -169,7 +169,7 @@ - + - + - + - + - + - + - + - +
- 取 消 - 确 定 + 取 消 + 确 定 + 确 定5 + 确 定7 + 确 定1 + 确 定3 +
- 取 消 - 确 定 + 取 消 + 确 定 + 确 定5 + 确 定7 + 确 定1 + 确 定3 +
@@ -256,34 +266,26 @@ export default { this.examineVisible = true this.queryParams.companyAuditRemarks = '同意' }, - handelExamine(type){ - if(type){ - this.subAuditLeaseByCompany() - }else { - this.queryParams.companyAuditRemarks = '' - } - this.examineVisible = type - }, + // handelExamine(type){ + // if(type){ + // this.subAuditLeaseByCompany() + // }else { + // this.queryParams.companyAuditRemarks = '' + // } + // this.examineVisible = type + // }, //审核 同意 - async subAuditLeaseByCompany(){ + async subAuditLeaseByCompany(type){ + console.log(type) const params = JSON.parse(JSON.stringify(this.queryParams)) - // if(params.taskStatus<32){ - // params.taskStatus = params.taskStatus+1 - // } params.taskStatus = params.taskStatus+1 + params.leaseApplyInfoList.forEach(v => { + console.log(v) this.$set(v,'companyAuditRemark',params.companyAuditRemarks) this.$set(v,'companyAuditBy',this.user.id) - this.$set(v,'examineStatusId',params.examineStatusId) - if(params.examineStatusId=='32'){ - if(v.companyId==101){ - this.$set(v,'status',1) - } - if(v.companyId==102){ - this.$set(v,'status',3) - } - } - + this.$set(v,'examineStatusId',Number(params.examineStatusId)) + this.$set(v,'status',type) }) params.updateTime = params.updateTimes params.createTime = params.createTimes @@ -301,20 +303,20 @@ export default { this.refuseVisible = true this.queryParams.companyAuditRemarks = '驳回' }, - handelRefuse(type){ - if (this.queryParams.companyAuditRemarks=='') { - this.$message.error('驳回时审核意见不能为空！'); - return; - } - if(type){ - this.refuseAuditLeaseByCompany() - }else { - this.queryParams.companyAuditRemarks = '' - } - this.refuseVisible = type - }, + // handelRefuse(type){ + // if (this.queryParams.companyAuditRemarks=='') { + // this.$message.error('驳回时审核意见不能为空！'); + // return; + // } + // if(type){ + // this.refuseAuditLeaseByCompany() + // }else { + // this.queryParams.companyAuditRemarks = '' + // } + // this.refuseVisible = type + // }, //审核 驳回 - async refuseAuditLeaseByCompany(){ + async refuseAuditLeaseByCompany(type){ const params = JSON.parse(JSON.stringify(this.queryParams)) if(params.taskStatus==30){ params.taskStatus=98; diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue index e662c3e6..98c5bb6d 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManage.vue @@ -12,7 +12,7 @@ - + - + 审批 + >施管审批 安监审批 + 机具审批 调试审批 @@ -394,7 +401,7 @@ export default { // this.open = true; // this.title = "添加字典类型"; }, - handleExamine(row) { + handleExamine(row,type) { this.$tab.closeOpenPage({ path:"/claimAndRefund/receive/receiveExamine", query: { diff --git a/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue b/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue index 33b724c8..e0ec186f 100644 --- a/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue +++ b/sgzb-ui/src/views/claimAndRefund/receive/receiveManageAdd.vue @@ -15,7 +15,7 @@ - + diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue index a6ce4849..d6139dbc 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue +++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue @@ -12,7 +12,7 @@ diff --git a/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue b/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue index 890cb33b..388fdc47 100644 --- a/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue +++ b/sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue @@ -127,6 +127,8 @@