From a2f806f7b19eb03b7e445dcaad855ecee277298f Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Fri, 8 Dec 2023 14:38:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E5=92=8C=E5=8F=91=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/detail/comRequestDetailCard.vue  | 13 ++++-
 pages.json                                    |  2 +-
 pages/issue/coms/comIssueRequestCreator.vue   |  7 +++
 pages/issue/request/issueRequestCreate.vue    |  3 +-
 pages/issue/request/issueRequestDetail.vue    |  4 +-
 .../coms/comReturnCommonRequest.vue           |  5 +-
 .../coms/comReturnRequestInfo.vue             | 57 +++++++++++++++++++
 .../request/requestDetail.vue                 |  1 +
 ...uestSubmit.vue => returnRequestCreate.vue} |  2 +-
 pages/purchaseReturn/record/returnRecord.vue  | 22 +++----
 10 files changed, 95 insertions(+), 21 deletions(-)
 create mode 100644 pages/productionReturn/coms/comReturnRequestInfo.vue
 rename pages/productionReturn/request/{returnToStoreRequestSubmit.vue => returnRequestCreate.vue} (99%)

diff --git a/mycomponents/detail/comRequestDetailCard.vue b/mycomponents/detail/comRequestDetailCard.vue
index 8cb916fa..d0194090 100644
--- a/mycomponents/detail/comRequestDetailCard.vue
+++ b/mycomponents/detail/comRequestDetailCard.vue
@@ -1,5 +1,7 @@
 <template>
 	<view class="" style="background-color: #fff;">
+		<comReturnRequestInfo :workShopCode="dataContent.workshopCode" :dataContent="requestItem">
+		</comReturnRequestInfo>
 		<uni-collapse ref="collapse1" @change="">
 			<uni-collapse-item :open="true">
 				<template v-slot:title>
@@ -32,6 +34,7 @@
 	import recommend from '@/mycomponents/recommend/recommend.vue'
 	import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
 	import comMessage from '@/mycomponents/common/comMessage.vue'
+	import comReturnRequestInfo from '@/pages/productionReturn/coms/comReturnRequestInfo.vue'
 	import {
 		getDetailOption,
 		getDetailEditRemoveOption,
@@ -45,6 +48,7 @@
 			recommend,
 			balanceQtyEdit,
 			comMessage,
+			comReturnRequestInfo
 		},
 		props: {
 			dataContent: {
@@ -69,7 +73,11 @@
 			},
 		},
 		watch: {
-
+			dataContent(newVal) {
+				var test =this.dataContent
+				debugger
+				this.requestItem = newVal.subList[0];
+			},
 		},
 
 		data() {
@@ -82,7 +90,8 @@
 					}
 				},
 				detailOptions: [],
-				scanOptions: []
+				scanOptions: [],
+				requestItem:{}
 			}
 		},
 
diff --git a/pages.json b/pages.json
index c999c106..9c37edb4 100644
--- a/pages.json
+++ b/pages.json
@@ -554,7 +554,7 @@
 			}
 		},
 		{
-			"path": "pages/productionReturn/request/returnToStoreRequestSubmit",
+			"path": "pages/productionReturn/request/returnRequestCreate",
 			"style": {
 				"navigationBarTitleText": "生产合格退料申请",
 				"enablePullDownRefresh": true,
diff --git a/pages/issue/coms/comIssueRequestCreator.vue b/pages/issue/coms/comIssueRequestCreator.vue
index 5a935cf6..7a4cd165 100644
--- a/pages/issue/coms/comIssueRequestCreator.vue
+++ b/pages/issue/coms/comIssueRequestCreator.vue
@@ -65,6 +65,10 @@
 				type: Boolean,
 				default: true
 			},
+			isSwipe: {
+				type: Boolean,
+				default: true
+			},
 		},
 		watch: {
 			dataContent(newVal) {
@@ -99,6 +103,9 @@
 				// 	this.scanOptions = getDetailRemoveOption();
 				// }
 			}
+			if(!this.isSwipe){
+				this.detailOptions=[]
+			}
 		},
 
 		methods: {
diff --git a/pages/issue/request/issueRequestCreate.vue b/pages/issue/request/issueRequestCreate.vue
index 9bef35b6..b547a751 100644
--- a/pages/issue/request/issueRequestCreate.vue
+++ b/pages/issue/request/issueRequestCreate.vue
@@ -5,7 +5,7 @@
 		</view>
 		<view v-else class="page-wraper">
 			<view class="page-main">
-				<comIssueRequestCreator ref="issueRequest" :dataContent="detailSource">
+				<comIssueRequestCreator ref="issueRequest" :dataContent="detailSource" :isSwipe ="false">
 				</comIssueRequestCreator>
 				<button class="btn_add" @click="goScan(false)">+去添加</button>
 			</view>
@@ -101,7 +101,6 @@
 						subList: []
 					}
 					
