From becd39f135ba9478bbae3f1494664fa1ff038113 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 22 Apr 2024 15:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=94=9F=E4=BA=A7=E6=94=B6=E8=B4=A7?=
 =?UTF-8?q?=20=E8=A3=85=E9=85=8D=E6=94=B6=E5=9B=9E=20=20=E5=88=B6=E5=93=81?=
 =?UTF-8?q?=E5=9B=9E=E6=94=B6=20=20=E6=8A=A5=E5=BA=9F=E6=94=B6=E8=B4=A7=20?=
 =?UTF-8?q?=20=E5=88=B6=E5=93=81=E4=B8=8A=E6=9E=B6=E4=B8=BB=E5=AD=90?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js                           | 39 +++++++++++++++----
 .../productPutaway/coms/comProductJobCard.vue | 16 ++------
 .../coms/comPutawayRequestCard.vue            |  9 ++---
 .../productPutaway/request/putawayRequest.vue | 14 +++----
 .../productReceipt/coms/comProductJobCard.vue | 11 ++++--
 .../productReceipt/job/productReceiptJob.vue  |  8 ++--
 .../productRecycle/coms/comRecycleJobCard.vue | 12 ++----
 .../productRecycle/job/productRecycleJob.vue  |  4 +-
 8 files changed, 62 insertions(+), 51 deletions(-)

