Browse Source

总税额处理

cyy 1 year ago
parent
commit
61b5bfe3f9

+ 1 - 1
src/views/system/jbdScan/goods/chnangguirukudan.vue

@@ -187,7 +187,7 @@ export default {
     addshuieToFixed:function(arr){
     addshuieToFixed:function(arr){
       let adds =0;
       let adds =0;
       arr.forEach(item=>{
       arr.forEach(item=>{
-        adds =adds+(((item.shu_liang_*1) * (item.dan_jia_han_shui_*1)) - ((item.shu_liang_*1) * (item.dan_jia_*1)) );
+        adds =adds+(((item.shu_liang_*1) * (item.dan_jia_han_shui_*1)) - ((item.shu_liang_*1) * ((item.shui_lv_==='0%'?item.dan_jia_han_shui_:item.dan_jia_)*1)) );
       })
       })
       return adds.toFixed(2);
       return adds.toFixed(2);
     },
     },

+ 1 - 1
src/views/system/jbdScan/wuliao/chnangguirukudan.vue

@@ -182,7 +182,7 @@ export default {
       return d==='0%' ? '0':value.toFixed(2);
       return d==='0%' ? '0':value.toFixed(2);
     },
     },
     addshuieToFixed:function(arr){
     addshuieToFixed:function(arr){
-      const total = arr.reduce((account,item) => account + (Math.abs(item.shu_liang_) * 1) * (Math.abs(item.dan_jia_han_shui_) * 1) - (Math.abs(item.shu_liang_) * 1) * (Math.abs(item.dan_jia_) * 1),0)
+      const total = arr.reduce((account,item) => account + (Math.abs(item.shu_liang_) * 1) * (Math.abs(item.dan_jia_han_shui_) * 1) - (Math.abs(item.shu_liang_) * 1) * (Math.abs((item.shui_lv_==='0%'?item.dan_jia_han_shui_:item.dan_jia_)) * 1),0)
       return total.toFixed(2)
       return total.toFixed(2)
     },
     },
     addjineToFixed(arr){
     addjineToFixed(arr){