From a8372003d2f07b1ecdac7d737efe2b0a251ac09b Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 29 Dec 2023 16:29:12 +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=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |   8 +-
 .../coms/comReturnRequestCard.vue             |   4 +-
 pages/customerReturn/record/returnRecord.vue  |   2 +-
 .../request/customerReturnRequest.vue         |   4 +-
 .../request/customerReturnRequestCreate.vue   | 476 ++++++++++++++++++
 pages/deliver/coms/comDeliverRequestPopup.vue |   1 -
 .../deliver/request/deliverRequestDetail.vue  |  40 +-
 static/config.json                            |   2 +-
 8 files changed, 514 insertions(+), 23 deletions(-)
 create mode 100644 pages/customerReturn/request/customerReturnRequestCreate.vue

diff --git a/pages.json b/pages.json
index 207b2b99..128078bc 100644
--- a/pages.json
+++ b/pages.json
@@ -1589,7 +1589,13 @@
 				"enablePullDownRefresh": false
 			}
 		},
-
+		{
+			"path": "pages/customerReturn/request/customerReturnRequestCreate",
+			"style": {
+				"navigationBarTitleText": "客户退货申请创建",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
 			"path": "pages/scrap/record/scrapRecord",
 			"style": {
diff --git a/pages/customerReturn/coms/comReturnRequestCard.vue b/pages/customerReturn/coms/comReturnRequestCard.vue
index 5978d07d..eb39e121 100644
--- a/pages/customerReturn/coms/comReturnRequestCard.vue
+++ b/pages/customerReturn/coms/comReturnRequestCard.vue
@@ -1,9 +1,9 @@
 <template>
  	<request-com-main-card :dataContent="dataContent">
  		<view class="task_item">
- 			<view class="task_text">
+ 			<!-- <view class="task_text">
  				申请单号 : {{dataContent.requestNumber}}
- 			</view>
+ 			</view> -->
  			<view class="task_text">
  				客户代码 : {{dataContent.customerCode}}
  			</view>
diff --git a/pages/customerReturn/record/returnRecord.vue b/pages/customerReturn/record/returnRecord.vue
index e4f854e6..41d0fe8d 100644
--- a/pages/customerReturn/record/returnRecord.vue
+++ b/pages/customerReturn/record/returnRecord.vue
@@ -110,7 +110,7 @@
 			};
 		},
 		onLoad(option) {
-			var typeCode = "CustomerreturnRecord"
+			var typeCode = "CustomerReject"
 			getBusinessType(typeCode, res => {
 				if (res.success) {
 					this.businessType = res.businessType;
diff --git a/pages/customerReturn/request/customerReturnRequest.vue b/pages/customerReturn/request/customerReturnRequest.vue
index a85fd3c7..77f1b3b1 100644
--- a/pages/customerReturn/request/customerReturnRequest.vue
+++ b/pages/customerReturn/request/customerReturnRequest.vue
@@ -33,7 +33,7 @@
 		goHome,
 		updateTitle
 	} from '@/common/basic.js';
-	
+
 	import {
 		getCustomerReturnRequestList,
 	} from '@/api/request2.js';
@@ -193,7 +193,7 @@
 
 			openScanDetailPopup() {
 				uni.navigateTo({
-					url: "../record/returnRecord?fromType=" + this.fromType
+					url: "../request/customerReturnRequestCreate"
 				})
 			},
 
diff --git a/pages/customerReturn/request/customerReturnRequestCreate.vue b/pages/customerReturn/request/customerReturnRequestCreate.vue
new file mode 100644
index 00000000..c91ed6dc
--- /dev/null
+++ b/pages/customerReturn/request/customerReturnRequestCreate.vue
@@ -0,0 +1,476 @@
+<template>
+	<view class="page-wraper">
+		<view class="">
+			<com-blank-view @goScan='getLocation' 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">
+				<text>客户 : </text>
+				<view class="uni-flex u-col-center uni-row" @click="showSelect">
+					<view class="" style="margin-left: 20rpx;">
+						{{customerName}}
+					</view>
+					<u-select v-model="showCustomer" mode="single-column" :list="customerList" @confirm="confirmSelect">
+					</u-select>
+				</view>
+			</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">
+						<view class="">
+							<record-com-detail-card :dataContent="item" :index="index" :isShowLocation="true"
+								:isShowToLocation="false" @removeItem="removeItem(index,item)" @updateData="updateData"
+								@removePack="removePack">
+							</record-com-detail-card>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+
+			<div class="btn_bottom">
+				<view class="" style="display: flex;flex-direction: row;">
+
+					<!-- <view class="">
+						<requiredLocation title="目标库位" :locationCode="toLocationCode" @getLocation='getToLocationCode'
+							:locationTypeList="tolocationTypeList"></requiredLocation>
+					</view> -->
+					<view class="">
+						<button class="btn_single_commit" hover-class="btn_commit_after" @click="commit">提交</button>
+					</view>
+				</view>
+			</div>
+			<win-scan-button @goScan='openScanPopup'></win-scan-button>
+		</view>
+
+		<win-scan-pack-and-location ref="scanPopup" @getResult='getScanResult' headerType="HPQ,HMQ"
+			:allowModifyLocation="false">
+		</win-scan-pack-and-location>
+		<comMessage ref="comMessage"></comMessage>
+		<win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+			:locationTypeList="fromlocationTypeList"></win-scan-location>
+	</view>
+
+</template>
+
+<script>
+	import {
+		customerReturnRequestSubmit,
+		getBasicCustomerList
+	} from '@/api/request2.js';
+	import {
+		getInventoryStatusDesc,
+		getDirectoryItemArray
+	} from '@/common/directory.js';
+
+	import {
+		getPrecisionStrategyList
+	} from '@/common/balance.js';
+	import {
+		goHome,
+		updateTitle,
+		getPackingNumberAndBatchByList
+	} from '@/common/basic.js';
+
+	import {
+		getBusinessType,
+		createItemInfo,
+		createDetailInfo,
+		calcHandleQty
+	} from '@/common/record.js';
+
+	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+	import comReturnRecord from '@/pages/customerReturn/coms/comReturnRecord.vue'
+	import comBlankView from '@/mycomponents/common/comBlankView.vue'
+	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+
+
+	export default {
+		components: {
+			winScanButton,
+			winScanPack,
+			comReturnRecord,
+			requiredLocation,
+			comBlankView,
+			winScanLocation,
+			comMessage,
+			winScanPackAndLocation,
+			recordComDetailCard
+		},
+		data() {
+			return {
+				id: '',
+				scanCount: 0,
+				dataContent: {}, //任务内容
+				subList: [], //接口返回的任务subList
+				detailSource: [], //绑定在页面上的数据源
+				locationTypeList: [],
+				businessType: {},
+				fromLocationCode: "",
+				fromLocation: {},
+				toLocationCode: "",
+				fromlocationTypeList: [],
+				tolocationTypeList: [],
+				toWarehouseCode: '',
+				customerCode: '',
+				showCustomer: false,
+				customerList: [],
+				customerName: "请选择退货客户",
+				customerCode: ""
+			};
+		},
+		onLoad(option) {
+			var typeCode = "CustomerReject"
+			getBusinessType(typeCode, res => {
+				if (res.success) {
+					this.businessType = res.businessType;
+					this.fromlocationTypeList = res.fromlocationTypeList;
+					this.tolocationTypeList = res.tolocationTypeList;
+					this.showFromLocationPopup();
+				} else {
+					this.showErrorMessage(res.message)
+				}
+			});
+			getBasicCustomerList().then(res => {
+				if (res.data.length > 0) {
+					var list = res.data;
+					list.forEach(item => {
+						item.label = item.name
+						item.value = item.code
+					})
+					this.customerList = list;
+				}
+			}).catch(error => {
+
+			})
+
+		},
+		//返回首页
+		onNavigationBarButtonTap(e) {
+			if (e.index === 0) {
+				goHome();
+			}
+		},
+		//拦截返回按钮事件
+		onBackPress(e) {},
+
+		onPullDownRefresh() {},
+
+		mounted() {
+
+		},
+		methods: {
+			getScanResult(result) {
+				let balance = result.balance;
+				let label = result.label;
+				let pack = result.package;
+				var item = this.detailSource.find(res => {
+					if (res.itemCode == balance.itemCode) {
+						return res
+					}
+				})
+				if (item == undefined) {
+					var itemp = createItemInfo(balance, pack);
+					let newDetail = createDetailInfo(balance, pack); //
+					itemp.subList.push(newDetail);
+					this.detailSource.push(itemp)
+				} else {
+					var detail = item.subList.find(r => {
+						if (r.packingNumber == balance.packingNumber &&
+							r.batch == balance.batch &&
+							r.locationCode == balance.locationCode &&
+							r.inventoryStatus == balance.inventoryStatus) {
+							return r;
+						}
+					})
+					if (detail == undefined) {
+						let newDetail = createDetailInfo(balance, pack);
+						item.subList.push(newDetail);
+					} else {
+						if (detail.scaned == true) {
+							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]已经在列表中")
+						}
+					}
+				}
+				this.calcHandleQty();
+			},
+
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+			calcHandleQty() {
+				calcHandleQty(this.detailSource)
+				this.$forceUpdate();
+			},
+
+
+			updateData() {
+				this.calcHandleQty();
+			},
+			removeItem(index, item) {
+				this.detailSource.splice(index, 1)
+			},
+			removePack() {
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item = this.detailSource[i];
+					if (item.subList.length == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+				this.updateData();
+			},
+
+			openScanPopup() {
+				if (this.fromLocationCode == "") {
+					this.showFromLocationPopup();
+					return
+				}
+				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
+			},
+			showFromLocationPopup() {
+				this.$nextTick(() => {
+					this.$refs.scanLocationCode.openScanPopup();
+				})
+			},
+
+			closeScanPopup() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.closeScanPopup();
+				}
+			},
+
+			scanPopupGetFocus() {
+				if (this.$refs.scanPopup != undefined) {
+					this.$refs.scanPopup.getfocus();
+				}
+			},
+
+			scanLocationCode(location, code) {
+				this.$refs.comMessage.showQuestionMessage("是否把所有的目标库位都变成默认库位[" + code + "]", res => {
+					this.toLocationCode = code
+					this.detailSource.forEach(item => {
+						item.subList.forEach(detail => {
+							detail.toLocationCode = code
+						})
+					})
+				})
+
+			},
+
+			commit() {
+				// if (this.toLocationCode == "") {
+				// 	this.showMessage("请先选择目标库位")
+				// 	return;
+				// }
+				if (this.detailSource.length > 0 && this.detailSource[0].subList.length > 0) {
+					//查询管理模式
+					uni.showLoading({
+						title: "提交中....",
+						mask: true
+					});
+					//客户退货默认推到hold库
+					var params = this.setParams()
+					console.log("提交" + JSON.stringify(params))
+					customerReturnRequestSubmit(params).then(res => {
+						uni.hideLoading()
+						if (res.data) {
+							this.showCommitSuccessMessage("提交成功<br>生成客户退货申请<br>" + res.data)
+						} else {
+							this.showErrorMessage("提交失败[" + res.msg + "]")
+						}
+					}).catch(error => {
+						uni.hideLoading()
+						this.showErrorMessage(error)
+					})
+				} else {
+					this.showErrorMessage("没有要提交的数据,请先扫描")
+				}
+			},
+
+			setPrecisionStrategParams() {
+				var itemList = []
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.toLocationCode = this.toLocationCode;
+							var filterResult = itemList.filter(res => {
+								if (res.itemCode == item.itemCode &&
+									detail.toLocationCode == res.locationCode) {
+									return res
+								}
+							})
+							//去掉重复元素
+							if (filterResult.length == 0) {
+								var result = {
+									itemCode: item.itemCode,
+									locationCode: detail.toLocationCode
+								}
+								itemList.push(result)
+							}
+
+						}
+					})
+				})
+				return itemList;
+			},
+
+			setParams() {
+				var subList = []
+				var creator = this.$store.state.user.id
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				this.dataContent.customerCode = 'CF';
+				this.dataContent.fromWarehouseCode = this.fromLocation.warehouseCode;
+				this.dataContent.toWarehouseCode = this.toWarehouseCode;
+
+				this.detailSource.forEach(item => {
+					item.subList.forEach(detail => {
+						if (detail.scaned) {
+							detail.itemCode = detail.itemCode;
+							detail.itemName = detail.package.itemName;
+							detail.itemDesc1 = detail.package.itemDesc1;
+							detail.itemDesc2 = detail.package.itemDesc2;
+
+							detail.inventoryStatus = detail.inventoryStatus;
+							detail.toInventoryStatus = 'HOLD';
+
+							detail.fromPackingNumber = detail.packingNumber;
+							detail.toPackingNumber = detail.packingNumber;
+
+							detail.fromContainerNumber = detail.containerNumber;
+							detail.toContainerNumber = detail.containerNumber
+
+							detail.fromBatch = detail.batch;
+							detail.toBatch = detail.batch;
+
+							detail.fromLocationCode = detail.locationCode;
+							detail.toLocationCode = 'HOLD';
+
+							subList.push(detail)
+						}
+					})
+				})
+
+				return this.dataContent;
+			},
+
+			showMessage(message) {
+				this.$refs.comMessage.showMessage(message, res => {
+					if (res) {}
+				});
+			},
+			showErrorMessage(message) {
+				this.$refs.comMessage.showErrorMessage(message, res => {
+					if (res) {
+
+					}
+				});
+			},
+
+			showScanMessage(message) {
+				this.$refs.comMessage.showScanMessage(message);
+			},
+
+			afterCloseMessage() {
+				this.scanPopupGetFocus();
+			},
+
+			closeScanMessage() {
+				this.scanPopupGetFocus();
+			},
+			getLocation(location, code) {
+				this.getFromLocationCode(location, code)
+			},
+			getFromLocationCode(location, code) {
+				this.fromLocationCode = code;
+				this.openScanPopup();
+			},
+			getToLocationCode(location, code) {
+				this.toLocationCode = code;
+			},
+
+			showCommitSuccessMessage(hint) {
+				this.$refs.comMessage.showSuccessMessage(hint, res => {
+					this.clearData()
+				})
+			},
+
+			clearData() {
+				this.fromLocationCode = '';
+				this.fromLocation = ''
+				this.subList = [];
+				this.detailSource = [];
+				this.toLocationCode = '';
+				this.dataContent = {}
+				this.toWarehouseCode = ""
+			},
+
+			updateData() {
+				this.calcHandleQty();
+				for (var i = 0; i < this.detailSource.length; i++) {
+					let item = this.detailSource[i];
+					if (item.qty == 0) {
+						this.detailSource.splice(i, 1)
+					}
+				}
+			},
+
+			confirmSelect(e) {
+				this.customerName = e[0].label
+				this.customerCode = e[0].value
+			},
+
+			showSelect() {
+				this.showCustomer = true
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+
+	.page-wraper {
+		display: flex;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.page-main {
+		flex: 1;
+		position: relative;
+	}
+
+	.page-main-scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.page-main-list {
+		/*  height: 80rpx;
+	    line-height: 80rpx; */
+		text-align: center;
+		background: #e0e0e0;
+
+	}
+</style>
diff --git a/pages/deliver/coms/comDeliverRequestPopup.vue b/pages/deliver/coms/comDeliverRequestPopup.vue
index 474c39f2..4c26a1f0 100644
--- a/pages/deliver/coms/comDeliverRequestPopup.vue
+++ b/pages/deliver/coms/comDeliverRequestPopup.vue
@@ -22,7 +22,6 @@
 									<u-select v-model="showCustomer" mode="single-column" :list="customerList"
 										@confirm="confirmSelect"></u-select>
 								</view>
-					
 							</view>
 							<u-line />
 					
diff --git a/pages/deliver/request/deliverRequestDetail.vue b/pages/deliver/request/deliverRequestDetail.vue
index ec60c608..a04c1aa9 100644
--- a/pages/deliver/request/deliverRequestDetail.vue
+++ b/pages/deliver/request/deliverRequestDetail.vue
@@ -1,12 +1,18 @@
 <template>
 	<view class="page-wraper">
-
 		<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">
+				<view class="page-header">
+					<view class="page-item">
+						{{detailSource.customerCode}}
+					</view>
+					<u-line />
+				</view>
+				<view class="detail-list" v-for="(item, index) in detailSource.subList" :key="item.id">
 					<view class="">
-						<comRequestDetailCard :dataContent="item" @openDetail="openDetail">
-						</comRequestDetailCard>
+						<item-qty :dataContent="item"></item-qty>
+						<!-- <comRequestDetailCard :dataContent="item" @openDetail="openDetail">
+						</comRequestDetailCard> -->
 					</view>
 				</view>
 			</scroll-view>
@@ -34,18 +40,19 @@
 	import comRequestDetailCard from "@/mycomponents/detail/comRequestDetailCard.vue"
 	import requestDetailInfoPopup from '@/pages/deliver/coms/requestDetailInfoPopup.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import itemQty from '@/mycomponents/item/itemQty.vue'
 
 	export default {
 		components: {
 			comRequestDetailCard,
 			requestDetailInfoPopup,
 			comMessage,
+			itemQty
 		},
 		data() {
 			return {
 				id: '',
 				requestContent: {}, //任务内容
-				subList: [], //接口返回的任务details
 				detailSource: [], //绑定在页面上的数据源
 			};
 		},
@@ -81,16 +88,19 @@
 					if (res.data == null) {
 						that.showMessage('未获取到详情');
 					} else {
-						if (res.data.subList.length > 0) {
-							that.requestContent = res.data;
-							that.subList = res.data.subList;
-							that.subList.forEach(res => {
-								res.fromLocationCode = res.toLocationCode
-							})
-							that.detailSource = getDataSource(that.subList);
-						} else {
-							that.showMessage('列表数据为0');
-						}
+						that.detailSource = res.data
+
+						// if (res.data.subList.length > 0) {
+						// 	that.requestContent = res.data;
+						// 	that.subList = res.data.subList;
+						// 	that.subList.forEach(res => {
+						// 		res.fromLocationCode = res.toLocationCode
+						// 	})
+						// 	that.detailSource = getDataSource(that.subList);
+						// 	debugger;
+						// } else {
+						// 	that.showMessage('列表数据为0');
+						// }
 					}
 				}).catch(error => {
 					uni.hideLoading()
diff --git a/static/config.json b/static/config.json
index 5ff11180..3f6576ad 100644
--- a/static/config.json
+++ b/static/config.json
@@ -18,7 +18,7 @@
 
 		"request_url": {
 			"name": "request_url",
-			"value": "http://192.168.0.230:12080/admin-api",
+			"value": "http://dev.ccwin-in.com:25100/api/admin-api",
 			"dev2": "http://192.168.0.157:12080/admin-api",
 			"chefang": "http://192.168.0.176:12080/admin-api",
 			"chenxinming": "http://192.168.0.230:12080/admin-api",