From 8c5b3d6d414674e2deff34b8f55c0a74cae1e4bb Mon Sep 17 00:00:00 2001
From: yangfuda <945208611@qq.com>
Date: Sat, 3 Aug 2024 17:01:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E5=86=9C=EF=BC=9A=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=9F=A5=E7=9C=8B=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../paymentApproval/approvalProcess.vue       | 97 +++++++------------
 .../paymentApproval/approvalProcess.vue       | 91 +++++++----------
 2 files changed, 73 insertions(+), 115 deletions(-)

diff --git a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalProcess.vue b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalProcess.vue
index 012f7344..f2324453 100644
--- a/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalProcess.vue
+++ b/src/views/sunVillage_info/bankAgriculture/paymentApproval/approvalProcess.vue
@@ -11,52 +11,41 @@
         </template>
       </van-nav-bar>
       <div class="main_box">
-        <van-divider content-position="center"><h4>批次号：{{this.$route.query.auditbatchNo}}</h4></van-divider>
-        <van-row v-if="form.auditStatus== '0'">
-          <van-col span="4" align="right"><p class="icon_jian blue"><van-icon name="success" size="14" /></p></van-col>
-          <van-col span="20" class="textBlue">草稿</van-col>
-        </van-row>
-        <van-row v-if="form.auditStatus != '0'">
-          <van-col span="4" align="right"><p class="icon_jian blue"><van-icon name="success" size="14" /></p></van-col>
-          <van-col span="20" class="textBlue">已申请
-            <van-row>
-              <van-col span="12" style="padding: 0;" class="textBlue" v-show="processList.auditStatus!='0'">{{form.applyUserName}}</van-col>
-              <van-col span="12" style="padding: 0;" class="textBlue" v-show="processList.auditStatus!='0'">{{form.applyDate}}</van-col>
-            </van-row>
-          </van-col>
-        </van-row>
-        <van-row  v-for="(item1,index,i) in processList" :key="i">
-          <van-col span="4" align="right">
-            <p class="icon_jian" v-show="item1.auditStatus=='1'"><van-icon name="minus" size="14" /></p>
-            <p class="icon_jian blue" v-show="item1.auditStatus=='3'"><van-icon name="success" size="14" /></p>
-            <p class="icon_jian red" v-show="item1.auditStatus=='2'"><van-icon name="cross" size="14" /></p>
-          </van-col>
-          <van-col span="20">
-            <van-row>
-              <van-col span="12" style="padding: 0;">
-                <p v-show="item1.auditStatus == '1'">{{item1.nodeName}}</p>
-                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.nodeName}}</p>
-                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.nodeName}}</p>
-              </van-col>
-              <van-col span="12" style="padding: 0;" >
-                <p v-show="item1.auditStatus == '1'">{{item1.auditTime}}</p>
-                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditTime}}</p>
-                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditTime}}</p>
-              </van-col>
-            </van-row>
-            <van-row>
-              <van-col span="12" style="padding: 0;" >
-                <p v-show="item1.auditStatus == '1'">{{item1.auditBy}}</p>
-                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditBy}}</p>
-                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditBy}}</p>
-              </van-col>
-              <van-col span="12" style="padding: 0;">
-                <p v-show="item1.auditStatus == '1'">{{item1.auditRemark}}</p>
-                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditRemark}}</p>
-                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditRemark}}</p>
-              </van-col>
-            </van-row>
-          </van-col>
+        <van-row   v-for="(item,index) in processList" :key="index">
+          <van-divider content-position="center"><h4>批次号：{{index}}</h4></van-divider>
+          <van-row  v-for="(item1,index,i) in item" :key="i">
+            <van-col span="4" align="right">
+              <p class="icon_jian" v-show="item1.auditStatus=='1'"><van-icon name="minus" size="14" /></p>
+              <p class="icon_jian blue" v-show="item1.auditStatus=='3'"><van-icon name="success" size="14" /></p>
+              <p class="icon_jian red" v-show="item1.auditStatus=='2'"><van-icon name="cross" size="14" /></p>
+            </van-col>
+            <van-col span="20">
+              <van-row>
+                <van-col span="12" style="padding: 0;">
+                  <p v-show="item1.auditStatus == '1'">{{item1.actorName}}</p>
+                  <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.actorName}}</p>
+                  <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.actorName}}</p>
+                </van-col>
+                <van-col span="12" style="padding: 0;" >
+                  <p v-show="item1.auditStatus == '1'">{{item1.auditTime}}</p>
+                  <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditTime}}</p>
+                  <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditTime}}</p>
+                </van-col>
+              </van-row>
+              <van-row>
+                <van-col span="12" style="padding: 0;" >
+                  <p v-show="item1.auditStatus == '1'">{{item1.auditBy}}</p>
+                  <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditBy}}</p>
+                  <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditBy}}</p>
+                </van-col>
+                <van-col span="12" style="padding: 0;">
+                  <p v-show="item1.auditStatus == '1'">{{item1.auditRemark}}</p>
+                  <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditRemark}}</p>
+                  <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditRemark}}</p>
+                </van-col>
+              </van-row>
+            </van-col>
+          </van-row>
         </van-row>
         <van-divider content-position="center" v-if="approvalTemplateDetailList.length>0"><h4>审批流程</h4></van-divider>
         <van-row v-if="approvalTemplateDetailList.length>0" v-for="(item1,index,i) in approvalTemplateDetailList" :key="i">