-					debugger
 					var subItem = {
 						productionLineCode: item.productionLineCode,
 						workStationCode: item.workStationCode,
diff --git a/pages/issue/request/issueRequestDetail.vue b/pages/issue/request/issueRequestDetail.vue
index 56e11597..677e2da9 100644
--- a/pages/issue/request/issueRequestDetail.vue
+++ b/pages/issue/request/issueRequestDetail.vue
@@ -9,13 +9,13 @@
 					</view>
 				</view>
 			</scroll-view>
-			<div class="btn_bottom" >
+			<!-- <div class="btn_bottom" >
 				<view class="" style="display: flex;flex-direction: row;">
 					<view class="">
 						<button class="btn_commit" hover-class="btn_commit_after" @click="submit()">提交</button>
 					</view>
 				</view>
-			</div>
+			</div> -->
 		</view>
 		<com-message ref="comMessage"></com-message>
 	</view>
diff --git a/pages/productionReturn/coms/comReturnCommonRequest.vue b/pages/productionReturn/coms/comReturnCommonRequest.vue
index cf580725..01667f18 100644
--- a/pages/productionReturn/coms/comReturnCommonRequest.vue
+++ b/pages/productionReturn/coms/comReturnCommonRequest.vue
@@ -43,7 +43,8 @@
 	} from '@/api/request2.js';
 	import {
 		goHome,
-		updateTitle
+		updateTitle,
+		clearTirmAndWrap
 	} from '@/common/basic.js';
 
 	import {
@@ -230,7 +231,7 @@
 
 			openScanDetailPopup() {
 				uni.navigateTo({
-					url: "./returnToStoreRequestSubmit?fromType=" + this.fromType
+					url: "./returnRequestCreate?fromType=" + this.fromType
 				})
 			},
 			openFilter(){
diff --git a/pages/productionReturn/coms/comReturnRequestInfo.vue b/pages/productionReturn/coms/comReturnRequestInfo.vue
new file mode 100644
index 00000000..fbb64a31
--- /dev/null
+++ b/pages/productionReturn/coms/comReturnRequestInfo.vue
@@ -0,0 +1,57 @@
+<template>
+	<view class="cen_card" style="padding: 20rpx;">
+		<view class="cell_box uni-flex uni-row">
+			<view class="cell_info">
+				<view class="text_lightblue">车间</view>
+				<view>{{workShopCode}}</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">生产线</view>
+				<view>{{dataContent.productionLineCode}}</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">工位</view>
+				<view>{{ dataContent.workStationCode }}</view>
+			</view>
+			<view class="cell_info">
+				<view class="text_lightblue">原材料库</view>
+				<view>{{ dataContent.toLocationCode}}</view>
+			</view>
+		</view>
+		<u-line />
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {};
+		},
+
+		props: {
+			workShopCode: {
+				type: String,
+				default: ''
+			},
+			dataContent: {
+				type: Object,
+				default: {}
+			},
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>
+
+
+<style>
+</style>
diff --git a/pages/productionReturn/request/requestDetail.vue b/pages/productionReturn/request/requestDetail.vue
index 631c82f8..1acd47b1 100644
--- a/pages/productionReturn/request/requestDetail.vue
+++ b/pages/productionReturn/request/requestDetail.vue
@@ -84,6 +84,7 @@
 							that.requestContent = res.data;
 							that.subList = res.data.subList;
 							that.detailSource = getDataSource(that.subList);
+							that.detailSource[0].workshopCode = that.requestContent.workshopCode
 						} else {
 							that.showMessage('列表数据为0');
 						}
diff --git a/pages/productionReturn/request/returnToStoreRequestSubmit.vue b/pages/productionReturn/request/returnRequestCreate.vue
similarity index 99%
rename from pages/productionReturn/request/returnToStoreRequestSubmit.vue
rename to pages/productionReturn/request/returnRequestCreate.vue
index 31e04a0c..b78163de 100644
--- a/pages/productionReturn/request/returnToStoreRequestSubmit.vue
+++ b/pages/productionReturn/request/returnRequestCreate.vue
@@ -5,7 +5,7 @@
 		</view>
 		<view v-else class="page-wraper">
 			<view class="page-main">
-				<comReturnRequestCreator ref="issueRequest" :dataContent="detailSource">
+				<comReturnRequestCreator ref="issueRequest" :dataContent="detailSource" :isSwipe ="false">
 				</comReturnRequestCreator>
 				<button class="btn_add" @click="goScan(false)">+去添加</button>
 			</view>
diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue
index 060b49ad..4468b608 100644
--- a/pages/purchaseReturn/record/returnRecord.vue
+++ b/pages/purchaseReturn/record/returnRecord.vue
@@ -226,17 +226,17 @@
 					if (this.fromType == "requestType") {
 						var params = this.setRequestParams();
 						console.log("提交" + JSON.stringify(params))
-						// purchaseReturnRequestSubmit(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)
-						// })
+						purchaseReturnRequestSubmit(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)
+						})
 					} else {
 						
 						var itemCodes = []