gjy 3 anni fa
parent
commit
461cefdcb6
1 ha cambiato i file con 30 aggiunte e 15 eliminazioni
  1. 30 15
      src/views/houseSelfCollect/newWeighingManagement.vue

+ 30 - 15
src/views/houseSelfCollect/newWeighingManagement.vue

@@ -740,6 +740,7 @@
             this.setCurrent(this.mList[0])
 
             this.weighingList = this.mList[0]
+            console.log(this.weighingList)
             this.carWeightInfo = {
               carNumber: this.mList[0].carNumber,
               type: this.information,
@@ -756,7 +757,6 @@
             this.weighingList.inOutType = this.pList[0].qualityInspectionManagement.inOutType
             this.weighingList.inOutTypeKey = this.pList[0].qualityInspectionManagement.inOutTypeKey
             this.weighingList.deductionAmount = this.pList[0].qualityInspectionManagement.deductionAmount
-            console.log(this.weighingList)
             this.carWeightInfo = {
               carNumber: this.pList[0].carNumber,
               type: this.information,
@@ -1400,21 +1400,36 @@
                       id: this.weighingList.warehouseInOutId
                     }).toPromise().then((response) => {
                       that.inOutDate = response
-                      warehousing.statusFlag = 3
-                      warehousing.grossWeight /= 1000
-                      warehousing.tare /= 1000
-                      warehousing.netWeight /= 1000
-                      warehousing.pureWeight = 1000
-                      warehousing.deductionAmount = Number(warehousing.deductionAmount) * 1000
-                      warehousing.deductionWeight /= 1000
-                      warehousing.inOutFlag = 2
-                      console.log(that.weighingList)
-                      warehousing.inOutTypeKey = that.weighingList.inOutTypeKey
-                      warehousing.inOutType = that.weighingList.inOutType
-                      warehousing.deductionAmount = that.weighingList.deductionAmount
-                      warehousing.id = warehousing.warehouseInOutId
+                      that.inOutDate.statusFlag = 3
+                      that.inOutDate.grossWeight=warehousing.grossWeight /1000
+                      that.inOutDate.tare=warehousing.tare /1000
+                      that.inOutDate.netWeight=warehousing.netWeight /1000
+                      that.inOutDate.pureWeight=warehousing.pureWeight /1000
+                      that.inOutDate.deductionAmount= Number(warehousing.deductionAmount) * 1000
+                      that.inOutDate.deductionWeight=warehousing.deductionWeight /1000
+                      that.inOutDate.inOutFlag = 2
+                      console.log(that.inOutDate)
+                      // warehousing.inOutTypeKey = that.weighingList.inOutTypeKey
+                      // warehousing.inOutType = that.weighingList.inOutType
+                      // warehousing.deductionAmount = that.weighingList.deductionAmount
+                      // warehousing.positionId = that.weighingList.positionId
+                      // warehousing.id = warehousing.warehouseInOutId
+                      // warehousing.statusFlag = 3
+                      // warehousing.grossWeight /= 1000
+                      // warehousing.tare /= 1000
+                      // warehousing.netWeight /= 1000
+                      // warehousing.pureWeight = 1000
+                      // warehousing.deductionAmount = Number(warehousing.deductionAmount) * 1000
+                      // warehousing.deductionWeight /= 1000
+                      // warehousing.inOutFlag = 2
+                      // console.log(that.inOutDate)
+                      // warehousing.inOutTypeKey = that.weighingList.inOutTypeKey
+                      // warehousing.inOutType = that.weighingList.inOutType
+                      // warehousing.deductionAmount = that.weighingList.deductionAmount
+                      // // warehousing.positionId = that.weighingList.positionId
+                      // warehousing.id = warehousing.warehouseInOutId
                       // delete that.inOutDate.status
-                      that.inOutDate = Object.assign(that.inOutDate, warehousing)
+                      // that.inOutDate = Object.assign(that.inOutDate, warehousing)
                       addstorageputList(that.inOutDate).toPromise().then((response) => {})
                     })
                   }