From b3fa9e852ce7da2ce8b51258cf385cfc6716be94 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Tue, 2 Jan 2024 14:46:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/location/toLocation.vue          | 55 +++++++++++++++++++
 pages/purchaseReturn/record/returnRecord.vue  | 20 +++++--
 .../request/returnRequestCreate.vue           |  6 +-
 3 files changed, 74 insertions(+), 7 deletions(-)
 create mode 100644 mycomponents/location/toLocation.vue

diff --git a/mycomponents/location/toLocation.vue b/mycomponents/location/toLocation.vue
new file mode 100644
index 00000000..b2286bf3
--- /dev/null
+++ b/mycomponents/location/toLocation.vue
@@ -0,0 +1,55 @@
+<template>
+	<view class="" style="background-color: #fff;">
+		<view class="uni-flex uni-row space-between u-col-center" >
+			<view class="location_view" >
+				<text class="card_location"> 库位 </text>
+				<text> {{locationCode}}</text>
+			</view>
+			<view class="" v-if="recommendQty>0">
+				<count :countType="'recommend_handle_no_pack'"
+				:recommendQty="recommendQty"
+				:handledQty="handledQty"
+				:uom="uom"></count>
+			</view>
+			
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+		},
+		data(){
+			return {
+			}
+		},
+		props: {
+			locationInfo:{
+				type: Object,
+				default: {}
+			},
+			locationCode:{
+				type: String,
+				default: ''
+			},
+			recommendQty:{
+				type: Number,
+				default: 0
+			},
+			handledQty:{
+				type: Number,
+				default: 0
+			},
+			uom:{
+				type: String,
+				default: ''
+			}
+		},
+		
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue
index f79ec716..32cb1766 100644
--- a/pages/purchaseReturn/record/returnRecord.vue
+++ b/pages/purchaseReturn/record/returnRecord.vue
@@ -4,7 +4,18 @@
 			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
 		</view>
 		<view class="page-wraper" v-if="detailSource.length>0">
-			<u-line></u-line>
+
+			<view class="page-header">
+				<!-- <view class="header_job_top">
+					<job-top :dataContent="jobContent"></job-top>
+				</view> -->
+				<view class="header_item">
+					采购订单：{{poNumber}}
+				</view>
+				<u-line color="#D8D8D8"></u-line>
+			</view>
+
+
 			<view class="page-main">
 				<scroll-view scroll-y="true" class="page-main-scroll">
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
@@ -143,11 +154,12 @@
 			},
 
 			getScanResult(result) {
+				debugger;
 				if (this.poNumber == '') {
-					this.poNumber = result.label.order;
+					this.poNumber = result.label.poNumber;
 				} else {
-					if (this.poNumber != result.label.order) {
-						this.showErrorMessage('扫描的采购订单号[' + result.label.order + ']与默认采购订单号[' + this.poNumber + ']不一致')
+					if (this.poNumber != result.label.poNumber) {
+						this.showErrorMessage('扫描的采购订单号[' + result.label.poNumber + ']与默认采购订单号[' + this.poNumber + ']不一致')
 						return;
 					}
 				}
diff --git a/pages/purchaseReturn/request/returnRequestCreate.vue b/pages/purchaseReturn/request/returnRequestCreate.vue
index 986c8772..dbc33c07 100644
--- a/pages/purchaseReturn/request/returnRequestCreate.vue
+++ b/pages/purchaseReturn/request/returnRequestCreate.vue
@@ -137,10 +137,10 @@
 
 			getScanResult(result) {
 				if (this.poNumber == '') {
-					this.poNumber = result.label.order;
+					this.poNumber = result.label.poNumber;
 				} else {
-					if (this.poNumber != result.label.order) {
-						this.showErrorMessage('扫描的采购订单号[' + result.label.order + ']与默认采购订单号[' + this.poNumber + ']不一致')
+					if (this.poNumber != result.label.poNumber) {
+						this.showErrorMessage('扫描的采购订单号[' + result.label.poNumber + ']与默认采购订单号[' + this.poNumber + ']不一致')
 						return;
 					}
 				}