From 9b0818564b7edce64cbe06171fa17b5ec16daca4 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 23 Apr 2024 16:38:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E5=8F=91=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=20=20=E6=88=90=E5=93=81=E5=8F=91=E8=B4=A7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=20=20=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=20=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js                           | 47 +++++++++++++++----
 .../customerReturn/coms/comReturnJobCard.vue  | 16 ++-----
 .../coms/comReturnRequestCard.vue             | 11 ++---
 src/pages/customerReturn/job/returnJob.vue    |  4 +-
 .../request/customerReturnRequest.vue         | 14 +++---
 src/pages/deliver/coms/comDeliverJobCard.vue  | 28 ++---------
 .../deliver/coms/comDeliverRequestCard.vue    |  8 ++--
 src/pages/deliver/job/deliverJob.vue          |  4 +-
 src/pages/deliver/request/deliverRequest.vue  | 14 +++---
 9 files changed, 69 insertions(+), 77 deletions(-)

diff --git a/src/api/request2.js b/src/api/request2.js
index 6cdfaab1..621d2cc4 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -2148,7 +2148,13 @@ export function getStockUpJobList(params) {
 		data: params,
 	});
 }
-
+// export function getStockUpJobList(params) {
+// 	return request({
+// 		url: baseApi + "/wms/stockup-main-detail/senior",
+// 		method: "post",
+// 		data: params,
+// 	});
+// }
 /**
  * 直接备货 获取任务明细
  * @param {*}   id 任务id
@@ -2290,14 +2296,20 @@ export function productDismantleRecordSubmit(params) {
  * 获取日期任务列表
  * @param {*}  
  */
+// export function getDeliverJobList(params) {
+// 	return request({
+// 		url: baseApi + "/wms/deliver-job-main/senior",
+// 		method: "post",
+// 		data: params,
+// 	});
+// }
 export function getDeliverJobList(params) {
 	return request({
-		url: baseApi + "/wms/deliver-job-main/senior",
+		url: baseApi + "/wms/deliver-job-detail/senior",
 		method: "post",
 		data: params,
 	});
 }
-
 /**
  * 制品发货 获取任务明细
  * @param {*}   id 任务id
@@ -2361,14 +2373,20 @@ export function deliverJobSubmit(params) {
  * 获取日期任务列表
  * @param {*} 
  */
+// export function getDeliverRequestList(params) {
+// 	return request({
+// 		url: baseApi + "/wms/deliver-request-main/senior",
+// 		method: "post",
+// 		data: params,
+// 	});
+// }
 export function getDeliverRequestList(params) {
 	return request({
-		url: baseApi + "/wms/deliver-request-main/senior",
+		url: baseApi + "/wms/deliver-request-detail/senior",
 		method: "post",
 		data: params,
 	});
 }
-
 /**
  * 制品发货申请 获取任务明细
  * @param {*}   id 任务id
@@ -2575,9 +2593,16 @@ export function productRecycleRecordSubmit(params) {
  * 获取日期任务列表
  * @param {*} 
  */
