采购退货申请，采购退货任务主子合并，补料申请

src/api/request2.js

@@ -799,14 +799,20 @@ export function purchaseReceiptJobSubmit(params) {
  * 获取日期任务列表
  *  获取任务明细
  */
+// export function getPurchaseReturnJobList(params) {
+// 	return request({
+// 		url: baseApi + "/wms/purchasereturn-job-main/senior",
+// 		method: "post",
+// 		data: params,
+// 	});
+// }
 export function getPurchaseReturnJobList(params) {
 	return request({
-		url: baseApi + "/wms/purchasereturn-job-main/senior",
+		url: baseApi + "/wms/purchasereturn-job-detail/senior",
 		method: "post",
 		data: params,
 	});
 }
-
 /**
  * 采购退货 获取任务明细
  * @param {*}  id 任务id
@@ -3601,9 +3607,16 @@ export function scrapRecordSubmit(params) {
  * 获取日期任务列表
  * @param {*}  
  */
+// export function getRepleinshJobList(params) {
+// 	return request({
+// 		url: baseApi + "/wms/repleinsh-job-main/senior",
+// 		method: "post",
+// 		data: params,
+// 	});
+// }
 export function getRepleinshJobList(params) {
 	return request({
-		url: baseApi + "/wms/repleinsh-job-main/senior",
+		url: baseApi + "/job/repleinsh-job-detail/senior",
 		method: "post",
 		data: params,
 	});

src/pages/purchaseReturn/coms/comReturnJobCard.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_item">
 				<view class="task_text">
 					<view class="">
@@ -15,15 +16,17 @@
 					</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 {};

src/pages/purchaseReturn/job/returnJob.vue

@@ -177,7 +177,7 @@
 
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './returnDetail?id=' + item.id + '&status=' + item.status
+					url: './returnDetail?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);
 							}
 						});
 				}

src/pages/purchaseReturn/request/returnRequest.vue

@@ -120,7 +120,7 @@
 		methods: {
 			openRequestDetail(item) {
 				uni.navigateTo({
-					url: './returnRequestDetail?id=' + item.id + '&fromType=' + this.fromType
+					url: './returnRequestDetail?id=' + item.masterId + '&fromType=' + this.fromType
 				});
 			},
 
@@ -211,27 +211,27 @@
 					this.openRequestInfoPopup(dataContent);
 				} else if (text == "处理") {
 					this.showQuestionMessage("确定要处理当前申请吗?", res => {
-						this.purchaseReturnRequestHandle(dataContent.id)
+						this.purchaseReturnRequestHandle(dataContent.masterId)
 					})
 				} else if (text == "提交审批") {
 					this.showQuestionMessage("确定要审批当前申请吗?", res => {
-						this.purchaseReturnRequestApprove(dataContent.id)
+						this.purchaseReturnRequestApprove(dataContent.masterId)
 					})
 				} else if (text == "审批通过") {
 					this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
-						this.purchaseReturnRequestApproveAgree(dataContent.id)
+						this.purchaseReturnRequestApproveAgree(dataContent.masterId)
 					})
 				} else if (text == "审批驳回") {
 					this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
-						this.purchaseReturnRequestApproveRefused(dataContent.id)
+						this.purchaseReturnRequestApproveRefused(dataContent.masterId)
 					})
 				} else if (text == "关闭") {
 					this.showQuestionMessage("确定要关闭当前申请吗?", res => {
-						this.purchaseReturnRequestClose(dataContent.id)
+						this.purchaseReturnRequestClose(dataContent.masterId)
 					})
 				} else if (text == "重新添加") {
 					this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
-						this.purchaseReturnRequestAddAgain(dataContent.id)
+						this.purchaseReturnRequestAddAgain(dataContent.masterId)
 					})
 				}
 			},

src/pages/repleinsh/coms/comRepleinshJobCard.vue

@@ -1,22 +1,17 @@
 <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}}
-					</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 {};

src/pages/repleinsh/job/repleinshJob.vue

@@ -177,7 +177,7 @@
 
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './repleinshDetail?id=' + item.id + '&status=' + item.status
+					url: './repleinshDetail?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);
 							}
 						});
 				}