From b885355e199a68a4cec1723c77e89f75508a8593 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Fri, 20 May 2022 13:23:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E5=86=9Capp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../paymentAccount/paymentAccountAdd.vue      |   4 +-
 .../paymentApproval/approvalAdd12.vue         |  12 +-
 .../paymentApproval/approvalApproval.vue      |  96 ++++---
 .../paymentApproval/approvalApproval10.vue    | 243 ++++--------------
 .../paymentApproval/approvalDetail10.vue      |  23 +-
 .../paymentApproval/approvalModify12.vue      |  46 +++-
 src/views/yinnong/done.vue                    |  15 +-
 7 files changed, 182 insertions(+), 257 deletions(-)

diff --git a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue
index c5e13b70..1bd7bcbc 100644
--- a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue
+++ b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue
@@ -213,9 +213,9 @@
         <van-field label="内部户名" v-if="accountType=='银行存款'&&form.bankType=='3'" v-model="form.alternateField2" required :rules="[{ required: true , message:'请输入内部户名' }]" placeholder="请输入内部户名" input-align="right" label-width="auto"/>
         <van-field label="账簿号" v-if="accountType=='银行存款'&&form.bankType=='3'" v-model="form.alternateField3" required :rules="[{ required: true , message:'请输入账簿号' }]" placeholder="请输入账簿号" input-align="right" label-width="auto"/>
         <van-field label="手机号码" v-if="accountType=='银行存款'&&form.bankType=='4'" v-model="form.alternateField1" required :rules="[{ required: true , message:'请输入手机号' }]" placeholder="请输入手机号" input-align="right" label-width="auto"/>
-        <van-field label="是否停用" required :rules="[{ required: true , message:'请选择是否停用' }]">
+        <van-field label="是否停用" required>
           <template #right-icon>
