From 16366ae9cd82addbc2dc2910c366e1b8200a0239 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 15 Nov 2024 14:34:04 +0800
Subject: [PATCH] =?UTF-8?q?YT-936=20=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/deliver/coms/comDeliverDetailCardBatch.vue | 2 +-
 src/pages/deliver/job/deliverDetailBatch.vue         | 7 ++-----
 src/pages/issue/coms/comIssueDetailCardBatch.vue     | 6 +++---
 src/pages/issue/job/issueDetailBatch.vue             | 6 +++---
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/pages/deliver/coms/comDeliverDetailCardBatch.vue b/src/pages/deliver/coms/comDeliverDetailCardBatch.vue
index 33de6657..fe39b788 100644
--- a/src/pages/deliver/coms/comDeliverDetailCardBatch.vue
+++ b/src/pages/deliver/coms/comDeliverDetailCardBatch.vue
@@ -14,7 +14,7 @@
 					<uni-swipe-action ref="swipeAction" style="margin-top: 10px;"
 						    v-for="(item,index) in dataContent.subList">
 						<uni-swipe-action-item
-							:right-options="(item.scaned&&isEdit)?editAndRemoveOptions : item.scaned? removeOptions:options"   @click="itemCoceClick($event,item,index)">
+							:right-options="(item.scaned&&isEdit)?editAndRemoveOptions : item.scaned? removeOptions:detailOptions"   @click="itemCoceClick($event,item,index)">
 							<view class="" :class="item.scaned?'scan_view':''">
 								<recommend :detail="item" :isShowLocation="false" :isShowFromLocation="true"  :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
 							</view>
diff --git a/src/pages/deliver/job/deliverDetailBatch.vue b/src/pages/deliver/job/deliverDetailBatch.vue
index 24c01ae1..c643e04b 100644
--- a/src/pages/deliver/job/deliverDetailBatch.vue
+++ b/src/pages/deliver/job/deliverDetailBatch.vue
@@ -28,9 +28,6 @@
 
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
-				<view>
-		
-				</view>
 				<view v-for="(toLocation, index) in detailSource">
 				<comDeliverDetailCardBatch ref='comIssueDetailCardBatch' :dataContent="toLocation" :settingParam="jobContent"
 					@updateData='updateData' :allowBiggerQty='allowBiggerQty'>
@@ -54,7 +51,7 @@
 		<!-- <comScanDeliverPackBatch ref="comScanIssuePack" @closeScan='closeScan' @updateData='updateData'>
 		</comScanDeliverPackBatch> -->
 		
-		<winScanPackAndLocation :balanceFromInventoryStatuses="false" :toLocationCode="jobToLocationCode" ref="scanPopup"
+		<winScanPackAndLocation :balanceFromInventoryStatuses="false"  ref="scanPopup"
 			@getResult='getScanResult' :noShowBalanceMessage="false" @confirm='confirmFromLocation'>
 		</winScanPackAndLocation>
 		<comMessage ref="comMessage"></comMessage>
@@ -315,7 +312,7 @@
 										toLocationCode:this.toLocationCode,
 										batch:result.label.batch,
 										handleQty:result.label.qty,
-										qty:this.recommendQty,
+										qty:0,
 										inventoryStatus:result.balance.inventoryStatus,
 										toLocation:result.balance.toLocation,
 										balance:result.balance,
diff --git a/src/pages/issue/coms/comIssueDetailCardBatch.vue b/src/pages/issue/coms/comIssueDetailCardBatch.vue
index 2e59bcf8..cd9f8272 100644
--- a/src/pages/issue/coms/comIssueDetailCardBatch.vue
+++ b/src/pages/issue/coms/comIssueDetailCardBatch.vue
@@ -14,7 +14,7 @@
 					<uni-swipe-action ref="swipeAction" style="margin-top: 10px;"
 						    v-for="(item,index) in dataContent.subList">
 						<uni-swipe-action-item
-							:right-options="(item.scaned&&settingParam.allowModifyQty == 'TRUE')?editAndRemoveOptions : item.scaned? removeOptions:options"   @click="itemCoceClick($event,item,index)">
+							:right-options="(item.scaned&&settingParam.allowModifyQty == 'TRUE')?editAndRemoveOptions : item.scaned? removeOptions:[]"   @click="itemCoceClick($event,item,index)">
 							<view class="" :class="item.scaned?'scan_view':''">
 								<recommend :detail="item" :isShowLocation="false" :isShowFromLocation="true"  :isShowToLocation="settingParam.allowModifyLocation=='TRUE'"></recommend>
 							</view>
@@ -68,8 +68,8 @@
 		},
 		props: {
 			dataContent: {
-				type: Array,
-				default: []
+				type: Object,
+				default: {}
 			},
 			settingParam: {
 				type: Object,
diff --git a/src/pages/issue/job/issueDetailBatch.vue b/src/pages/issue/job/issueDetailBatch.vue
index 3b518718..090066d4 100644
--- a/src/pages/issue/job/issueDetailBatch.vue
+++ b/src/pages/issue/job/issueDetailBatch.vue
@@ -39,10 +39,10 @@
 			@afterScan='afterScan' :locationCode='fromLocationCode'>
 		</com-scan-issue-pack> -->
 	
-		<winScanPackAndLocation :balanceFromInventoryStatuses="false" :toLocationCode="jobToLocationCode" ref="scanPopup"
+		<winScanPackAndLocation :balanceFromInventoryStatuses="false"  ref="scanPopup"
 			@getResult='getScanResult' :noShowBalanceMessage="false" @confirm='confirmFromLocation'>
 		</winScanPackAndLocation>
-		<balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
+		<balance-select ref="balanceSelect" ></balance-select>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -347,7 +347,7 @@
 										toLocationCode:this.toLocationCode,
 										batch:result.label.batch,
 										handleQty:result.label.qty,
-										qty:this.recommendQty,
+										qty:0,
 										inventoryStatus:result.balance.inventoryStatus,
 										toLocation:result.balance.toLocation,
 										balance:result.balance,