From 098a17190025f062f49dc8ea22cacfc26d5cc935 Mon Sep 17 00:00:00 2001 From: yangfuda <945208611@qq.com> Date: Thu, 3 Nov 2022 10:36:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E5=86=9C-=E5=AE=8C=E5=96=84=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E6=B5=81=E7=A8=8B=E5=B1=95=E7=A4=BA=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../paymentApproval/approvalProcess.vue | 129 +++++++++--------- .../paymentApproval/approvalProcess2.vue | 129 +++++++++--------- 2 files changed, 132 insertions(+), 126 deletions(-) diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue index 2cbd9778..c290d293 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue @@ -12,74 +12,73 @@
-

- 草稿 +

+ 草稿 -

- 已申请 +

+ 已申请 - 申请人：{{processList.申请人}} - - - 申请时间：{{processList.申请时间}} + {{processList.申请人}} + {{processList.申请时间}} - -

-

-

+ +

+

+

- -

{{item1[0].deptLabel}}

-

{{item1[0].deptLabel}}

-

{{item1[0].deptLabel}}

-
- - -

审批人：{{item2.assigneeName}}

-

审批人：{{item2.assigneeName}}

-

审批人：{{item2.assigneeName}}

- - - - -

审批时间：{{item2.time}}

-

审批时间：{{item2.time}}

-

审批时间：{{item2.time}}

- - -
+ + + +

{{item1.deptLabel}}

+

{{item1.deptLabel}}

+

{{item1.deptLabel}}

+ + +

{{item1.time}}

+

{{item1.time}}

+

{{item1.time}}

+ + + + +

{{item1.assigneeName}}

+

{{item1.assigneeName}}

+

{{item1.assigneeName}}

+ + +

{{item1.comment}}

+

{{item1.comment}}

+

{{item1.comment}}

+ + - - +

审批流程

 + +

- -

组级审批

-

村级审批

-

镇级审批

-
- - -

审批人：{{item2.nickName}}

-

审批角色：{{item2.roleName}}

- - - - -

审批顺序：{{item2.approvalOrder}}级审批

- - - - -

审批节点：{{item2.name}}

- - -
+ + + +

{{item1.name}}

+ + +

组级审批

+

村级审批

+

镇级审批

+

区县审批

+ + + + +

{{item1.nickName}}({{item1.feeLimit}}元)

+ +
@@ -122,14 +121,18 @@ export default { getTransfer(id).then((response) => { this.form = response.data; this.processList = {} - if(this.form.auditStatus == 0){ - selectApprovalByTemplateId(this.form.approvalTemplateId).then(rs => { - this.approvalTemplateDeptList = rs.approvalDepts; - this.approvalTemplateDetailList = rs.approvalDetails; - }) - }else{ + if(this.form.auditStatus != 0){ this.getTransferProcess(this.$route.query.id); } + selectApprovalByTemplateId(this.form.approvalTemplateId).then(rs => { + this.approvalTemplateDeptList = rs.approvalDepts; + this.approvalTemplateDetailList = rs.approvalDetails; + if(this.form.approveLevel === "1"){ + this.approvalTemplateDetailList.push({"approvalLevel":"3"}); + }else if(this.form.approveLevel === "2"){ + this.approvalTemplateDetailList.push({"approvalLevel":"4"}); + } + }) if(this.form.capitalExpenditureType==2){ this.capitalExpenditureOpen = true let param={ @@ -199,7 +202,7 @@ export default { color: rgb(245, 108, 108)!important; } .van-col{ - padding: 20Px 10Px; + padding: 10Px 10Px; } .van-col:nth-child(2){ font-size: 16Px; diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue index b0f57d56..d646b30e 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue @@ -12,74 +12,73 @@
-

- 草稿 +

+ 草稿 -

- 已申请 +

+ 已申请 - 申请人：{{processList.申请人}} - - - 申请时间：{{processList.申请时间}} + {{processList.申请人}} + {{processList.申请时间}} - -

-

-

+ +

+

+

- -

{{item1[0].deptLabel}}

-

{{item1[0].deptLabel}}

-

{{item1[0].deptLabel}}

-
- - -

审批人：{{item2.assigneeName}}

-

审批人：{{item2.assigneeName}}

-

审批人：{{item2.assigneeName}}

- - - - -

审批时间：{{item2.time}}

-

审批时间：{{item2.time}}

-

审批时间：{{item2.time}}

- - -
+ + + +

{{item1.deptLabel}}

+

{{item1.deptLabel}}

+

{{item1.deptLabel}}

+ + +

{{item1.time}}

+

{{item1.time}}

+

{{item1.time}}

+ + + + +

{{item1.assigneeName}}

+

{{item1.assigneeName}}

+

{{item1.assigneeName}}

+ + +

{{item1.comment}}

+

{{item1.comment}}

+

{{item1.comment}}

+ + - - +

审批流程

 + +

- -

组级审批

-

村级审批

-

镇级审批

-
- - -

审批人：{{item2.nickName}}

-

审批角色：{{item2.roleName}}

- - - - -

审批顺序：{{item2.approvalOrder}}级审批

- - - - -

审批节点：{{item2.name}}

- - -
+ + + +

{{item1.name}}

+ + +

组级审批

+

村级审批

+

镇级审批

+

区县审批

+ + + + +

{{item1.nickName}}({{item1.feeLimit}}元)

+ +
@@ -127,14 +126,18 @@ export default { getCash(id).then((response) => { this.form = response.data; this.processList = {} - if(this.form.auditStatus == 0){ - selectApprovalByTemplateId(this.form.approvalTemplateId).then(rs => { - this.approvalTemplateDeptList = rs.approvalDepts; - this.approvalTemplateDetailList = rs.approvalDetails; - }) - }else{ + if(this.form.auditStatus != 0){ this.getTransferProcess1(this.$route.query.id); } + selectApprovalByTemplateId(this.form.approvalTemplateId).then(rs => { + this.approvalTemplateDeptList = rs.approvalDepts; + this.approvalTemplateDetailList = rs.approvalDetails; + if(this.form.approveLevel === "1"){ + this.approvalTemplateDetailList.push({"approvalLevel":"3"}); + }else if(this.form.approveLevel === "2"){ + this.approvalTemplateDetailList.push({"approvalLevel":"4"}); + } + }) if(this.form.capitalExpenditureType==2){ this.capitalExpenditureOpen = true let param={ @@ -204,7 +207,7 @@ export default { color: rgb(245, 108, 108)!important; } .van-col{ - padding: 20Px 10Px; + padding: 10Px 10Px; } .van-col:nth-child(2){ font-size: 16Px;