From 191a9ca27147252f562ffedfa9c0d16006e2e336 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Thu, 25 Apr 2024 17:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=90=88=E6=A0=BC=E8=BD=AC=E9=9A=94=E7=A6=BB=EF=BC=8C?=
 =?UTF-8?q?=E9=9A=94=E7=A6=BB=E8=BD=AC=E5=90=88=E6=A0=BC=EF=BC=8C=E9=9A=94?=
 =?UTF-8?q?=E7=A6=BB=E8=BD=AC=E6=8A=A5=E5=BA=9F=EF=BC=8C=E5=90=88=E6=A0=BC?=
 =?UTF-8?q?=E8=BD=AC=E6=8A=A5=E5=BA=9F=EF=BC=8C=E6=8A=A5=E5=BA=9F=E8=BD=AC?=
 =?UTF-8?q?=E9=9A=94=E7=A6=BB,=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=20?=
 =?UTF-8?q?=E4=B8=BB=E5=AD=90=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                           |  4 +--
 src/pages/count/coms/comCountJobCard.vue      | 27 +++----------------
 src/pages/count/job/countJob.vue              |  4 +--
 .../coms/comInventoryJobCard.vue              | 10 +++----
 src/pages/inventoryMove/coms/comMoveJob.vue   |  4 +--
 5 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/src/api/request2.js b/src/api/request2.js
index aec8066b..4e70267a 100644
--- a/src/api/request2.js
+++ b/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,
 	});
diff --git a/src/pages/count/coms/comCountJobCard.vue b/src/pages/count/coms/comCountJobCard.vue
index c2908fe7..4ca0e136 100644
--- a/src/pages/count/coms/comCountJobCard.vue
+++ b/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 {};
diff --git a/src/pages/count/job/countJob.vue b/src/pages/count/job/countJob.vue
index d25a1bd1..b98061be 100644
--- a/src/pages/count/job/countJob.vue
+++ b/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);
 							}
 						});
 				}
diff --git a/src/pages/inventoryMove/coms/comInventoryJobCard.vue b/src/pages/inventoryMove/coms/comInventoryJobCard.vue
index 98946e3d..d8a43bf2 100644
--- a/src/pages/inventoryMove/coms/comInventoryJobCard.vue
+++ b/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 {};
diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue
index 1b196480..ea4ce8b2 100644
--- a/src/pages/inventoryMove/coms/comMoveJob.vue
+++ b/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);
 							}
 						});
 				}