@@ -111,12 +100,8 @@ export default {
     //查询审批进程
     getTransferProcess(id){
       getTransferProcess(id).then(res => {
-        this.processList = res.data[auditbatchNo]
-        // console.info( this.processList);
-        // this.processList.乡镇审批时间 = this.processList.乡镇审批时间?this.format(this.processList.乡镇审批时间, "yyyy-MM-dd HH:mm:ss"):""
-        // this.processList.区县审批时间 = this.processList.区县审批时间?this.format(this.processList.区县审批时间, "yyyy-MM-dd HH:mm:ss"):""
-        // this.processList.支付状态时间 = this.processList.支付状态时间?this.format(this.processList.支付状态时间, "yyyy-MM-dd HH:mm:ss"):""
-        // this.processList.入账状态时间 = this.processList.入账状态时间?this.format(this.processList.入账状态时间, "yyyy-MM-dd HH:mm:ss"):""
+        this.processList = res.data
+        console.info( this.processList);
       })
     },
     handleUpdate(id) {
@@ -214,12 +199,4 @@ export default {
     color: #878787;
     line-height: 22Px;
   }
-  .van-row{
-    .van-row{
-      .van-col{
-        padding: 5Px 0 0 0!important;
-        color: #878787;
-      }
-    }
-  }
 </style>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue
index 82906b32..e6821d4c 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue
@@ -11,52 +11,41 @@
         </template>
       </van-nav-bar>
       <div class="main_box">
-        <van-divider content-position="center" v-if="this.$route.query.auditbatchNo != 'null'"><h4>批次号：{{this.$route.query.auditbatchNo}}</h4></van-divider>
-        <van-row v-if="form.auditStatus== '0'">
-          <van-col span="4" align="right"><p class="icon_jian blue"><van-icon name="success" size="14" /></p></van-col>
-          <van-col span="20" class="textBlue">草稿</van-col>
-        </van-row>
-        <van-row v-if="form.auditStatus != '0'">
-          <van-col span="4" align="right"><p class="icon_jian blue"><van-icon name="success" size="14" /></p></van-col>
-          <van-col span="20" class="textBlue">已申请
-            <van-row>
-              <van-col span="12" style="padding: 0;" class="textBlue" v-show="processList.auditStatus!='0'">{{form.applyUserName}}</van-col>
-              <van-col span="12" style="padding: 0;" class="textBlue" v-show="processList.auditStatus!='0'">{{form.applyDate}}</van-col>
-            </van-row>
-          </van-col>
-        </van-row>
-        <van-row  v-for="(item1,index,i) in processList" :key="i">
-          <van-col span="4" align="right">
-            <p class="icon_jian" v-show="item1.auditStatus=='1'"><van-icon name="minus" size="14" /></p>
-            <p class="icon_jian blue" v-show="item1.auditStatus=='3'"><van-icon name="success" size="14" /></p>
-            <p class="icon_jian red" v-show="item1.auditStatus=='2'"><van-icon name="cross" size="14" /></p>
-          </van-col>
-          <van-col span="20">
-            <van-row>
-              <van-col span="12" style="padding: 0;">
-                <p v-show="item1.auditStatus == '1'">{{item1.nodeName}}</p>
-                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.nodeName}}</p>
-                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.nodeName}}</p>
-              </van-col>
-              <van-col span="12" style="padding: 0;" >
-                <p v-show="item1.auditStatus == '1'">{{item1.auditTime}}</p>
-                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditTime}}</p>
-                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditTime}}</p>
-              </van-col>
-            </van-row>
-            <van-row>
-              <van-col span="12" style="padding: 0;" >
-                <p v-show="item1.auditStatus == '1'">{{item1.auditBy}}</p>
-                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditBy}}</p>
-                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditBy}}</p>
-              </van-col>
-              <van-col span="12" style="padding: 0;">
-                <p v-show="item1.auditStatus == '1'">{{item1.auditRemark}}</p>
-                <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditRemark}}</p>
-                <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditRemark}}</p>
-              </van-col>
-            </van-row>
-          </van-col>
+        <van-row   v-for="(item,index) in processList" :key="index">
+          <van-divider content-position="center"><h4>批次号：{{index}}</h4></van-divider>
+          <van-row  v-for="(item1,index,i) in item" :key="i">
+            <van-col span="4" align="right">
+              <p class="icon_jian" v-show="item1.auditStatus=='1'"><van-icon name="minus" size="14" /></p>
+              <p class="icon_jian blue" v-show="item1.auditStatus=='3'"><van-icon name="success" size="14" /></p>
+              <p class="icon_jian red" v-show="item1.auditStatus=='2'"><van-icon name="cross" size="14" /></p>
+            </van-col>
+            <van-col span="20">
+              <van-row>
+                <van-col span="12" style="padding: 0;">
+                  <p v-show="item1.auditStatus == '1'">{{item1.actorName}}</p>
+                  <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.actorName}}</p>
+                  <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.actorName}}</p>
+                </van-col>
+                <van-col span="12" style="padding: 0;" >
+                  <p v-show="item1.auditStatus == '1'">{{item1.auditTime}}</p>
+                  <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditTime}}</p>
+                  <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditTime}}</p>
+                </van-col>
+              </van-row>
+              <van-row>
+                <van-col span="12" style="padding: 0;" >
+                  <p v-show="item1.auditStatus == '1'">{{item1.auditBy}}</p>
+                  <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditBy}}</p>
+                  <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditBy}}</p>
+                </van-col>
+                <van-col span="12" style="padding: 0;">
+                  <p v-show="item1.auditStatus == '1'">{{item1.auditRemark}}</p>
+                  <p v-show="item1.auditStatus == '3'" class="textBlue">{{item1.auditRemark}}</p>
+                  <p v-show="item1.auditStatus == '2'" class="textRed">{{item1.auditRemark}}</p>
+                </van-col>
+              </van-row>
+            </van-col>
+          </van-row>
         </van-row>
         <van-divider content-position="center" v-if="approvalTemplateDetailList.length>0"><h4>审批流程</h4></van-divider>
         <van-row v-if="approvalTemplateDetailList.length>0" v-for="(item1,index,i) in approvalTemplateDetailList" :key="i">
@@ -111,7 +100,7 @@ export default {
     //查询审批进程
     getTransferProcess(id){
       getTransferProcess(id).then(res => {
-        this.processList = res.data[auditbatchNo]
+        this.processList = res.data
       })
     },
     handleUpdate(id) {
@@ -209,12 +198,4 @@ export default {
     color: #878787;
     line-height: 22Px;
   }
-  .van-row{
-    .van-row{
-      .van-col{
-        padding: 5Px 0 0 0!important;
-        color: #878787;
-      }
-    }
-  }
 </style>