银农-完善审批流程展示功能；

src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess.vue

@@ -12,74 +12,73 @@
       </van-nav-bar>
       <div class="main_box">
         <van-row v-if="processList.待申请!=2">
-          <van-col span="6" align="right"><p class="icon_jian blue"><van-icon name="success" size="14" /></p></van-col>
-          <van-col span="18" class="textBlue">草稿</van-col>
+          <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="processList.待申请==2">
-          <van-col span="6" align="right"><p class="icon_jian blue"><van-icon name="success" size="14" /></p></van-col>
-          <van-col span="18" class="textBlue">已申请
+          <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="24" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">申请人：{{processList.申请人}}</van-col>
-            </van-row>
-            <van-row>
-              <van-col span="24" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">申请时间：{{processList.申请时间}}</van-col>
+              <van-col span="8" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">{{processList.申请人}}</van-col>
+              <van-col span="16" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">{{processList.申请时间}}</van-col>
             </van-row>
           </van-col>
         </van-row>
         <van-row v-if="processList.status==2" v-for="(item1,index,i) in processList.审批事项" :key="i">
-          <van-col span="6" align="right">
-            <p class="icon_jian" v-show="item1[0].deptStatus==1||item1[0].deptStatus==null||item1[0].deptStatus==''"><van-icon name="minus" size="14" /></p>
-            <p class="icon_jian blue" v-show="item1[0].deptStatus==2"><van-icon name="success" size="14" /></p>
-            <p class="icon_jian red" v-show="item1[0].deptStatus==3"><van-icon name="cross" size="14" /></p>
+          <van-col span="4" align="right">
+            <p class="icon_jian" v-show="item1.approverStatus==1"><van-icon name="minus" size="14" /></p>
+            <p class="icon_jian blue" v-show="item1.approverStatus==2"><van-icon name="success" size="14" /></p>
+            <p class="icon_jian red" v-show="item1.approverStatus==3"><van-icon name="cross" size="14" /></p>
           </van-col>
-          <van-col span="18">
-            <p v-show="item1[0].deptStatus==1||item1[0].deptStatus==null||item1[0].deptStatus==''">{{item1[0].deptLabel}}</p>
-            <p v-show="item1[0].deptStatus==2" class="textBlue">{{item1[0].deptLabel}}</p>
-            <p v-show="item1[0].deptStatus==3" class="textRed">{{item1[0].deptLabel}}</p>
-            <div v-for="(item2,index) in item1" :key="item1.assigneeName">
-              <van-row>
-                <van-col span="24" style="padding: 0;">
-                  <p v-show="item2.approverStatus == 1">审批人：{{item2.assigneeName}}</p>
-                  <p v-show="item2.approverStatus == 2" class="textBlue">审批人：{{item2.assigneeName}}</p>
-                  <p v-show="item2.approverStatus == 3" class="textRed">审批人：{{item2.assigneeName}}</p>
-                </van-col>
-              </van-row>
-              <van-row>
-                <van-col span="24" style="padding: 0;" >
-                  <p v-show="item2.approverStatus == 1">审批时间：{{item2.time}}</p>
-                  <p v-show="item2.approverStatus == 2" class="textBlue">审批时间：{{item2.time}}</p>
-                  <p v-show="item2.approverStatus == 3" class="textRed">审批时间：{{item2.time}}</p>
-                </van-col>
-              </van-row>
-            </div>
+          <van-col span="20">
+            <van-row>
+              <van-col span="8" style="padding: 0;">
+                <p v-show="item1.approverStatus == 1">{{item1.deptLabel}}</p>
+                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.deptLabel}}</p>
+                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.deptLabel}}</p>
+              </van-col>
+              <van-col span="16" style="padding: 0;" >
+                <p v-show="item1.approverStatus == 1">{{item1.time}}</p>
+                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.time}}</p>
+                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.time}}</p>
+              </van-col>
+            </van-row>
+            <van-row>
+              <van-col span="16" style="padding: 0;" >
+                <p v-show="item1.approverStatus == 1">{{item1.assigneeName}}</p>
+                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.assigneeName}}</p>
+                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.assigneeName}}</p>
+              </van-col>
+              <van-col span="8" style="padding: 0;">
+                <p v-show="item1.approverStatus == 1">{{item1.comment}}</p>
+                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.comment}}</p>
+                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.comment}}</p>
+              </van-col>
+            </van-row>
           </van-col>
         </van-row>
-        <van-row v-if="approvalTemplateDeptList.length>0" v-for="(item1,index,i) in approvalTemplateDeptList" :key="i">
-          <van-col span="6" align="right">
+        <van-divider content-position="center"><h4>审批流程</h4></van-divider>
+        <van-row v-if="approvalTemplateDetailList.length>0" v-for="(item1,index,i) in approvalTemplateDetailList" :key="i">
+          <van-col span="4" align="right">
             <p class="icon_jian" ><van-icon name="minus" size="14" /></p>
           </van-col>
