采购单计算调整单价不使用数据库数据，由含税单价计算出来后再进行税额计算

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

@@ -68,8 +68,10 @@
                         <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.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: 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.dan_jia_han_shui_|shuieToFixedNew(item.shu_liang_,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: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{item.dan_jia_han_shui_|jineToFixedNew(item.shu_liang_,item.shui_lv_)}}</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;">
@@ -184,17 +186,28 @@ export default {
       let value = hshj - jine;
       return d==='0%' ? '0':value.toFixed(2);
     },
+    shuieToFixedNew:function(a,b,c){
+      // console.log(d)
+      let jine = (Number(a)/((parseFloat(Number(c.replace("%", ""))) / 100)+1))*Number(b);
+      let hshj = a*b;
+      let value = hshj - jine;
+      return c==='0%' ? '0':value.toFixed(2);
+    },
+    jineToFixedNew:function(a,b,c){
+      let value = (Number(a)/((parseFloat(Number(c.replace("%", ""))) / 100)+1))*Number(b)
+      return c==='0%' ? '0':value.toFixed(2);
+    },
     addshuieToFixed:function(arr){
       let adds =0;
       arr.forEach(item=>{
-        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)) );
+        adds =adds+(((Number(item.shu_liang_)*1) * (Number(item.dan_jia_han_shui_)*1)) - ((Number(item.shu_liang_)*1) * (Number(item.dan_jia_han_shui_)/((parseFloat(Number(item.shui_lv_.replace("%", ""))) / 100)+1))) );
       })
       return adds.toFixed(2);
     },
     addjineToFixed(arr){  
       let adds =0;
       arr.forEach(item=>{
-        adds =adds+((item.shu_liang_*1) * ((item.shui_lv_==='0%'?item.dan_jia_han_shui_:item.dan_jia_)*1));
+        adds =adds+((Number(item.shu_liang_)*1) * (Number(item.dan_jia_han_shui_)/((parseFloat(Number(item.shui_lv_.replace("%", ""))) / 100)+1)));
       })
       return adds.toFixed(2);
     },

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

@@ -20,7 +20,7 @@
                     <thead>
                       <tr class="title">
                         <th colspan="15" style="line-height: 12px !important;">
-                          <h1 style="display:block;margin:0px;line-height: 16px;font-size:16px;padding: 0px 0px 5px;">采购入库1</h1>
+                          <h1 style="display:block;margin:0px;line-height: 16px;font-size:16px;padding: 0px 0px 5px;">采购入库</h1>
                         </th>
                       </tr>
                       <tr class="title-sub" style="line-height: 12px;">

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

@@ -67,8 +67,13 @@
                         <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.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: 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.dan_jia_han_shui_|shuieToFixedNew(item.shu_liang_,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: 45px;padding: 1px;word-wrap: normal !important;word-break: break-all !important;">{{item.dan_jia_han_shui_|jineToFixedNew(item.shu_liang_,item.shui_lv_)}}</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;">
@@ -181,16 +186,27 @@ export default {
       let value = hshj - jine;
       return d==='0%' ? '0':value.toFixed(2);
     },
+    shuieToFixedNew:function(a,b,c){
+      // console.log(d)
+      let jine = (Number(a)/((parseFloat(Number(c.replace("%", ""))) / 100)+1))*Number(b);
+      let hshj = Number(a)*Number(b);
+      let value = hshj - jine;
+      return c==='0%' ? '0':value.toFixed(2);
+    },
+    jineToFixedNew:function(a,b,c){
+      let value = (Number(a)/((parseFloat(Number(c.replace("%", ""))) / 100)+1))*Number(b)
+      return c==='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.shui_lv_==='0%'?item.dan_jia_han_shui_:item.dan_jia_)) * 1),0)
+      const total = arr.reduce((account,item) => account + (Math.abs(Number(item.shu_liang_)) * 1) * (Math.abs(Number(item.dan_jia_han_shui_)) * 1) - (Math.abs(Number(item.shu_liang_)) * 1) * (Math.abs((Number(item.dan_jia_han_shui_)/((parseFloat(Number(item.shui_lv_.replace("%", ""))) / 100)+1))) * 1),0)
       return total.toFixed(2)
     },
     addjineToFixed(arr){
-      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)
+      const total = arr.reduce((account,item) => account + (Math.abs(Number(item.shu_liang_)) * 1) * (Math.abs((Number(item.dan_jia_han_shui_)/((parseFloat(Number(item.shui_lv_.replace("%", ""))) / 100)+1))) * 1),0)
       return total.toFixed(2)
     },
     addhshjToFixed(arr){
-      const total = arr.reduce((account,item) => account + (Math.abs(item.shu_liang_) * 1) * (Math.abs(item.dan_jia_han_shui_) * 1),0)
+      const total = arr.reduce((account,item) => account + (Math.abs(Number(item.shu_liang_)) * 1) * (Math.abs(Number(item.dan_jia_han_shui_)) * 1),0)
       return total.toFixed(2)
     },
     bumenfilters: function (value, list) {