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,19 +5,20 @@
 		</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">
 				<scroll-view scroll-y="true" class="page-main-scroll">
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<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>
@@ -131,7 +132,7 @@
 				show: false,
 				positionInfo: "请选择生产线",
 				resultData: {},
-				itemCode:""
+				itemCode: ""
 			};
 		},
 		onLoad(option) {
@@ -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>