采购收货管理合格转隔离，隔离转合格，隔离转报废，合格转报废，报废转隔离,库存移动 主子合并

src/api/request2.js

@@ -1479,7 +1479,7 @@ export function productionReceiptRecordSubmit(params) {
  */
 export function getInventoryMoveJobList(params) {
 	return request({
-		url: baseApi + "/wms/inventorymove-job-main/senior",
+		url: baseApi + "/wms/inventorymove-job-detail/senior",
 		method: "post",
 		data: params,
 	});
@@ -1562,7 +1562,7 @@ export function inventoryMoveRecordSubmit(params) {
  */
 export function getCountJobList(params) {
 	return request({
-		url: baseApi + "/wms/count-job-main/senior",
+		url: baseApi + "/wms/count-job-detail/senior",
 		method: "post",
 		data: params,
 	});

src/pages/count/coms/comCountJobCard.vue

@@ -1,29 +1,6 @@
 <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="">
- 					盘点阶段 : {{getCountStageName(dataContent.stage)}}
- 				</view>
- 			</view>
-
- 			<view class="task_text">
- 				<view class="">
- 					盘点库位 : {{dataContent.locationCode}}
- 				</view>
- 			</view>
-			<view class="task_text">
-				<view class="">
-					盘点策略 : {{isOpenCount(dataContent.isOpenCount)}}
-				</view>
-			</view>
- 		</view>
+		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
  	</job-com-main-card>
  </template>
 
@@ -32,9 +9,11 @@
 	 	getCountStageName
 	 } from '@/common/directory.js';
  	import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
+	import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
  	export default {
  		components: {
  			jobComMainCard,
+			jobComMainDetailCard
  		},
  		data() {
  			return {};

src/pages/count/job/countJob.vue

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

src/pages/inventoryMove/coms/comInventoryJobCard.vue

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

src/pages/inventoryMove/coms/comMoveJob.vue

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