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 @@ - + - + - + - + - + - + - + - + @@ -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 @@