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 @@ @@ -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 @@