diff --git a/src/option/distribution/distributionStockArticleFrom.js b/src/option/distribution/distributionStockArticleFrom.js index a363b284..c170a471 100644 --- a/src/option/distribution/distributionStockArticleFrom.js +++ b/src/option/distribution/distributionStockArticleFrom.js @@ -202,17 +202,16 @@ export default { fixed: false, sortable: true, }, - // { - // label: '状态', - // prop: 'conditions', - // search: true, - // type: 2, - // values: '', - // width: '130', - // checkarr: [], - // fixed: false, - // sortable: true, - // }, + { + label: '物料维护状态', + prop: 'materialCodeMaintainStatus', + type: 6, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, { label: '包条码', prop: 'orderPackageCode', diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue index 21a841cc..4a57d395 100644 --- a/src/views/distribution/inventory/distributionStockArticleDetails.vue +++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue @@ -136,7 +136,11 @@ @selection="selectionChange" > @@ -624,6 +629,26 @@ export default { fixed: false, sortable: true, }, + { + prop: 'materialCode', + label: '物料编码', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'materialCodeMaintainStatus', + label: '物料维护状态', + type: 6, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'quantity', label: '数量', @@ -1404,17 +1429,22 @@ export default { this.page.total = data.total; this.dataPare = data.records; - this.dataPare.some(i => { - if (i.conditions == '1') { - i.conditions = '定制品'; - } else { - i.conditions = '库存品'; - } - if (!i.materialId) { - //有 - this.dataMaterial = true; - } - }); + for (let i = 0; i < this.dataPare.length; i++) { + const item = this.dataPare[i]; + item.materialCodeMaintainStatus = item.materialId ? '已维护' : '未维护' + } + + // this.dataPare.some(i => { + // if (i.conditions == '1') { + // i.conditions = '定制品'; + // } else { + // i.conditions = '库存品'; + // } + // if (!i.materialId) { + // //有 + // this.dataMaterial = true; + // } + // }); // this.loading = false; this.selectionClear(); } catch (error) { diff --git a/src/views/distribution/inventory/distributionStockArticleFrom.vue b/src/views/distribution/inventory/distributionStockArticleFrom.vue index 89ab7423..de15311f 100644 --- a/src/views/distribution/inventory/distributionStockArticleFrom.vue +++ b/src/views/distribution/inventory/distributionStockArticleFrom.vue @@ -51,7 +51,11 @@ @selection="selectionChange" > + + @@ -133,6 +139,10 @@ export default { const data = res.data.data; this.page.total = data.total; this.data = data.records; + for (let i = 0; i < this.data.length; i++) { + const item = this.data[i]; + item.materialCodeMaintainStatus = item.materialId ? '已维护' : '未维护' + } this.loading = false; this.selectionClear(); });