gjy 3 vuotta sitten
vanhempi
commit
8be13f3ec0

+ 7 - 5
src/views/warehouse/warehouseManagementGross.vue

@@ -1412,10 +1412,12 @@ export default {
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.pcFlag = 1
               this.deptBudgetList.statusFlag = 3
-               this.deptBudgetList.grossWeight /= 1000
-              this.deptBudgetList.tare /= 1000
-              this.deptBudgetList.netWeight /= 1000
-              this.deptBudgetList.pureWeight /= 1000
+              his.deptBudgetList.grossWeight /= 1000
+                this.deptBudgetList.tare /= 1000
+                this.deptBudgetList.netWeight /= 1000
+                this.deptBudgetList.pureWeight /= 1000
+                this.deptBudgetList.deductionAmount *= 1000
+                this.deptBudgetList.deductionWeight /= 1000
               addstorageputList(this.deptBudgetList)
                 .toPromise()
                 .then((response) => {
@@ -1919,7 +1921,7 @@ export default {
                 this.deptBudgetList.netWeight /= 1000
                 this.deptBudgetList.pureWeight /= 1000
                 this.deptBudgetList.deductionAmount *= 1000
-                this.deptBudgetList.deductionWeight *= 1000
+                this.deptBudgetList.deductionWeight /= 1000
               addstorageputList(this.deptBudgetList)
                 .toPromise()
                 .then((response) => {

+ 2 - 2
src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -641,7 +641,7 @@ export default {
     this.dataList.solidGrainWater=this.$route.query.solidGrainWater
     this.dataList.pureWeight=this.$route.query.pureWeight*1000
     this.dataList.deductionAmount=this.$route.query.deductionAmount/1000
-    this.dataList.deductionWeight=this.$route.query.deductionWeight/1000
+    this.dataList.deductionWeight=this.$route.query.deductionWeight*1000
     this.dataList.inOutTypeFlag=1
     if(this.dataList.cost){
       this.isGetCost = true
@@ -1368,7 +1368,7 @@ export default {
               if(!this.dataList.deductionAmount){
                 this.dataList.deductionAmount = 0
               }
-              this.dataList.deductionWeight *= 1000
+              this.dataList.deductionWeight /= 1000
               this.dataList.deductionAmount *= 1000
               addstorageputList(this.dataList)
                 .toPromise()

+ 5 - 3
src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -1107,9 +1107,11 @@ export default {
               this.dataList.inOutFlag = 1
               this.dataList.statusFlag = 3
               this.dataList.grossWeight /= 1000
-              this.dataList.tare /= 1000
-              this.dataList.netWeight /= 1000
-              this.dataList.pureWeight /= 1000
+                this.dataList.tare /= 1000
+                this.dataList.netWeight /= 1000
+                this.dataList.pureWeight /= 1000
+                this.dataList.deductionAmount *= 1000
+                this.dataList.deductionWeight /= 1000
               addstorageputList(this.dataList)
                 .toPromise()
                 .then((response) => {

+ 9 - 7
src/views/warehouse/warehouseManagementTare.vue

@@ -990,10 +990,10 @@ export default {
               this.deptBudgetList.inOutFlag = 1
               this.deptBudgetList.pcFlag = 1
               this.deptBudgetList.statusFlag = 1
-              this.deptBudgetList.grossWeight /= 1000
-              this.deptBudgetList.tare /= 1000
-              this.deptBudgetList.netWeight /= 1000
-              this.deptBudgetList.pureWeight /= 1000
+              his.deptBudgetList.grossWeight /= 1000
+                this.deptBudgetList.tare /= 1000
+                this.deptBudgetList.netWeight /= 1000
+                this.deptBudgetList.pureWeight /= 1000
               addstorageputList(this.deptBudgetList)
                 .toPromise()
                 .then((response) => {
@@ -1409,9 +1409,11 @@ export default {
         this.$refs.deptBudgetList.validate((valid) => {
           if (valid) {
              this.deptBudgetList.grossWeight /= 1000
-              this.deptBudgetList.tare /= 1000
-              this.deptBudgetList.netWeight /= 1000
-              this.deptBudgetList.pureWeight /= 1000
+                this.deptBudgetList.tare /= 1000
+                this.deptBudgetList.netWeight /= 1000
+                this.deptBudgetList.pureWeight /= 1000
+                this.deptBudgetList.deductionAmount *= 1000
+                this.deptBudgetList.deductionWeight /= 1000
             this.deptBudgetList.compId = sessionStorage.getItem('ws-pf_compId')
             this.deptBudgetList.inOutFlag = 1
             this.deptBudgetList.statusFlag = 3