更新

src/layout/index/top/index.vue

@@ -630,24 +630,24 @@
         _saomadata.cangid = this.cangid
         _saomadata.id = this.toPageData.qualityInspectionManagement.id
         _saomadata.warehouseName = this.toPageData.qualityInspectionManagement.warehouseName
-       _saomadata.managementType = this.toPageData.qualityInspectionManagement.managementType//贸易入库1 收购入库3
+       _saomadata.managementType = this.toPageData.qualityInspectionManagement.serviceManagementType//贸易入库1 收购入库3
          this.barCode = ''
         let _url = ''
         if (type === 1) {
            _saomadata.type = 1
-           localStorage.setItem("saoma_data",JSON.stringify(_saomadata))
+           localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
           this.$router.push({
           	name: 'inspectionManagementNew'
           })
         } else if (type === 2) {
            _saomadata.type = 2
-           localStorage.setItem("saoma_data",JSON.stringify(_saomadata))
+           localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
             this.$router.push({
           	name: 'inspectionManagementNew'
           })
         } else if (type === 3) {
            _saomadata.type = 3
-           localStorage.setItem("saoma_data",JSON.stringify(_saomadata))
+           localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
             this.$router.push({
           	name: 'inspectionManagementNew'
           })
@@ -656,7 +656,7 @@
            _saomadata.monitorUrl1 = this.toPageData.warehouseBaseInfo.monitorUrl1
            _saomadata.monitorUrl2 = this.toPageData.warehouseBaseInfo.monitorUrl2
            _saomadata.allowEdit = this.toPageData.warehouseBaseInfo.allowEdit
-            localStorage.setItem("saoma_data",JSON.stringify(_saomadata))
+            localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
              this.$router.push({
             name: 'newWeighingManagement'
           })
@@ -674,7 +674,7 @@
            _saomadata.monitorUrl1 = this.toPageData.warehouseBaseInfo.monitorUrl1
            _saomadata.monitorUrl2 = this.toPageData.warehouseBaseInfo.monitorUrl2
            _saomadata.allowEdit = this.toPageData.warehouseBaseInfo.allowEdit
-            localStorage.setItem("saoma_data",JSON.stringify(_saomadata))
+            localStorage.setItem('saoma_data',JSON.stringify(_saomadata))
            this.$router.push({
             name: 'newWeighingManagement',
           })

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -447,7 +447,6 @@
           inOutDate: new Date(),
           netWeight:0,
           pureWeight:0,
-          deductionWeight:0,
           waterContent:'',
           reWaterContent:'',
           reGrade:'',
@@ -1085,7 +1084,6 @@
           inOutDate: new Date(),
           netWeight:0,
           pureWeight:0,
-          deductionWeight:0,
           waterContent:'',
           reWaterContent:'',
           reGrade:'',
@@ -1105,6 +1103,8 @@
           boxNoOther:'',
           titleNo:'',
           titleNoOther:'',
+          inOutType:'',
+          inOutTypeKey:1
         }
         if(this.serviceManagementType==3){
           var count=''
@@ -1187,7 +1187,6 @@
                         inOutDate: new Date(),
                         netWeight:0,
                         pureWeight:0,
-                        deductionWeight:0,
                         waterContent:'',
                         reWaterContent:'',
                         reGrade:'',
@@ -1207,6 +1206,8 @@
                         boxNoOther:'',
                         titleNo:'',
                         titleNoOther:'',
+                        inOutType:'',
+                        inOutTypeKey:1
                       }
                       if(this.serviceManagementType==3){
                         var count=''
@@ -2056,7 +2057,6 @@
                         inOutDate: new Date(),
                         netWeight:0,
                         pureWeight:0,
-                        deductionWeight:0,
                         waterContent:'',
                         reWaterContent:'',
                         reGrade:'',

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -448,7 +448,10 @@
             this.allowEdit = _saomaData.allowEdit
             this.id = _saomaData.id
             this.tpyeNo = _saomaData.typeNo
-            this.inWarehouseType = _saomaData.managementType
+            if(_saomaData.managementType){
+                this.inWarehouseType = _saomaData.managementType
+            }
+            
             localStorage.removeItem('saoma_data'); //第一次进来结束后清除缓存
           } else if (localStorage.getItem('houseSelfCollect_house1')) {
             this.warehouseName = JSON.parse(localStorage.getItem('houseSelfCollect_house1')).value
@@ -1391,8 +1394,6 @@
                       }
                     }
                   }
-                  this.isShowPrintType = true
-                  this.getList()
 
                   //贸易入库需要再走入库接口
                   if (this.inWarehouseType == 1) {
@@ -1403,7 +1404,7 @@
                       that.inOutDate = response
                       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,'tare',warehousing.tare /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)
@@ -1437,8 +1438,14 @@
                       // // delete that.inOutDate.status
                       // that.inOutDate = Object.assign(that.inOutDate, warehousing)
                       addstorageputList(that.inOutDate).toPromise().then((response) => {})
+                      this.isShowPrintType = true
+                      this.getList()
                     })
                   }
+                  else{
+                    this.isShowPrintType = true
+                    this.getList()
+                  }
                 })
                 .catch((response) => {})
             }