Browse Source

计价单位修改

wengyuwen 4 years ago
parent
commit
9e271e3a94

+ 2 - 4
src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -2155,7 +2155,6 @@
             fQty = parseFloat(Number(fQty) + Number(this.dataList[li].fQty)).toFixed(2)
           }
         }
-        fQty=(fQty/1000).toFixed(2);
         this.warehouseDrList.push({
           fCorpid: null,
           fFeeid: null,
@@ -2181,7 +2180,6 @@
             fQty = parseFloat(Number(fQty) + Number(this.dataList[li].fQty)).toFixed(2)
           }
         }
-        fQty=(fQty/1000).toFixed(2);
         this.warehouseCrList.push({
           fCorpid: null,
           fFeeid: null,
@@ -2870,7 +2868,7 @@
       },
       deleteRow(index, rows) {
         rows.splice(index, 1)
-        this.this.updateDeduplication()
+        this.updateDeduplication()
       },
       // 变更计价单位
       changeFeeUnit(row) {
@@ -2897,7 +2895,7 @@
           }
         }
         if (row.fFeeunitid === "1") {
-          this.$set(row, 'fQty', (fQty/1000).toFixed(2))
+          this.$set(row, "fQty", fQty);
         } else if (row.fFeeunitid === "2") {
           this.$set(row, 'fQty', (fGrossweight/1000).toFixed(2))
         }else if (row.fFeeunitid === "3") {

+ 3 - 3
src/views/warehouseBusiness/inStock/index.vue

@@ -3632,7 +3632,7 @@ export default {
         }
         for (let list in this.warehouseDrList) {
           if (this.warehouseDrList[list].fFeeUnitid === "1") {
-            this.$set(this.warehouseDrList[list], "fQty", (this.fQty/1000).toFixed(2));
+            this.$set(this.warehouseDrList[list], "fQty", this.fQty.toFixed(2));
           } else if (this.warehouseDrList[list].fFeeUnitid === "2") {
             this.$set(this.warehouseDrList[list], "fQty", (this.fGrossweight/1000).toFixed(2));
           } else if (this.warehouseDrList[list].fFeeUnitid === "3") {
@@ -3670,7 +3670,7 @@ export default {
         }
         for (let list in this.warehouseCrList) {
           if (this.warehouseCrList[list].fFeeUnitid === "1") {
-            this.$set(this.warehouseCrList[list], "fQty", (this.fQty/1000).toFixed(2));
+            this.$set(this.warehouseCrList[list], "fQty", this.fQty.toFixed(2));
           } else if (this.warehouseCrList[list].fFeeUnitid === "2") {
             this.$set(this.warehouseCrList[list], "fQty", (this.fGrossweight/1000).toFixed(2));
           } else if (this.warehouseCrList[list].fFeeUnitid === "3") {
@@ -4116,7 +4116,7 @@ export default {
       if (row.fFeeUnitid === "2") {
         this.$set(row, "fQty", (this.fGrossweight/1000).toFixed(2));
       } else if (row.fFeeUnitid === "1") {
-        this.$set(row, "fQty", (this.fQty/1000).toFixed(2));
+        this.$set(row, "fQty", this.fQty.toFixed(2));
       } else if (row.fFeeUnitid === "3") {
         this.$set(row, "fQty", (this.fNetweight/1000).toFixed(2));
       } else {

+ 4 - 4
src/views/warehouseBusiness/outStock/index.vue

@@ -3047,13 +3047,13 @@ export default {
         if (this.dialogWhgenlegList[zhgen].fFeeUnitid === 1) {
           qty = this.fQty
         } else if (this.dialogWhgenlegList[zhgen].fFeeUnitid === 2) {
-          qty = this.fGrossweight
+          qty = (this.fGrossweight/1000).toFixed(2)
         } else if (this.dialogWhgenlegList[zhgen].fFeeUnitid === 3) {
-          qty = this.fNetweight
+          qty = (this.fNetweight/1000).toFixed(2)
         } else if (this.dialogWhgenlegList[zhgen].fFeeUnitid === 4) {
           qty = this.fVolumn
         }
-        qty=(qty/1000).toFixed(2);
+        // qty=(qty/1000).toFixed(2);
         let fAmount = parseFloat(Number(this.dialogWhgenlegList[zhgen].fPrice) * Number(qty)).toFixed(2)
         if (this.costStatus === 'Cr') {
           this.warehouseCrList.push({
@@ -3802,7 +3802,7 @@ export default {
         }
       }
       if (row.fFeeunitid == "1") {
-        this.$set(row, 'fQty', (fQty/1000).toFixed(2))
+        this.$set(row, 'fQty', this.fQty.toFixed(2))
       } else if (row.fFeeunitid == "2") {
         this.$set(row, 'fQty', (fGrossweight/1000).toFixed(2))
       }else if (row.fFeeunitid == "3") {

+ 10 - 8
src/views/warehouseBusiness/stockTransfer/index.vue

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