-          <van-col span="18">
-            <p v-show="item1.approvalLevel == 1">组级审批</p>
-            <p v-show="item1.approvalLevel == 2">村级审批</p>
-            <p v-show="item1.approvalLevel == 3">镇级审批</p>
-            <div v-for="(item2,index) in approvalTemplateDetailList" :key="item2.approvalOrder">
-              <van-row v-if="item1.approvalLevel == item2.approvalLevel">
-                <van-col span="24" style="padding: 0;">
-                  <p v-show="item2.userName!=null&&item2.userName!=''">审批人：{{item2.nickName}}</p>
-                  <p v-show="item2.userName==null||item2.userName==''">审批角色：{{item2.roleName}}</p>
-                </van-col>
-              </van-row>
-              <van-row v-if="item1.approvalLevel == item2.approvalLevel">
-                <van-col span="24" style="padding: 0;">
-                  <p v-show="item2.approverStatus != null">审批顺序：{{item2.approvalOrder}}级审批</p>
-                </van-col>
-              </van-row>
-              <van-row v-if="item1.approvalLevel == item2.approvalLevel">
-                <van-col span="24" style="padding: 0;" >
-                  <p v-show="item2.approvalOrder != null">审批节点：{{item2.name}}</p>
-                </van-col>
-              </van-row>
-            </div>
+          <van-col span="20">
+            <van-row>
+              <van-col span="12" style="padding: 0;">
+                <p>{{item1.name}}</p>
+              </van-col>
+              <van-col span="12" style="padding: 0;">
+                <p v-show="item1.approvalLevel == 1">组级审批</p>
+                <p v-show="item1.approvalLevel == 2">村级审批</p>
+                <p v-show="item1.approvalLevel == 3">镇级审批</p>
+                <p v-show="item1.approvalLevel == 4">区县审批</p>
+              </van-col>
+            </van-row>
+            <van-row>
+              <van-col span="24" style="padding: 0;">
+                <p>{{item1.nickName}}<span v-if="item1.feeLimit != 0 && item1.nickName != null">({{item1.feeLimit}}元)</span></p>
+              </van-col>
+            </van-row>
           </van-col>
         </van-row>
       </div>
@@ -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;

src/views/yinnong/bankAgriculture/paymentApproval/approvalProcess2.vue

@@ -12,74 +12,73 @@
       </van-nav-bar>
       <div class="main_box">
         <van-row v-if="processList.待申请!=2">
-          <van-col span="6" align="right"><p class="icon_jian blue"><van-icon name="success" size="14" /></p></van-col>
-          <van-col span="18" class="textBlue">草稿</van-col>
+          <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="processList.待申请==2">
-          <van-col span="6" align="right"><p class="icon_jian blue"><van-icon name="success" size="14" /></p></van-col>
-          <van-col span="18" class="textBlue">已申请
+          <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="24" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">申请人：{{processList.申请人}}</van-col>
-            </van-row>
-            <van-row>
-              <van-col span="24" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">申请时间：{{processList.申请时间}}</van-col>
+              <van-col span="8" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">{{processList.申请人}}</van-col>
+              <van-col span="16" style="padding: 0;" class="textBlue" v-show="processList.待申请==2">{{processList.申请时间}}</van-col>
             </van-row>
           </van-col>
         </van-row>
         <van-row v-if="processList.status==2" v-for="(item1,index,i) in processList.审批事项" :key="i">
-          <van-col span="6" align="right">
-            <p class="icon_jian" v-show="item1[0].deptStatus==1||item1[0].deptStatus==null||item1[0].deptStatus==''"><van-icon name="minus" size="14" /></p>
-            <p class="icon_jian blue" v-show="item1[0].deptStatus==2"><van-icon name="success" size="14" /></p>
-            <p class="icon_jian red" v-show="item1[0].deptStatus==3"><van-icon name="cross" size="14" /></p>
+          <van-col span="4" align="right">
+            <p class="icon_jian" v-show="item1.approverStatus==1"><van-icon name="minus" size="14" /></p>
+            <p class="icon_jian blue" v-show="item1.approverStatus==2"><van-icon name="success" size="14" /></p>
+            <p class="icon_jian red" v-show="item1.approverStatus==3"><van-icon name="cross" size="14" /></p>
           </van-col>
