From f63d2fdfe5a359edb0b14099eeacad31f45addf7 Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Thu, 26 May 2022 17:17:38 +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

---
 .../bankAgriculture/paymentApproval.js        |  2 +-
 .../paymentApproval/approvalAdd.vue           |  8 ++++---
 .../paymentApproval/approvalAdd11.vue         | 22 ++++++++++++-------
 .../paymentApproval/approvalAdd12.vue         | 14 +++++++++---
 .../paymentApproval/approvalAdd2.vue          |  1 +
 .../paymentApproval/approvalList.vue          | 13 ++++++++++-
 .../paymentApproval/approvalList11.vue        | 13 ++++++++++-
 .../paymentApproval/approvalList12.vue        | 15 +++++++++++--
 .../paymentApproval/approvalList2.vue         | 13 ++++++++++-
 .../paymentApproval/approvalModify11.vue      | 14 +++++-------
 10 files changed, 87 insertions(+), 28 deletions(-)

diff --git a/src/api/onlineHome/bankAgriculture/paymentApproval.js b/src/api/onlineHome/bankAgriculture/paymentApproval.js
index aa8697d4..4e0d2850 100644
--- a/src/api/onlineHome/bankAgriculture/paymentApproval.js
+++ b/src/api/onlineHome/bankAgriculture/paymentApproval.js
@@ -300,7 +300,7 @@ export function listAccount(query) {
 // 查询村虚拟出纳账户设置列表
 export function listAccount1(query) {
   return request({
-    url: '/cashier/account/list',
+    url: '/cashier/account/listFoBalance',
     method: 'get',
     params: query
   })
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
index aa5c361e..9ba2e788 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue
@@ -427,6 +427,7 @@
           // 分页
           pageNum: 1,
           pageSize: 999,
+          type:'1'
         };
         listTemplate(templateQueryParams).then(response => {
           this.templateList = response.rows;
@@ -757,6 +758,7 @@
               this.$set(this.form, "accountTypeList", this.chargeItme);
               this.$set(this.form, "transferStatusList", this.chargeItme);
               addTransfer(this.form).then(response => {
+                console.log(response.data.id)
                 this.projectForm.outId = response.data.id
                 this.infoForm.transferId = response.data.id
                 this.$set(this.projectForm, "ynType", '1');
@@ -803,7 +805,7 @@
             if(this.uploadFiles1!=null&&this.uploadFiles1.length>0){
               this.uploadFiles1.map(rr => {
                 let params = new FormData();
-                params.append("tableId", this.form.id);
+                params.append("tableId", response.data.id);
                 params.append("tableName", "t_yinnong_transfer");
                 params.append("bizPath", "transfer");
                 params.append("fileType", "1");
@@ -814,7 +816,7 @@
             if(this.uploadFiles2!=null&&this.uploadFiles2.length>0){
               this.uploadFiles2.map(rr => {
                 let params = new FormData();
-                params.append("tableId", this.form.id);
+                params.append("tableId", response.data.id);
                 params.append("tableName", "t_yinnong_transfer");
                 params.append("bizPath", "transfer");
                 params.append("fileType", "2");
@@ -825,7 +827,7 @@
             if(this.uploadFiles3!=null&&this.uploadFiles3.length>0){
               this.uploadFiles3.map(rr => {
                 let params = new FormData();
-                params.append("tableId", this.form.id);
+                params.append("tableId", response.data.id);
                 params.append("tableName", "t_yinnong_transfer");
                 params.append("bizPath", "transfer");
                 params.append("fileType", "3");
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue
index 78815547..6aa6e20d 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd11.vue
@@ -258,7 +258,7 @@
   import {
     addCash,
     addCashdetail, attachmentList,
-    commonAttach, listAccount,
+    commonAttach, listAccount1,
     updateCash
   } from "../../../../api/onlineHome/bankAgriculture/paymentApproval";
   import Dialog from "vant/lib/dialog";
@@ -360,13 +360,14 @@
         accountType: "101",
         status: "N",
       }
-      listAccount(queryParamsOld).then((response) => {
+      listAccount1(queryParamsOld).then((response) => {
         response.rows.map(res => {
-          res['accountName'] = this.$store.state.user.bookName
-          res['id'] = this.$store.state.user.loginBookId
-          res['text'] = this.$store.state.user.bookName
-          res['value'] = this.$store.state.user.loginBookId
-          res['bankAccountNumber'] = res.id
+          console.log(res)
+          // res['accountName'] = this.$store.state.user.bookName
+          // res['id'] = this.$store.state.user.loginBookId
+          res['text'] = res.accountName+"余额："+res.balance
+          res['value'] = res.id
+          res['bankAccountNumber'] = res.startDay
           res['payerFrom'] = '6'
           this.payerOptions.push(res)
         })
@@ -381,6 +382,7 @@
           // 分页
           pageNum: 1,
           pageSize: 999,
+          type :'3'
         };
         listTemplate(templateQueryParams).then(response => {
           this.templateList = response.rows;
@@ -926,6 +928,9 @@
           //model就是上面的数据源
           return account.id === select; //筛选出匹配数据
         });
+        if(obj.accountType == "101"){
+          obj.accountPassword = "";
+        }
         if(obj.accountPassword != null && obj.accountPassword != "" &&
           obj.bankType != null && obj.bankType != ""){
           this.$set(this.form, "bookId", obj.bookId);
@@ -941,6 +946,7 @@
           this.$set(this.form, "taccountId", obj.taccountId);
           this.$set(this.form, "accountNo", obj.accountNo);
           this.$set(this.form, "cifNo", obj.cifNo);
+          this.$set(this.form, "balance", obj.balance);
           this.$set(this.form, "payerFrom", '1');
           if(obj.bankType==1){
             this.form.accountType = "1"
@@ -980,7 +986,7 @@
             this.$set(this.form, "payer", obj.accountName);
             this.$set(this.form, "bankType", obj.bankType);
             if(obj.payerFrom==6){
-              getQmyeFlow(obj.bankAccountNumber).then((response) => {
+              getQmyeFlow(obj.id).then((response) => {
                 this.$set(this.form, "payerAccount", response.data);
               });
             }else {
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue
index c5ebe188..0e66aad0 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12.vue
@@ -428,6 +428,7 @@
           // 分页
           pageNum: 1,
           pageSize: 999,
+          type:'4'
         };
         listTemplate(templateQueryParams).then(response => {
           this.templateList = response.rows;
@@ -882,8 +883,11 @@
             return;
           }
         }
+            let length1 = 0
+            let length2 = 0
+            let length3 = 0
           addCash(this.form).then((response) => {
-            this.uploadFiles1.map(rr => {
+            this.uploadFiles1.map((rr,index) => {
               const params = new FormData();
               params.append("tableId", response.data.id);
               params.append("tableName", "t_yinnong_cash");
@@ -891,9 +895,11 @@
               params.append("fileType", "1");
               params.append("file", rr);
               commonAttach(params).then((r) => {
+                length1 = index+1
+                console.log(length1)
               })
             })
-            this.uploadFiles2.map(rr => {
+            this.uploadFiles2.map((rr,index) => {
               const params = new FormData();
               params.append("tableId", response.data.id);
               params.append("tableName", "t_yinnong_cash");
@@ -901,9 +907,10 @@
               params.append("fileType", "2");
               params.append("file", rr);
               commonAttach(params).then((r) => {
+                length2 = index+1
               })
             })
-            this.uploadFiles3.map(rr => {
+            this.uploadFiles3.map((rr,index) => {
               const params = new FormData();
               params.append("tableId", response.data.id);
               params.append("tableName", "t_yinnong_cash");
@@ -911,6 +918,7 @@
               params.append("fileType", "3");
               params.append("file", rr);
               commonAttach(params).then((r) => {
+                length3 = index+1
               })
             })
             this.chargeItme.map(res => {
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue
index b0b35d50..8a09c12b 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2.vue
@@ -420,6 +420,7 @@
           // 分页
           pageNum: 1,
           pageSize: 999,
+          type:'2'
         };
         listTemplate(templateQueryParams).then(response => {
           this.templateList = response.rows;
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue
index e56004ab..82b31483 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue
@@ -26,7 +26,7 @@
               <van-icon name="../../../../../static/images/onlineHome/icon_yn1.png" size="30" color="#FF4646" style="margin-right: 10px;" />
             </template>
             <template #label>
-              <p><span><i>￥</i>{{item.expenditureAmount}}</span><i style="margin-right: 30px;"></i>{{item.applyDate}}</p>
+              <p><span><i>￥</i>{{stateFormat(item.expenditureAmount)}}</span><i style="margin-right: 30px;"></i>{{item.applyDate}}</p>
             </template>
             <template #default>
               <p style="width: 80px;display: inline-block">{{item.auditStatus}}</p>
@@ -73,6 +73,17 @@ export default {
     });
   },
   methods: {
+    //金额千分符 会在整数后添加两个0
+    stateFormat(cellValue) {
+      if (cellValue) {
+        return Number(cellValue)
+          .toFixed(2)
+          .replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+            return $1 + ",";
+          })
+          .replace(/\.$/, "") + "元";
+      }
+    },
     goAdd(){
       window.location = 'approvalAdd';
     },
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList11.vue
index f07c00c8..b90fad2f 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList11.vue
@@ -27,7 +27,7 @@
               <van-icon name="../../../../../static/images/onlineHome/icon_yn7.png" size="30" color="#539FFD" style="margin-right: 10px;" />
             </template>
             <template #label>
-              <p><span><i>￥</i>{{item.expenditureAmount}}</span><i style="margin-right: 1rem;"></i>{{item.applyDate}}</p>
+              <p><span><i>￥</i>{{stateFormat(item.expenditureAmount)}}</span><i style="margin-right: 1rem;"></i>{{item.applyDate}}</p>
             </template>
           </van-cell>
           <template #right>
@@ -72,6 +72,17 @@ export default {
     });
   },
   methods: {
+    //金额千分符 会在整数后添加两个0
+    stateFormat(cellValue) {
+      if (cellValue) {
+        return Number(cellValue)
+          .toFixed(2)
+          .replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+            return $1 + ",";
+          })
+          .replace(/\.$/, "") + "元";
+      }
+    },
     goAdd(){
       window.location = 'approvalAdd11';
     },
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList12.vue
index 6ed2ab11..b40908fe 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList12.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList12.vue
@@ -27,7 +27,7 @@
               <van-icon name="../../../../../static/images/onlineHome/icon_yn8.png" size="30" color="#539FFD" style="margin-right: 10px;" />
             </template>
             <template #label>
-              <p><span><i>￥</i>{{item.expenditureAmount}}</span><i style="margin-right: 1rem;"></i>{{item.applyDate}}</p>
+              <p><span><i>￥</i>{{stateFormat(item.expenditureAmount)}}</span><i style="margin-right: 1rem;"></i>{{item.applyDate}}</p>
             </template>
           </van-cell>
           <template #right>
@@ -72,6 +72,17 @@ export default {
     });
   },
   methods: {
+    //金额千分符 会在整数后添加两个0
+    stateFormat(cellValue) {
+      if (cellValue) {
+        return Number(cellValue)
+          .toFixed(2)
+          .replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+            return $1 + ",";
+          })
+          .replace(/\.$/, "") + "元";
+      }
+    },
     goAdd(){
       window.location = 'approvalAdd12';
     },
@@ -100,7 +111,7 @@ export default {
       .then(() => {
         // on confirm
         this.applicationList.splice(index,1)
-        delCash33333333333333(id).then(res => {
+        delCash(id).then(res => {
           if(res.code = 200){
             this.$toast.success('删除成功');
           }
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList2.vue
index c34ad1d1..40bab025 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList2.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList2.vue
@@ -27,7 +27,7 @@
               <van-icon name="../../../../../static/images/onlineHome/icon_yn2.png" size="30" color="#539FFD" style="margin-right: 10px;" />
             </template>
             <template #label>
-              <p><span><i>￥</i>{{item.expenditureAmount}}</span><i style="margin-right: 1rem;"></i>{{item.applyDate}}</p>
+              <p><span><i>￥</i>{{stateFormat(item.expenditureAmount)}}</span><i style="margin-right: 1rem;"></i>{{item.applyDate}}</p>
             </template>
           </van-cell>
           <template #right>
@@ -71,6 +71,17 @@ export default {
     });
   },
   methods: {
+    //金额千分符 会在整数后添加两个0
+    stateFormat(cellValue) {
+      if (cellValue) {
+        return Number(cellValue)
+          .toFixed(2)
+          .replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+            return $1 + ",";
+          })
+          .replace(/\.$/, "") + "元";
+      }
+    },
     goAdd(){
       window.location = 'approvalAdd2';
     },
diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue
index ef65046e..d3f80b3c 100644
--- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue
+++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalModify11.vue
@@ -252,7 +252,7 @@
 </template>
 
 <script>
-  import { getAccount , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto
+  import { listAccount1 , getTransfer , queryTransferDetail , listPayee , updateTransfer , getProjectto , listProject , addProjectto
     , cashSubmit ,getQmyeFlow,listInfo ,getInfoto ,addInfoto,listTemplate} from "@/api/onlineHome/bankAgriculture/paymentApproval";
   import {
     addCash, addCashdetail,
@@ -358,13 +358,11 @@
         accountType: "101",
         status: "N",
       }
-      getAccount(params1).then((response) => {
+      listAccount1(params1).then((response) => {
         response.rows.map(res => {
-          res['accountName'] = this.$store.state.user.bookName
-          res['id'] = this.$store.state.user.loginBookId
-          res['text'] = this.$store.state.user.bookName
-          res['value'] = this.$store.state.user.loginBookId
-          res['bankAccountNumber'] = res.id
+          res['text'] = res.accountName+"余额："+res.balance
+          res['value'] = res.id
+          res['bankAccountNumber'] = res.startDay
           res['payerFrom'] = '6'
           this.payerOptions.push(res)
         })
@@ -995,7 +993,7 @@
             this.$set(this.form, "payer", obj.accountName);
             this.$set(this.form, "bankType", obj.bankType);
             if(obj.payerFrom==6){
-              getQmyeFlow(obj.bankAccountNumber).then((response) => {
+              getQmyeFlow(obj.id).then((response) => {
                 this.$set(this.form, "payerAccount", response.data);
               });
             }else {