diff --git a/src/api/basic/basicMaterial.js b/src/api/basic/basicMaterial.js index 318122e5..fa13c012 100644 --- a/src/api/basic/basicMaterial.js +++ b/src/api/basic/basicMaterial.js @@ -23,6 +23,16 @@ export const getListMaterial = (current, size, params) => { } }) } + +export const materialList= (params) => { + return request({ + url: '/api/logpm-basic/material/materialList', + method: 'get', + params + }) +} + + export const $_getListMaterial = (params) => { return request({ url: '/api/logpm-basic/material//findPidList', diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue index 010a2ff1..448a1142 100644 --- a/src/views/distribution/inventory/distributionStockArticleDetails.vue +++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue @@ -383,7 +383,7 @@ import { addService } from '@/api/distribution/distributionServiceLog'; import option from '@/option/distribution/distributionStockArticle'; import { mapGetters } from 'vuex'; import { getDictionaryBiz } from '@/api/system/dict'; -import { getListMaterial } from '@/api/basic/basicMaterial'; +import { materialList } from '@/api/basic/basicMaterial'; import { getLodop } from '@/utils/LodopFuncs'; import { getStockTemplate } from '@/api/distribution/distributionStockArticle'; import dayjs from 'dayjs'; @@ -893,11 +893,11 @@ export default { if (query) { this.loading = true; //查询物料数据 - let asd = await getListMaterial(this.page.currentPage, this.page.pageSize, { + let asd = await materialList({ name: query, - }).then(); - console.log('物料信息', asd.data.data); - this.optionsName = asd.data.data.records; + }) + console.log('物料信息', asd); + this.optionsName = asd.data.data; this.loading = false; } else { this.optionsName = []; @@ -906,11 +906,11 @@ export default { async remoteMethodCode(query) { if (query) { this.loading = true; - let asd = await getListMaterial(this.page.currentPage, this.page.pageSize, { + let asd = await materialList({ productCode: query, - }).then(); - console.log('物料编号信息', asd.data.data); - this.optionsCode = asd.data.data.records; + }) + console.log('物料编号信息', asd); + this.optionsCode = asd.data.data; this.loading = false; } else { this.optionsCode = []; @@ -1253,17 +1253,18 @@ export default { this.titleMaterial = '修改物料'; this.formMaterial = row; this.loading = true; - getListMaterial(this.page.currentPage, this.page.pageSize, { + materialList( { productCode: row.materialCode, }).then(res => { - // console.log('物料编号信息', res.data.data.records[0].sku); - this.formMaterial.sku = res.data.data.records[0].sku; - }); + this.formMaterial.sku = res.data.data[0].sku; + this.formMaterial.packingSpecification = res.data.data[0].packingSpecification; + }); this.loading = false; this.optionsName = [{ id: row.materialId, name: row.materialName }]; this.optionsCode = [{ id: row.materialId, productCode: row.materialCode }]; // console.log("333333",this.optionsCode[0]); } else { + this.formMaterial={} this.titleMaterial = '补充物料'; this.formMaterial.id = row.id; }