diff --git a/klp-ui/package.json b/klp-ui/package.json index c5a1f7a6..7b40bc22 100644 --- a/klp-ui/package.json +++ b/klp-ui/package.json @@ -44,7 +44,6 @@ "echarts": "5.4.0", "element-ui": "2.15.12", "file-saver": "2.0.5", - "frappe-gantt": "^1.0.3", "fuse.js": "6.4.3", "highlight.js": "10.5.0", "js-beautify": "1.13.0", diff --git a/klp-ui/src/api/wms/purchasePlan.js b/klp-ui/src/api/wms/purchasePlan.js index 8b6322de..fde8b48d 100644 --- a/klp-ui/src/api/wms/purchasePlan.js +++ b/klp-ui/src/api/wms/purchasePlan.js @@ -42,3 +42,20 @@ export function delPurchasePlan(planId) { method: 'delete' }) } + +// 获取推荐的采购计划 +export function recommendPurchasePlan(orderId) { + return request({ + url: '/wms/purchasePlan/recommend/' + orderId, + method: 'get' + }) +} + +// 创建采购计划(含明细) +export function createPurchasePlan(data) { + return request({ + url: '/wms/purchasePlan/addWithDetails', + method: 'post', + data + }) +} diff --git a/klp-ui/src/views/wms/order/index.vue b/klp-ui/src/views/wms/order/index.vue index 538046ee..64bb0c02 100644 --- a/klp-ui/src/views/wms/order/index.vue +++ b/klp-ui/src/views/wms/order/index.vue @@ -171,7 +171,7 @@ import ClacPanel from '../purchasePlan/panels/clac.vue'; export default { name: "Order", components: { OrderDetailPanel, ClacPanel }, - dict: ['order_status'], + dicts: ['order_status'], data() { return { // 按钮loading diff --git a/klp-ui/src/views/wms/productionLine/GanttChart.vue b/klp-ui/src/views/wms/productionLine/GanttChart.vue deleted file mode 100644 index 88be2de0..00000000 --- a/klp-ui/src/views/wms/productionLine/GanttChart.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - 生产任务列表 - - - - - {{ formatDate(scope.row.startDate) }} - - - {{ formatDate(scope.row.endDate) }} - - - - - - - 相关订单信息 - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/klp-ui/src/views/wms/purchasePlan/index.vue b/klp-ui/src/views/wms/purchasePlan/index.vue index 3c794830..233c8ae7 100644 --- a/klp-ui/src/views/wms/purchasePlan/index.vue +++ b/klp-ui/src/views/wms/purchasePlan/index.vue @@ -70,6 +70,15 @@ @click="handleExport" >导出 + + 推荐采购计划 + @@ -83,6 +92,12 @@ + 详情 取 消 + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + + + + + + + + + + + + + + + + 当前选择订单ID: {{ selectedOrderId }} + 重新选择订单 + + + + + + + + + + + 当前采购计划ID: {{ selectedPlanId }} + + + + +
+ 当前选择订单ID: {{ selectedOrderId }} + 重新选择订单 +
+ 当前采购计划ID: {{ selectedPlanId }} +