-            <van-radio-group direction="horizontal" v-model="form.status">
+            <van-radio-group direction="horizontal" v-model="form.status" required :rules="[{ required: true , message:'请选择是否停用' }]">
               <van-radio name="Y">是</van-radio>
               <van-radio name="N">否</van-radio>
             </van-radio-group>
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue
index d4124f87..c5ebe188 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue
@@ -412,11 +412,9 @@
         pageSize: 1000,
       }
       listMoneyorder(params1).then((response) => {
-        console.log(response)
         this.payerOptions = response.rows;
         response.rows.map((res,index) => {
           res['payerFrom'] = '12'
-          console.log(res)
           this.payerOptions[index].text = res.billReceiveUnit;
           this.payerOptions[index].value = res.id;
         })
@@ -455,7 +453,6 @@
         }
         listProject(queryParams).then(response => {
           _this.projectList = response.rows;
-          console.log(response)
           for (let i = 0; i < response.rows.length; i++) {
             //_this.projectList[i].set({text: response.rows[i].projectName, value: response.rows[i].id});
             _this.$set(_this.projectList[i],"text",response.rows[i].projectName)
@@ -638,13 +635,12 @@
       },
       onConfirmPayer(select){
         this.showpayer = false;
-        console.log(this.form,select)
         if(this.form.applyDate==""||this.form.applyDate==null){
           this.$set(this.form, "payer", "")
           this.$notify({ type: 'danger', message: "请先选择申请时间！"});
           this.orderTypeName = ''
         }else{
-          if(this.form.applyDate>select.endTime){
+          if(this.form.applyDate>new Date(select.endTime)){
             this.$notify({ type: 'danger', message: "当前申请时间大于汇票的到期日为"+select.endTime+"，无法使用！"});
             this.$set(this.form, "payer", "")
             this.form.payerAccount = ""
@@ -654,7 +650,7 @@
             this.form.expenditureAmount = ""
             this.$set(this.form, "cashierId", "")
             this.orderTypeName = ''
-          }else if(this.form.applyDate<select.startTime){
+          }else if(this.form.applyDate<new Date(select.startTime)){
             this.$notify({ type: 'danger', message: "当前申请时间小于汇票的开票日为"+select.startTime+"，无法使用！" });
             this.$set(this.form, "payer", "")
             this.form.payerAccount = ""
@@ -673,7 +669,6 @@
             this.$set(this.form, "cashierId", select.id)
             this.$set(this.form, "payer", select.billReceiveUnit)
             this.orderTypeOptions.map(res => {
-              console.log(this.orderTypeOptions)
               if(res.dictValue==this.form.orderType){
                 this.orderTypeName = res.dictLabel
               }
@@ -699,7 +694,6 @@
       },
       // 钱计算
       moneyChange(input) {
-        console.log(input)
         let obj = {};
         obj = this.chargeItme.find((account) => {
           //model就是上面的数据源
@@ -750,7 +744,6 @@
             message: '此申请单中未上传任何附件，是否确认提交？',
           })
             .then(() => {
-              console.log(this.form)
               addCash(this.form).then((response) => {
                 this.chargeItme.map(res => {
                   res.cashId = response.data.id
@@ -890,7 +883,6 @@
           }
         }
           addCash(this.form).then((response) => {
-            console.log(this.uploadFiles)
             this.uploadFiles1.map(rr => {
               const params = new FormData();
               params.append("tableId", response.data.id);
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue
index 53cb76d2..9fb5de49 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval.vue
@@ -20,12 +20,13 @@
       <van-field readonly label="支出总金额" v-model="form.expenditureAmount" input-align="right" label-width="auto"/>
       <van-field name="radio" label="审批模式" input-align="right" autocomplete="off" readonly>
         <template #input>
-          <van-radio-group v-model="form.paymentState" direction="horizontal">
+          <van-radio-group v-model="form.approvalMode" direction="horizontal">
             <van-radio name="1">线上支付</van-radio>
             <van-radio name="2">线下支付</van-radio>
           </van-radio-group>
         </template>
       </van-field>
+      <van-field readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)" input-align="right" label-width="auto"/>
     </div>
 
     <div class="main_box" style="margin-top: 10px;">
@@ -49,12 +50,18 @@
       <van-field readonly label="工程款类型" v-model="projectFundType" input-align="right" />
       <van-field readonly label="工程发票号" v-model="projectForm.projectBillNum" input-align="right" label-width="auto"/>
     </div>
+    <div class="main_box" v-if="contractOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+      <van-field readonly label="合同名称" v-model="infoForm.name" input-align="right" />
+      <van-field readonly label="合同编码" v-model="infoForm.code" input-align="right" label-width="auto"/>
+      <van-field readonly label="合同价款（元）" v-model="infoForm.totalAmount" input-align="right" label-width="auto"/>
+    </div>
 
-    <p class="main_title">列表信息</p>
+    <p class="main_title">收款方信息</p>
 
     <div class="main_box" style="margin-bottom: 15px;">
-      <van-field readonly label="收款账户类型" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
-      <van-field readonly label="是否与付款方同行" v-if="form.bankType==2||form.bankType==4" v-model="form.isPeers == 'Y' ? '是':'否'" input-align="right" label-width="auto" />
+      <van-field readonly label="收款账户类型" v-if="form.bankType==1" v-model="form.accountType == 1 ? '公户':'私户'" input-align="right" label-width="auto" />
+      <van-field readonly label="是否与付款方同行" v-if="form.bankType==2||form.bankType==3||form.bankType==4" v-model="form.isPeers == 'Y' ? '是':'否'" input-align="right" label-width="auto" />
+
     </div>
 
     <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
@@ -66,33 +73,18 @@
         <van-field readonly label="所属银行" v-model="item.bankTypeText" input-align="right" />
       </div>
     </div>
-    <p class="main_title">上传附件(收据)</p>
-    <div class="main_box" style="padding: 5px 0 0 8px;">
-      <van-uploader v-model="fileList1" v-if="fileList1==null||fileList1.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'"></van-uploader>
-      <van-uploader v-model="fileList1" v-if="fileList1!=null&&fileList1.length>0" :deletable="false" :max-count="fileList1.length"  ></van-uploader>
-    </div>
-    <p style="margin-top:20px;padding: 0 10px">附件下载(收据){{fileList1&&fileList1.length==0?':暂无可下载文件':''}}</p>
-    <van-cell v-for="(item,index) in fileList1" :key="index">
-      <a :href="item.url">{{index+1}}.{{item.fileName}}</a>
-    </van-cell>
-    <p class="main_title">上传附件(发票)</p>
-    <div class="main_box" style="padding: 5px 0 0 8px;">
-      <van-uploader v-model="fileList2" v-if="fileList2==null||fileList2.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'"></van-uploader>
-      <van-uploader v-model="fileList2" v-if="fileList2!=null&&fileList2.length>0" :deletable="false" :max-count="fileList2.length"  ></van-uploader>
-    </div>
-    <p style="margin-top:20px;padding: 0 10px">附件下载(发票){{fileList2&&fileList2.length==0?':暂无可下载文件':''}}</p>
-    <van-cell v-for="(item,index) in fileList2" :key="index">
-      <a :href="item.url">{{index+1}}.{{item.fileName}}</a>
-    </van-cell>
-    <p class="main_title">上传附件(其他)</p>
-    <div class="main_box" style="padding: 5px 0 0 8px;">
-      <van-uploader v-model="fileList3" v-if="fileList3==null||fileList3.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'"></van-uploader>
-      <van-uploader v-model="fileList3" v-if="fileList3!=null&&fileList3.length>0" :deletable="false" :max-count="fileList3.length"  ></van-uploader>
+    <p class="main_title">上传附件</p>
+    <div class="main_box" style="padding: 5px 0 0 0;">
+      <van-cell value="收据" />
+      <van-uploader v-model="fileList1" v-if="fileList1==null||fileList1.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
+      <van-uploader v-model="fileList1" v-if="fileList1!=null&&fileList1.length>0" :deletable="false" :max-count="fileList1.length"  style="margin-left:8px;"></van-uploader>
+      <van-cell value="发票" />
+      <van-uploader v-model="fileList2" v-if="fileList2==null||fileList2.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
+      <van-uploader v-model="fileList2" v-if="fileList2!=null&&fileList2.length>0" :deletable="false" :max-count="fileList2.length"  style="margin-left:8px;"></van-uploader>
+      <van-cell value="其他" />
+      <van-uploader v-model="fileList3" v-if="fileList3==null||fileList3.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
+      <van-uploader v-model="fileList3" v-if="fileList3!=null&&fileList3.length>0" :deletable="false" :max-count="fileList3.length" style="margin-left:8px;" ></van-uploader>
     </div>
-    <p style="margin-top:20px;padding: 0 10px">附件下载(其他){{fileList3&&fileList3.length==0?':暂无可下载文件':''}}</p>
-    <van-cell v-for="(item,index) in fileList3" :key="index">
-      <a :href="item.url">{{index+1}}.{{item.fileName}}</a>
-    </van-cell>
     <div class="main_box examine_box" v-if="this.$route.query.type != 'done'">
       <van-row type="flex" justify="space-between" align="center">
         <van-col span="5">审批<br/>意见</van-col>
@@ -101,7 +93,7 @@
             <van-radio name="true">同意</van-radio>
             <van-radio name="false">驳回</van-radio>
           </van-radio-group>
-          <van-field rows="2" autosize v-model="comment" type="textarea" placeholder="同意申请宅基地"/>
+          <van-field rows="2" autosize v-model="comment" type="textarea" placeholder="请输入审批意见"/>
         </van-col>
       </van-row>
     </div>
@@ -119,7 +111,7 @@
 </template>
 
 <script>
-  import { getTransfer , queryTransferDetail , listPayee , getProjectto , listProject , approval } from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import { getTransfer , queryTransferDetail , listPayee , getProjectto , listProject , approval ,listTemplate } from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import {attachmentList, systemAttachment} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
   export default {
@@ -173,6 +165,15 @@
           outId:null,
           ynType:'1'
         },
+        contractOpen:false,
+        infoForm:{
+          infoId:null,
+          name:null,
+          code:null,
+          totalAmount:null,
+          contractionId:null,
+          transferId:null
+        },
         projectFundType:'',
         fileList1:[],
         fileList2:[],
@@ -181,10 +182,10 @@
         // 审核意见默认值
         pass: "true",
         comment: "同意",
+        templateList:[],
       };
     },
     created() {
-      console.log(this.$store.state.user);
       this.getDicts("project_fund_type").then((response) => {
         for (var i = 0; i < response.data.length; i++) {
           this.projectFundTypeOptions.push({text: response.data[i].dictLabel, value: response.data[i].dictValue});
@@ -193,8 +194,28 @@
       });
       this.getDictionaries();
       this.getFileList();
+      this.getTemplateList();
     },
     methods: {
+      getTemplateList(){
+        let templateQueryParams = {
+          // 分页
+          pageNum: 1,
+          pageSize: 999,
+        };
+        listTemplate(templateQueryParams).then(response => {
+          this.templateList = response.rows;
+        });
+      },
+      tempalteFormat(id){
+        let name = ""
+        this.templateList.map(res => {
+          if(res.id==id){
+            name =  res.name
+          }
+        })
+        return name
+      },
       backDone(){
         if(this.$route.query.type != 'done'){
           this.$router.push({name:'yinnongDone',query: {activeName:'1'}})
@@ -223,6 +244,14 @@
               this.projectFundType = this.selectDictLabel(this.projectFundTypeDictionaries, res.data.projectFundType);
               this.projectForm = res.data
             })
+          }else if(response.data.capitalExpenditureType==4) {
+            this.contractOpen = true
+            let param = {
+              'transferId': response.data.id
+            }
+            getInfoto(param).then(res => {
+              this.infoForm = res.data
+            })
           }else{
             this.showproject = false
           }
@@ -299,7 +328,6 @@
             pass: this.pass,
           }),
         };
-        console.log(data);
         approval(data).then((response) => {
           if(response.code==200 && response.msg=="操作成功"){
             this.$toast.success("操作成功");
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval10.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval10.vue
index f754aecf..854f781e 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval10.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalApproval10.vue
@@ -20,12 +20,13 @@
       <van-field readonly label="提现总金额" v-model="form.expenditureAmount" input-align="right" label-width="auto"/>
       <van-field name="radio" label="审批模式" input-align="right" autocomplete="off" readonly>
         <template #input>
-          <van-radio-group v-model="form.paymentState" direction="horizontal">
+          <van-radio-group v-model="form.approvalMode" direction="horizontal">
             <van-radio name="1">线上支付</van-radio>
             <van-radio name="2">线下支付</van-radio>
           </van-radio-group>
         </template>
       </van-field>
+      <van-field readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)" input-align="right" label-width="auto"/>
     </div>
 
     <div class="main_box" style="margin-top: 10px;">
@@ -49,7 +50,11 @@
       <van-field readonly label="工程款类型" v-model="projectFundType" input-align="right" />
       <van-field readonly label="工程发票号" v-model="projectForm.projectBillNum" input-align="right" label-width="auto"/>
     </div>
-
+    <div class="main_box" v-if="contractOpen" style="margin-bottom: 10px;margin-top: 10px;position:relative;">
+      <van-field readonly label="合同名称" v-model="infoForm.name" input-align="right" />
+      <van-field readonly label="合同编码" v-model="infoForm.code" input-align="right" label-width="auto"/>
+      <van-field readonly label="合同价款（元）" v-model="infoForm.totalAmount" input-align="right" label-width="auto"/>
+    </div>
     <p class="main_title">收款方信息</p>
     <div :style="{position:'relative',padding: index == 0 ? '':'10px 0 0 0'}" v-for="(item, index) in chargeItme" :key="index">
       <div class="main_box" style="margin-bottom: 10px;position:relative;">
@@ -59,33 +64,18 @@
         <van-field readonly label="资金用途" v-model="item.remark" input-align="right" />
       </div>
     </div>
-    <p class="main_title">上传附件(收据)</p>
-    <div class="main_box" style="padding: 5px 0 0 8px;">
-      <van-uploader v-model="fileList1" v-if="fileList1==null||fileList1.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'"></van-uploader>
-      <van-uploader v-model="fileList1" v-if="fileList1!=null&&fileList1.length>0" :deletable="false" :max-count="fileList1.length"  ></van-uploader>
-    </div>
-    <p style="margin-top:20px;padding: 0 10px">附件下载(收据){{fileList1&&fileList1.length==0?':暂无可下载文件':''}}</p>
-    <van-cell v-for="(item,index) in fileList1" :key="index">
-      <a :href="item.url">{{index+1}}.{{item.fileName}}</a>
-    </van-cell>
-    <p class="main_title">上传附件(发票)</p>
-    <div class="main_box" style="padding: 5px 0 0 8px;">
-      <van-uploader v-model="fileList2" v-if="fileList2==null||fileList2.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'"></van-uploader>
-      <van-uploader v-model="fileList2" v-if="fileList2!=null&&fileList2.length>0" :deletable="false" :max-count="fileList2.length"  ></van-uploader>
-    </div>
-    <p style="margin-top:20px;padding: 0 10px">附件下载(发票){{fileList2&&fileList2.length==0?':暂无可下载文件':''}}</p>
-    <van-cell v-for="(item,index) in fileList2" :key="index">
-      <a :href="item.url">{{index+1}}.{{item.fileName}}</a>
-    </van-cell>
-    <p class="main_title">上传附件(其他)</p>
-    <div class="main_box" style="padding: 5px 0 0 8px;">
-      <van-uploader v-model="fileList3" v-if="fileList3==null||fileList3.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'"></van-uploader>
-      <van-uploader v-model="fileList3" v-if="fileList3!=null&&fileList3.length>0" :deletable="false" :max-count="fileList3.length"  ></van-uploader>
+    <p class="main_title">上传附件</p>
+    <div class="main_box" style="padding: 5px 0 0 0;">
+      <van-cell value="收据" />
+      <van-uploader v-model="fileList1" v-if="fileList1==null||fileList1.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
+      <van-uploader v-model="fileList1" v-if="fileList1!=null&&fileList1.length>0" :deletable="false" :max-count="fileList1.length"  style="margin-left:8px;"></van-uploader>
+      <van-cell value="发票" />
+      <van-uploader v-model="fileList2" v-if="fileList2==null||fileList2.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
+      <van-uploader v-model="fileList2" v-if="fileList2!=null&&fileList2.length>0" :deletable="false" :max-count="fileList2.length"  style="margin-left:8px;"></van-uploader>
+      <van-cell value="其他" />
+      <van-uploader v-model="fileList3" v-if="fileList3==null||fileList3.length==0" :deletable="false"  disabled  :upload-text="'未上传附件'" style="margin-left:8px;"></van-uploader>
+      <van-uploader v-model="fileList3" v-if="fileList3!=null&&fileList3.length>0" :deletable="false" :max-count="fileList3.length" style="margin-left:8px;" ></van-uploader>
     </div>
-    <p style="margin-top:20px;padding: 0 10px">附件下载(其他){{fileList3&&fileList3.length==0?':暂无可下载文件':''}}</p>
-    <van-cell v-for="(item,index) in fileList3" :key="index">
-      <a :href="item.url">{{index+1}}.{{item.fileName}}</a>
-    </van-cell>
     <div class="main_box examine_box" v-if="this.$route.query.type != 'done'">
       <van-row type="flex" justify="space-between" align="center">
         <van-col span="5">审批<br/>意见</van-col>
@@ -111,7 +101,7 @@
 </template>
 
 <script>
-  import { getCash , listCashdetailByCashId , listPayee , getProjectto , listProject , addProjectto , customSubmit} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import { getCash , listCashdetailByCashId , listPayee , getProjectto , listProject , addProjectto , customSubmit ,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
   import {approval, attachmentList, commonAttach} from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   export default {
@@ -167,11 +157,21 @@
           outId:null,
           ynType:'2'
         },
+        contractOpen:false,
+        infoForm:{
+          infoId:null,
+          name:null,
+          code:null,
+          totalAmount:null,
+          contractionId:null,
+          transferId:null
+        },
         projectFundType:'',
         uploadFiles:[],
         // 审核意见默认值
         pass: "true",
         comment: "同意",
+        templateList:[],
       };
     },
     created() {
@@ -194,8 +194,28 @@
       });
       this.getDictionaries();
       this.getFileList();
+      this.getTemplateList()
     },
     methods: {
+      getTemplateList(){
+        let templateQueryParams = {
+          // 分页
+          pageNum: 1,
+          pageSize: 999,
+        };
+        listTemplate(templateQueryParams).then(response => {
+          this.templateList = response.rows;
+        });
+      },
+      tempalteFormat(id){
+        let name = ""
+        this.templateList.map(res => {
+          if(res.id==id){
+            name =  res.name
+          }
+        })
+        return name
+      },
       goFlow(){
         window.location='approvalProcess2?id='+this.$route.query.id;
       },
@@ -222,23 +242,12 @@
           }
           this.form = response.data;
         });
-        console.log(this.$route.query.id)
         listCashdetailByCashId(this.$route.query.id).then((response) => {
           this.chargeItme = response.data;
-          console.log(response.data)
           this.getPayeeList();
         });
       },
-      addChargeItme(index){
-        this.chargeItme.splice(index + 1, 0, {
-          payeeId: "", //收款方ID
-          payee: "", //收款方
-          payeeAccount: "", //收款账户
-          bankDeposit: "", //开户银行
-          incomeAmount: "", //收入金额
-          bankType: "", //所属银行
-        });
-      },
+
       getPayeeList() {
         //普通转账
         this.queryParams.accountType = this.form.accountType
@@ -249,158 +258,6 @@
           }
         });
       },
-      payeeDictLabel(datas, value) {
-        var actions = [];
-        Object.keys(datas).some((key) => {
-          if (datas[key].payeeId == ('' + value)) {
-            actions.push(datas[key].payee);
-            return true;
-          }
-        })
-        return actions.join('');
-      },
-      onConfirmCapital(data){
-        console.log(data)
-        if (data.value != 2){
-          this.capitalExpenditureOpen = false;
-          this.projectForm = [];
-        }else{
-          this.capitalExpenditureOpen = true;
-        }
-        this.capitalExpenditureType = data.text;
-        this.form.capitalExpenditureType = data.value;
-        this.showcapital = false;
-      },
-      onConfirmFundType(data){
-        console.log(data)
-        this.projectForm.projectFundType = data.value;
-        this.projectFundType = data.text;
-        this.showFundType = false;
-      },
-      onConfirmProject(data){
-        console.log(data)
-        this.projectList.map(res => {
-          console.log(res)
-          if(res.projectName==data.text){
-            this.projectForm.projectId = res.id
-            this.projectForm.projectName = res.projectName
-            this.projectForm.projectContractor = res.projectContractor
-            this.projectForm.projectAmount = res.projectAmount
-            console.log(this.projectForm)
-          }
-        })
-        this.showproject = false;
-      },
-      onConfirmPayee(data){
-        // this.chargeItme[this.chargeItme.length-1].payeeText = data.text;
-        this.chargeItme[this.chargeItme.length-1].payee = data.text;
-        this.chargeItme[this.chargeItme.length-1].payeeId = data.value;
-        console.log(this.chargeItme)
-        this.showpayee = false;
-      },
-      onConfirmBankType(data){
-        console.log(this.chargeItme)
-        this.chargeItme[this.chargeItme.length-1].bankTypeText = data.text;
-        this.chargeItme[this.chargeItme.length-1].bankType = data.value;
-        this.showbankType = false;
-      },
-      onConfirmLasj(data){
-        this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
-        this.showlasj = false;
-      },
-      accountTypeChange(e){
-        console.log(e)
-        this.payeeList = [];
-        this.queryParams.accountType = this.form.accountType
-        this.queryParams.status = "0"
-        listPayee(this.queryParams).then((response) => {
-          for (var i = 0; i < response.rows.length; i++) {
-            this.payeeList.push({text: response.rows[i].payee, value: response.rows[i].id});
-          }
-        });
-      },
-      goAdd(){
-        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
-          this.$toast.error("付款事由禁止包含|。");
-          return;
-        }
-        if(this.form.capitalExpenditureType==2){
-          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
-            this.$toast.error('请选择项目名称！');
-            return;
-          }
-          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
-            this.$toast.error('请输入工程发票号！');
-            return;
-          }
-        }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        console.log(this.form);
-        updateTransfer(this.form).then(response => {
-          console.log(response);
-          this.projectForm.outId = this.form.id
-          this.$set(this.projectForm, "ynType", '1');
-          console.log(this.projectForm)
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              customSubmit(this.form.id).then(res => {
-                this.$toast.success('提交成功');
-                setTimeout(function(){
-                  history.go(-1)
-                },2000)
-              })
-            })
-          }else{
-            customSubmit(this.form.id).then(res => {
-              this.$toast.success('提交成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
-            })
-          }
-        });
-      },
-      goUpdate(){
-        if(this.form.remark != null && this.form.remark.indexOf("|")!=-1){
-          this.$toast.error("付款事由禁止包含|。");
-          return;
-        }
-        if(this.form.capitalExpenditureType==2){
-          if(this.projectForm.projectName==""||this.projectForm.projectName==null){
-            this.$toast.error('请选择项目名称！');
-            return;
-          }
-          if(this.projectForm.projectBillNum==""||this.projectForm.projectBillNum==null){
-            this.$toast.error('请输入工程发票号！');
-            return;
-          }
-        }
-        this.$set(this.form, "payeeList", this.chargeItme);
-        this.$set(this.form, "bankTypeList", this.chargeItme);
-        this.$set(this.form, "accountTypeList", this.chargeItme);
-        this.$set(this.form, "transferStatusList", this.chargeItme);
-        this.projectForm.outId = this.form.id
-        updateTransfer(this.form).then((response) => {
-          this.projectForm.outId = this.form.id
-          this.$set(this.projectForm, "ynType", '1');
-          if(this.form.capitalExpenditureType==2){
-            addProjectto(this.projectForm).then(res => {
-              this.$toast.success('修改成功');
-              setTimeout(function(){
-                history.go(-1)
-              },2000)
-            })
-          }else{
-            this.$toast.success('修改成功');
-            setTimeout(function(){
-              history.go(-1)
-            },2000)
-          }
-        });
-      },
       beforeRead(file) {
         this.uploadFiles.push(file.file);
       },
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail10.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail10.vue
index bc3e6a39..97a96ba7 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail10.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalDetail10.vue
@@ -26,6 +26,7 @@
           </van-radio-group>
         </template>
       </van-field>
