Merge remote-tracking branch 'origin/master'

pages/Bookkeeping/Bookkeeping.js

@@ -66,6 +66,8 @@ Page({
             const element = list[i];
             list[i].checkedStatusText = UTIL.getTransform(element.checkedStatus,that.data.capitalExpenditureTypeOptions);
             list[i].incomeTypeText = UTIL.getTransform(element.incomeType,that.data.incomeTypeOptions);
+            list[i].jieAmount = Number(element.jieAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+              return $1 + ","; }).replace(/\.$/, "");
           }
           this.setData({
             flowListSR:list,
@@ -93,6 +95,8 @@ Page({
             const element = list[i];
             list[i].checkedStatusText = UTIL.getTransform(element.checkedStatus,that.data.capitalExpenditureTypeOptions);
             list[i].expenditureTypeText = UTIL.getTransform(element.expenditureType,that.data.expenditureTypeOptions);
+            list[i].daiAmount = Number(element.daiAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+              return $1 + ","; }).replace(/\.$/, "");
           }
           this.setData({
             flowListZC:list,
@@ -132,6 +136,8 @@ Page({
               const element = list[i];
               list[i].checkedStatusText = UTIL.getTransform(element.checkedStatus,that.data.capitalExpenditureTypeOptions);
               list[i].incomeTypeText = UTIL.getTransform(element.incomeType,that.data.incomeTypeOptions);
+              list[i].jieAmount = Number(element.jieAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+                return $1 + ","; }).replace(/\.$/, "");
             }
             this.setData({
               flowListSR:list,
@@ -156,6 +162,8 @@ Page({
               const element = list[i];
               list[i].checkedStatusText = UTIL.getTransform(element.checkedStatus,that.data.capitalExpenditureTypeOptions);
               list[i].expenditureTypeText = UTIL.getTransform(element.expenditureType,that.data.expenditureTypeOptions);
+              list[i].daiAmount = Number(element.daiAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+              return $1 + ","; }).replace(/\.$/, "");
             }
             this.setData({
               flowListZC:list,
@@ -216,6 +224,8 @@ Page({
               const element = list[i];
               element.checkedStatusText = UTIL.getTransform(element.checkedStatus,that.data.capitalExpenditureTypeOptions);
               element.incomeTypeText = UTIL.getTransform(element.incomeType,that.data.incomeTypeOptions);
+              element.jieAmount = Number(element.jieAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+                return $1 + ","; }).replace(/\.$/, "");
             }
             this.setData({
               flowListSR:list,
@@ -239,6 +249,8 @@ Page({
               const element = list[i];
               list[i].checkedStatusText = UTIL.getTransform(element.checkedStatus,that.data.capitalExpenditureTypeOptions);
               list[i].expenditureTypeText = UTIL.getTransform(element.expenditureType,that.data.expenditureTypeOptions);
+              list[i].daiAmount = Number(element.daiAmount).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+                return $1 + ","; }).replace(/\.$/, "");
             }
             this.setData({
               flowListZC:list,

pages/apply/index.js

@@ -157,7 +157,8 @@ swichPaymentApply:function(e){
           for (let i = 0; i < res.rows.length; i++) {
             if(res.rows[i].bankAccountNumber==null){continue;}
             res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 ");
-            res.rows[i].balance = parseFloat(res.rows[i].balance).toFixed(2);
+            res.rows[i].balance = Number(res.rows[i].balance).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+              return $1 + ","; }).replace(/\.$/, "");
             res.rows[i].bankTypeText = UTIL.getTransform(res.rows[i].bankType,that.data.bankTypeOptions);
           }
           console.log(res.rows)
@@ -173,7 +174,8 @@ swichPaymentApply:function(e){
         for (let i = 0; i < res.rows.length; i++) {
           // if(res.rows[i].bankAccountNumber==null){continue;}
           // res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 ");
-          res.rows[i].balance = parseFloat(res.rows[i].balance).toFixed(2);
+          res.rows[i].balance = Number(res.rows[i].balance).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+            return $1 + ","; }).replace(/\.$/, "");;
           console.log(res.rows[i].balance)
         }
         that.setData({

pages/apply/paymentTemplate/add/add.js

@@ -310,6 +310,7 @@ Page({
                 list.applyData.transfers[i].cashForm = res.data
               }
             })
+            list.applyData.transfers[i].payer = "";
           }
           
           let fileForm = [];
@@ -782,6 +783,14 @@ Page({
       [event.currentTarget.dataset.value+'.isPeers']: '',  
       [event.currentTarget.dataset.value+'.paymentPattern']: event.detail.value.dictValue,  
       [event.currentTarget.dataset.value+'.amountReadonly']:false,
+      [event.currentTarget.dataset.value+'.payeeList']:[{//收款方账户集合
+        payeeId:'0',//收款方id
+        payee:'',//收款方
+        bankDeposit:'',//开户行
+        incomeAmount:'',//收入金额
+        bankType:'',//所属银行0其他银行1中国银行2农商行（山东省）3农业银行4建设银行5工商银行
+        payeeAccount:'',//收款账户
+      }],
       balance:0,
     });
     console.log(event.detail.value.dictValue);

pages/drawee/drawee.js

@@ -162,7 +162,8 @@ swichPaymentApply:function(e){
             for (let i = 0; i < res.rows.length; i++) {
               if(res.rows[i].bankAccountNumber==null){continue;}
               res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 ");
-              res.rows[i].balance = parseFloat(res.rows[i].balance).toFixed(2);
+              res.rows[i].balance = Number(res.rows[i].balance).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+                return $1 + ","; }).replace(/\.$/, "");
               res.rows[i].bankTypeText = UTIL.getTransform(res.rows[i].bankType,that.data.bankTypeOptions);
             }
             console.log(res.rows)
@@ -176,8 +177,8 @@ swichPaymentApply:function(e){
       UTIL.httpRequest(API.URL_GET_ACCOUNTLIST, sendData2,{
         success: (res) => {
           for (let i = 0; i < res.rows.length; i++) {
-            if(res.rows[i].bankAccountNumber==null){continue;}
-            res.rows[i].bankAccountNumber = res.rows[i].bankAccountNumber.replace(/(\d{4})(?=\d)/g, "$1 ")
+            res.rows[i].balance = Number(res.rows[i].balance).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, ($0, $1) => {
+              return $1 + ","; }).replace(/\.$/, "");
           }
           console.log(res.rows)
           that.setData({