Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -2148,11 +2148,19 @@
       },
       // 收款信息
       addCollection() {
+        // 获取明细件数
+        let fQty = 0;
+        for (let li in this.dataList) {
+          if (this.dataList[li].fQty) {
+            fQty = parseFloat(Number(fQty) + Number(this.dataList[li].fQty)).toFixed(2)
+          }
+        }
+        fQty=(fQty/1000).toFixed(2);
         this.warehouseDrList.push({
           fCorpid: null,
           fFeeid: null,
           fFeeunitid: 1,
-          fQty: 0,
+          fQty: fQty,
           fUnitprice: 0,
           fAmount: 0,
           fCurrency: null,
@@ -2166,11 +2174,19 @@
         })
       },
       addpayment() {
+        // 获取明细件数
+        let fQty = 0;
+        for (let li in this.dataList) {
+          if (this.dataList[li].fQty) {
+            fQty = parseFloat(Number(fQty) + Number(this.dataList[li].fQty)).toFixed(2)
+          }
+        }
+        fQty=(fQty/1000).toFixed(2);
         this.warehouseCrList.push({
           fCorpid: null,
           fFeeid: null,
           fFeeunitid: 1,
-          fQty: 0,
+          fQty: fQty,
           fUnitprice: 0,
           fAmount: 0,
           fCurrency: null,
@@ -2875,15 +2891,15 @@
           }
         }
         if (row.fFeeunitid === 1) {
-          this.$set(row, 'fQty', fQty)
+          this.$set(row, 'fQty', (fQty/1000).toFixed(2))
         } else if (row.fFeeunitid === 2) {
-          this.$set(row, 'fQty', fGrossweight)
+          this.$set(row, 'fQty', (fGrossweight/1000).toFixed(2))
         }else if (row.fFeeunitid === 3) {
-          this.$set(row, 'fQty', fNetweight)
+          this.$set(row, 'fQty', (fNetweight/1000).toFixed(2))
         }else if (row.fFeeunitid === 4) {
-          this.$set(row, 'fQty', volumn)
+          this.$set(row, 'fQty', (volumn/1000).toFixed(2))
         }else if (row.fFeeunitid === 5) {
-          this.$set(row, 'fQty', fixed)
+          this.$set(row, 'fQty', (fixed/1000).toFixed(2))
         }
         if (row.fUnitprice) {
           this.$set(row, 'fAmount', parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2))

src/views/warehouseBusiness/outStock/index.vue

@@ -3052,6 +3052,7 @@ export default {
         } else if (this.dialogWhgenlegList[zhgen].fFeeUnitid === 4) {
           qty = this.fVolumn
         }
+        qty=(qty/1000).toFixed(2);
         let fAmount = parseFloat(Number(this.dialogWhgenlegList[zhgen].fPrice) * Number(qty)).toFixed(2)
         if (this.costStatus === 'Cr') {
           this.warehouseCrList.push({
@@ -3800,15 +3801,15 @@ export default {
         }
       }
       if (row.fFeeunitid === 1) {
-        this.$set(row, 'fQty', fQty)
+        this.$set(row, 'fQty', (fQty/1000).toFixed(2))
       } else if (row.fFeeunitid === 2) {
-        this.$set(row, 'fQty', fGrossweight)
+        this.$set(row, 'fQty', (fGrossweight/1000).toFixed(2))
       }else if (row.fFeeunitid === 3) {
-        this.$set(row, 'fQty', fNetweight)
+        this.$set(row, 'fQty', (fNetweight/1000).toFixed(2))
       }else if (row.fFeeunitid === 4) {
-        this.$set(row, 'fQty', volumn)
+        this.$set(row, 'fQty', (volumn/1000).toFixed(2))
       }else if (row.fFeeunitid === 5) {
-        this.$set(row, 'fQty', fixed)
+        this.$set(row, 'fQty', (fixed/1000).toFixed(2))
       }
       if (row.fUnitprice) {
         this.$set(row, 'fAmount', parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2))

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -2707,6 +2707,7 @@ export default {
         } else if (this.dialogWhgenlegList[zhgen].fFeeUnitid === 4) {
           qty = this.fVolumn
         }
+        qty=(qty/1000).toFixed(2);
         let fAmount = parseFloat(Number(this.dialogWhgenlegList[zhgen].fPrice) * Number(qty)).toFixed(2)
         if (this.costStatus === 'Cr') {
           this.warehouseCrList.push({
@@ -3503,15 +3504,15 @@ export default {
         }
       }
       if (row.fFeeunitid === 1) {
-        this.$set(row, 'fQty', fQty)
+        this.$set(row, 'fQty', (fQty/1000).toFixed(2))
       } else if (row.fFeeunitid === 2) {
-        this.$set(row, 'fQty', fGrossweight)
+        this.$set(row, 'fQty', (fGrossweight/1000).toFixed(2))
       }else if (row.fFeeunitid === 3) {
-        this.$set(row, 'fQty', fNetweight)
+        this.$set(row, 'fQty', (fNetweight/1000).toFixed(2))
       }else if (row.fFeeunitid === 4) {
-        this.$set(row, 'fQty', volumn)
+        this.$set(row, 'fQty', (volumn/1000).toFixed(2))
       }else if (row.fFeeunitid === 5) {
-        this.$set(row, 'fQty', fixed)
+        this.$set(row, 'fQty', (fixed/1000).toFixed(2))
       }
       if (row.fUnitprice) {
         this.$set(row, 'fAmount', parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2))

vue.config.js

@@ -34,7 +34,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.137.1:9010`,
+        target: `http://localhost:9010`,
         //  target: `http://engineering.echepei.com:9010/`,
         changeOrigin: true,
         pathRewrite: {