+      <van-field readonly label="审批流程" :value="tempalteFormat(form.approvalTemplateId)" input-align="right" label-width="auto"/>
     </div>
 
     <div class="main_box" style="margin-top: 10px;">
@@ -79,7 +80,7 @@
 </template>
 
 <script>
-  import { getTransfer , queryTransferDetail , listPayee , getProjectto , listProject , addProjectto , customSubmit ,getInfoto} from "@/api/onlineHome/bankAgriculture/paymentApproval";
+  import { getTransfer , queryTransferDetail , listPayee , getProjectto , listProject , addProjectto , customSubmit ,getInfoto ,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import request from '@/utils/request'
   import {
     attachmentList,
@@ -151,6 +152,7 @@
         },
         projectFundType:'',
         uploadFiles:[],
+        templateList:[],
       };
     },
     created() {
@@ -164,6 +166,25 @@
       this.getFileList();
     },
     methods: {
+      getTemplateList(){
+        let templateQueryParams = {
+          // 分页
+          pageNum: 1,
+          pageSize: 999,
+        };
+        listTemplate(templateQueryParams).then(response => {
+          this.templateList = response.rows;
+        });
+      },
+      tempalteFormat(id){
+        let name = ""
+        this.templateList.map(res => {
+          if(res.id==id){
+            name =  res.name
+          }
+        })
+        return name
+      },
       goFlow(){
         window.location='approvalProcess?id='+this.$route.query.id;
       },
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue
index 1cd671bb..05992298 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify12.vue
@@ -631,11 +631,48 @@
         this.chargeItme[index].bankType = data.value;
         this.chargeItme[index].showbankType = false;
       },