diff --git a/src/api/request2.js b/src/api/request2.js
index e08ef619..6cdfaab1 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -1960,15 +1960,21 @@ export function unPlannedIssueRecordSubmit(params) {
  * 获取日期任务列表
  * @param {*} 
  */
+// export function getProductReceiptJobList(params) {
+// 	return request({
+// 		url: baseApi + "/wms/productreceipt-job-main/senior",
+// 		method: "post",
+// 		data: params,
+// 	});
+// }
 export function getProductReceiptJobList(params) {
 	return request({
-		url: baseApi + "/wms/productreceipt-job-main/senior",
+		url: baseApi + "/wms/productreceipt-job-detail/senior",
 		method: "post",
 		data: params,
 	});
 }
 
-
 /**
  * 制品收货 获取任务明细
  * @param {*}   id 任务id
@@ -2042,14 +2048,20 @@ export function productReceiptRecordsubmit(params) {
  * 获取日期任务列表
  * @param {*}  
  */
+// export function getProductPutawayJobList(params) {
+// 	return request({
+// 		url: baseApi + "/wms/productputaway-job-main/senior",
+// 		method: "post",
+// 		data: params,
+// 	});
+// }
 export function getProductPutawayJobList(params) {
 	return request({
-		url: baseApi + "/wms/productputaway-job-main/senior",
+		url: baseApi + "/wms/productputaway-job-detail/senior",
 		method: "post",
 		data: params,
 	});
 }
-
 /**
  * 制品上架 获取任务明细
  * @param {*}  id 任务id
@@ -2474,9 +2486,16 @@ export function deliverRecordSubmit(params) {
  * 获取日期任务列表
  * @param {*}  
  */
+// export function getProductRecycleJobList(params) {
+// 	return request({
+// 		url: baseApi + "/wms/productredress-job-main/senior",
+// 		method: "post",
+// 		data: params,
+// 	});
+// }
 export function getProductRecycleJobList(params) {
 	return request({
-		url: baseApi + "/wms/productredress-job-main/senior",
+		url: baseApi + "/wms/productredress-job-detail/senior",
 		method: "post",
 		data: params,
 	});
@@ -2918,14 +2937,20 @@ export function transferIssueRecordSubmit(params) {
  * 获取日期任务列表
  * @param {*}  
  */
+// export function getProductPutawayRequestList(params) {
+// 	return request({
+// 		url: baseApi + "/wms/productputaway-request-main/senior",
+// 		method: "post",
+// 		data: params,
+// 	});
+// }
 export function getProductPutawayRequestList(params) {
 	return request({
-		url: baseApi + "/wms/productputaway-request-main/senior",
+		url: baseApi + "/wms/productputaway-request-detail/senior",
 		method: "post",
 		data: params,
 	});
 }
-
 /**
  * 制品上架申请 获取任务明细
  * @param {*}   id 任务id
diff --git a/src/pages/productPutaway/coms/comProductJobCard.vue b/src/pages/productPutaway/coms/comProductJobCard.vue
index 9e7eb95b..d8a43bf2 100644
--- a/src/pages/productPutaway/coms/comProductJobCard.vue
+++ b/src/pages/productPutaway/coms/comProductJobCard.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.supplierCode}}
- 				</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/productPutaway/coms/comPutawayRequestCard.vue b/src/pages/productPutaway/coms/comPutawayRequestCard.vue
index ca0ba131..3093a56a 100644
--- a/src/pages/productPutaway/coms/comPutawayRequestCard.vue
+++ b/src/pages/productPutaway/coms/comPutawayRequestCard.vue
@@ -1,18 +1,17 @@
 <template>
  	<request-com-main-card :dataContent="dataContent">
- 		<view class="task_item">
- 			<!-- <view class="task_text">
- 				供应商代码 : {{dataContent.supplierCode}}
- 			</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/productPutaway/request/putawayRequest.vue b/src/pages/productPutaway/request/putawayRequest.vue
index a551af6b..4323d297 100644
--- a/src/pages/productPutaway/request/putawayRequest.vue
+++ b/src/pages/productPutaway/request/putawayRequest.vue
@@ -125,7 +125,7 @@
 			},
 			openRequestDetail(item) {
 				uni.navigateTo({
-					url: './putawayRequestDetail?id=' + item.id
+					url: './putawayRequestDetail?id=' + item.masterId
 				});
 			},
 
@@ -218,27 +218,27 @@
 					this.openRequestInfoPopup(dataContent);
 				} else if (text == "处理") {
 					this.showQuestionMessage("确定要处理当前申请吗?", res => {
-						this.productPutawayRequestHandle(dataContent.id)
+						this.productPutawayRequestHandle(dataContent.masterId)
 					})
 				} else if (text == "提交审批") {
 					this.showQuestionMessage("确定要审批当前申请吗?", res => {
-						this.productPutawayRequestApprove(dataContent.id)
+						this.productPutawayRequestApprove(dataContent.masterId)
 					})
 				} else if (text == "审批通过") {
 					this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
-						this.productPutawayRequestApproveAgree(dataContent.id)
+						this.productPutawayRequestApproveAgree(dataContent.masterId)
 					})
 				} else if (text == "审批驳回") {
 					this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
-						this.productPutawayRequestApproveRefused(dataContent.id)
+						this.productPutawayRequestApproveRefused(dataContent.masterId)
 					})
 				} else if (text == "关闭") {
 					this.showQuestionMessage("确定要关闭当前申请吗?", res => {
-						this.productPutawayRequestClose(dataContent.id)
+						this.productPutawayRequestClose(dataContent.masterId)
 					})
 				} else if (text == "重新添加") {
 					this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
-						this.productPutawayRequestAddAgain(dataContent.id)
+						this.productPutawayRequestAddAgain(dataContent.masterId)
 					})
 				}
 			},
diff --git a/src/pages/productReceipt/coms/comProductJobCard.vue b/src/pages/productReceipt/coms/comProductJobCard.vue
index e97859ae..8710f316 100644
--- a/src/pages/productReceipt/coms/comProductJobCard.vue
+++ b/src/pages/productReceipt/coms/comProductJobCard.vue
@@ -1,6 +1,7 @@
 <template>
 	<job-com-main-card :dataContent="dataContent">
-		<view class="task_item">
+		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
+		<!-- <view class="task_item">
 			<view class="task_text">
 				<view class="">
 					申请单号 : {{dataContent.requestNumber}}
@@ -18,7 +19,7 @@
 				</view>
 			</view>
 
-			<!-- 	<view class="task_text">
+				<view class="task_text">
  				<view class="">
  					班组 : {{dataContent.team}}
  				</view>
@@ -27,16 +28,18 @@
 				<view class="">
 					班次 : {{dataContent.shift}}
 				</view>
-			</view> -->
-		</view>
+			</view>
+		</view> -->
 	</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/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index a19c48b1..5e05d1ff 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -206,15 +206,15 @@
 			openJobDetail(item) {
 				if (this.type == 'predict') {
 					uni.navigateTo({
-						url: './productReceiptDetail?id=' + item.id + '&status=' + item.status
+						url: './productReceiptDetail?id=' + item.masterId + '&status=' + item.status
 					});
 				} else if(this.type == 'assemble'){
 					uni.navigateTo({
-						url: './fgProductReceiptDetail?id=' + item.id + '&status=' + item.status
+						url: './fgProductReceiptDetail?id=' + item.masterId + '&status=' + item.status
 					});
 				}else {
 					uni.navigateTo({
-						url: './scrapReceiptDetail?id=' + item.id + '&status=' + item.status
+						url: './scrapReceiptDetail?id=' + item.masterId + '&status=' + item.status
 					});
 				}
 			},
@@ -234,7 +234,7 @@
 					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
 						res => {
 							if (res) {
-								this.cancleJob(dataContent.id);
+								this.cancleJob(dataContent.masterId);
 							}
 						});
 				}
diff --git a/src/pages/productRecycle/coms/comRecycleJobCard.vue b/src/pages/productRecycle/coms/comRecycleJobCard.vue
index 42adb984..216deb18 100644
--- a/src/pages/productRecycle/coms/comRecycleJobCard.vue
+++ b/src/pages/productRecycle/coms/comRecycleJobCard.vue
@@ -1,22 +1,16 @@
 <template>
 	<job-com-main-card :dataContent="dataContent">
-		<view class="task_item">
-			<view class="task_item">
-				<view class="task_text">
-					<view class="">
-						申请单号 : {{dataContent.requestNumber}}
-					</view>
-				</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/productRecycle/job/productRecycleJob.vue b/src/pages/productRecycle/job/productRecycleJob.vue
index c894b253..5bfc7b93 100644
--- a/src/pages/productRecycle/job/productRecycleJob.vue
+++ b/src/pages/productRecycle/job/productRecycleJob.vue
@@ -177,7 +177,7 @@
 
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './productRecycleJobDetail?id=' + item.id + '&status=' + item.status
+					url: './productRecycleJobDetail?id=' + item.masterId + '&status=' + item.status
 				});
 			},
 
@@ -196,7 +196,7 @@
 					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
 						res => {
 							if (res) {
-								this.cancleJob(dataContent.id);
+								this.cancleJob(dataContent.masterId);
 							}
 						});
 				}