调拨出库 计划外出库 计划外入库 报废出库 主子合并

src/api/request2.js

@@ -1630,7 +1630,7 @@ export function countJobSubmit(params) {
  */
 export function getUnPlannedReceiptJobList(params) {
 	return request({
-		url: baseApi + "/wms/unplannedreceipt-job-main/senior",
+		url: baseApi + "/wms/unplannedreceipt-job-detail/senior",
 		method: "post",
 		data: params,
 	});
@@ -1795,7 +1795,7 @@ export function unPlannedReceiptRecordbSubmit(params) {
  */
 export function getUnPlannedIssueJobList(params) {
 	return request({
-		url: baseApi + "/wms/unplannedissue-job-main/senior",
+		url: baseApi + "/wms/unplannedissue-job-detail/senior",
 		method: "post",
 		data: params,
 	});
@@ -2141,20 +2141,20 @@ export function productPutawayRecordSubmit(params) {
  * 获取日期任务列表
  * @param {*} 
  */
-export function getStockUpJobList(params) {
-	return request({
-		url: baseApi + "/wms/stockup-main-job/senior",
-		method: "post",
-		data: params,
-	});
-}
 // export function getStockUpJobList(params) {
 // 	return request({
-// 		url: baseApi + "/wms/stockup-main-detail/senior",
+// 		url: baseApi + "/wms/stockup-main-job/senior",
 // 		method: "post",
 // 		data: params,
 // 	});
 // }
+export function getStockUpJobList(params) {
+	return request({
+		url: baseApi + "/wms/stockup-detail-job/senior",
+		method: "post",
+		data: params,
+	});
+}
 /**
  * 直接备货 获取任务明细
  * @param {*}   id 任务id
@@ -2805,7 +2805,7 @@ export function customerReturnRecordSubmit(params) {
  */
 export function getTransferReceiptJobList(params) {
 	return request({
-		url: baseApi + "/wms/transferreceipt-job-main/senior",
+		url: baseApi + "/wms/transferreceipt-job-detail/senior",
 		method: "post",
 		data: params,
 	});
@@ -2888,7 +2888,7 @@ export function transferReceiptRecordSubmit(params) {
  */
 export function getTransferIssueJobList(params) {
 	return request({
-		url: baseApi + "/wms/transferissue-job-main/senior",
+		url: baseApi + "/wms/transferissue-job-detail/senior",
 		method: "post",
 		data: params,
 	});
@@ -3437,7 +3437,7 @@ export function productionReturnRecordSubmit(params) {
  */
 export function getUnPlannedIssueRequestList(params) {
 	return request({
-		url: baseApi + "/wms/unplannedissue-request-main/senior",
+		url: baseApi + "/wms/unplannedissue-request-detail/senior",
 		method: "post",
 		data: params,
 	});
@@ -3516,7 +3516,7 @@ export function unPlannedReceiptRequestSubmit(params) {
  */
 export function getScrapJobList(params) {
 	return request({
-		url: baseApi + "/wms/scrap-job-main/senior",
+		url: baseApi + "/wms/scrap-job-detail/senior",
 		method: "post",
 		data: params,
 	});
@@ -3582,7 +3582,7 @@ export function scrapJobSubmit(params) {
  */
 export function getScrapRequestList(params) {
 	return request({
-		url: baseApi + "/wms/scrap-request-main/senior",
+		url: baseApi + "/wms/scrap-request-detail/senior",
 		method: "post",
 		data: params,
 	});

src/pages/scrap/coms/comScrapJobCard.vue

@@ -1,20 +1,16 @@
 <template>
 	<job-com-main-card :dataContent="dataContent">
-		<view class="task_item">
+ 		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
-			<view class="task_text">
-				<view class="">
-					申请单号 : {{dataContent.requestNumber}}
-				</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/scrap/coms/comScrapRequestCard.vue

@@ -1,18 +1,16 @@
 <template>
  	<request-com-main-card :dataContent="dataContent">
- 		<view class="task_item">
+ 		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
- 			<view class="task_text">
- 				从仓库代码 : {{dataContent.fromWarehouseCode}}
- 			</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 {};

src/pages/scrap/job/scrapJob.vue

@@ -173,7 +173,7 @@
 
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './scrapJobDetail?id=' + item.id + '&status=' + item.status
+					url: './scrapJobDetail?id=' + item.masterId + '&status=' + item.status
 				});
 			},
 
@@ -192,7 +192,7 @@
 					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
 						res => {
 							if (res) {
-								this.cancleJob(dataContent.id);
+								this.cancleJob(dataContent.masterId);
 							}
 						});
 				}

src/pages/scrap/request/scrapRrequest.vue

@@ -123,7 +123,7 @@
 			},
 			openRequestDetail(item) {
 				uni.navigateTo({
-					url: './scrapRequestDetail?id=' + item.id
+					url: './scrapRequestDetail?id=' + item.masterId
 				});
 			},
 			getList(type) {
@@ -210,27 +210,27 @@
 					this.openRequestInfoPopup(dataContent);
 				} else if (text == "处理") {
 					this.showQuestionMessage("确定要处理当前申请吗?", res => {
-						this.scrapRequestHandle(dataContent.id)
+						this.scrapRequestHandle(dataContent.masterId)
 					})
 				} else if (text == "提交审批") {
 					this.showQuestionMessage("确定要审批当前申请吗?", res => {
-						this.scrapRequestApprove(dataContent.id)
+						this.scrapRequestApprove(dataContent.masterId)
 					})
 				} else if (text == "审批通过") {
 					this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
-						this.scrapRequestApproveAgree(dataContent.id)
+						this.scrapRequestApproveAgree(dataContent.masterId)
 					})
 				} else if (text == "审批驳回") {
 					this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
-						this.scrapRequestApproveRefused(dataContent.id)
+						this.scrapRequestApproveRefused(dataContent.masterId)
 					})
 				} else if (text == "关闭") {
 					this.showQuestionMessage("确定要关闭当前申请吗?", res => {
-						this.scrapRequestClose(dataContent.id)
+						this.scrapRequestClose(dataContent.masterId)
 					})
 				} else if (text == "重新添加") {
 					this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
-						this.scrapRequestAddAgain(dataContent.id)
+						this.scrapRequestAddAgain(dataContent.masterId)
 					})
 				}
 			},

src/pages/stockUp/coms/comStockUpJobCard.vue

@@ -1,32 +1,16 @@
 <template>
  	<job-com-main-card :dataContent="dataContent">
- 		<view class="task_item">
+ 		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
- 			<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.customerCode}}
- 				</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/stockUp/job/stockUpJob.vue

