瀏覽代碼

修改禅道问题

Qukatie 1 周之前
父節點
當前提交
e8f5d049ea

+ 5 - 5
src/views/iosBasicData/cashier/indexC.vue

@@ -341,11 +341,11 @@ export default {
             prop: "amountCrUsd ",
             overHidden: true
           },
-          {
-            label: "事由",
-            prop: "remarks",
-            overHidden: true
-          },
+          // {
+          //   label: "事由",
+          //   prop: "remarks",
+          //   overHidden: true
+          // },
           {
             label: "已完成",
             prop: "cashierStatus",

+ 18 - 6
src/views/iosBasicData/financialManagement/finstlbills/components/pickedData.vue

@@ -1253,23 +1253,35 @@ export default {
         this.allCRMBSum = 0;
         this.allCUSDSum = 0;
         this.allCSum = 0;
-        let DSUM=0;
-        let CSUM=0;
+        let DSUM = 0;
+        let CSUM = 0;
         if (oldValue.length) {
+          // for (let e of oldValue) {
+          //   if (e.dc == "D") {
+          //     this.allDRMBSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+          //     this.allDUSDSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+          //     DSUM += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0) * e.currentStlExrate;
+          //   }
+          //   if (e.dc == "C") {
+          //     this.allCRMBSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
+          //     this.allCUSDSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
+          //     CSUM += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0) * e.currentStlExrate;
+          //   }
+          // }
           oldValue.forEach((e) => {
             if (e.dc == "D") {
               this.allDRMBSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
               this.allDUSDSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
-              DSUM += this.allDUSDSum * e.currentStlExrate;
+              DSUM += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0) * e.currentStlExrate;
             }
             if (e.dc == "C") {
               this.allCRMBSum += Number(e.currentStlAmountRMB ? e.currentStlAmountRMB : 0);
               this.allCUSDSum += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0);
-              CSUM += this.allCUSDSum * e.currentStlExrate;
+              CSUM += Number(e.currentStlAmountUSD ? e.currentStlAmountUSD : 0) * e.currentStlExrate;
             }
           });
-          this.allDSum=this.allDRMBSum+DSUM
-          this.allCSum=this.allCRMBSum+CSUM
+          this.allDSum = this.allDRMBSum + DSUM;
+          this.allCSum = this.allCRMBSum + CSUM;
         }
       },
       deep: true, // 深度监听