gjy 3 년 전
부모
커밋
93fb6ec643
2개의 변경된 파일7개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 2
      src/views/houseSelfCollect/inspectionManagement.vue
  2. 3 2
      src/views/houseSelfCollect/weighingManagement.vue

+ 4 - 2
src/views/houseSelfCollect/inspectionManagement.vue

@@ -183,10 +183,12 @@
 			},
 			inspectInfo(row, index) {
 				for (let i = 0; i < this.warehouseList.length; i++) {
-					if (this.WAREHOUSE[1].payname == this.warehouseList[i].value) {
+					if (this.warehouseName == this.warehouseList[i].value) {
+						// console.log(this.warehouseList[i])
 						this.cangid = this.warehouseList[i].id
 					}
 				}
+				// console.log(this.cangid)
 				//添加,编辑,查看
 				this.$router.push({
 					path: 'inspectInfo',
@@ -264,7 +266,7 @@
 						let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
 						_wareHouse = JSON.parse(_wareHouse)
 						if (_wareHouse) {
-								this.cangid = _wareHouse.id
+								this.cangid = _wareHouse.warehouseId
 								this.warehouseName = _wareHouse.value
 								this.warehouseNo = _wareHouse.No
 								this.warehouseCount = _wareHouse.count

+ 3 - 2
src/views/houseSelfCollect/weighingManagement.vue

@@ -248,6 +248,7 @@
         this.getList()
       },
       weightCheck(row, num) {
+        console.log(this.cangid)
         this.$router.push({
           path: 'weightCheck',
           query: {
@@ -307,10 +308,10 @@
                 warehouseNo: response[i].commonWarehouseNo
               })
               if (_wareHouse) {
-                this.cangid = _wareHouse.id
+                this.cangid = _wareHouse.warehouseId
                 this.warehouseName = _wareHouse.value
                 this.common.name = _wareHouse.value
-                this.warehouseId = _wareHouse.id
+                this.warehouseId = _wareHouse.warehouseId
                 this.warehouseNo = _wareHouse.warehouseNo
                 this.monitorUrl1 = _wareHouse.monitorUrl1
                 this.allowEdit = _wareHouse.allowEdit