采购验收入库单对税率为0单独处理，去掉含税单价和单价去四舍五入处理

src/views/system/jbdScan/goods/chnangguirukudan.vue

@@ -63,11 +63,13 @@
                         <td style="width: 100px;word-wrap: normal !important;word-break: break-all !important;"> {{ item.gong_ying_shang_| gongyingshang(gongyingshangList) }} </td>
                         <td style="width: 45px;word-wrap: normal !important;word-break: break-all !important;">{{ item.shu_liang_ }}</td>
                         <td style="width: 45px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_wei_ }}</td>
-                        <td style="width: 60px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_han_shui_ |numToFixed}}</td>
+                        <!-- <td style="width: 60px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_han_shui_ |numToFixed}}</td> -->
+                        <td style="width: 60px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_han_shui_}}</td>
                         <td style="width: 45px;word-wrap: normal !important;word-break: break-all !important;">{{ item.shui_lv_ }}</td>
-                        <td style="width: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_|numToFixed}}</td>
-                        <td style="width: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;"> {{ item.dan_jia_han_shui_|shuieToFixed(item.shu_liang_,item.dan_jia_) }}</td>
-                        <td style="width: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_|jineToFixed(item.shu_liang_)}}</td>
+                        <!-- <td style="width: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_|numToFixed}}</td> -->
+                        <td style="width: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.shui_lv_==='0%'?item.dan_jia_han_shui_:item.dan_jia_}}</td>
+                        <td style="width: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;"> {{ item.dan_jia_han_shui_|shuieToFixed(item.shu_liang_,item.dan_jia_,item.shui_lv_) }}</td>
+                        <td style="width: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.shui_lv_==='0%'?item.dan_jia_han_shui_:item.dan_jia_|jineToFixed(item.shu_liang_)}}</td>
                         <td style="width: 60px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_han_shui_|jineToFixed(item.shu_liang_) }}</td>
                       </tr>
                       <tr class="count" style="border:1px solid #000;">
@@ -175,11 +177,12 @@ export default {
      
      return value.toFixed(2)
     },
-    shuieToFixed:function(a,b,c){
+    shuieToFixed:function(a,b,c,d){
+      console.log(d)
       let jine = b*1*(c*1);
       let hshj = b*1*(a*1);
       let value = hshj - jine;
-      return value.toFixed(2);
+      return d==='0%' ? '0':value.toFixed(2);
     },
     addshuieToFixed:function(arr){
       let adds =0;
@@ -191,7 +194,7 @@ export default {
     addjineToFixed(arr){  
       let adds =0;
       arr.forEach(item=>{
-        adds =adds+((item.shu_liang_*1) * (item.dan_jia_*1));
+        adds =adds+((item.shu_liang_*1) * ((item.shui_lv_==='0%'?item.dan_jia_han_shui_:item.dan_jia_)*1));
       })
       return adds.toFixed(2);
     },

src/views/system/jbdScan/wuliao/chnangguirukudan.vue

@@ -62,11 +62,13 @@
                         <td style="width: 100px;word-wrap: normal !important;word-break: break-all !important;"> {{ item.gong_ying_shang_| gongyingshang(gongyingshangList) }} </td>
                         <td style="width: 45px;word-wrap: normal !important;word-break: break-all !important;">{{ (Math.abs(item.shu_liang_) * 1) }}</td>
                         <td style="width: 45px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_wei_ }}</td>
-                        <td style="width: 60px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_han_shui_ |numToFixed}}</td>
+                        <!-- <td style="width: 60px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_han_shui_ |numToFixed}}</td> -->
+                        <td style="width: 60px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_han_shui_ }}</td>
                         <td style="width: 45px;word-wrap: normal !important;word-break: break-all !important;">{{ item.shui_lv_ }}</td>
-                        <td style="width: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_|numToFixed}}</td>
-                        <td style="width: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;"> {{ item.dan_jia_han_shui_|shuieToFixed(item.shu_liang_,item.dan_jia_) }}</td>
-                        <td style="width: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_|jineToFixed(item.shu_liang_)}}</td>
+                        <!-- <td style="width: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_|numToFixed}}</td> -->
+                        <td style="width: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.shui_lv_==='0%'?item.dan_jia_han_shui_:item.dan_jia_}}</td>
+                        <td style="width: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;"> {{ item.dan_jia_han_shui_|shuieToFixed(item.shu_liang_,item.dan_jia_,item.shui_lv_) }}</td>
+                        <td style="width: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{ item.shui_lv_==='0%'?item.dan_jia_han_shui_:item.dan_jia_|jineToFixed(item.shu_liang_)}}</td>
                         <td style="width: 60px;word-wrap: normal !important;word-break: break-all !important;">{{ item.dan_jia_han_shui_|jineToFixed(item.shu_liang_) }}</td>
                       </tr>
                       <tr class="count" style="border:1px solid #000;">
@@ -173,18 +175,18 @@ export default {
      let value = (Math.abs((a * 1) * (b * 1)) * 1);
      return value.toFixed(2)
     },
-    shuieToFixed:function(a,b,c){
+    shuieToFixed:function(a,b,c,d){
       let jine = (Math.abs(b*1*(c*1)) * 1);
       let hshj = (Math.abs(b*1*(a*1)) * 1);
       let value = hshj - jine;
-      return value.toFixed(2);
+      return d==='0%' ? '0':value.toFixed(2);
     },
     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)
       return total.toFixed(2)
     },
     addjineToFixed(arr){
-      const total = arr.reduce((account,item) => account + (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.shui_lv_==='0%'?item.dan_jia_han_shui_:item.dan_jia_)) * 1),0)
       return total.toFixed(2)
     },
     addhshjToFixed(arr){