@@ -176,7 +176,7 @@
 
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './stockUpJobDetail?id=' + item.id + '&status=' + item.status
+					url: './stockUpJobDetail?id=' + item.masterId + '&status=' + item.status
 				});
 			},
 

src/pages/transfer/coms/comTransferJobCard.vue

@@ -1,20 +1,16 @@
 <template>
  	<job-com-main-card :dataContent="dataContent">
- 		<view class="task_item">
+ 		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
- 			<view class="task_text">
- 				<view class="">
- 					申请单号 : {{dataContent.requestNumber}}
- 				</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/transfer/job/issueJob.vue

@@ -178,7 +178,7 @@
 
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './issueDetail?id=' + item.id + '&status=' + item.status
+					url: './issueDetail?id=' + item.masterId + '&status=' + item.status
 				});
 			},
 
@@ -197,7 +197,7 @@
 					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
 						res => {
 							if (res) {
-								this.cancleJob(dataContent.id);
+								this.cancleJob(dataContent.masterId);
 							}
 						});
 				}

src/pages/transfer/job/receiptJob.vue

@@ -178,7 +178,7 @@
 
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './receiptDetail?id=' + item.id + '&status=' + item.status
+					url: './receiptDetail?id=' + item.masterId + '&status=' + item.status
 				});
 			},
 
@@ -197,7 +197,7 @@
 					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
 						res => {
 							if (res) {
-								this.cancleJob(dataContent.id);
+								this.cancleJob(dataContent.masterId);
 							}
 						});
 				}

src/pages/unPlanned/coms/comIssueJobCard.vue

@@ -1,20 +1,16 @@
 <template>
  	<job-com-main-card :dataContent="dataContent">
- 		<view class="task_item">
+ 		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
- 			<view class="task_text">
- 				<view class="">
- 					申请单号 : {{dataContent.requestNumber}}
- 				</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/unPlanned/coms/comIssueRequestCard.vue

@@ -1,16 +1,16 @@
 <template>
  	<request-com-main-card :dataContent="dataContent">
- 		<view class="task_item">
+ 		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
- 			从仓库代码 : {{dataContent.fromWarehouseCode}}
- 		</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 {};

src/pages/unPlanned/coms/comReceiptJobCard.vue

@@ -1,20 +1,16 @@
 <template>
  	<job-com-main-card :dataContent="dataContent">
- 		<view class="task_item">
+ 		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
- 			<view class="task_text">
- 				<view class="">
- 					申请单号 : {{dataContent.requestNumber}}
- 				</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/unPlanned/coms/comReceiptRequestCard.vue

@@ -1,18 +1,16 @@
 <template>
  	<request-com-main-card :dataContent="dataContent">
- 		<view class="task_item">
+ 		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
- 			<view class="task_text">
- 				到仓库代码 : {{dataContent.toWarehouseCode}}
- 			</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 {};

src/pages/unPlanned/job/issueJob.vue

@@ -180,7 +180,7 @@
 
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './issueJobDetail?id=' + item.id + '&status=' + item.status
+					url: './issueJobDetail?id=' + item.masterId + '&status=' + item.status
 				});
 			},
 
