From 4425d6960ebcd9b85620a7fe34e81f940dc95fb2 Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Mon, 16 May 2022 22:21:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E6=8E=92=E4=BA=A7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js                      | 14 +++++
 src/views/mes/pro/schedule/ganttedit.vue | 76 ++++++++++++++++++++++++
 src/views/mes/pro/schedule/ganttx.vue    | 13 +++-
 src/views/mes/pro/schedule/index.vue     |  6 +-
 src/views/mes/wm/warehouse/index.vue     |  2 -
 5 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 src/views/mes/pro/schedule/ganttedit.vue

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 @@
+<template>
+    <div class="wrapper">
+      <div class="container">
+        <GanttChar class="left-container" ref="ganttChar" optType="edit" :tasks="tasks"></GanttChar>
+      </div>      
+    </div> 
+</template>
+
+<script>
+import GanttChar from "./ganttx.vue";
+import {listGanttTaskList} from "@/api/mes/pro/protask";
+export default {
+    name:'',
+    components:{GanttChar},
+    data(){
+        return {
+            tasks:{
+                data: [],
+                links: []
+            },
+            optType:'edit',
+            // 查询参数
+            queryParams: {
+                workorderCode: null,
+                workorderName: null,
+                orderSource: null,
+                sourceCode: null,
+                productId: null,
+                productCode: null,
+                productName: null,
+                productSpc: null,
+                unitOfMeasure: null,
+                quantity: null,
+                quantityProduced: null,
+                quantityChanged: null,
+                quantityScheduled: null,
+                clientId: null,
+                clientCode: null,
+                clientName: null,
+                requestDate: null,
+                parentId: null,
+                ancestors: null,
+                status: null,
+            },
+        }
+    },
+    created(){
+        this.getGanttTasks();
+    },
+    methods: {
+        getGanttTasks(){
+            listGanttTaskList(this.queryParams).then(response =>{
+                debugger;
+                this.tasks.data = response.data.data;
+                this.tasks.links = response.data.links;
+                this.$refs.ganttChar.reload();
+            });
+        },
+    }
+}
+</script>
+
+<style scoped>
+.wrapper{
+    height: 700px;
+}
+.container {
+  height: 100%;
+  width: 100%;
+}
+.left-container {
+  overflow: hidden;
+  position: relative;
+  height: 100%;
+}
+</style>
\ 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 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-refresh" circle="" @click="getList"></el-button>
-        <el-button type="primary" icon="el-icon-edit" circle="" @click="getList"></el-button>
+        <el-button type="primary" icon="el-icon-edit" circle="" @click="handleOpenGantt"></el-button>
       </el-form-item>
     </el-form>
     <div class="wrapper">
@@ -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;