From 8f3527642a67d826b1d43f4e9249467d1d4ce0fa Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Fri, 29 Dec 2023 14:42:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=93=81=E5=8F=91?=
 =?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

---
 .../deliver/coms/comDeliverRequestCreator.vue | 44 +++------------
 .../deliver/request/deliverRequestCreate.vue  | 55 +++++--------------
 pages/issue/coms/comIssueRequestPopup.vue     |  2 +-
 .../request/putawayRequestCreate.vue          |  1 +
 .../putaway/request/putawayRequestCreate.vue  |  1 +
 5 files changed, 26 insertions(+), 77 deletions(-)

diff --git a/pages/deliver/coms/comDeliverRequestCreator.vue b/pages/deliver/coms/comDeliverRequestCreator.vue
index 3fa70302..5f75ab38 100644
--- a/pages/deliver/coms/comDeliverRequestCreator.vue
+++ b/pages/deliver/coms/comDeliverRequestCreator.vue
@@ -1,61 +1,33 @@
 <template>
 	<view class="">
-
-
 		<uni-collapse ref="collapse">
 			<uni-collapse-item :open="true">
 				<template v-slot:title>
-					<view class="" style="font-size: 32rpx;">
-						<view class="" >
-							客户 : {{dataContent.customerName}} ({{dataContent.customerCode}})
-						</view>
-						
-						<view class="">
-							总数量 : {{dataContent.totalQty}} 
+					<view class="page-header" style="font-size: 32rpx;">
+						<view class="page-item">
+							{{dataContent.customerCode }} ({{dataContent.customerName}})
 						</view>
 					</view>
-					
 				</template>
-				<u-line />
 				<uni-swipe-action ref="swipeAction">
 					<view v-for="(item, index) in dataContent.subList" :key="index">
 						<uni-swipe-action-item>
-							<view class="" style="font-size: 32rpx;margin: 10rpx;">
-								<view class="">
-									物品代码 : {{item.itemCode}}
-								</view>
-								<view class="">
-									物品名称 : {{item.itemName}}
-								</view>
-								
-								<view class="uni-flex uni-row uni-center">
-									<view class="">
-										数量 : {{item.qty}} 单位 : 
-									</view>
-									<view class="">
-										<uom :uom="item.uom"></uom>
-									</view>
-									
-								</view>
-
-							</view>
+							<item-qty :dataContent="item"></item-qty>
 						</uni-swipe-action-item>
-						<u-line />
 					</view>
 				</uni-swipe-action>
-
 			</uni-collapse-item>
 		</uni-collapse>
-
-
 	</view>
 </template>
 
 <script>
 	import uom from '@/mycomponents/qty/uom.vue'
+	import itemQty from '@/mycomponents/item/itemQty.vue'
 	export default {
 		components: {
-			uom
+			uom,
+			itemQty
 		},
 		data() {
 			return {
@@ -69,7 +41,7 @@
 			},
 		},
 		methods: {
-			update(){
+			update() {
 				this.$nextTick(r => {
 					this.$refs.collapse.resize()
 				});
diff --git a/pages/deliver/request/deliverRequestCreate.vue b/pages/deliver/request/deliverRequestCreate.vue
index fb2d7209..5a1cc358 100644
--- a/pages/deliver/request/deliverRequestCreate.vue
+++ b/pages/deliver/request/deliverRequestCreate.vue
@@ -153,53 +153,28 @@
 
 				var params = this.setRequestParams()
 				console.log("提交参数", JSON.stringify(params));
-				// deliverRequestSubmit(params).then(res => {
-				// 	uni.hideLoading()
-				// 	if (res.data) {
-				// 		this.showCommitSuccessMessage("提交成功<br>生成成品发货申请" + res.data)
-				// 	} else {
-				// 		this.showErrorMessage("提交失败[" + res.msg + "]")
-				// 	}
-				// }).catch(error => {
-				// 	uni.hideLoading()
-				// 	this.showErrorMessage(error)
-				// })
-
-
+				deliverRequestSubmit(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)
+				})
 			},
 
 			setRequestParams() {
+				let requestContent = {};
+				requestContent.customerCode = this.detailSource.customerCode;
 				var subList = []
 				this.detailSource.subList.forEach(detail => {
-					detail.soNumber = detail.package.soNumber;
-					detail.soLine = detail.package.soLine;
-					detail.remark = ""
-					// soNumber: 926926926,
-					// soLine: 926,
-					// itemCode: THILDD0A691AG,
-					// remark: ,
-					// qty: 2,
-					// uom: EA
 					subList.push(detail)
 				})
-
-				this.detailSource.subList = subList
-				this.detailSource.deliverPlanNumber = "DP20231130-0001"
-				this.detailSource.customerCode = this.detailSource.customerCode
-				this.detailSource.customerDockCode = ""
-				this.detailSource.carrierCode = ""
-				this.detailSource.transferMode = ""
-				this.detailSource.vehiclePlateNumber = ""
-				this.detailSource.remark = ""
-				this.detailSource.dueTime = ""
-				this.detailSource.departmentCode = "研发部门"
-				this.detailSource.status = 1
-				this.detailSource.autoCommit = "FALSE"
-				this.detailSource.autoAgree = "FALSE"
-				this.detailSource.autoExecute = "FALSE"
-				this.detailSource.directCreateRecord = "FALSE"
-
-				return this.detailSource;
+				requestContent.subList = subList;
+				return requestContent;
 			},
 			showCommitSuccessMessage(hint) {
 				this.$refs.comMessage.showSuccessMessage(hint, res => {
diff --git a/pages/issue/coms/comIssueRequestPopup.vue b/pages/issue/coms/comIssueRequestPopup.vue
index e20fb685..0824a730 100644
--- a/pages/issue/coms/comIssueRequestPopup.vue
+++ b/pages/issue/coms/comIssueRequestPopup.vue
@@ -260,7 +260,7 @@
 						this.numberFocus = true
 						this.uom = res.data.list[0].uom
 					} else {
-						this.showErrorMessage('未查找到物料【' +itemCode + '】', "itemCode");
+						this.showErrorMessage('未查找到物料【' + itemCode + '】', "itemCode");
 					}
 
 				}).catch(error => {
diff --git a/pages/productPutaway/request/putawayRequestCreate.vue b/pages/productPutaway/request/putawayRequestCreate.vue
index 921823f8..c82a647c 100644
--- a/pages/productPutaway/request/putawayRequestCreate.vue
+++ b/pages/productPutaway/request/putawayRequestCreate.vue
@@ -304,6 +304,7 @@
 							var subItem = {};
 							Object.assign(subItem, detail)
 							subItem.fromLocationCode = detail.locationCode;
+							subItem.qty = detail.handleQty;
 							subItem.package = null;
 							subList.push(subItem)
 						}
diff --git a/pages/putaway/request/putawayRequestCreate.vue b/pages/putaway/request/putawayRequestCreate.vue
index 5cf7c2e1..18a8cc44 100644
--- a/pages/putaway/request/putawayRequestCreate.vue
+++ b/pages/putaway/request/putawayRequestCreate.vue
@@ -311,6 +311,7 @@
 							var subItem = {};
 							Object.assign(subItem, detail)
 							subItem.fromLocationCode = detail.locationCode;
+							subItem.qty=detail.handleQty;
 							subItem.package = null;
 							subList.push(subItem)
 						}