+// export function getCustomerReturnJobList(params) {
+// 	return request({
+// 		url: baseApi + "/wms/customerreturn-job-main/senior",
+// 		method: "post",
+// 		data: params,
+// 	});
+// }
 export function getCustomerReturnJobList(params) {
 	return request({
-		url: baseApi + "/wms/customerreturn-job-main/senior",
+		url: baseApi + "/wms/customerreturn-job-detail/senior",
 		method: "post",
 		data: params,
 	});
@@ -2644,15 +2669,21 @@ export function customerReturnJobSubmit(params) {
  * 获取日期任务列表
  * @param {*} 
  */
+// export function getCustomerReturnRequestList(params) {
+// 	return request({
+// 		url: baseApi + "/wms/customerreturn-request-main/senior",
+// 		method: "post",
+// 		data: params,
+// 	});
+// }
 export function getCustomerReturnRequestList(params) {
 	return request({
-		url: baseApi + "/wms/customerreturn-request-main/senior",
+		url: baseApi + "/wms/customerreturn-request-detail/senior",
 		method: "post",
 		data: params,
 	});
 }
 
-
 /**
  * 客户退货申请 任务明细
  * @param {*}   id 任务id
diff --git a/src/pages/customerReturn/coms/comReturnJobCard.vue b/src/pages/customerReturn/coms/comReturnJobCard.vue
index 4691483d..dc9ffc44 100644
--- a/src/pages/customerReturn/coms/comReturnJobCard.vue
+++ b/src/pages/customerReturn/coms/comReturnJobCard.vue
@@ -1,26 +1,16 @@
 <template>
  	<job-com-main-card :dataContent="dataContent">
- 		<view class="task_item">
- 			<view class="task_text">
- 				<view class="">
- 					申请单号 : {{dataContent.requestNumber}}
- 				</view>
- 			</view>
-
- 			<view class="task_text">
- 				<view class="">
- 					客户代码 : {{dataContent.customerCode}}
- 				</view>
- 			</view>
- 		</view>
+ 		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
  	</job-com-main-card>
  </template>
 
  <script>
  	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+	import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
  	export default {
  		components: {
  			jobComMainCard,
+			jobComMainDetailCard
  		},
  		data() {
  			return {};
diff --git a/src/pages/customerReturn/coms/comReturnRequestCard.vue b/src/pages/customerReturn/coms/comReturnRequestCard.vue
index eb39e121..911f880c 100644
--- a/src/pages/customerReturn/coms/comReturnRequestCard.vue
+++ b/src/pages/customerReturn/coms/comReturnRequestCard.vue
@@ -1,21 +1,16 @@
 <template>
  	<request-com-main-card :dataContent="dataContent">
- 		<view class="task_item">
- 			<!-- <view class="task_text">
- 				申请单号 : {{dataContent.requestNumber}}
- 			</view> -->
- 			<view class="task_text">
- 				客户代码 : {{dataContent.customerCode}}
- 			</view>
- 		</view>
+ 		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
  	</request-com-main-card>
  </template>
 
  <script>
  	import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
+	import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
  	export default {
  		components: {
  			requestComMainCard,
+			jobComMainDetailCard
  		},
  		data() {
  			return {};
diff --git a/src/pages/customerReturn/job/returnJob.vue b/src/pages/customerReturn/job/returnJob.vue
index 12b9634f..8a058220 100644
--- a/src/pages/customerReturn/job/returnJob.vue
+++ b/src/pages/customerReturn/job/returnJob.vue
@@ -175,7 +175,7 @@
 
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './returnDetail?id=' + item.id + '&status=' + item.status
+					url: './returnDetail?id=' + item.masterId + '&status=' + item.status
 				});
 			},
 
@@ -194,7 +194,7 @@
 					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
 						res => {
 							if (res) {
-								this.cancleJob(dataContent.id);
+								this.cancleJob(dataContent.masterId);
 							}
 						});
 				}
diff --git a/src/pages/customerReturn/request/customerReturnRequest.vue b/src/pages/customerReturn/request/customerReturnRequest.vue
index e6d5c04b..9a80dcc5 100644
--- a/src/pages/customerReturn/request/customerReturnRequest.vue
+++ b/src/pages/customerReturn/request/customerReturnRequest.vue
@@ -124,7 +124,7 @@
 			},
 			openRequestDetail(item) {
 				uni.navigateTo({
-					url: './customerReturnRequestDetail?id=' + item.id
+					url: './customerReturnRequestDetail?id=' + item.masterId
 				});
 			},
 
@@ -211,27 +211,27 @@
 					this.openRequestInfoPopup(dataContent);
 				} else if (text == "处理") {
 					this.showQuestionMessage("确定要处理当前申请吗?", res => {
-						this.customerReturnRequestHandle(dataContent.id)
+						this.customerReturnRequestHandle(dataContent.masterId)
 					})
 				} else if (text == "提交审批") {
 					this.showQuestionMessage("确定要审批当前申请吗?", res => {
-						this.customerReturnRequestApprove(dataContent.id)
+						this.customerReturnRequestApprove(dataContent.masterId)
 					})
 				} else if (text == "审批通过") {
 					this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
-						this.customerReturnRequestApproveAgree(dataContent.id)
+						this.customerReturnRequestApproveAgree(dataContent.masterId)
 					})
 				} else if (text == "审批驳回") {
 					this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
-						this.customerReturnRequestApproveRefused(dataContent.id)
+						this.customerReturnRequestApproveRefused(dataContent.masterId)
 					})
 				} else if (text == "关闭") {
 					this.showQuestionMessage("确定要关闭当前申请吗?", res => {
-						this.customerReturnRequestClose(dataContent.id)
+						this.customerReturnRequestClose(dataContent.masterId)
 					})
 				} else if (text == "重新添加") {
 					this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
-						this.customerReturnRequestAddAgain(dataContent.id)
+						this.customerReturnRequestAddAgain(dataContent.masterId)
 					})
 				}
 			},
diff --git a/src/pages/deliver/coms/comDeliverJobCard.vue b/src/pages/deliver/coms/comDeliverJobCard.vue
index a4e79a87..dfb3bb26 100644
--- a/src/pages/deliver/coms/comDeliverJobCard.vue
+++ b/src/pages/deliver/coms/comDeliverJobCard.vue
@@ -1,38 +1,16 @@
 <template>
 	<job-com-main-card :dataContent="dataContent">
-		<view class="task_item">
-			<!-- <view class="task_text">
- 				<view class="">
- 					申请单号 : {{dataContent.requestNumber}}
- 				</view>
- 			</view> -->
-
-			<view class="task_text">
-				<view class="">
-					发货计划单号 : {{dataContent.deliverPlanNumber}}
-				</view>
-			</view>
-
-			<view class="task_text">
-				<view class="">
-					发货类型 : {{dataContent.deliverType}}
-				</view>
-			</view>
-
-			<view class="task_text">
-				<view class="">
-					客户代码 : {{dataContent.customerCode}}
-				</view>
-			</view>
-		</view>
+		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
 	</job-com-main-card>
 </template>
 
 <script>
 	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+	import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
 	export default {
 		components: {
 			jobComMainCard,
+			jobComMainDetailCard
 		},
 		data() {
 			return {};
diff --git a/src/pages/deliver/coms/comDeliverRequestCard.vue b/src/pages/deliver/coms/comDeliverRequestCard.vue
index 5c26c197..911f880c 100644
--- a/src/pages/deliver/coms/comDeliverRequestCard.vue
+++ b/src/pages/deliver/coms/comDeliverRequestCard.vue
@@ -1,18 +1,16 @@
 <template>
  	<request-com-main-card :dataContent="dataContent">
- 		<view class="task_item">
- 			<view class="task_text">
- 				客户代码 : {{dataContent.customerCode}}
- 			</view>
- 		</view>
+ 		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
  	</request-com-main-card>
  </template>
 
  <script>
  	import requestComMainCard from '@/mycomponents/request/requestComMainCard.vue'
+	import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
  	export default {
  		components: {
  			requestComMainCard,
+			jobComMainDetailCard
  		},
  		data() {
  			return {};
diff --git a/src/pages/deliver/job/deliverJob.vue b/src/pages/deliver/job/deliverJob.vue
index be9e63a7..a51dd3c6 100644
--- a/src/pages/deliver/job/deliverJob.vue
+++ b/src/pages/deliver/job/deliverJob.vue
@@ -176,7 +176,7 @@
 
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './deliverDetail?id=' + item.id + '&status=' + item.status
+					url: './deliverDetail?id=' + item.masterId + '&status=' + item.status
 				});
 			},
 
@@ -195,7 +195,7 @@
 					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
 						res => {
 							if (res) {
-								this.cancleJob(dataContent.id);
+								this.cancleJob(dataContent.masterId);
 							}
 						});
 				}
diff --git a/src/pages/deliver/request/deliverRequest.vue b/src/pages/deliver/request/deliverRequest.vue
index 4633935d..a635d02f 100644
--- a/src/pages/deliver/request/deliverRequest.vue
+++ b/src/pages/deliver/request/deliverRequest.vue
@@ -125,7 +125,7 @@
 			},
 			openRequestDetail(item) {
 				uni.navigateTo({
-					url: './deliverRequestDetail?id=' + item.id
+					url: './deliverRequestDetail?id=' + item.masterId
 				});
 			},
 			getList(type) {
@@ -209,27 +209,27 @@
 					this.openRequestInfoPopup(dataContent);
 				} else if (text == "处理") {
 					this.showQuestionMessage("确定要处理当前申请吗?",res=>{
-						this.deliverRequestHandle(dataContent.id)
+						this.deliverRequestHandle(dataContent.masterId)
 					})
 				} else if (text == "提交审批") {
 					this.showQuestionMessage("确定要审批当前申请吗?",res=>{
-						this.deliverRequestApprove(dataContent.id)
+						this.deliverRequestApprove(dataContent.masterId)
 					})
 				} else if (text=="审批通过") {
 					this.showQuestionMessage("确定要审批通过当前申请吗?",res=>{
-						this.deliverRequestApproveAgree(dataContent.id)
+						this.deliverRequestApproveAgree(dataContent.masterId)
 					})
 				} else if (text == "审批驳回") {
 					this.showQuestionMessage("确定要审批驳回当前申请吗?",res=>{
-						this.deliverRequestApproveRefused(dataContent.id)
+						this.deliverRequestApproveRefused(dataContent.masterId)
 					})
 				} else if (text == "关闭") {
 					this.showQuestionMessage("确定要关闭当前申请吗?",res=>{
-						this.deliverRequestClose(dataContent.id)
+						this.deliverRequestClose(dataContent.masterId)
 					})
 				}else if(text == "重新添加"){
 					this.showQuestionMessage("确定要重新添加当前申请吗?",res=>{
-						this.deliverRequestAddAgain(dataContent.id)
+						this.deliverRequestAddAgain(dataContent.masterId)
 					})
 				}
 			},