前端

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -1399,21 +1399,41 @@
                       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
-                      // delete that.inOutDate.status
-                      that.inOutDate = Object.assign(that.inOutDate, warehousing)
+                      that.$set(that.inOutDate,'statusFlag',3)
+                     that.$set(that.inOutDate,'grossWeight',warehousing.grossWeight /1000)
+                      that.$set(that.inOutDate,'tare',warehousing.grossWeight /1000)
+                      that.$set(that.inOutDate,'netWeight',warehousing.netWeight /1000)
+                      // that.$set(that.inOutDate,'pureWeight',warehousing.pureWeight /1000)
+                      that.$set(that.inOutDate,'deductionAmount',Number(warehousing.deductionAmount) * 1000)
+                      that.$set(that.inOutDate,'deductionWeight',warehousing.deductionWeight /1000)
+                      that.$set(that.inOutDate,'inOutFlag',2)
+                     // that.inOutDate = response
+                      // that.$set(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.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
+                      // // delete that.inOutDate.status
+                      // that.inOutDate = Object.assign(that.inOutDate, warehousing)
                       addstorageputList(that.inOutDate).toPromise().then((response) => {})
                     })
                   }

src/views/outboundManagement/newQualityInspectionManagement.vue

@@ -388,6 +388,7 @@
               data: formdata,
             }).then((response) => {
               //编辑接口
+              this.printData.pictureAddress = response.data.url
               this.inspect.pictureAddress = response.data.url
               addOut(this.inspect)
               .toPromise()
@@ -411,6 +412,7 @@
               data: formdata,
             }).then((response) => {
               //编辑接口
+              this.printData.pictureAddress = response.data.url
               this.inspect.pictureAddress = response.data.url
               addOut(this.inspect)
               .toPromise()
@@ -578,6 +580,8 @@
               .then((response) => {
                 this.$message.success('保存成功')
                 this.printData = this.inspect
+                conole.log(this.printData)
+                
                 this.isShowPrint = true
                 this.getList()
               })

src/views/outboundManagement/outInspectRecord.vue

@@ -109,7 +109,10 @@
         this.getList()
       },
       print(row){
-           window.open('../../../static/outInspectionPrint.html?type=2&dataList=' + JSON.stringify(row))
+         row.type = 2
+        localStorage.setItem('out-Warehouse_print',JSON.stringify(row))
+        window.open('../../../static/outInspectionPrint.html')
+          //  window.open('../../../static/outInspectionPrint.html?type=2&dataList=' + JSON.stringify(row))
       },
       qualityInspection(row) {
         //查看

src/views/outboundManagement/weighingManagementNew.vue

@@ -363,7 +363,7 @@
         fleetNameList: [],
         carstatus: false,
         carjudge: false,
-        warehouseCount: 0,
+        warehouseCount: '',
         warehouseCount1: 0,
         warehouseNo: '',
         statusType: '3',
@@ -422,11 +422,14 @@
       this.isShowBalance = true
       this.openPort()
       this.getNowTime()
-      if (localStorage.getItem('houseSelfCollect_house1').allowEdit == 1) {
-        this.disabled = false
-      } else {
-        this.disabled = true
-      }
+	  if(localStorage.getItem('houseSelfCollect_house1')){
+		if (localStorage.getItem('houseSelfCollect_house1').allowEdit == 1) {
+			this.disabled = false
+		} else {
+			this.disabled = true
+		}
+	  }
+      
     },
     activated() {},
     methods: {
@@ -1217,7 +1220,7 @@
         for (let i = 0; i < this.warehouseList.length; i++) {
           if (this.warehouseList[i].value == e) {
             this.warehouseId = this.warehouseList[i].warehouseId
-            this.warehouseCount = this.warehouseList[i].count
+            // this.warehouseCount = this.warehouseList[i].ouCount
           }
         }
         for (let i = 0; i < this.warehouseList1.length; i++) {
@@ -1238,7 +1241,7 @@
               this.disabled = true
             }
             this.positionInfos = this.warehouseList1[i].positionInfos
-            this.warehouseCount = this.warehouseList1[i].count
+            this.warehouseCount = this.warehouseList1[i].outCount
             this.warehouseNo = this.warehouseList1[i].commonWarehouseNo
             this.warehouseType = this.warehouseList1[i].warehouseType
           }
@@ -1448,6 +1451,7 @@
       },
       contractNoChange(e) {
         this.warehouseCount = this.warehouseCount1
+		console.log(this.warehouseCount)
         for (let i = 0; i < this.taskNolist.length; i++) {
           if (this.taskNolist[i].inOutTaskNo == e) {
             var data = this.taskNolist[i]
@@ -1572,7 +1576,7 @@
                 this.warehouseId = this.warehouseList[0].warehouseId
                 this.positionInfos = response[0].positionInfos
                 this.warehouseCount = response[0].outCount
-                this.warehouseCount1 = response[i].outCount
+                this.warehouseCount1 = response[0].outCount
                 this.warehouseNo = response[0].commonWarehouseNo
                 this.warehouseType = response[0].warehouseType
                 if (response[0].allowEdit == 1) {
@@ -1580,6 +1584,7 @@
                 } else {
                   this.disabled = true
                 }
+				console.log()
               }
             }
             this.warehouseList1 = response