diff --git a/src/api/distribution/createTask.js b/src/api/distribution/createTask.js index f9e6cbdc..d90f7faf 100644 --- a/src/api/distribution/createTask.js +++ b/src/api/distribution/createTask.js @@ -1,4 +1,3 @@ -// /basicdataClient/dictList import request from '@/axios'; /** @@ -48,7 +47,7 @@ export const postEditTaskQuestUpdate = data => { /** * 批量删除盘点任务 */ -export const $_postBatchDelete = params => { +export const postBatchDelete = params => { return request({ url: '/api/logpm-warehouse/blade-taskQuest/taskQuest/remove', method: 'post', diff --git a/src/views/distribution/checkInventoryTask/createTask.vue b/src/views/distribution/checkInventoryTask/createTask.vue index c2b0c5ff..45e00b3b 100644 --- a/src/views/distribution/checkInventoryTask/createTask.vue +++ b/src/views/distribution/checkInventoryTask/createTask.vue @@ -691,7 +691,7 @@ import { $_questDetailIds, $_exportGetContrastInfo, $_getList, - $_postBatchDelete, + postBatchDelete, } from '@/api/distribution/createTask'; import { ElMessageBox } from 'element-plus' import { ElMessage } from 'element-plus'; @@ -1747,9 +1747,10 @@ const Discard=(val)=>{ data.push(val.id) let ids = data.join(',') console.log(data); - ElMessageBox.confirm('是否废弃该盘点任务?') + + ElMessageBox.confirm('是否废弃该盘点任务?') .then(() => { - $_postBatchDelete({ids}).then(res=>{ + postBatchDelete({ids}).then(res=>{ console.log(res,'删除成功'); if(res.data.code==200){ ElMessage({ diff --git a/src/views/distribution/inventory/distributionStockListDetails.vue b/src/views/distribution/inventory/distributionStockListDetails.vue index ebd1af5d..4a94a9f5 100644 --- a/src/views/distribution/inventory/distributionStockListDetails.vue +++ b/src/views/distribution/inventory/distributionStockListDetails.vue @@ -769,24 +769,23 @@ export default { let query = {}; query.marketId = this.queryOwn.marketId; query.materialId = this.queryOwn.materialId; + query.stockListId = this.$route.query.id; console.log('tianjian ', query); let b = await getListStock(page.currentPage, page.pageSize, Object.assign(params, query)); this.data1 = b.data.data.records; console.log('出库明细>>>>', this.data1); this.data1.forEach(i => { - if (i.outboundType == '1') { + if (i.outboundType == 1) { i.outboundTypeName = '商配'; } - if (i.outboundType == '2') { + if (i.outboundType == 2) { i.outboundTypeName = '市配'; } - if (i.outboundType == '3') { + if (i.outboundType == 3) { i.outboundTypeName = '自提'; } - if (i.deliveryListCode == '-1') { - i.deliveryListCode = null; - } }); + console.log("处理的数据》》》",this.data1); this.page1.total = b.data.data.total; this.loading = false; }, @@ -819,6 +818,7 @@ export default { this.query.serviceType = this.queryOwn.serviceType; this.query.materialId = this.queryOwn.materialId; this.query.warehouseId = this.queryOwn.warehouseId; + this.query.incomingBatch = this.$route.query.incomingBatch; this.query.storeId = !!this.queryOwn.storeId && this.queryOwn.storeId != '-1' ? this.queryOwn.storeId : null; console.log('库存品参数<><><><', this.query);