diff --git a/src/api/plan/order.js b/src/api/plan/order.js index 42c6e70..77301bb 100644 --- a/src/api/plan/order.js +++ b/src/api/plan/order.js @@ -144,4 +144,4 @@ export function syncSAP() { url: '/plan/order/syncSAP', method: 'post' }); -} +} \ No newline at end of file diff --git a/src/views/mes/prepare/index.vue b/src/views/mes/prepare/index.vue index 75536f4..36abf0b 100644 --- a/src/views/mes/prepare/index.vue +++ b/src/views/mes/prepare/index.vue @@ -143,12 +143,11 @@ {{ parseTime(scope.row.productDate, '{y}-{m}-{d}') }} - + diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue index 83f77a6..a7f2d14 100644 --- a/src/views/plan/order/index.vue +++ b/src/views/plan/order/index.vue @@ -94,6 +94,12 @@ >导出 + @@ -105,8 +111,9 @@ style="width: 100%" max-height="480" :tree-props="{children: 'children', hasChildren: 'hasChildren'}" + @selection-change="handleAutoSplitSelection" > - + @@ -133,8 +140,8 @@ - - + + @@ -484,7 +548,7 @@ import { listOrder, addOrder, updateOrder, - syncSAP, selectMaterielList + syncSAP, selectMaterielList,getAutoSplitList } from '@/api/plan/order' import Treeselect from '@riophae/vue-treeselect' import '@riophae/vue-treeselect/dist/vue-treeselect.css' @@ -598,7 +662,12 @@ export default { addrules: {}, /**********************************/ eRouteProps: {multiple: true}, - eRouteOptions: [] + eRouteOptions: [], + titleAutoSplit:"订单排产", + openAutoSplit:false, + orderCodes:[], + autoSplitList:[], + autoSplitLoading: true } }, created() { @@ -1303,7 +1372,21 @@ export default { } } ) - } + }, + /**自动排产**/ + // 多选框选中数据 + handleAutoSplitSelection(selection) { + + this.orderCodes = selection + }, + //排产优先级 + handleAutoSplit(row) { + debugger + this.autoSplitLoading = true; + this.autoSplitList = this.orderCodes; + this.openAutoSplit = true; + this.autoSplitLoading = false; + }, } } @@ -1349,4 +1432,7 @@ export default { margin-top: 20px; margin-left: 650px; } +.autoSplitBtn{ + margin: 1px 40%; +}