From 1aadce221f9a8e71f9684e113efe703382f0095c Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Fri, 14 Jun 2024 16:20:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E9=9A=90=E8=97=8F=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/detail/comDetailCard.vue                | 6 +++++-
 src/mycomponents/detail/comJobDetailCard.vue             | 8 +++++---
 src/mycomponents/package/packageList.vue                 | 2 +-
 src/mycomponents/record/recordComDetailCard.vue          | 2 +-
 src/pages/productPutaway/job/productPutawayDetail.vue    | 4 ++--
 src/pages/productPutaway/record/productPutawayRecord.vue | 2 +-
 src/pages/putaway/job/putawayDetail.vue                  | 2 +-
 7 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/mycomponents/detail/comDetailCard.vue b/src/mycomponents/detail/comDetailCard.vue
index 242543f4..171b48f0 100644
--- a/src/mycomponents/detail/comDetailCard.vue
+++ b/src/mycomponents/detail/comDetailCard.vue
@@ -13,7 +13,7 @@
 						<uni-swipe-action-item @click="swipeClick($event,item)"
 							:right-options="item.scaned?scanOptions:detailOptions"
 							style='padding:0px 0px  5px 0px;align-items: center;'>
-							<recommend :detail="item" :isShowToLocation="false">
+							<recommend :detail="item" :isShowStatus="isShowStatus" :isShowToLocation="false">
 							</recommend>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
@@ -74,6 +74,10 @@
 				type: Boolean,
 				default: true
 			},
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
 		},
 		watch: {
 			dataContent: {
diff --git a/src/mycomponents/detail/comJobDetailCard.vue b/src/mycomponents/detail/comJobDetailCard.vue
index ee9407fc..142df77d 100644
--- a/src/mycomponents/detail/comJobDetailCard.vue
+++ b/src/mycomponents/detail/comJobDetailCard.vue
@@ -10,7 +10,7 @@
 				:isEdit="settingParam.allowModifyQty=='TRUE'"
 				  :settingParam="settingParam" 
 					@collapseChange="collapseChange"
-					@updateData="updateData"
+					@updateData="updateData" :isShowStatus="isShowStatus"
 					></package-list>
 			</uni-collapse-item>
 		</uni-collapse>
@@ -60,8 +60,10 @@
 				type: Object,
 				default: null
 			},
-
-
+			isShowStatus: {
+				type: Boolean,
+				default: true
+			},
 		},
 		watch: {
 
diff --git a/src/mycomponents/package/packageList.vue b/src/mycomponents/package/packageList.vue
index 7f631f8b..30cad4ee 100644
--- a/src/mycomponents/package/packageList.vue
+++ b/src/mycomponents/package/packageList.vue
@@ -5,7 +5,7 @@
 				<uni-collapse-item :disabled="false">
 					<template v-slot:title>
 						<package-card :dataContent="item" :isShowLocation="false"
-							:isShowFromLocation="isShowFromLocation"></package-card>
+							:isShowFromLocation="isShowFromLocation" :isShowStatus="isShowStatus"></package-card>
 					</template>
 					<view v-for="(pack,index) in item.packList" :key="pack.id"
 						style=" width: 100%; background-color: antiquewhite;">
diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
index 42490f0c..d1082ca4 100644
--- a/src/mycomponents/record/recordComDetailCard.vue
+++ b/src/mycomponents/record/recordComDetailCard.vue
@@ -15,7 +15,7 @@
 					<uni-swipe-action >
 						<uni-swipe-action-item @click="swipeClick($event,detail,index)"
 							:right-options="detail.scaned?scanOptions:detailOptions">
-							<balance :dataContent="detail" :isShowStdPack="false" :isShowStatus="true"
+							<balance :dataContent="detail" :isShowStdPack="false" :isShowStatus="isShowStatus"
 								:isShowPack="true" :isShowFromLocation="isShowFromLocation" :isShowToLocation="isShowToLocation">
 							</balance>
 						</uni-swipe-action-item>
diff --git a/src/pages/productPutaway/job/productPutawayDetail.vue b/src/pages/productPutaway/job/productPutawayDetail.vue
index c4c53f0f..1623c02b 100644
--- a/src/pages/productPutaway/job/productPutawayDetail.vue
+++ b/src/pages/productPutaway/job/productPutawayDetail.vue
@@ -13,8 +13,8 @@
 			<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" :index="index" :settingParam="jobContent"
-							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
+						<com-detail-card :dataContent="item" :index="index" :settingParam="jobContent" :isShowStatus="false"
+							@remove="updateData" @updateData="updateData" @openDetail="openDetail" 
 							:locationAreaTypeList='toLocationAreaTypeList'>
 						</com-detail-card>
 					</view>
diff --git a/src/pages/productPutaway/record/productPutawayRecord.vue b/src/pages/productPutaway/record/productPutawayRecord.vue
index 820d4a28..25300cbd 100644
--- a/src/pages/productPutaway/record/productPutawayRecord.vue
+++ b/src/pages/productPutaway/record/productPutawayRecord.vue
@@ -9,7 +9,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="">
-							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
+							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent" :isShowStatus="false"
 								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack">
 							</record-com-detail-card>
 						</view>
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index 78542323..a722f558 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.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="">
-						<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent"
+						<comJobDetailCard :dataContent="item" :index="index" :settingParam="jobContent" :isShowStatus="false"
 							@remove="updateData" @updateData="updateData"
 							:locationAreaTypeList='toLocationAreaTypeList'>
 						</comJobDetailCard>