5月17日修改

package.json

@@ -51,6 +51,7 @@
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "print-js": "^1.0.61",
+    "python2": "0.0.1",
     "screenfull": "3.3.3",
     "showdown": "1.8.6",
     "simplemde": "1.11.2",
@@ -99,7 +100,7 @@
     "lint-staged": "7.2.2",
     "mini-css-extract-plugin": "0.4.1",
     "node-notifier": "5.2.1",
-    "node-sass": "^4.12.0",
+    "node-sass": "^4.14.1",
     "optimize-css-assets-webpack-plugin": "5.0.0",
     "ora": "3.0.0",
     "path-to-regexp": "2.4.0",

src/views/SaleOut/AddSaleOut.vue

@@ -21,7 +21,7 @@
                     <el-option :label="$t('prompt.xsjh')" value="4"/>
                     <el-option :label="$t('prompt.wly')" value="5"/>
                     <el-option :label="$t('prompt.eshsd')" value="6"/>
-                    <el-option label="bom" value="7"/>
+                    <el-option label= "bom" value="7"/>
                   </el-select>
                 </el-form-item>
               </el-col>

src/views/StockArrival/AddStockArrival.vue

@@ -691,7 +691,8 @@ export default {
     },
     // 计算金额
     getMoney(row) {
-      row.money = (row.arrivalQuantity * row.price).toFixed(6)
+      row.money = (row.arrivalQuantity * (Number(row.includeTaxPrice) / (1 + (row.taxRate / 100)))).toFixed(2)
+
       return row.money
     },
     getways() {

src/views/StockArrival/components/MyDialog.vue

@@ -600,7 +600,8 @@ export default {
     },
     // 计算金额
     getMoney(row) {
-      row.money = (row.arrivalQuantity * row.price).toFixed(6)
+      row.money = (row.arrivalQuantity * (Number(row.includeTaxPrice) / (1 + (row.taxRate / 100)))).toFixed(2)
+
       return row.money
     },
     gettaxRate(row) {

src/views/StockInvoice/AddStockInvoice.vue

@@ -974,7 +974,7 @@ export default {
     },
     // 计算金额
     getMoney(row) {
-      row.money = (row.quantity * row.price).toFixed(2)
+      row.money = (row.quantity * (Number(row.includeTaxPrice) / (1 + (row.taxRate / 100)))).toFixed(2)
       return row.money
     },
     getways() {

src/views/StockInvoice/components/MyDialog.vue

@@ -932,7 +932,8 @@ export default {
     },
     // 计算金额
     getMoney(row) {
-      row.money = (row.quantity * row.price).toFixed(2)
+      row.money = (row.quantity * (Number(row.includeTaxPrice) / (1 + (row.taxRate / 100)))).toFixed(2)
+
       return row.money
     },
     getways() {

src/views/StockOrder/AddStockOrder.vue

@@ -613,7 +613,7 @@ export default {
   methods: {
     getcurrency() {
       const mycountry = this.$store.getters.countryId
-      console.log('mycountry============', mycountry)
+      // console.log('mycountry============', mycountry)
       if (mycountry === 1) {
         this.personalForm.currency = '3'
       } else if (mycountry === 2) {
@@ -627,7 +627,7 @@ export default {
       const hasPermission = roles.some(role => {
         return permissionRoles.includes(role)
       })
-      console.log('hasPermission=======', hasPermission)
+      // console.log('hasPermission=======', hasPermission)
       return hasPermission
     },
     handlechooseRep() {
@@ -927,7 +927,7 @@ export default {
     },
     // 计算金额
     getMoney(row) {
-      row.money = (row.stockQuantity * row.price).toFixed(6)
+      row.money = (row.stockQuantity * (Number(row.includeTaxPrice) / (1 + (row.taxRate / 100)))).toFixed(2)
       return row.money
     },
     // 选择源单类型事件

src/views/StockOrder/components/MyDialog.vue

@@ -780,7 +780,8 @@ export default {
     },
     // 计算金额
     getMoney(row) {
-      row.money = (row.stockQuantity * row.price).toFixed(6)
+      row.money = (row.stockQuantity * (Number(row.includeTaxPrice) / (1 + (row.taxRate / 100)))).toFixed(2)
+
       return row.money
     },
     // 选择源单类型事件

src/views/Stockenter/addstockenter.vue

@@ -166,7 +166,7 @@
             </el-editable-column>
             <el-editable-column :label="$t('updates.rkje')" prop="enterMoney" align="center" width="150px">
               <template slot-scope="scope">
-                <p v-show="jundgeprice()">{{ getSize(scope, scope.row.actualEnterQuantity, scope.row.enterPrice) }}</p>
+                <p v-show="jundgeprice()">{{ getSize(scope.row) }}</p>
               </template>
             </el-editable-column>
             <el-editable-column :label="$t('updates.sl')" prop="taxRate" align="center" width="150px">
@@ -1042,9 +1042,10 @@ export default {
       }
     },
     // 入库金额计算
-    getSize(scope, quan, pric) {
-      scope.row.enterMoney = (Number(quan) * Number(pric)).toFixed(6)
-      return (quan * pric).toFixed(6)
+    getSize(row) {
+      row.money = (row.actualEnterQuantity * (Number(row.includeTaxPrice) / (1 + (row.taxRate / 100)))).toFixed(2)
+
+      return row.money
     },
     getmylocation(scope) {
       if (scope.row.flag === undefined) {

src/views/Stockenter/components/MyDialog.vue

@@ -181,7 +181,7 @@
           </el-editable-column>
           <el-editable-column :label="$t('updates.rkje')" prop="enterMoney" align="center" width="150px">
             <template slot-scope="scope">
-              <p v-show="jundgeprice()">{{ getSize(scope.row.actualEnterQuantity, scope.row.enterPrice) }}</p>
+              <p v-show="jundgeprice()">{{ getSize(scope.row) }}</p>
             </template>
           </el-editable-column>
           <el-editable-column :edit-render="{name: 'ElInput', type: 'visible'}" :label="$t('updates.dcbm')" prop="batteryCode" align="center" min-width="150" >
@@ -570,8 +570,9 @@ export default {
       }
     },
     // 入库金额计算
-    getSize(quan, pric) {
-      return quan * pric
+    getSize(row) {
+      row.money = (row.actualEnterQuantity * (Number(row.includeTaxPrice) / (1 + (row.taxRate / 100)))).toFixed(2)
+      return row.money
     },
     getmylocation(scope) {
       if (scope.row.flag === undefined) {