Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803

src/pages/issue/record/directIssue.vue

@@ -5,8 +5,10 @@
 		</view>
 		<view class="page-wraper" v-if="detailSource.length>0">
 			<view class="page-header">
-				<view class="header-view header_item">
+				<view class="header-view">
+					<view class="header_item">
 						来源库位 : {{fromLocationCode}}
+					</view>
 				</view>
 			</view>
 			<view class="page-main">
@@ -15,9 +17,8 @@
 						<view class="">
 							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
 								:isShowFromLocation="false" @removeItem="removeItem(index,item)"
-								:isShowToLocation="false"
+								:isShowToLocation="false" :isShowParentToLocation="false" @updateData="updateData"
-								:isShowParentToLocation="false"
+								@removePack="removePack">
-								 @updateData="updateData" @removePack="removePack">
 							</record-com-detail-card>
 
 						</view>
@@ -44,7 +45,7 @@
 			</view>
 			<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		</view>
-		
+
 		<winComScanBalance ref="scanPopup" @getBalance='getScanResult' :bussinessCode="businessTypeCode">
 		</winComScanBalance>
 		<comMessage ref="comMessage"></comMessage>
@@ -131,7 +132,7 @@
 				show: false,
 				positionInfo: "请选择生产线",
 				resultData: {},
-				itemCode:""
+				itemCode: ""
 			};
 		},
 		onLoad(option) {
@@ -169,7 +170,7 @@
 		mounted() {},
 
 		methods: {
-			
+
 			getBusinessType() {
 				getBusinessType(this.businessTypeCode, res => {
 					if (res.success) {
@@ -182,7 +183,7 @@
 					}
 				});
 			},
-			
+
 			getScanResult(result) {
 				this.setData(result);
 			},
@@ -190,14 +191,14 @@
 				let balance = result.balance;
 				let label = result.label;
 				let pack = result.package;
-			
+
-			
+
 				if (this.fromLocationCode && this.fromLocationCode != balance.locationCode) {
 					this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]在库位[" + this
 						.fromLocationCode + "]没有库存余额")
 					return;
 				}
-			
+
 				var item = this.detailSource.find(res => {
 					if (res.itemCode == balance.itemCode) {
 						return res
@@ -255,13 +256,8 @@
 			},
 
 			showErrorMessage(message) {
-				if (this.$refs.scanPopup) {
-					this.$refs.scanPopup.losefocus();
-				}
 				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
+					if (res) {}
-						this.scanPopupGetFocus()
-					}
 				});
 			},
 
@@ -518,7 +514,7 @@
 				this.toWarehouseCode = '';
 				this.detailSource = [];
 				this.positionInfo = "请选择生产线";
-				this.itemCode=""
+				this.itemCode = ""
 			}
 		}
 	}

src/pages/pointPutawayJob/index.vue

@@ -26,7 +26,7 @@
 							<tr>
 								<td>供应商</td>
 								<td>{{item.supplierCode}}</td>
-								<td>批次</td>
+								<td>供应商批次</td>
 								<td>{{item.supplierBatch}}</td>
 							</tr>
 							<tr>
@@ -218,7 +218,7 @@
 													<tr>
 														<td>供应商</td>
 														<td>${item.supplierCode}</td>
-														<td>批次</td>
+														<td>供应商批次</td>
 														<td>${item.supplierBatch}</td>
 													</tr>
 													<tr>