diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue index 59a8a933..ab79ad65 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue @@ -603,6 +603,16 @@ export default { fixed: false, sortable: true, }, + { + prop: 'orderReceiveStatusName', + label: '入库状态', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'completeSetName', label: '是否齐套', @@ -929,7 +939,12 @@ export default { this.query['orderStatus'] = index; }else if(row.prop ==='typeServerName'){ this.query['typeService'] = index; - }else{ + } + else if(row.prop ==='orderReceiveStatusName'){ + this.query['orderReceiveStatus'] = index; + } + + else{ this.query[row.prop] = index; } this.onLoad(this.page); @@ -1153,7 +1168,7 @@ export default { // return item // }); }); - getDictionaryBiz('order_package_status').then(res => { + getDictionaryBiz('order_status').then(res => { this.deliveryOrderStatus = res.data.data; this.checkcColumnList("orderStatusName", this.columnList).checkarr=res.data.data.map(item=>{ item.value=item.dictKey @@ -1185,7 +1200,7 @@ export default { return item }); - }); + }); getDictionaryBiz('order_reservation_status').then(res => { this.checkcColumnList("reservationStatusName", this.columnList).checkarr=res.data.data.map(item=>{ item.value=item.dictKey @@ -1193,6 +1208,13 @@ export default { return item }); + getDictionaryBiz('order_receive_status').then(res => { + this.checkcColumnList("orderReceiveStatusName", this.columnList).checkarr=res.data.data.map(item=>{ + item.value=item.dictKey + item.label=item.dictValue + return item + }); + }); },