From 5ba63efc7dbaf5134480ed5ebbee4d7fd91b3262 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Mon, 23 Sep 2024 09:15:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E6=94=B6=E8=B4=A7=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=97=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/detail/comDetailCard.vue            |  6 +++++-
 src/pages/productReceipt/record/recordList.vue       |  7 ++++++-
 src/pages/productReceipt/record/recordListDetail.vue | 10 +++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/mycomponents/detail/comDetailCard.vue b/src/mycomponents/detail/comDetailCard.vue
index 2f624835..4a008109 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" :isShowStatus="isShowStatus" :isShowToLocation="isShowToLocation">
+							<recommend :detail="item" :isShowFromLocation="isShowFromLocation" :isShowStatus="isShowStatus" :isShowToLocation="isShowToLocation">
 							</recommend>
 							
 						</uni-swipe-action-item>
@@ -67,6 +67,10 @@
 				type: Boolean,
 				default: true
 			},
+			isShowFromLocation: {
+				type: Boolean,
+				default: true
+			},
 			isShowToLocation: {
 				type: Boolean,
 				default: false
diff --git a/src/pages/productReceipt/record/recordList.vue b/src/pages/productReceipt/record/recordList.vue
index fd1221a6..831613b1 100644
--- a/src/pages/productReceipt/record/recordList.vue
+++ b/src/pages/productReceipt/record/recordList.vue
@@ -181,8 +181,13 @@
 							value: this.filterItemCode
 						})
 					}
-					
 				}
+				
+				filterParams.push({
+					column: "type",
+					action: "like",
+					value: "scrap"
+				})
 
 				return filterParams;
 
diff --git a/src/pages/productReceipt/record/recordListDetail.vue b/src/pages/productReceipt/record/recordListDetail.vue
index a1cf6464..297f44a1 100644
--- a/src/pages/productReceipt/record/recordListDetail.vue
+++ b/src/pages/productReceipt/record/recordListDetail.vue
@@ -22,7 +22,9 @@
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<com-detail-card :dataContent="item" :index="index" :settingParam="recordContent"
-							@remove="updateData" :isShowToLocation="true" @updateData="updateData"
+							@remove="updateData" 
+							:isShowFromLocation="false"
+							:isShowToLocation="true" @updateData="updateData"
 							@openDetail="openDetail">
 						</com-detail-card>
 						
@@ -154,12 +156,6 @@
 						if (res.data.list.length > 0) {
 							that.recordContent = res.data.list[0];
 							that.subList = res.data.list;
-							that.subList.forEach(item => {
-								item.batch = item.toBatch;
-								item.packingNumber = item.toPackingNumber;
-								item.inventoryStatus= item.fromInventoryStatus
-								item.toInventoryStatus =item.toInventoryStatus
-							})
 							that.detailSource = getDataSource(that.subList)
 						} else {
 							that.showMessage('列表数据为0');