diff --git a/src/router/index.js b/src/router/index.js index 8f908bd..9de281e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -176,6 +176,20 @@ export const dynamicRoutes = [ } ] }, + { + path: '/mes/pro/schedule', + component: Layout, + hidden: true, + permissions: ['mes:pro:schedule:edit'], + children: [ + { + path: 'ganttedit', + component: () => import("@/views/mes/pro/schedule/ganttedit"), + name: 'ganttEdit', + meta: {title: '使用甘特图排产',activeMenu: '/mes/pro/schedule'} + } + ] + }, { path: '/monitor/job-log', component: Layout, diff --git a/src/views/mes/pro/schedule/ganttedit.vue b/src/views/mes/pro/schedule/ganttedit.vue new file mode 100644 index 0000000..6686e97 --- /dev/null +++ b/src/views/mes/pro/schedule/ganttedit.vue @@ -0,0 +1,76 @@ + + + + + \ No newline at end of file diff --git a/src/views/mes/pro/schedule/ganttx.vue b/src/views/mes/pro/schedule/ganttx.vue index fff924c..658695d 100644 --- a/src/views/mes/pro/schedule/ganttx.vue +++ b/src/views/mes/pro/schedule/ganttx.vue @@ -17,6 +17,12 @@ export default { default () { return {data: [], links: []} } + }, + optType: { + type: String, + default (){ + return 'view' + } } }, @@ -60,7 +66,12 @@ export default { initConfig() { // 1 基础配置 // 1.1 甘特图是否只读 - gantt.config.readonly = true; + if(this.optType =='view'){ + gantt.config.readonly = true; + }else{ + gantt.config.readonly = false; + } + // 1.2 表格列设置 gantt.config.duration_unit="hour"; gantt.config.duration_step=8; diff --git a/src/views/mes/pro/schedule/index.vue b/src/views/mes/pro/schedule/index.vue index fe0ec53..72a603b 100644 --- a/src/views/mes/pro/schedule/index.vue +++ b/src/views/mes/pro/schedule/index.vue @@ -73,7 +73,7 @@ - +
@@ -351,7 +351,9 @@ export default { this.loading = false; }); }, - + handleOpenGantt(){ + this.$router.push({ path: '/mes/pro/schedule/ganttedit'}) + }, getGanttTasks(){ listGanttTaskList(this.queryParams).then(response =>{ debugger; diff --git a/src/views/mes/wm/warehouse/index.vue b/src/views/mes/wm/warehouse/index.vue index a62d6ad..59d4bbb 100644 --- a/src/views/mes/wm/warehouse/index.vue +++ b/src/views/mes/wm/warehouse/index.vue @@ -347,12 +347,10 @@ export default { }, `warehouse_${new Date().getTime()}.xlsx`) }, handleLocation(warehouseId){ - debugger; this.$router.push({ path: '/mes/wm/location/index', query: { warehouseId: warehouseId || 0 ,optType: this.optType} }) }, //自动生成编码 handleAutoGenChange(autoGenFlag){ - debugger; if(autoGenFlag){ genCode('WAREHOUSE_CODE').then(response =>{ this.form.warehouseCode = response;