银农app

src/api/onlineHome/bankAgriculture/paymentApproval.js

@@ -321,3 +321,10 @@ export function listTemplate(query) {
     params: query
   })
 }
+// 根据模板主表id审批模板明细详细
+export function selectApprovalByTemplateId(templateId) {
+  return request({
+    url: '/service/templateDetail/selectApprovalByTemplateId/' + templateId,
+    method: 'get'
+  })
+}

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

@@ -165,6 +165,7 @@
       });
       this.getDictionaries();
       this.getFileList();
+      this.getTemplateList();
     },
     methods: {
       getTemplateList(){

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

@@ -222,6 +222,7 @@
       });
       this.getDictionaries();
       this.getFileList();
+      this.getTemplateList();
     },
     methods: {
       getTemplateList(){

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

@@ -26,32 +26,6 @@
             </van-row>
           </van-col>
         </van-row>
-<!--        <van-row>-->
-<!--          <van-col span="6" align="right">-->
-<!--            <p class="icon_jian" v-show="processList.乡镇审批==1"><van-icon name="minus" size="14" /></p>-->
-<!--            <p class="icon_jian blue" v-show="processList.乡镇审批==2"><van-icon name="success" size="14" /></p>-->
-<!--            <p class="icon_jian red" v-show="processList.乡镇审批==3"><van-icon name="cross" size="14" /></p>-->
-<!--          </van-col>-->
-<!--          <van-col span="18">-->
-<!--            <p v-show="processList.乡镇审批==1">乡镇审批</p>-->
-<!--            <p v-show="processList.乡镇审批==2" class="textBlue">乡镇审批</p>-->
-<!--            <p v-show="processList.乡镇审批==3" class="textRed">乡镇审批</p>-->
-<!--            <van-row>-->
-<!--              <van-col span="24" style="padding: 0;" v-if="processList.乡镇审批人!=null&&processList.乡镇审批人!=''">-->
-<!--                <p v-show="processList.乡镇审批==1">审批人：{{processList.乡镇审批人}}</p>-->
-<!--                <p v-show="processList.乡镇审批==2" class="textBlue">审批人：{{processList.乡镇审批人}}</p>-->
-<!--                <p v-show="processList.乡镇审批==3" class="textRed">审批人：{{processList.乡镇审批人}}</p>-->
-<!--              </van-col>-->
-<!--            </van-row>-->
-<!--            <van-row>-->
-<!--              <van-col span="24" style="padding: 0;" v-if="processList.乡镇审批时间!=null&&processList.乡镇审批时间!=''">-->
-<!--                <p v-show="processList.乡镇审批==1">审批时间：{{processList.乡镇审批时间}}</p>-->
-<!--                <p v-show="processList.乡镇审批==2" class="textBlue">审批时间：{{processList.乡镇审批时间}}</p>-->
-<!--                <p v-show="processList.乡镇审批==3" class="textRed">审批时间：{{processList.乡镇审批时间}}</p>-->
-<!--              </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>
@@ -80,6 +54,33 @@
             </div>
           </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">
+            <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>
+                </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>
+        </van-row>
       </div>
     </div>
 </template>
@@ -89,14 +90,17 @@ import {
   getTransferProcess,
   getTransfer,
   getProjectto,
-  queryTransferDetail
+  queryTransferDetail,
+  selectApprovalByTemplateId
 } from "@/api/onlineHome/bankAgriculture/paymentApproval";
 export default {
   name: "approvalProcess",
   data() {
     return {
       processList:{},
-      form:{}
+      form:{},
+      approvalTemplateDeptList:[],
+      approvalTemplateDetailList:[]
     };
   },
   created() {
@@ -107,7 +111,6 @@ export default {
     getTransferProcess(id){
       getTransferProcess(id).then(res => {
         this.processList = res.data.processSchedule
-        console.log(res.data.processSchedule)
         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"):""
@@ -118,7 +121,14 @@ export default {
       getTransfer(id).then((response) => {
         this.form = response.data;
         this.processList = {}
-        this.getTransferProcess(this.$route.query.id);
+        if(this.form.auditStatus == 0){
+          selectApprovalByTemplateId(this.form.approvalTemplateId).then(rs => {
+            this.approvalTemplateDeptList = rs.approvalDepts;
+            this.approvalTemplateDetailList = rs.approvalDetails;
+          })
+        }else{
+          this.getTransferProcess(this.$route.query.id);
+        }
         if(this.form.capitalExpenditureType==2){
           this.capitalExpenditureOpen = true
           let param={

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

@@ -26,32 +26,6 @@
             </van-row>
           </van-col>
         </van-row>
-<!--        <van-row>-->
-<!--          <van-col span="6" align="right">-->
-<!--            <p class="icon_jian" v-show="processList.乡镇审批==1"><van-icon name="minus" size="14" /></p>-->
-<!--            <p class="icon_jian blue" v-show="processList.乡镇审批==2"><van-icon name="success" size="14" /></p>-->
-<!--            <p class="icon_jian red" v-show="processList.乡镇审批==3"><van-icon name="cross" size="14" /></p>-->
-<!--          </van-col>-->
-<!--          <van-col span="18">-->
-<!--            <p v-show="processList.乡镇审批==1">乡镇审批</p>-->
-<!--            <p v-show="processList.乡镇审批==2" class="textBlue">乡镇审批</p>-->
-<!--            <p v-show="processList.乡镇审批==3" class="textRed">乡镇审批</p>-->
-<!--            <van-row>-->
-<!--              <van-col span="24" style="padding: 0;" v-if="processList.乡镇审批人!=null&&processList.乡镇审批人!=''">-->
-<!--                <p v-show="processList.乡镇审批==1">审批人：{{processList.乡镇审批人}}</p>-->
-<!--                <p v-show="processList.乡镇审批==2" class="textBlue">审批人：{{processList.乡镇审批人}}</p>-->
-<!--                <p v-show="processList.乡镇审批==3" class="textRed">审批人：{{processList.乡镇审批人}}</p>-->
-<!--              </van-col>-->
-<!--            </van-row>-->
-<!--            <van-row>-->
-<!--              <van-col span="24" style="padding: 0;" v-if="processList.乡镇审批时间!=null&&processList.乡镇审批时间!=''">-->
-<!--                <p v-show="processList.乡镇审批==1">审批时间：{{processList.乡镇审批时间}}</p>-->
-<!--                <p v-show="processList.乡镇审批==2" class="textBlue">审批时间：{{processList.乡镇审批时间}}</p>-->
-<!--                <p v-show="processList.乡镇审批==3" class="textRed">审批时间：{{processList.乡镇审批时间}}</p>-->
-<!--              </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>
@@ -80,6 +54,33 @@
             </div>
           </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">
+            <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>
+                </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>
+        </van-row>
       </div>
     </div>
 </template>
@@ -89,7 +90,8 @@ import {
   getTransferProcess,
   getTransfer,
   getProjectto,
-  queryTransferDetail
+  queryTransferDetail,
+  selectApprovalByTemplateId
 } from "@/api/onlineHome/bankAgriculture/paymentApproval";
 import {
   getCash,
@@ -101,7 +103,9 @@ export default {
   data() {
     return {
       processList:{},
-      form:{}
+      form:{},
+      approvalTemplateDeptList:[],
+      approvalTemplateDetailList:[]
     };
   },
   created() {
@@ -122,7 +126,14 @@ export default {
       getCash(id).then((response) => {
         this.form = response.data;
         this.processList = {}
-        this.getTransferProcess1(this.$route.query.id);
+        if(this.form.auditStatus == 0){
+          selectApprovalByTemplateId(this.form.approvalTemplateId).then(rs => {
+            this.approvalTemplateDeptList = rs.approvalDepts;
+            this.approvalTemplateDetailList = rs.approvalDetails;
+          })
+        }else{
+          this.getTransferProcess1(this.$route.query.id);
+        }
         if(this.form.capitalExpenditureType==2){
           this.capitalExpenditureOpen = true
           let param={