From 2ec0d6b694b964ecc52a1bb6720e374d23caabd9 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Mon, 26 Feb 2024 15:16:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E6=9E=B6=E5=90=8E=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PDA/api/index.js                           |  2 +-
 fe/PDA/pages/return/purchaseReturnRequest.vue | 92 +++++++++++--------
 2 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/fe/PDA/api/index.js b/fe/PDA/api/index.js
index 442597131..7066dae35 100644
--- a/fe/PDA/api/index.js
+++ b/fe/PDA/api/index.js
@@ -833,7 +833,7 @@ export const getReturnJobList = (params) => request(
 
 //上架后退货申请提交
 export const purchaseReturnRequestSubmit = (params) => request(
-	devUrl + "/api/pda/store/purchase-return-request", {
+	devUrl + "/api/pda/store/purchase-return-request/create-many", {
 		method: 'post',
 		data: params
 	});
diff --git a/fe/PDA/pages/return/purchaseReturnRequest.vue b/fe/PDA/pages/return/purchaseReturnRequest.vue
index b7428a33f..b38ede759 100644
--- a/fe/PDA/pages/return/purchaseReturnRequest.vue
+++ b/fe/PDA/pages/return/purchaseReturnRequest.vue
@@ -14,9 +14,9 @@
 			</view>
 		</scroll-view>
 		<div class="new_bot_box" v-show="itemList.length>0">
-		<view class="new_btn_bot">
-			<button class="new_save_btn" @click="submit()">提交</button>
-		</view>
+			<view class="new_btn_bot">
+				<button class="new_save_btn" @click="submit()">提交</button>
+			</view>
 		</div>
 
 		<win-scan-button @goScan='openScanPopup' v-if="itemList.length>0"></win-scan-button>
@@ -29,6 +29,7 @@
 <script>
 	import {
 		getBalancesByFilter,
+		purchaseReturnRequestSubmit
 	} from '@/api/index.js';
 	import winBlankView from '@/mycomponents/wincom/winBlankView.vue'
 	import winScanButton from '@/mycomponents/wincom/winScanButton.vue'
@@ -62,6 +63,7 @@
 
 				itemList: [],
 				currentLabel: null,
+				lableResult: {}
 			};
 		},
 		onReady() {
@@ -70,8 +72,9 @@
 		methods: {
 			//扫描箱标签
 			getScanResult(result) {
-				
+
 				let code = result.data.code;
+				this.lableResult = result.data
 				if (code == '') return;
 				this.currentLabel = result.data;
 				let items = this.itemList.filter(r => {
@@ -80,7 +83,7 @@
 
 				if (items.length > 0) {
 					this.showMessage('箱码【' + code + '】已经存在,请扫描其他箱码.');
-					
+
 				} else {
 					this.getBalances()
 				}
@@ -117,39 +120,37 @@
 				});
 			},
 			createItem(item) {
-				item.remark = item.remrak;
-				item.itemCode = item.itemCode
-				item.itemName = item.itemName;
-				item.itemDesc1 = item.itemDesc1;
-				item.itemDesc2 = item.itemDesc2;
-				item.uom = item.uom;
-				item.qty = item.qty;
-				// item.stdPackUom = 
-				// item.stdPackQty = 
-				item.fromPackingCode = item.packingCode;
-				item.toPackingCode = item.packingCode;
-				item.fromContainerCode = item.containerCode;
-				item.toContainerCode = item.containerCode;
-				item.fromLot = item.lot;
-				item.toLot = item.lot;
-				item.supplierBatch = item.supplierBatch;
-				item.arriveDate = item.arriveDate;
-				item.produceDate = item.produceDate;
-				item.expireDate = item.expireDate;
-				item.fromLocationCode = item.locationCode;
-				item.fromLocationGroup = item.locationGroup;
-				item.fromLocationArea = item.locationArea;
-				item.fromLocationErpCode = item.locationErpCode;
-				item.fromWarehouseCode = localStorage.warehouseCode;
-				item.toLocationCode = item.locationCode;
-				item.toLocationGroup = item.locationGroup;
-				item.toLocationArea = item.locationArea;
-				item.toLocationErpCode = item.locationErpCode;
-				item.toWarehouseCode = localStorage.warehouseCode;
-				item.fromStatus = item.status;
-				item.toStatus = item.status;
-				item.reasonCode = this.scrapReason;
-				return item;
+				var result = {}
+				result.remark = item.remrak;
+				result.itemCode = item.itemCode;
+				result.itemName = item.itemName;
+				result.itemDesc1 = item.itemDesc1;
+				result.itemDesc2 = item.itemDesc2;
+				result.lot = item.lot;
+				result.supplierBatch = item.supplierBatch;
+				result.arriveDate = item.arriveDate;
+				result.produceDate = item.produceDate;
+				result.expireDate = item.expireDate;
+				result.packingCode = item.packingCode;
+				result.containerCode = null;
+				result.uom = item.uom;
+				result.qty = item.qty;
+				result.stdPackQty = item.stdPackQty;
+				result.locationCode = item.locationCode;
+				result.locationArea = item.locationArea;
+				result.locationGroup = item.locationGroup;
+				result.locationErpCode = item.locationErpCode;
+				result.status = item.status;
+				result.warehouseCode = localStorage.warehouseCode;
+				result.rpNumber = this.lableResult.rpNumber;
+				result.asnNumber = this.lableResult.asnNumber
+				result.poNumber = this.lableResult.poNumber;
+				result.supplierCode = this.lableResult.supplierCode
+				result.returnType = 2;
+				result.poLine = "";
+				result.supplierPackQty = this.lableResult.stdPackQty;
+
+				return result;
 			},
 			selectedBalanceItem(balanceItem) {
 				let item = this.createItem(balanceItem);
@@ -183,11 +184,22 @@
 					});
 				}
 			},
-			submit(){
-				if(this.itemList.length==0){
+			submit() {
+				if (this.itemList.length == 0) {
 					this.showMessage("请先扫描箱码")
 					return;
 				}
+				uni.showLoading({
+					title: "提交中..."
+				})
+				console.log("参数",JSON.stringify(this.itemList))
+				
+				// purchaseReturnRequestSubmit(this.itemList).then(res => {
+				// 	uni.hideLoading()
+				// }).catch(error => {
+				// 	uni.hideLoading()
+				// 	this.showMessage(error.message)
+				// })
 			}
 		}