diff --git a/src/api/firstOrder/outbound.js b/src/api/firstOrder/outbound.js index 1938af4..fe38680 100644 --- a/src/api/firstOrder/outbound.js +++ b/src/api/firstOrder/outbound.js @@ -87,8 +87,9 @@ export const editList = (oneOutStorageId) => { }) } export const getPutPurchaseList = (current, size, params) => { + console.log('api中的数据', params) return request({ - url: '/smartpark/oneOutStorageDetail/getOneOutStorageDetailList', + url: '/smartpark/oneOutStorage/getDemandEndList', method: 'get', params: { ...params, diff --git a/src/views/firstOrder/components/consumableDialog.vue b/src/views/firstOrder/components/consumableDialog.vue index 4c4b9e4..ff38c39 100644 --- a/src/views/firstOrder/components/consumableDialog.vue +++ b/src/views/firstOrder/components/consumableDialog.vue @@ -40,6 +40,7 @@ export default { total: 0, }, option: { + reserveSelection: true, // height: "auto", calcHeight: 30, tip: false, diff --git a/src/views/firstOrder/components/needDialog.vue b/src/views/firstOrder/components/needDialog.vue index 9a9a2e1..3f3abe4 100644 --- a/src/views/firstOrder/components/needDialog.vue +++ b/src/views/firstOrder/components/needDialog.vue @@ -44,7 +44,7 @@ export default { prop: 'materialName' }, { label: '计划需求数量', - prop: 'requiredQuantity' + prop: 'applicationQuantity' }, { label: '已出库数量', prop: 'outboundQuantity' @@ -55,7 +55,6 @@ export default { }, mounted() { this.openShow = this.showDialog - }, methods: { closeDialog() { @@ -74,7 +73,7 @@ export default { onLoad(page, params = {}) { this.loading = true; const queryParams = Object.assign(params, this.query, { - onePutStorageId: this.id + oneOutStorageId: this.id }); getPutPurchaseList(page.currentPage, page.pageSize, queryParams).then(res => { console.log('采购单列表', res.data.result) diff --git a/src/views/firstOrder/outbound.vue b/src/views/firstOrder/outbound.vue index 7f6571b..5d1952f 100644 --- a/src/views/firstOrder/outbound.vue +++ b/src/views/firstOrder/outbound.vue @@ -8,15 +8,7 @@ - @@ -240,6 +232,7 @@ export default { this.purchaseOpen = true this.purchaseTitle = row.demandEndInfo + '需求单详情' this.id = row.id + console.log(this.id,'需求单的id') }, closeDialog() { this.purchaseOpen = false