From 6d0400f6e5f28dbb865898f2dd6093893996a052 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 26 Jan 2024 13:29:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/scan/winScanPackAndLocation.vue       | 12 ++++++------
 .../request/customerReturnRequestCreate.vue        | 14 ++++++++------
 pages/productionReturn/record/returnToStore.vue    |  2 ++
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/mycomponents/scan/winScanPackAndLocation.vue b/mycomponents/scan/winScanPackAndLocation.vue
index 86602f43..a9f4baeb 100644
--- a/mycomponents/scan/winScanPackAndLocation.vue
+++ b/mycomponents/scan/winScanPackAndLocation.vue
@@ -425,13 +425,13 @@
 				this.show = e.show
 			},
 			isInLocationList(location) {
-				var item = this.fromLocationList.filter(res => {
-					res = location
-				})
-				if (item != undefined && item.length > 0) {
-					return true
+				
+				var item = this.fromLocationList.find(res => res == location)
+				
+				if (item = undefined) {
+					return false
 				}
-				return false
+				return true
 			},
 			addLocationCode(code) {
 				if (!this.isInLocationList(code)) {
diff --git a/pages/customerReturn/request/customerReturnRequestCreate.vue b/pages/customerReturn/request/customerReturnRequestCreate.vue
index 6a46fa16..1056332d 100644
--- a/pages/customerReturn/request/customerReturnRequestCreate.vue
+++ b/pages/customerReturn/request/customerReturnRequestCreate.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page-wraper">
 		<view class="">
-			<com-blank-view @goScan='getLocation' v-if="detailSource.length==0"></com-blank-view>
+			<com-blank-view @goScan='showFromLocationPopup' v-if="detailSource.length==0"></com-blank-view>
 		</view>
 		<view class="page-wraper" v-if="detailSource.length>0">
 			<view class="uni-flex uni-row padding title u-col-center" @click="showSelect" style="font-size: 35rpx;">
@@ -272,10 +272,10 @@
 			},
 
 			commit() {
-				// if (this.toLocationCode == "") {
-				// 	this.showMessage("请先选择目标库位")
-				// 	return;
-				// }
+				if (this.customerName == ""||this.customerName == "请选择退货客户") {
+					this.showErrorMessage("请选择退货客户")
+					return;
+				}
 				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
 					//查询管理模式
 					uni.showLoading({
@@ -368,7 +368,7 @@
 
 				this.dataContent.subList = subList;
 				this.dataContent.creator = creator;
-				this.dataContent.customerCode = 'CF';
+				this.dataContent.customerCode = this.customerCode;
 				this.dataContent.fromWarehouseCode = this.fromLocation.warehouseCode;
 				this.dataContent.toWarehouseCode = this.toWarehouseCode;
 
@@ -424,6 +424,8 @@
 				this.toLocationCode = '';
 				this.dataContent = {}
 				this.toWarehouseCode = ""
+				this.customerName ="请选择退货客户"
+				this.customerCode =""
 			},
 
 			updateData() {
diff --git a/pages/productionReturn/record/returnToStore.vue b/pages/productionReturn/record/returnToStore.vue
index 70a0c112..c58b32d6 100644
--- a/pages/productionReturn/record/returnToStore.vue
+++ b/pages/productionReturn/record/returnToStore.vue
@@ -223,6 +223,7 @@
 					})
 
 				} else {
+					debugger
 					var detail = item.subList.find(r => {
 						if (r.packingNumber == label.packingNumber &&
 							r.batch == label.batch) {
@@ -235,6 +236,7 @@
 							let newDetail = this.createDetailInfo(label, pack);
 							newDetail.toLocationCode = toLocation.code;
 							newDetail.fromLocationCode = this.rawLocationCode;
+							newDetail.locationCode = this.rawLocationCode;
 							newDetail.toWarehouseCode = toLocation.warehouseCode;
 							item.subList.push(newDetail);
 							this.calcHandleQty();