前端

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -228,7 +228,7 @@ export default {
           // if(this.userJurisdiction){
           //   this.warehouseList.unshift({warehouseName:response[0].flag})
           // }
-          debugger
+          // debugger
           let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
           if (_wareHouse) {
             _wareHouse = JSON.parse(_wareHouse)

src/views/houseSelfCollect/inspectionManagement.vue

@@ -159,6 +159,7 @@ export default {
       searchType: 0,
       warehouseName: '',
       inspect: [],
+      warehouseList1:[],
       warehouseList: [],
       cangid: '', //仓库id
       warehouseCount: '',
@@ -215,6 +216,11 @@ export default {
           this.WAREHOUSE[1].payname = this.warehouseList[i].value
         }
       }
+      for(let i = 0 ; i < this.warehouseList1.length; i++){
+        if(this.warehouseList1[i].warehouseName == e){
+           sessionStorage.setItem('houseSelfCollect_house',JSON.stringify(this.warehouseList[i]))
+        }
+      }
       this.getList()
     },
     del(row) {
@@ -260,26 +266,36 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          this.warehouseList1=response
           this.warehouseList = []
+          let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
+          _wareHouse = JSON.parse(_wareHouse)
           for (let i = 0; i < response.length; i++) {
             this.warehouseList.push({
               value: response[i].warehouseName,
               id: response[i].id,
               count: response[i].count,
               No:response[i].commonWarehouseNo
-            })
+            })  
+            if (_wareHouse) {
+            this.cangid = _wareHouse.id
+            this.warehouseName = _wareHouse.warehouseName
+             this.warehouseNo =_wareHouse.commonWarehouseNo
+             this.warehouseCount = _wareHouse.count
+          } else {
             if (this.cangid&&this.cangid == response[i].id) {
               this.warehouseName = response[i].warehouseName
               this.warehouseCount =  response[i].count
               this.warehouseNo =  response[i].commonWarehouseNo
             } 
+            if(this.warehouseList.length > 0 && !this.cangid){
+              this.warehouseName = this.warehouseList[0].value
+              this.warehouseCount =  this.warehouseList[0].count
+              this.warehouseNo =  this.warehouseList[0].No
+              this.cangid =  this.warehouseList[0].id
+              this.WAREHOUSE[1].payname = this.warehouseList[0].value
+            }
           }
-          if(this.warehouseList.length > 0 && !this.cangid){
-            this.warehouseName = this.warehouseList[0].value
-            this.warehouseCount =  this.warehouseList[0].count
-            this.warehouseNo =  this.warehouseList[0].No
-            this.cangid =  this.warehouseList[0].id
-            this.WAREHOUSE[1].payname = this.warehouseList[0].value
           }
           this.getList()
         })

src/views/houseSelfCollect/paymentManagement.vue

@@ -287,19 +287,25 @@ export default {
       }
     },
     getWarehouse() {
+      let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
+      _wareHouse = JSON.parse(_wareHouse)
       selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId')
       })
         .toPromise()
         .then(response => {
           this.warehouseList = response
-          console.log(this.WAREHOUSE[3].payname)
-          this.warehouseNameKey = this.warehouseList[0].id
-          if (this.warehouseName) {
-            this.warehouseNameKey = this.WAREHOUSE[3].payname
+           if (_wareHouse) {
+            this.warehouseNameKey = _wareHouse.id
+            this.warehouseName = _wareHouse.warehouseName
           } else {
-            this.WAREHOUSE[3].payname = this.warehouseList[0].id
-            this.warehouseName =  this.warehouseList[0].warehouseName
+          this.warehouseNameKey = this.warehouseList[0].id
+            if (this.warehouseName) {
+              this.warehouseNameKey = this.WAREHOUSE[3].payname
+            } else {
+              this.WAREHOUSE[3].payname = this.warehouseList[0].id
+              this.warehouseName =  this.warehouseList[0].warehouseName
+            }
           }
           this.getList()
         })
@@ -598,6 +604,7 @@ export default {
       for (let i = 0; i < this.warehouseList.length; i++) {
         if (this.warehouseList[i].id == this.warehouseNameKey) {
           this.warehouseName = this.warehouseList[i].warehouseName
+          sessionStorage.setItem('houseSelfCollect_house',JSON.stringify(this.warehouseList[i]))
           this.WAREHOUSE[3].payname = this.warehouseList[i].id
         }
       }

src/views/houseSelfCollect/weighingManagement.vue

@@ -250,12 +250,15 @@ export default {
       this.getList()
     },
     selectWarehouse(){
+      let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
+      _wareHouse = JSON.parse(_wareHouse)
       selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId'),
       })
         .toPromise()
         .then((response) => {
           this.warehouseList = []
+          
           for (let i = 0; i < response.length; i++) {
             this.warehouseList.push({
               value: response[i].warehouseName,
@@ -264,6 +267,16 @@ export default {
               monitorUrl1:response[i].monitorUrl1,
               monitorUrl2:response[i].monitorUrl2
             })
+             if (_wareHouse) {
+            
+            this.cangid = _wareHouse.id
+            this.warehouseName = _wareHouse.warehouseName
+            this.common.name=_wareHouse.warehouseName
+            this.warehouseId=_wareHouse.id
+             this.warehouseNo =_wareHouse.commonWarehouseNo
+             this.monitorUrl1=_wareHouse.monitorUrl1
+             this.monitorUrl2=_wareHouse.monitorUrl2
+          } else {
             if (this.cangid&&this.cangid == response[i].id) {
               this.warehouseName = response[i].warehouseName
               this.allowEdit = response[i].allowEdit
@@ -273,7 +286,7 @@ export default {
               this.monitorUrl1 =  response[i].monitorUrl1
               this.monitorUrl2 =  response[i].monitorUrl2
             }
-          }
+         
            if(this.warehouseList.length > 0 && !this.cangid){
             this.warehouseName = this.warehouseList[0].value
             this.cangid =  this.warehouseList[0].warehouseId
@@ -282,8 +295,11 @@ export default {
             this.common.name  =  this.warehouseList[0].value
             this.monitorUrl1 =  this.warehouseList[0].monitorUrl1
             this.monitorUrl2 =  this.warehouseList[0].monitorUrl2
+            } 
+          }
           }
            sessionStorage.setItem('ck',this.common.name)
+           console.log(this.warehouseList)
          this.getList()
         })
     },