Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server

erp-produce/src/main/resources/template/js/departmentMachining/departmentMachiningList.js

-
 var rowId = "";
 
 layui.config({
@@ -111,11 +110,11 @@ layui.config({
 
     // 甘特图
     function gantt(data) {
-        _openNewWindows({
+        parent._openNewWindows({
             url: "../../tpl/departmentMachining/machiningGantt.html?id=" + data.id,
             title: "车间任务安排甘特图",
             pageId: "machiningGantt",
-            area: ['90vw', '90vh'],
+            area: ['100vw', '100vh'],
             callBack: function (refreshCode) {
                 winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
                 loadTable();
@@ -134,6 +133,7 @@ layui.config({
                 loadTable();
             }});
     }
+
     //转补料单
     function processingToSupplementMaterials(data){
         _openNewWindows({

erp-produce/src/main/resources/template/js/departmentMachining/machiningGantt.js

@@ -10,37 +10,26 @@ layui.config({
         form = layui.form;
     var id = GetUrlParam("id");
 
+    let noteList = [];
     // 根据id查询加工单信息
     AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryMachinForGanttById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
-            console.log(json)
-            matchingLanguage();
-            form.render();
-            renderPanel();
-            // render();
-
-            gantt.clearAll();  //清空缓存
-            let nodeList = json.bean.node;
-            if (isNull(nodeList) || nodeList.length == 0) {
-                return;
-            }
-            $.each(nodeList, function (i, item) {
-                item.start_date = new Date(item.start_date);
-                item.end_date = new Date(item.end_date);
-            });
-            let linkList = json.bean.link;
-            if (isNull(linkList) || linkList.length == 0) {
-                linkList = [];
-            }
-            // 解析
-            gantt.parse({
-                data: nodeList,
-                links: linkList
-            });
+        matchingLanguage();
+        form.render();
+        renderPanel();
 
-        }});
+        gantt.config.start_date = new Date(json.bean.mathinTime.start_time);
+        gantt.config.end_date = new Date(json.bean.mathinTime.end_time);
+        gantt.clearAll();  //清空缓存
+        // 解析
+        noteList = json.bean.node;
+        gantt.parse({
+            data: json.bean.node,
+            links: json.bean.link
+        });
+    }});
 
     function renderPanel() {
-        document.getElementById('device_load').style.cssText = 'height:' + ($(window).height() - 140) + 'px';
+        document.getElementById('device_load').style.cssText = 'height:' + $(window).height() + 'px';
     }
     $(window).resize(function () {
         renderPanel();
@@ -60,12 +49,30 @@ layui.config({
         align: "center",
         tree: true,
         resize: true
+    }, {
+        name: "types",
+        label: "类型",
+        width: 60,
+        align: "center",
+        resize: true,
+        template: function (item) {
+            if (item.types == "project") {
+                return "<span style='color: #009688; font-weight: bold;'>产品</span>";
+            }
+            return "<span style='color: #FFB800;'>工序</span>";
+        }
     }, {
         name: "start_date",
         label: "开始日期",
         width: 100,
         align: "center",
         resize: true
+    }, {
+        name: "end_date",
+        label: "结束日期",
+        width: 100,
+        align: "center",
+        resize: true
     }, {
         name: "duration",
         label: "持续时间",
@@ -73,6 +80,7 @@ layui.config({
         align: "center",
         resize: true
     }];
+    // 是否可以编辑
     gantt.config.readonly = true;
     gantt.config.row_height = 40;
     gantt.config.scale_height = 50;
@@ -84,6 +92,18 @@ layui.config({
     gantt.attachEvent("onTaskDblClick", function (id, e) {
         return false;
     });
+    gantt.attachEvent("onTaskClick", function(id, e){
+        // 这里的代码会在节点被点击时执行
+        // id 参数是被点击的任务的ID
+        // e 参数是点击事件的事件对象
+        let item = getInPoingArr(noteList, "id", id, null);
+        if (item.types != "project") {
+            console.log(item)
+            alert("Task with ID " + id + " was clicked");
+        }
+        // 返回true以允许默认行为继续，返回false可以阻止默认行为
+        return true;
+    });
     gantt.config.show_tasks_outside_timescale = true;
     gantt.plugins({
         auto_scheduling: true,  //自动排程
@@ -93,8 +113,7 @@ layui.config({
     gantt.config.layout = {
         css: "gantt_container",
         cols: [{
-            width: 400,
-            min_width: 300,
+            width: 500,
             rows: [
                 {
                     view: "grid",
@@ -124,58 +143,7 @@ layui.config({
     };
 
     gantt.init("device_load");
-
     gantt.i18n.setLocale("cn");  //使用中文
-    // function render() {
-    //     let milestoneId = $("#milestoneId").val();
-    //     if (isNull(milestoneId)) {
-    //         winui.window.msg("请选择产品", {icon: 2, time: 2000});
-    //         return false;
-    //     }
-    //     let params = {
-    //         id: objectId,
-    //         // objectKey: objectKey,
-    //         // holderId: milestoneId,
-    //         // type: $("#type .plan-select").attr("data-type")
-    //     };
-    //     var tem = getInPoingArr(milestoneList, "id", milestoneId, null);
-    //     gantt.config.start_date = new Date(tem.startTime);
-    //     gantt.config.end_date = new Date(tem.endTime);
-    //     console.log(999)
-    //     AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryMachinForGanttById", params: params, type: 'json', method: 'GET', callback: function (json) {
-    //             gantt.clearAll();  //清空缓存
-    //             let nodeList = json.bean.node;
-    //             if (isNull(nodeList) || nodeList.length == 0) {
-    //                 return;
-    //             }
-    //             $.each(nodeList, function (i, item) {
-    //                 item.start_date = new Date(item.start_date);
-    //                 item.end_date = new Date(item.end_date);
-    //             });
-    //             let linkList = json.bean.link;
-    //             if (isNull(linkList) || linkList.length == 0) {
-    //                 linkList = [];
-    //             }
-    //             // 解析
-    //             gantt.parse({
-    //                 data: nodeList,
-    //                 links: linkList
-    //             });
-    //         }});
-    // }
-
-    $("body").on("click", ".type-btn", function (e) {
-        $(this).parent().find('.type-btn').removeClass("plan-select");
-        $(this).addClass("plan-select");
-        render();
-    });
-
-    form.on('submit(formSearch)', function (data) {
-        if (winui.verifyForm(data.elem)) {
-            render();
-        }
-        return false;
-    });
 
     exports('machiningGantt', {});
 });
\ No newline at end of file

erp-produce/src/main/resources/template/tpl/departmentMachining/machiningGantt.html

@@ -39,21 +39,6 @@
 </head>
 
 <body>
-<div class="txtcenter" style="margin: 0 auto; padding-top: 10px;">
-    <form class="layui-form layui-form-pane" action="" autocomplete="off">
-        <div class="layui-form-item">
-            <div class="layui-inline">
-                <label class="layui-form-label">产品</label>
-                <div class="layui-input-inline">
-                    <select lay-filter="milestoneId" lay-search="" id="milestoneId">
-                    </select>
-                </div>
-                <button type="reset" class="layui-btn layui-btn-primary list-form-search"><language showName="com.skyeye.reset"></language></button>
-                <button class="layui-btn list-form-search" lay-submit lay-filter="formSearch"><language showName="com.skyeye.search2"></language></button>
-            </div>
-        </div>
-    </form>
-</div>
 <div style="margin: auto 10px;">
     <div id="device_load" style="width: 100%;"></div>
 </div>