-          <van-col span="18">
-            <p v-show="item1[0].deptStatus==1||item1[0].deptStatus==null||item1[0].deptStatus==''">{{item1[0].deptLabel}}</p>
-            <p v-show="item1[0].deptStatus==2" class="textBlue">{{item1[0].deptLabel}}</p>
-            <p v-show="item1[0].deptStatus==3" class="textRed">{{item1[0].deptLabel}}</p>
-            <div v-for="(item2,index) in item1" :key="item1.assigneeName">
-              <van-row>
-                <van-col span="24" style="padding: 0;">
-                  <p v-show="item2.approverStatus == 1">审批人：{{item2.assigneeName}}</p>
-                  <p v-show="item2.approverStatus == 2" class="textBlue">审批人：{{item2.assigneeName}}</p>
-                  <p v-show="item2.approverStatus == 3" class="textRed">审批人：{{item2.assigneeName}}</p>
-                </van-col>
-              </van-row>
-              <van-row>
-                <van-col span="24" style="padding: 0;" >
-                  <p v-show="item2.approverStatus == 1">审批时间：{{item2.time}}</p>
-                  <p v-show="item2.approverStatus == 2" class="textBlue">审批时间：{{item2.time}}</p>
-                  <p v-show="item2.approverStatus == 3" class="textRed">审批时间：{{item2.time}}</p>
-                </van-col>
-              </van-row>
-            </div>
+          <van-col span="20">
+            <van-row>
+              <van-col span="8" style="padding: 0;">
+                <p v-show="item1.approverStatus == 1">{{item1.deptLabel}}</p>
+                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.deptLabel}}</p>
+                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.deptLabel}}</p>
+              </van-col>
+              <van-col span="16" style="padding: 0;" >
+                <p v-show="item1.approverStatus == 1">{{item1.time}}</p>
+                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.time}}</p>
+                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.time}}</p>
+              </van-col>
+            </van-row>
+            <van-row>
+              <van-col span="16" style="padding: 0;" >
+                <p v-show="item1.approverStatus == 1">{{item1.assigneeName}}</p>
+                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.assigneeName}}</p>
+                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.assigneeName}}</p>
+              </van-col>
+              <van-col span="8" style="padding: 0;">
+                <p v-show="item1.approverStatus == 1">{{item1.comment}}</p>
+                <p v-show="item1.approverStatus == 2" class="textBlue">{{item1.comment}}</p>
+                <p v-show="item1.approverStatus == 3" class="textRed">{{item1.comment}}</p>
+              </van-col>
+            </van-row>
           </van-col>
         </van-row>
-        <van-row v-if="approvalTemplateDeptList.length>0" v-for="(item1,index,i) in approvalTemplateDeptList" :key="i">
-          <van-col span="6" align="right">
+        <van-divider content-position="center"><h4>审批流程</h4></van-divider>
+        <van-row v-if="approvalTemplateDetailList.length>0" v-for="(item1,index,i) in approvalTemplateDetailList" :key="i">
+          <van-col span="4" align="right">
             <p class="icon_jian" ><van-icon name="minus" size="14" /></p>
           </van-col>
-          <van-col span="18">
-            <p v-show="item1.approvalLevel == 1">组级审批</p>
-            <p v-show="item1.approvalLevel == 2">村级审批</p>
-            <p v-show="item1.approvalLevel == 3">镇级审批</p>
-            <div v-for="(item2,index) in approvalTemplateDetailList" :key="item2.approvalOrder">
-              <van-row v-if="item1.approvalLevel == item2.approvalLevel">
-                <van-col span="24" style="padding: 0;">
-                  <p v-show="item2.userName!=null&&item2.userName!=''">审批人：{{item2.nickName}}</p>
-                  <p v-show="item2.userName==null||item2.userName==''">审批角色：{{item2.roleName}}</p>
-                </van-col>
-              </van-row>
-              <van-row v-if="item1.approvalLevel == item2.approvalLevel">
-                <van-col span="24" style="padding: 0;">
-                  <p v-show="item2.approverStatus != null">审批顺序：{{item2.approvalOrder}}级审批</p>
-                </van-col>
-              </van-row>
-              <van-row v-if="item1.approvalLevel == item2.approvalLevel">
-                <van-col span="24" style="padding: 0;" >
-                  <p v-show="item2.approvalOrder != null">审批节点：{{item2.name}}</p>
-                </van-col>
-              </van-row>
-            </div>
+          <van-col span="20">
+            <van-row>
+              <van-col span="12" style="padding: 0;">
+                <p>{{item1.name}}</p>
+              </van-col>
+              <van-col span="12" style="padding: 0;">
+                <p v-show="item1.approvalLevel == 1">组级审批</p>
+                <p v-show="item1.approvalLevel == 2">村级审批</p>
+                <p v-show="item1.approvalLevel == 3">镇级审批</p>
+                <p v-show="item1.approvalLevel == 4">区县审批</p>
+              </van-col>
+            </van-row>
+            <van-row>
+              <van-col span="24" style="padding: 0;">
+                <p>{{item1.nickName}}<span v-if="item1.feeLimit != 0 && item1.nickName != null">({{item1.feeLimit}}元)</span></p>
+              </van-col>
+            </van-row>
           </van-col>
         </van-row>
       </div>
@@ -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;