@@ -199,7 +199,7 @@
 					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
 						res => {
 							if (res) {
-								this.cancleJob(dataContent.id);
+								this.cancleJob(dataContent.masterId);
 							}
 						});
 				}

src/pages/unPlanned/job/receiptJob.vue

@@ -168,7 +168,7 @@
 
 			openJobDetail(item) {
 				uni.navigateTo({
-					url: './receiptJobDetail?id=' + item.id + '&status=' + item.status
+					url: './receiptJobDetail?id=' + item.masterId + '&status=' + item.status
 				});
 			},
 
@@ -187,7 +187,7 @@
 					this.$refs.comMessage.showQuestionMessage("确定要放弃当前任务?",
 						res => {
 							if (res) {
-								this.cancleJob(dataContent.id);
+								this.cancleJob(dataContent.masterId);
 							}
 						});
 				}

src/pages/unPlanned/request/issueRequest.vue

@@ -1,3 +1,4 @@
+
 <template>
 	<view>
 		<com-empty-view v-if="requestList.length==0"></com-empty-view>
@@ -122,7 +123,7 @@
 
 			openRequestDetail(item) {
 				uni.navigateTo({
-					url: './issueRequestDetail?id=' + item.id
+					url: './issueRequestDetail?id=' + item.masterId
 				});
 			},
 			openRequestInfoPopup(item) {
@@ -214,27 +215,27 @@
 					this.openRequestInfoPopup(dataContent);
 				} else if (text == "处理") {
 					this.showQuestionMessage("确定要处理当前申请吗?", res => {
-						this.unPlannedIssueRequestHandle(dataContent.id)
+						this.unPlannedIssueRequestHandle(dataContent.masterId)
 					})
 				} else if (text == "提交审批") {
 					this.showQuestionMessage("确定要审批当前申请吗?", res => {
-						this.unPlannedIssueRequestApprove(dataContent.id)
+						this.unPlannedIssueRequestApprove(dataContent.masterId)
 					})
 				} else if (text == "审批通过") {
 					this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
-						this.unPlannedIssueRequestApproveAgree(dataContent.id)
+						this.unPlannedIssueRequestApproveAgree(dataContent.masterId)
 					})
 				} else if (text == "审批驳回") {
 					this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
-						this.unPlannedIssueRequestApproveRefused(dataContent.id)
+						this.unPlannedIssueRequestApproveRefused(dataContent.masterId)
 					})
 				} else if (text == "关闭") {
 					this.showQuestionMessage("确定要关闭当前申请吗?", res => {
-						this.unPlannedIssueRequestClose(dataContent.id)
+						this.unPlannedIssueRequestClose(dataContent.masterId)
 					})
 				} else if (text == "重新添加") {
 					this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
-						this.unPlannedIssueRequestAddAgain(dataContent.id)
+						this.unPlannedIssueRequestAddAgain(dataContent.masterId)
 					})
 				}
 			},

src/pages/unPlanned/request/receiptRequest.vue

@@ -124,7 +124,7 @@
 			},
 			openRequestDetail(item) {
 				uni.navigateTo({
-					url: './receiptRequestDetail?id=' + item.id
+					url: './receiptRequestDetail?id=' + item.masterId
 				});
 			},
 			getList(type) {
@@ -211,27 +211,27 @@
 					this.openRequestInfoPopup(dataContent);
 				} else if (text == "处理") {
 					this.showQuestionMessage("确定要处理当前申请吗?", res => {
-						this.unPlannedReceiptRequestHandle(dataContent.id)
+						this.unPlannedReceiptRequestHandle(dataContent.masterId)
 					})
 				} else if (text == "提交审批") {
 					this.showQuestionMessage("确定要审批当前申请吗?", res => {
-						this.unPlannedReceiptRequestApprove(dataContent.id)
+						this.unPlannedReceiptRequestApprove(dataContent.masterId)
 					})
 				} else if (text == "审批通过") {
 					this.showQuestionMessage("确定要审批通过当前申请吗?", res => {
-						this.unPlannedReceiptRequestApproveAgree(dataContent.id)
+						this.unPlannedReceiptRequestApproveAgree(dataContent.masterId)
 					})
 				} else if (text == "审批驳回") {
 					this.showQuestionMessage("确定要审批驳回当前申请吗?", res => {
-						this.unPlannedReceiptRequestApproveRefused(dataContent.id)
+						this.unPlannedReceiptRequestApproveRefused(dataContent.masterId)
 					})
 				} else if (text == "关闭") {
 					this.showQuestionMessage("确定要关闭当前申请吗?", res => {
-						this.unPlannedReceiptRequestClose(dataContent.id)
+						this.unPlannedReceiptRequestClose(dataContent.masterId)
 					})
 				} else if (text == "重新添加") {
 					this.showQuestionMessage("确定要重新添加当前申请吗?", res => {
-						this.unPlannedReceiptRequestAddAgain(dataContent.id)
+						this.unPlannedReceiptRequestAddAgain(dataContent.masterId)
 					})
 				}
 			},