From eb7e21267497688977af02b5a80dba998903dec0 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Mon, 3 Jun 2024 11:07:40 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D--=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E4=BB=BB=E5=8A=A1=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?--=E7=BC=96=E8=BE=91=E6=97=A0=E5=8F=8D=E5=BA=94=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=202=E3=80=81=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=97=A0=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/detail/comDetailCard.vue     |  6 ++++-
 src/mycomponents/job/jobComMainDetailCard.vue |  2 +-
 src/mycomponents/qty/balanceQtyEdit.vue       | 23 ++++++++++++-------
 src/pages/purchaseReturn/job/returnDetail.vue |  2 +-
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/mycomponents/detail/comDetailCard.vue b/src/mycomponents/detail/comDetailCard.vue
index d229d897..242543f4 100644
--- a/src/mycomponents/detail/comDetailCard.vue
+++ b/src/mycomponents/detail/comDetailCard.vue
@@ -20,7 +20,7 @@
 				</view>
 			</uni-collapse-item>
 		</uni-collapse>
-		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm"></balance-qty-edit>
+		<balance-qty-edit ref="qtyEdit" :settingParam="settingParam" :queryBalance="queryBalance" @confirm="confirm"></balance-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
 			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
 		<comMessage ref="message"></comMessage>
@@ -70,6 +70,10 @@
 				type: Array,
 				default: null
 			},
+			queryBalance: {
+				type: Boolean,
+				default: true
+			},
 		},
 		watch: {
 			dataContent: {
diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue
index 77d64e39..e0e547f6 100644
--- a/src/mycomponents/job/jobComMainDetailCard.vue
+++ b/src/mycomponents/job/jobComMainDetailCard.vue
@@ -9,7 +9,7 @@
 				</pack>
 				<batch v-if="isShowBatch && dataContent.batch!=null" :batch="dataContent.batch"></batch>
 				<div class="u-flex justify-between">
-					<location v-if="isShowFromLocation" title="来源库位" :locationCode="dataContent.fromLocationCode">
+					<location v-if="isShowFromLocation&&dataContent.fromLocationCode" title="来源库位" :locationCode="dataContent.fromLocationCode">
 					</location>
 					<!-- 	<to-location></to-location> -->
 					<to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode">
diff --git a/src/mycomponents/qty/balanceQtyEdit.vue b/src/mycomponents/qty/balanceQtyEdit.vue
index 735d5205..cbd92cdf 100644
--- a/src/mycomponents/qty/balanceQtyEdit.vue
+++ b/src/mycomponents/qty/balanceQtyEdit.vue
@@ -41,15 +41,15 @@
 								</view>
 							</view>
 							<view class='split_line'></view>
-							<view class="uni-flex uni-row space-between padding title u-col-center">
+							<view class="uni-flex uni-row space-between padding title u-col-center" v-if="queryBalance">
 								<text>库存数量 : </text>
 								<view class="uni-flex uni-row uni-center" style="align-items: center;">
 									<text class="text_recommend">{{Number(dataContent.balanceQty)}}</text>
 									<uom :uom="dataContent.uom"></uom>
 								</view>
 							</view>
-							<view class='split_line'></view>
-							<view v-if="isShowStatus" class="uni-flex uni-row space-between  title u-col-center"
+							<view class='split_line' v-if="queryBalance"></view>
+							<view v-if="isShowStatus&&queryBalance" class="uni-flex uni-row space-between  title u-col-center"
 								style="padding-left: 30rpx;">
 								<text>库存状态 : </text>
 								<view class="uni-flex uni-row uni-center" style="align-items: center;">
@@ -58,7 +58,7 @@
 									</balanceStatus>
 								</view>
 							</view>
-							<view class='split_line'></view>
+							<view class='split_line' v-if="queryBalance"></view>
 						</view>
 					</view>
 				</view>
@@ -115,6 +115,10 @@
 			allowEditStatus: {
 				type: Boolean,
 				default: false
+			},
+			queryBalance: {
+				type: Boolean,
+				default: true
 			}
 		},
 		watch:{
@@ -145,10 +149,13 @@
 				}
 			},
 			openEditPopup(item, handleQty) {
-				this.dataContent = item
-				this.inventoryStatus = this.dataContent.inventoryStatus
-				this.originalInventoryStatus =this.dataContent.inventoryStatus;
-				this.toInventoryStatus = this.dataContent.toInventoryStatus
+				
+				if(item){
+					this.dataContent = item 
+					this.inventoryStatus = this.dataContent.inventoryStatus
+					this.originalInventoryStatus =this.dataContent.inventoryStatus;
+					this.toInventoryStatus = this.dataContent.toInventoryStatus
+				}
 				this.allQty = handleQty
 				setTimeout(res => {
 					this.$refs.popup.open('bottom')
diff --git a/src/pages/purchaseReturn/job/returnDetail.vue b/src/pages/purchaseReturn/job/returnDetail.vue
index 9682998b..4f31b7bb 100644
--- a/src/pages/purchaseReturn/job/returnDetail.vue
+++ b/src/pages/purchaseReturn/job/returnDetail.vue
@@ -14,7 +14,7 @@
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
-						<com-detail-card :dataContent="item" :settingParam="jobContent" @remove="updateData"
+						<com-detail-card :dataContent="item" :settingParam="jobContent" @remove="updateData" :queryBalance="false"
 					
 							@updateData='updateData' @openDetail="openDetail">
 						</com-detail-card>