From 60354937ddfe86db342d0544b944f59771307bb0 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 22 Dec 2023 14:42:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E6=8B=A8=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=89=AB=E6=8F=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/new_style.css              |  1 +
 pages/issue/coms/comIssueDetailCard.vue |  1 -
 pages/issue/job/issueDetail.vue         |  1 -
 pages/issue/record/issueRecord.vue      | 13 ++++++++++--
 pages/putaway/record/putawayRecord.vue  | 28 +++++++++++++++++++++----
 pages/transfer/job/receiptDetail.vue    |  4 ++--
 6 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/common/style/new_style.css b/common/style/new_style.css
index 48a98b6b..0127473d 100644
--- a/common/style/new_style.css
+++ b/common/style/new_style.css
@@ -179,6 +179,7 @@ uni-page-head .uni-page-head__title {
 	border-radius: 50%;
 	text-align: center;
 	box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
+	opacity: 0.8;
 }
 
 .scan_float image {
diff --git a/pages/issue/coms/comIssueDetailCard.vue b/pages/issue/coms/comIssueDetailCard.vue
index e8a8505f..03cc180d 100644
--- a/pages/issue/coms/comIssueDetailCard.vue
+++ b/pages/issue/coms/comIssueDetailCard.vue
@@ -8,7 +8,6 @@
 				<uni-collapse-item :open="true">
 					<template v-slot:title>
 						<!-- 物品 -->
-						<u-line />
 						<item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
 						<!-- 			<com-issue-request-info :workShopCode="dataContent.workShopCode" :dataContent="dataContent">
 						</com-issue-request-info> -->
diff --git a/pages/issue/job/issueDetail.vue b/pages/issue/job/issueDetail.vue
index 5860906e..6b1f3699 100644
--- a/pages/issue/job/issueDetail.vue
+++ b/pages/issue/job/issueDetail.vue
@@ -13,7 +13,6 @@
 				<view v-for="(toLocation, index) in detailSource">
 					<com-issue-request-info :workShopCode="jobContent.workShopCode" :dataContent="toLocation">
 					</com-issue-request-info>
-					<!-- <u-line /> -->
 					<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation" @updateData='updateData'>
 					</com-issue-detail-card>
 				</view>
diff --git a/pages/issue/record/issueRecord.vue b/pages/issue/record/issueRecord.vue
index 9bccea91..ab5e130c 100644
--- a/pages/issue/record/issueRecord.vue
+++ b/pages/issue/record/issueRecord.vue
@@ -7,8 +7,10 @@
 			<view class="page-main">
 				<scroll-view scroll-y="true" class="">
 					<view v-for="(toLocation, index) in detailSource">
-						<com-issue-request-info :workShopCode="workShopCode" :dataContent="toLocation">
-						</com-issue-request-info>
+						<view class="uni-row uni-flex">
+							<com-issue-request-info :workShopCode="workShopCode" :dataContent="toLocation">
+							</com-issue-request-info>
+						</view>
 						<com-issue-detail-card ref='comIssueDetailCard' :dataContent="toLocation"
 							@updateData='updateData'>
 						</com-issue-detail-card>
@@ -146,6 +148,13 @@
 								that.subList.push(r);
 							})
 							that.detailSource = getDataSource(that.detailSource, that.subList)
+							//要修改一下数量
+							that.detailSource.forEach(item => {
+								//
+
+
+							})
+
 							that.resizeCollapse();
 						} else {
 							that.showMessage('列表数据为0');
diff --git a/pages/putaway/record/putawayRecord.vue b/pages/putaway/record/putawayRecord.vue
index 8286d84b..0661b87c 100644
--- a/pages/putaway/record/putawayRecord.vue
+++ b/pages/putaway/record/putawayRecord.vue
@@ -1,5 +1,11 @@
 <template>
 	<view class="page-wraper">
+		<view class="page-header">
+
+			<view class="header_item">
+				需求零件 : {{jobContent.requestNumber}}
+			</view>
+		</view>
 		<view class="">
 			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
 		</view>
@@ -108,6 +114,7 @@
 			};
 		},
 		onLoad(option) {
+			this.clear();
 			var typeCode = "PurchasePutaway"
 			getBusinessType(typeCode, res => {
 				if (res.success) {
@@ -184,6 +191,10 @@
 
 			//获取推荐库位
 			getRecommendLocation(balance, pack, callback) {
+				uni.showLoading({
+					title: '扫描中...',
+					mask: true
+				})
 				let recommend = this.recommendLocationList.find(r => r.itemCode == balance.itemCode);
 				if (recommend == undefined) {
 					let param = {
@@ -199,9 +210,11 @@
 							locationCode: res.data.code
 						})
 						callback(res.data);
+						uni.hideLoading();
 					}).catch(error => {
 						uni.hideLoading()
-						this.showErrorMessage(error)
+						this.showErrorMessage(error);
+						uni.hideLoading();
 					})
 
 				} else {
@@ -348,9 +361,17 @@
 						if (detail.scaned) {
 							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
 								detail.packingNumber, detail.toLocationCode, detail.batch);
-							detail.toPackingNumber = info.packingNumber;;
-							detail.toContainerNumber = detail.containerNumber
+							detail.toPackingNumber = info.packingNumber;
 							detail.toBatch = info.batch;
+							detail.toContainerNumber = detail.containerNumber;
+
+							detail.fromPackingNumber = info.packingNumber;
+							detail.fromBatch = info.batch;
+							detail.fromContainerNumber = detail.containerNumber;
+
+							detail.fromLocationCode = detail.locationCode;
+							detail.toLocationCode = detail.toLocationCode;
+
 							// detail.toInventoryStatus = detail.inventoryStatus
 							// detail.toLocationCode = detail.toLocationCode
 							detail.package = null;
@@ -362,7 +383,6 @@
 					this.dataContent.toWarehouseCode = subList[0].toWarehouseCode;
 				}
 				this.dataContent.subList = subList
-				debugger;
 				return this.dataContent;
 			},
 
diff --git a/pages/transfer/job/receiptDetail.vue b/pages/transfer/job/receiptDetail.vue
index 9779793f..650aeba1 100644
--- a/pages/transfer/job/receiptDetail.vue
+++ b/pages/transfer/job/receiptDetail.vue
@@ -496,11 +496,11 @@
 
 
 			scanPopupGetFocus() {
-				this.$refs.scanPopup.packGetFocus();
+				this.$refs.scanPopup.getfocus();
 			},
 
 			scanPopupLoseFocus() {
-				this.$refs.scanPopup.packLoseFocus();
+				this.$refs.scanPopup.loseFocus();
 			},
 
 			closeScanPopup() {