1

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -810,6 +810,11 @@
       deleteRow(i, obj) {
         obj.show = false;
         this.msg.detailList.splice(i, 1);
+        if(this.bankType==12){
+          this.getcommission()
+          this.countFee();
+        }
+        
         this.$forceUpdate();
       },
       jumpPage(path, id, type) { //生成单据时连带信息跳转
@@ -1079,6 +1084,7 @@
         }
         if(this.bankType==12){//如果等于平台账户 进去判断
           this.getcommission()
+          this.countFee();
         }
       },
       clearAccBank() { // 选择账户类型清空数据
@@ -1371,9 +1377,7 @@
             this.Calculation(1);
           })
         }
-        if(this.bankType==12){
-          this.getcommission()
-        }
+        
         
         if (list.CostTypeId == '') return
         if (list.Number == '') return
@@ -1415,6 +1419,9 @@
         if (this.shouxufei > 0) {
           this.shouxufeiJiSuan()
         }
+        if(this.bankType==12){
+          this.getcommission()
+        }
         this.countFee();
         
       },
@@ -1430,22 +1437,22 @@
             break
           }
         }
-        let allbTotalPriceTo = 0
+        let price = 0
         if(obj.SettlementType==1){
-          if(this.detailList){
-            if(Number(this.detailList.yTotalPriceTo)  > 0){
-                allbTotalPriceTo =  allbTotalPriceTo +  Number(this.detailList.yTotalPriceTo) 
-              }
-          }
           if(this.msg.detailList && this.msg.detailList.length>0){
             this.msg.detailList.forEach(x=>{
               if(Number(x.yTotalPriceTo)  > 0){
-                allbTotalPriceTo =  allbTotalPriceTo +  Number(x.yTotalPriceTo) 
+                price =  price +  Number(x.yTotalPriceTo) 
               }
             })
           }
+          // console.log(price,obj.Commission,'obj.Commission')
+          this.msg.OriginalFee =  Math.round((price * obj.Commission)*100 ) / 10000; 
+        }else{
+          this.msg.OriginalFee = 0
+          this.msg.Fee = 0
         }
-        this.msg.OriginalFee = (obj.Commission/100)*allbTotalPriceTo
+       
        
       },
       Calculation(t, i) { // 计算原币 本位币