update：加工单修改

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

@@ -43,7 +43,7 @@ layui.config({
                     return '<a lay-event="processDetails" class="notice-title-click">' + getNotUndefinedVal(d.processInstanceId) + '</a>';
                 }},
             { field: 'state', title: '状态', rowspan: '2', width: 90, templet: function (d) {
-                    return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("flowableStateEnum", 'id', d.state, 'name');
+                    return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("erpOrderStateEnum", 'id', d.state, 'name');
                 }},
             { field: 'pickState', rowspan: '2', title: '领料状态', align: 'left', width: 80, templet: function (d) {
                     return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("machinPickStateEnum", 'id', d.pickState, 'name');
@@ -55,7 +55,7 @@ layui.config({
             { title: systemLanguage["com.skyeye.operation"][languageType], fixed: 'right', align: 'center', rowspan: '2',width: 240, toolbar: '#tableBar'}
         ],[
             { field: 'fromTypeId', title: '来源类型', rowspan: '2',width: 150, templet: function (d) {
-                    return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("sealOutLetFromType", 'id', d.fromTypeId, 'name');
+                    return skyeyeClassEnumUtil.getEnumDataNameByCodeAndKey("machinFromType", 'id', d.fromTypeId, 'name');
                 }},
             { field: 'fromId', title: '单据编号', rowspan: '2',width: 200, templet: function (d) {
                     return getNotUndefinedVal(d.fromMation?.oddNumber);
@@ -84,9 +84,12 @@ layui.config({
             activitiUtil.activitiDetails(data);
         } else if (layEvent === 'revoke') { //撤销
             revoke(data);
+        } else if (layEvent === 'gantt') { //甘特图
+            gantt(data);
         }
     });
 
+
     // 新增
     $("body").on("click", "#addBean", function() {
         _openNewWindows({
@@ -100,6 +103,19 @@ layui.config({
             }});
     });
 
+    // 甘特图
+    function gantt(data) {
+        _openNewWindows({
+            url: "../../tpl/departmentMachining/machiningGantt.html?objectId=" + data.id + '&objectKey=' + data.serviceClassName,
+            title: "车间任务安排甘特图",
+            pageId: "machiningGantt",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+                winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                loadTable();
+            }});
+    }
+
     // 编辑
     function edit(data) {
         _openNewWindows({

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

+var objectKey = "";
+var objectId = "";
+
+layui.config({
+    base: basePath,
+    version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'jquery', 'winui', 'form', 'laydate'], function (exports) {
+    winui.renderColor();
+    var $ = layui.$,
+        form = layui.form,
+        layer = layui.layer,
+        laydate = layui.laydate;
+    objectKey = GetUrlParam("objectKey");
+    objectId = GetUrlParam("objectId");
+    if (isNull(objectKey) || isNull(objectId)) {
+        winui.window.msg("请传入适用对象信息", {icon: 2, time: 2000});
+        return false;
+    }
+
+    // 根据供应商id获取所有审批通过之后的里程碑列表
+    let milestoneList = [];
+    AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryMachinById", params: {id: objectId}, type: 'json', method: 'GET', callback: function (json) {
+            $("#milestoneId").html(getDataUseHandlebars(getFileContent('tpl/template/select-option-must.tpl'), json));
+            milestoneList = json.bean.machinChildList;
+            console.log(1,json)
+            console.log(2,milestoneList)
+
+            // var authPermission = teamObjectPermissionUtil.checkTeamBusinessAuthPermission(objectId, 'taskAuthEnum');
+            // var btnStr = `<div style="" class="type-group" id="type">`;
+            // var firstBtn = true;
+            // if (authPermission['list']) {
+            //     var defaultClassName = firstBtn ? 'plan-select' : '';
+            //     firstBtn = false;
+            //     btnStr += `<button type="button" class="layui-btn layui-btn-primary type-btn ${defaultClassName}" data-type="list" table-id="messageTable"><i class="layui-icon"></i>所有任务</button>`
+            // }
+            // if (authPermission['myExecute']) {
+            //     var defaultClassName = firstBtn ? 'plan-select' : '';
+            //     firstBtn = false;
+            //     btnStr += `<button type="button" class="layui-btn layui-btn-primary type-btn ${defaultClassName}" data-type="myExecute" table-id="messageTable"><i class="layui-icon"></i>我执行的任务</button>`
+            // }
+            // if (authPermission['myCreate']) {
+            //     var defaultClassName = firstBtn ? 'plan-select' : '';
+            //     btnStr += `<button type="button" class="layui-btn layui-btn-primary type-btn ${defaultClassName}" data-type="myCreate" table-id="messageTable"><i class="layui-icon"></i>我创建的任务</button>`
+            // }
+            // btnStr += `</div>`;
+            // $(".txtcenter").before(btnStr);
+
+            matchingLanguage();
+            form.render();
+            renderPanel();
+            render();
+        }});
+
+    function renderPanel() {
+        document.getElementById('device_load').style.cssText = 'height:' + ($(window).height() - 140) + 'px';
+    }
+    $(window).resize(function () {
+        renderPanel();
+    });
+
+    // 时间格式
+    gantt.config.date_format = "%Y-%m-%d";
+    gantt.config.scales = [
+        {unit: "year", step: 1, format: "%Y"},
+        {unit: "day", step: 1, date: "%m-%d"}
+    ];
+    gantt.config.reorder_grid_columns = true;
+    gantt.config.columns = [{
+        name: "text",
+        label: "产品",
+        width: 200,
+        align: "center",
+        tree: true,
+        resize: true
+    }, {
+        name: "start_date",
+        label: "开始日期",
+        width: 100,
+        align: "center",
+        resize: true
+    }, {
+        name: "duration",
+        label: "持续时间",
+        width: 100,
+        align: "center",
+        resize: true
+    }];
+    gantt.config.readonly = true;
+    gantt.config.row_height = 40;
+    gantt.config.scale_height = 50;
+    gantt.config.drag_move = false;
+    gantt.config.drag_resize = false;
+    gantt.config.sort = true;
+    gantt.config.show_quick_info = false;
+    //  关闭点击事件
+    gantt.attachEvent("onTaskDblClick", function (id, e) {
+        return false;
+    });
+    gantt.config.show_tasks_outside_timescale = true;
+    gantt.plugins({
+        auto_scheduling: true,  //自动排程
+        tooltip: true     //提示信息
+    });
+    // 样式
+    gantt.config.layout = {
+        css: "gantt_container",
+        cols: [{
+            width: 400,
+            min_width: 300,
+            rows: [
+                {
+                    view: "grid",
+                    scrollX: "gridScroll",
+                    scrollable: true,
+                    scrollY: "scrollVer"
+                },
+                {view: "scrollbar", id: "gridScroll", group: "horizontal"}
+            ]
+        },
+            {resizer: true, width: 1},
+            {
+                rows: [
+                    {
+                        view: "timeline",
+                        scrollX: "scrollHor",
+                        scrollY: "scrollVer"
+                    },
+                    {
+                        view: "scrollbar",
+                        id: "scrollHor",
+                        group: "horizontal"
+                    }
+                ]
+            },
+            {view: "scrollbar", id: "scrollVer"}]
+    };
+
+    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) {
+                console.log(88,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/js/wholeOut/wholeOutList.js

@@ -37,7 +37,7 @@ layui.config({
                 }},
             { field: 'operTime', width: 150, title: '单据日期', align: 'center'},
             { field: 'totalPrice', title: '合计金额', rowspan: '2', align: 'center', width: 120 },
-            { field: 'holderMation', title: '客户', rowspan: '2', align: 'center', width: 150, templet: function (d) {
+            { field: 'holderMation', title: '供应商', rowspan: '2', align: 'center', width: 150, templet: function (d) {
                     return getNotUndefinedVal(d.holderMation?.name);
                 }},
             { field: 'processInstanceId', width: 200, title: '流程ID', align: 'center'},

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

@@ -5,48 +5,48 @@
     <title></title>
     <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
     <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+    <link href="../../assets/lib/layui/lay/modules/ztree/css/zTreeStyle/zTreeStyle.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/customer/ztree/common-tree.css" rel="stylesheet" />
 </head>
 <body>
-<div class="winui-toolbar">
-    <div class="winui-tool">
-        <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
-        <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1590913527206"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+    <div class="winui-toolbar">
+        <div class="winui-tool">
+            <button id="reloadTable" class="winui-toolbtn search-table-btn-right"><i class="fa fa-refresh" aria-hidden="true"></i><language showName="com.skyeye.refreshDataBtn"></language></button>
+            <button id="addBean" class="winui-toolbtn search-table-btn-right" auth="1590913527206"><i class="fa fa-plus" aria-hidden="true"></i><language showName="com.skyeye.addBtn"></language></button>
+        </div>
     </div>
-</div>
-<div style="margin:auto 10px;">
-    <table id="messageTable" lay-filter="messageTable"></table>
-    <script type="text/html" id="tableBar">
-        {{# if(d.editRow == 1) { }}
-            {{# if(auth('1720796345289')) { }}
-                <a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
+    <div style="margin:auto 10px;">
+        <table id="messageTable" lay-filter="messageTable"></table>
+        <script type="text/html" id="tableBar">
+            {{# if(d.editRow == 1) { }}
+                {{# if(auth('1720796345289')) { }}
+                    <a class="layui-btn layui-btn-xs" lay-event="subApproval">提交审批</a>
+                {{# } }}
+                {{# if(auth('1720796297124')) { }}
+                    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
+                {{# } }}
+                {{# if(auth('1720796332498')) { }}
+                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
+                {{# } }}
             {{# } }}
-            {{# if(auth('1720796297124')) { }}
-                <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="edit"><language showName="com.skyeye.editBtn"></language></a>
-            {{# } }}
-            {{# if(auth('1720796332498')) { }}
-                <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="delete"><language showName="com.skyeye.deleteBtn"></language></a>
-            {{# } }}
-        {{# } }}
 
-        {{# if(d.editRow == 2) { }}
-            {{# if(auth('1720796375123')) { }}
-                <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
+            {{# if(d.editRow == 2) { }}
+                {{# if(auth('1720796375123')) { }}
+                    <a class="layui-btn layui-btn-xs layui-btn-danger" lay-event="revoke">撤销</a>
+                {{# } }}
             {{# } }}
-        {{# } }}
-
-<!--        {{# if(d.state == 'pass') { }}-->
-<!--            {{# if(auth('1720796281035')) { }}-->
-<!--                <a class="layui-btn layui-btn-xs " lay-event="----">转仓库入库</a>-->
-<!--            {{# } }}-->
-<!--        {{# } }}-->
-
 
+            <a class="layui-btn layui-btn-xs" lay-event="gantt">甘特图</a>
+        </script>
+    </div>
+    <script src="../../assets/lib/layui/layui.js"></script>
+    <script src="../../assets/lib/layui/custom.js"></script>
+    <script type="text/javascript" src="../../assets/lib/layui/lay/modules/jquery-min.js"></script>
+    <script type="text/javascript" src="../../assets/lib/layui/lay/modules/ztree/js/jquery.ztree.all.min.js"></script>
+    <script type="text/javascript" src="../../assets/lib/layui/lay/modules/ztree/js/jquery.ztree.exhide.min.js"></script>
+    <script type="text/javascript" src="../../assets/lib/layui/lay/modules/ztree/js/fuzzysearch.js"></script>
+    <script type="text/javascript">
+        layui.config({base: '../../js/departmentMachining/'}).use('departmentMachiningList');
     </script>
-</div>
-<script src="../../assets/lib/layui/layui.js"></script>
-<script src="../../assets/lib/layui/custom.js"></script>
-<script type="text/javascript">
-    layui.config({base: '../../js/departmentMachining/'}).use('departmentMachiningList');
-</script>
 </body>
 </html>
\ No newline at end of file

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

 <!DOCTYPE html>
-<html lang="en">
+<html>
 <head>
-  <meta charset="UTF-8">
-  <title>$Title$</title>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+          content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet"/>
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+    <link rel="stylesheet" href="../../assets/lib/layui/lay/modules/dhtmlxgantt/dhtmlxgantt.css" type="text/css">
+    <style>
+        html,
+        body {
+            height: 100%;
+            padding: 0px;
+            margin: 0px;
+            overflow: hidden;
+        }
+
+        .weekend {
+            background: #f4f7f4 !important;
+        }
+
+        .gantt_grid_head_cell {
+            font-size: 14px;
+            font-weight: 600;
+            color: #000 !important;
+        }
+
+        .gantt_scale_cell {
+            font-size: 14px;
+            font-weight: 600;
+            color: #000 !important;
+
+        }
+    </style>
 </head>
+
 <body>
-$END$
+<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>
+<script src="../../assets/lib/layui/layui.js"></script>
+<script src="../../assets/lib/layui/custom.js"></script>
+<script src="../../assets/lib/layui/lay/modules/dhtmlxgantt/dhtmlxgantt.js"></script>
+<script type="text/javascript">
+    layui.config({base: '../../js/departmentMachining/'}).use('machiningGantt');
+</script>
 </body>
+
 </html>
\ No newline at end of file

pro/src/main/resources/template/js/proTask/taskGantt.js

@@ -24,6 +24,8 @@ layui.config({
     AjaxPostUtil.request({url: sysMainMation.projectBasePath + "queryAllApprovalMilestoneList", params: {objectId: objectId}, type: 'json', method: 'GET', callback: function (json) {
         $("#milestoneId").html(getDataUseHandlebars(getFileContent('tpl/template/select-option-must.tpl'), json));
         milestoneList = json.rows;
+        console.log(123,json.rows)
+        console.log(456,milestoneList)
 
         var authPermission = teamObjectPermissionUtil.checkTeamBusinessAuthPermission(objectId, 'taskAuthEnum');
         var btnStr = `<div style="" class="type-group" id="type">`;