-      onConfirmPayer(data){
-        this.form.payer = data.text;
-        this.form.cashierId = data.value;
+      onConfirmPayer(select){
         this.showpayer = false;
-        this.selectChange(data.value)
+        if(this.form.applyDate==""||this.form.applyDate==null){
+          this.$set(this.form, "payer", "")
+          this.$notify({ type: 'danger', message: "请先选择申请时间！"});
+          this.orderTypeName = ''
+        }else{
+          if(this.form.applyDate>new Date(select.endTime)){
+            this.$notify({ type: 'danger', message: "当前申请时间大于汇票的到期日为"+select.endTime+"，无法使用！"});
+            this.$set(this.form, "payer", "")
+            this.form.payerAccount = ""
+            this.form.startTime = ""
+            this.form.endTime = ""
+            this.form.orderType = ""
+            this.form.expenditureAmount = ""
+            this.$set(this.form, "cashierId", "")
+            this.orderTypeName = ''
+          }else if(this.form.applyDate<new Date(select.startTime)){
+            this.$notify({ type: 'danger', message: "当前申请时间小于汇票的开票日为"+select.startTime+"，无法使用！" });
+            this.$set(this.form, "payer", "")
+            this.form.payerAccount = ""
+            this.form.startTime = ""
+            this.form.endTime = ""
+            this.form.orderType = ""
+            this.form.expenditureAmount = ""
+            this.$set(this.form, "cashierId", "")
+            this.orderTypeName = ''
+          }else{
+            this.form.payerAccount = select.orderNum
+            this.form.startTime = select.startTime
+            this.form.endTime = select.endTime
+            this.form.orderType = select.orderType
+            this.form.expenditureAmount = select.orderAmount
+            this.$set(this.form, "cashierId", select.id)
+            this.$set(this.form, "payer", select.billReceiveUnit)
+            this.orderTypeOptions.map(res => {
+              if(res.dictValue==this.form.orderType){
+                this.orderTypeName = res.dictLabel
+              }
+            })
+          }
+        }
       },
       onConfirmLasj(data){
         this.form.applyDate = this.getNowFormatDate(data).substr(0,10);
@@ -655,7 +692,6 @@
       },
       // 钱计算
       moneyChange(input) {
-        console.log(input)
         let obj = {};
         obj = this.chargeItme.find((account) => {
           //model就是上面的数据源
diff --git a/src/views/yinnong/done.vue b/src/views/yinnong/done.vue
index 49331d88..8a0df229 100644
--- a/src/views/yinnong/done.vue
+++ b/src/views/yinnong/done.vue
@@ -94,7 +94,6 @@
           this.$set(this.queryParams, "systemType", '4');
           if(this.activeName=='1'){
             ListTodo(this.queryParams).then((response) => {
-              console.log(response)
               response.rows.map(res => {
                 if(res.tableName?res.tableName.indexOf('house')>0:""){
                   res.tableName = '来自农村宅基地管理系统'
@@ -115,7 +114,6 @@
             })
           }else{
             ListDone(this.queryParams).then((response) => {
-              console.log(response)
               response.rows.map(res => {
                 if(res.tableName?res.tableName.indexOf('house')>0:""){
                   res.tableName = '来自农村宅基地管理系统'
@@ -146,19 +144,12 @@
               this.$router.push({name:'approvalForm',query: {id:item.formData.id,taskId:item.taskId,instanceId:item.formData.instanceId,type:item.type}})
               break;
             case 'yinnong_transfer':
-              this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
-              break;
-            case 'yinnong_cash':
-              if(item.formData.cashType == '10'){
+              if(item.formData.transferType == '10'||item.formData.transferType == '11'||item.formData.transferType == '12'){
                 this.$router.push({name:'approvalApproval10',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
                 break;
               }
-              if(item.formData.cashType == '11'){
-                this.$router.push({name:'approvalApproval11',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
-                break;
-              }
-              if(item.formData.cashType == '12'){
-                this.$router.push({name:'approvalApproval12',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
+              if(item.formData.transferType != '10'&&item.formData.transferType != '11'&&item.formData.transferType != '12'){
+                this.$router.push({name:'approvalApproval',query: {id:item.formData.id,taskId:item.taskId,type:item.type}})
                 break;
               }
           }