From 832778a3184e8df6251137395fb84ceb9da5d329 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 18 Apr 2024 10:29:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E8=B4=A7=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/record/recordFilter.vue                    | 4 ++--
 src/pages/supplierDeliver/coms/comRecordDetailCard.vue      | 2 --
 src/pages/supplierDeliver/record/supplierDeliverRecord.vue  | 5 ++---
 .../supplierDeliver/record/supplierDeliverRecordDetail.vue  | 6 +++---
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/mycomponents/record/recordFilter.vue b/src/mycomponents/record/recordFilter.vue
index 526e5010..c848b583 100644
--- a/src/mycomponents/record/recordFilter.vue
+++ b/src/mycomponents/record/recordFilter.vue
@@ -13,12 +13,12 @@
 			<view class="">
 				<view class="uni-flex u-row-center" style="margin-top: 30rpx;">
 					<button class="filter_button" hover-class="filter_button_after"
-						@click="scanNumberClick">扫描单据编号</button>
+						@click="scanNumberClick">扫描{{buttonTitle}}</button>
 				</view>
 			</view>
 		</view>
 	</uni-popup>
-	<win-scan-job-number ref="scanNumber" title="单据编号" @getScanCode='getScanNumber'></win-scan-job-number>
+	<win-scan-job-number ref="scanNumber" :title="buttonTitle" @getScanCode='getScanNumber'></win-scan-job-number>
 </template>
 
 <script>
diff --git a/src/pages/supplierDeliver/coms/comRecordDetailCard.vue b/src/pages/supplierDeliver/coms/comRecordDetailCard.vue
index e56f44a9..6913455f 100644
--- a/src/pages/supplierDeliver/coms/comRecordDetailCard.vue
+++ b/src/pages/supplierDeliver/coms/comRecordDetailCard.vue
@@ -5,7 +5,6 @@
 				<template v-slot:title>
 					<item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
 				</template>
-				<u-line />
 				<view class="" v-for="(item,index) in dataContent.subList">
 					<uni-swipe-action ref="swipeAction">
 						<uni-swipe-action-item @click="swipeClick($event,item)"
@@ -18,7 +17,6 @@
 							></recommend>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
-					<u-line color="#D8D8D8"></u-line>
 				</view>
 			</uni-collapse-item>
 		</uni-collapse>
diff --git a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
index 333ec1e5..dfc4356a 100644
--- a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
+++ b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
@@ -2,10 +2,9 @@
 	<view class="">
 		<com-empty-view v-if="recordList.length==0"></com-empty-view>
 		<record-filter ref="filter" @switchChangeToday="switchChangeToday" @onScanNumber="getScanNumber"
-			 :checkedToday="checkedToday">
+			 :checkedToday="checkedToday" buttonTitle="ASN单据号">
 		</record-filter>
 		<view v-if="recordList.length>0">
-
 			<uni-swipe-action ref="swipeAction">
 				<view v-for="(item, index) in recordList" :key="index">
 					<uni-swipe-action-item :right-options="detailOptions" @click="swipeClick($event,item)">
@@ -205,7 +204,7 @@
 				});
 				var filters = []
 				filters.push({
-					column: "number",
+					column: "asnNumber",
 					action: "==",
 					value: code
 				})
diff --git a/src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue b/src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
index 793bd58c..a2f577cd 100644
--- a/src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
+++ b/src/pages/supplierDeliver/record/supplierDeliverRecordDetail.vue
@@ -22,15 +22,15 @@
 			</scroll-view>
 		</view>
 
-		<view class="page-footer">
+	<!-- 	<view class="page-footer">
 			<view class="uni-flex u-col-center space-between padding_10"
 				style="background-color:ghostwhite; width: 100%; ">
 				<view class="">
 				</view>
 			</view>
-		</view>
+		</view> -->
 
-		<win-scan-pack ref="scanPopup" @getResult='getScanResult'></win-scan-pack>
+		<!-- <win-scan-pack ref="scanPopup" @getResult='getScanResult'></win-scan-pack> -->
 		<recordDetailInfoPopup ref="recordDetailPopup"></recordDetailInfoPopup>
 		<comMessage ref="comMessage"></comMessage>
 	</view>