From e09229981782c80ada52491602c46bb686e2f56b Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 19 Apr 2024 13:25:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=B8=8A=E6=9E=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=B8=BB=E5=AD=90=E5=90=88=E5=B9=B6=EF=BC=8C=E5=88=A0?=
 =?UTF-8?q?=E6=8E=89=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js                              | 10 ++++++++--
 .../purchaseReturn/coms/comReturnJobCard.vue     | 16 ----------------
 .../purchaseReturn/coms/comReturnRequestCard.vue |  8 --------
 src/pages/putaway/coms/comPutawayRequestCard.vue |  7 +++++--
 src/pages/putaway/request/putawayRequest.vue     | 14 +++++++-------
 5 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/src/api/request2.js b/src/api/request2.js
index 3688c8b3..9e15aaf5 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -1166,14 +1166,20 @@ export function putawayJobSubmit(params) {
  * 获取日期任务列表
  * @param {*}  
  */
+// export function getPutawayRequestList(params) {
+// 	return request({
+// 		url: baseApi + "/wms/putaway-request-main/senior",
+// 		method: "post",
+// 		data: params,
+// 	});
+// }
 export function getPutawayRequestList(params) {
 	return request({
-		url: baseApi + "/wms/putaway-request-main/senior",
+		url: baseApi + "/wms/putaway-request-detail/senior",
 		method: "post",
 		data: params,
 	});
 }
-
 /**
  * 采购上架申请 获取任务明细
  * @param {*}   id 任务id
diff --git a/src/pages/purchaseReturn/coms/comReturnJobCard.vue b/src/pages/purchaseReturn/coms/comReturnJobCard.vue
index d430aca1..216deb18 100644
--- a/src/pages/purchaseReturn/coms/comReturnJobCard.vue
+++ b/src/pages/purchaseReturn/coms/comReturnJobCard.vue
@@ -1,22 +1,6 @@
 <template>
 	<job-com-main-card :dataContent="dataContent">
 		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
-		<!-- <view class="task_item">
-			<view class="task_item">
-				<view class="task_text">
-					<view class="">
-						申请单号 : {{dataContent.requestNumber}}
-					</view>
-				</view>
-			</view>
-			<view class="task_item">
-				<view class="task_text">
-					<view class="">
-						供应商 : {{dataContent.supplierCode}}
-					</view>
-				</view>
-			</view>
-		</view> -->
 	</job-com-main-card>
 </template>
 
diff --git a/src/pages/purchaseReturn/coms/comReturnRequestCard.vue b/src/pages/purchaseReturn/coms/comReturnRequestCard.vue
index c248ad36..55036b26 100644
--- a/src/pages/purchaseReturn/coms/comReturnRequestCard.vue
+++ b/src/pages/purchaseReturn/coms/comReturnRequestCard.vue
@@ -1,14 +1,6 @@
 <template>
  	<request-com-main-card :dataContent="dataContent">
 		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
- 		<!-- <view class="task_item">
- 			<view class="task_text">
- 				收货单号 : {{dataContent.purchaseReceiptRecordNumber}}
- 			</view>
- 			<view class="task_text">
- 				供应商代码 : {{dataContent.supplierCode}}
- 			</view>
- 		</view> -->
  	</request-com-main-card>
  </template>
 
diff --git a/src/pages/putaway/coms/comPutawayRequestCard.vue b/src/pages/putaway/coms/comPutawayRequestCard.vue
index e1428660..18430aab 100644
--- a/src/pages/putaway/coms/comPutawayRequestCard.vue
+++ b/src/pages/putaway/coms/comPutawayRequestCard.vue
@@ -1,18 +1,21 @@
 <template>
  	<request-com-main-card :dataContent="dataContent">
- 		<view class="task_item">
+		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
+ 		<!-- <view class="task_item">
  			<view class="task_text">
  				供应商代码 : {{dataContent.supplierCode}}
  			</view>
- 		</view>
+ 		</view> -->
  	</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/putaway/request/putawayRequest.vue b/src/pages/putaway/request/putawayRequest.vue
index 9406c847..fd983a83 100644
--- a/src/pages/putaway/request/putawayRequest.vue
+++ b/src/pages/putaway/request/putawayRequest.vue
@@ -120,7 +120,7 @@
 
 			openRequestDetail(item) {
 				uni.navigateTo({
-					url: './putawayRequestDetail?id=' + item.id
+					url: './putawayRequestDetail?id=' + item.masterId
 				});
 			},
 			openRequestInfoPopup(item) {
@@ -215,27 +215,27 @@
 					this.openRequestInfoPopup(dataContent);
 				} else if (text == "处理") {
 					this.showQuestionMessage("确定要处理当前申请吗?", res => {
-						this.putawayRequestHandle(dataContent.id)
+						this.putawayRequestHandle(dataContent.masterId)
 					})
 				} else if (text == "提交审批") {
 					this.showQuestionMessage("确定要审批当前申请吗?", res => {
-						this.putawayRequestApprove(dataContent.id)
+						this.putawayRequestApprove(dataContent.masterId)
 					})
 				} else if (text == "审批通过") {
 					this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
-						this.putawayRequestApproveAgree(dataContent.id)
+						this.putawayRequestApproveAgree(dataContent.masterId)
 					})
 				} else if (text == "审批驳回") {
 					this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
-						this.putawayRequestApproveRefused(dataContent.id)
+						this.putawayRequestApproveRefused(dataContent.masterId)
 					})
 				} else if (text == "关闭") {
 					this.showQuestionMessage("确定要关闭当前申请吗?", res => {
-						this.putawayRequestClose(dataContent.id)
+						this.putawayRequestClose(dataContent.masterId)
 					})
 				} else if (text == "重新添加") {
 					this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
-						this.putawayRequestAddAgain(dataContent.id)
+						this.putawayRequestAddAgain(dataContent.masterId)
 					})
 				}
 			},