zhongtianhaoyuan пре 3 година
родитељ
комит
40fe156f77

+ 2 - 2
pages/erp/exWarehousing/exWarehousing.vue

@@ -367,7 +367,7 @@
 			// if (_data.contractNo) {
 			// 	this.detailData.contractNo = _data.contractNo;
 			// }
-			this.detailData.goodsNameKey = _data.goodsNameKey ? _data.goodsNameKey : '';
+			// this.detailData.goodsNameKey = _data.goodsNameKey ? _data.goodsNameKey : '';
 			if (!_data.tranCarInfoList) {
 				this.isPC = false
 				_data.tranCarInfoList = []
@@ -438,6 +438,7 @@
 					agentKey: this.userInfo.id
 				}).then(res => {
 					this.inOutNoList = res.data.data
+				this.detailData.goodsNameKey = res.data.data[0].goodsNameKey
 					this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo ? this.inOutNoList[0]
 						.inOutTaskNo : ''
 					this.detailData.agent = this.inOutNoList[0].agent
@@ -888,7 +889,6 @@
 				this.detailData.warehouseName = helper.erpWarehouse.warehouseName
 				this.detailData.positionId = helper.erpWarehouse.positionId
 				this.detailData.binNumber = this.binNumber
-				this.detailData.goodsNameKey = uni.getStorageSync('erpContractNoCK').goodsNameKey;
 				this.detailData.compId = helper.erpWarehouse.compId
 				this.detailData.netWeight = this.netWeight
 				this.detailData.inOutFlag = 1

+ 3 - 1
pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -374,6 +374,7 @@
 						agentKey : this.userInfo.id
 				}).then(res => {
 					this.inOutNoList = res.data.data
+					
 					// this.detailData.inOutTaskNo = this.inOutNoList[0].inOutTaskNo
 					// this.detailData.agent = this.inOutNoList[0].agent
 					// this.detailData.contractNo = this.inOutNoList[0].contractNo
@@ -410,6 +411,7 @@
 				this.detailData.goodsName = this.inOutNoList[e[0]].goodsName
 				this.detailData.grade = this.inOutNoList[e[0]].grade
 				this.detailData.inOutType = this.inOutNoList[e[0]].inOutType
+				this.detailData.goodsNameKey = this.inOutNoList[e[0]].goodsNameKey
 			},
 			toUpperCase(val) {
 				this.detailData.boxNo = val.detail.value.toUpperCase()
@@ -755,7 +757,7 @@
 				this.detailData.positionId = helper.erpWarehouse.positionId
 				this.detailData.warehouseName = helper.erpWarehouse.warehouseName
 				this.detailData.binNumber = this.binNumber
-				this.detailData.goodsNameKey = uni.getStorageSync('erpContractNo').goodsNameKey;
+				// this.detailData.goodsNameKey = uni.getStorageSync('erpContractNo').goodsNameKey;
 				this.detailData.compId = helper.erpWarehouse.compId
 				this.detailData.netWeight = this.netWeight
 				this.detailData.inOutFlag = 1