update：修改甘特图

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

+
+// 已经选择的资产集合key：表格的行trId，value：资产信息
+// 改
+var allChooseFarm = {};
+
+layui.config({
+    base: basePath,
+    version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table','jquery', 'winui', 'form'], function (exports) {
+    winui.renderColor();
+    var index = parent.layer.getFrameIndex(window.name);
+    var $ = layui.$,
+        form = layui.form,
+        table = layui.table;
+    var selTemplate = getFileContent('tpl/template/select-option.tpl');
+    let farmId = getNotUndefinedVal(GetUrlParam("id"));
+    // 改
+    let assetMap = {};
+
+    initTableChooseUtil.initTable({
+        id: "arrangeList",
+        cols: [
+            {id: 'workshopId', title: '安排车间', formType: 'input', width: '150', verify: 'required'},
+            {id: 'operNumber', title: '安排任务数量', formType: 'input', width: '140', verify: 'required|number'}
+        ],
+        deleteRowCallback: function (trcusid) {
+            delete allChooseFarm[trcusid];
+        },
+        addRowCallback: function (trcusid) {
+            if (!isNull(farmId)) {
+                if (isNull(assetMap[farmId])) {
+                    AjaxPostUtil.request({url: sysMainMation.admBasePath + "queryAssetById", params: {"id": farmId}, type: 'json', method: 'GET', callback: function (json) {
+                            assetMap[farmId] = json.bean
+                        }, async: false});
+                }
+                let chooseAssetMation = assetMap[farmId]
+                // 获取表格行号
+                var thisRowKey = trcusid.replace("tr", "");
+                // 资产名称赋值
+                $("#farmId" + thisRowKey).val(chooseAssetMation.name);
+                $("#farmId" + thisRowKey).attr(initTableChooseUtil.chooseInputDataIdKey, chooseAssetMation.id);
+                // 资产赋值
+                // 车间赋值
+                allChooseFarm[trcusid] = chooseAssetMation;
+            }
+        },
+        form: form,
+        minData: 1
+    });
+
+    $("body").on("click", "farmId", function (e) {
+        // 查询车间列表
+        AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erpfarm001", params: {page:1,limit:30}, type: 'json', method: "POST", callback: function(json) {
+            console.log(666,json)
+                // $("#workshopId").html(getDataUseHandlebars(selTemplate, json));
+                // form.render('select');
+                // initTable();
+            }, async: false});
+    });
+
+    var workshopId = "";
+    form.on('select(workshopId)', function(data) {
+        var thisRowValue = data.value;
+        workshopId = isNull(thisRowValue) ? "" : thisRowValue;
+        loadTable();
+    });
+
+    // AjaxPostUtil.request({url: sysMainMation.erpBasePath + "erpfarm001",  params: {page: page, limit: 15}, type: 'json', method: 'POST', callback: function (json) {
+    //         parent.layer.close(index);
+    //         parent.refreshCode = '0';
+    //     }});
+
+    matchingLanguage();
+    form.render();
+    form.on('submit(formAddBean)', function (data) {
+        if (winui.verifyForm(data.elem)) {
+            var result = initTableChooseUtil.getDataList('arrangeList');
+            if (!result.checkResult) {
+                return false;
+            }
+            var noError = false;
+            var tableData = [];
+            $.each(result.dataList, function(i, item) {
+                // 获取行编号
+                var thisRowKey = item["trcusid"].replace("tr", "");
+                if (parseInt(item.operNumber) == 0) {
+                    $("#operNumber" + thisRowKey).addClass("layui-form-danger");
+                    $("#operNumber" + thisRowKey).focus();
+                    winui.window.msg('数量不能为0', {icon: 2, time: 2000});
+                    noError = true;
+                    return false;
+                }
+                // 车间对象
+                // 更换下面两个
+                // assert
+                // allChooseAsset
+                // inTableDataArrayByAssetarId
+                var farm = allChooseFarm["tr" + thisRowKey];
+                if (inTableDataArrayByAssetarId(farm.id, tableData)) {
+                    winui.window.msg('一张单中不允许出现相同的资产信息.', {icon: 2, time: 2000});
+                    noError = true;
+                    return false;
+                }
+                item["farmId"] = farm.id;
+                tableData.push(item);
+            });
+            if (noError) {
+                return false;
+            }
+
+            var params = {
+                list: JSON.stringify(tableData),
+            };
+            AjaxPostUtil.request({url: sysMainMation.admBasePath + "insertAssetReport", params: params, type: 'json', method: 'POST', callback: function (json) {
+                    parent.layer.close(index);
+                    parent.refreshCode = '0';
+                }});
+        }
+        return false;
+    });
+
+    // 判断选中的资产是否也在数组中
+    function inTableDataArrayByAssetarId(farmId, array) {
+        var isIn = false;
+        $.each(array, function(i, item) {
+            if(item.farmId === farmId) {
+                isIn = true;
+                return false;
+            }
+        });
+        return isIn;
+    }
+
+    $("body").on("click", "#cancle", function() {
+        parent.layer.close(index);
+    });
+
+    function loadTable() {
+        table.reloadData("messageTable", {where: getTableParams()});
+    }
+
+    function getTableParams() {
+        var params = {
+            type: 'farm',
+            objectId: workshopId
+        }
+        return $.extend(true, params, initTableSearchUtil.getSearchValue("messageTable"));
+    }
+});
\ No newline at end of file

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

+
+var rowId = "";
+
+layui.config({
+    base: basePath,
+    version: skyeyeVersion
+}).extend({
+    window: 'js/winui.window'
+}).define(['window', 'table', 'jquery', 'winui', 'form', 'tableCheckBoxUtil'], function (exports) {
+    winui.renderColor();
+    var index = parent.layer.getFrameIndex(window.name);
+    var $ = layui.$,
+        form = layui.form,
+        table = layui.table,
+        tableCheckBoxUtil = layui.tableCheckBoxUtil;
+
+    // 选择类型，默认单选，true:多选，false:单选
+    // var assetCheckType = isNull(parent.adminAssistantUtil.assetCheckType) ? false : parent.adminAssistantUtil.assetCheckType;
+
+    // 设置提示信息
+    var s = '资产选择规则：';
+    if(assetCheckType){
+        s += '1.多选；如没有查到要选择的资产，请检查资产信息是否满足当前规则。';
+        // 多选保存的资产对象信息
+        var checkAssetMation = [].concat(parent.adminAssistantUtil.checkAssetMation);
+        // 初始化值
+        var ids = [];
+        $.each(checkAssetMation, function(i, item) {
+            ids.push(item.id);
+        });
+        tableCheckBoxUtil.setIds({
+            gridId: 'messageTable',
+            fieldName: 'id',
+            ids: ids
+        });
+        tableCheckBoxUtil.init({
+            gridId: 'messageTable',
+            filterId: 'messageTable',
+            fieldName: 'id'
+        });
+    } else {
+        s += '双击要选择的数据即可选中';
+        $("#saveCheckBox").hide();
+    }
+    $("#showInfo").html(s);
+
+    table.render({
+        id: 'messageTable',
+        elem: '#messageTable',
+        method: 'post',
+        url: sysMainMation.erpBasePath + 'erpfarm001',
+        where: getTableParams(),
+        even: true,
+        page: true,
+        limits: getLimits(),
+        limit: getLimit(),
+        cols: [[
+            { type: assetCheckType ? 'checkbox' : 'radio', fixed: 'left'},
+            { title: systemLanguage["com.skyeye.serialNumber"][languageType], fixed: 'left', type: 'numbers' },
+            { field: 'name', title: '车间名称', width: 120 },
+
+            // { field: 'assetImg', title: '图片', align: 'center', width: 60, templet: function (d) {
+            //         return '<img src="' + systemCommonUtil.getFilePath(d.assetImg) + '" class="photo-img" lay-event="assetImg">';
+            //     }},
+            // { field: 'typeId', title: '资产类型', width: 100, templet: function(d) {
+            //         return sysDictDataUtil.getDictDataNameByCodeAndKey("ADM_ASSET_TYPE", d.typeId);
+            //     }},
+            // { field: 'numberPrefix', title: '资产编号前缀', width: 140 },
+            // { field: 'readPrice', title: '参考价', width: 80 },
+        ]],
+        done: function(res) {
+            matchingLanguage();
+
+            initTableSearchUtil.initAdvancedSearch(this, res.searchFilter, form, "请输入资产名称", function () {
+                table.reloadData("messageTable", {page: {curr: 1}, where: getTableParams()});
+            });
+            if (assetCheckType) {
+                // 设置选中
+                tableCheckBoxUtil.checkedDefault({
+                    gridId: 'messageTable',
+                    fieldName: 'id'
+                });
+            } else {
+                $('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('dblclick',function() {
+                    var dubClick = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
+                    dubClick.find("input[type='radio']").prop("checked", true);
+                    form.render();
+                    var chooseIndex = JSON.stringify(dubClick.data('index'));
+                    var obj = res.rows[chooseIndex];
+                    parent.adminAssistantUtil.checkAssetMation = obj;
+
+                    parent.refreshCode = '0';
+                    parent.layer.close(index);
+                });
+
+                $('#messageTable').next().find('.layui-table-body').find("table" ).find("tbody").children("tr").on('click',function() {
+                    var click = $('#messageTable').next().find('.layui-table-body').find("table").find("tbody").find(".layui-table-hover");
+                    click.find("input[type='radio']").prop("checked", true);
+                    form.render();
+                });
+            }
+        }
+    });
+
+    table.on('tool(messageTable)', function (obj) {
+        var data = obj.data;
+        var layEvent = obj.event;
+        if (layEvent === 'assetlistdetails') { // 详情
+            assetlistdetails(data);
+        } else if (layEvent === 'assetImg') { // 图片预览
+            systemCommonUtil.showPicImg(systemCommonUtil.getFilePath(data.assetImg));
+        }
+    });
+
+    // 详情
+    function assetlistdetails(data) {
+        rowId = data.id;
+        _openNewWindows({
+            url: "../../tpl/assetManage/assetManageDetails.html",
+            title: systemLanguage["com.skyeye.detailsPageTitle"][languageType],
+            pageId: "assetManageDetails",
+            area: ['90vw', '90vh'],
+            callBack: function (refreshCode) {
+            }});
+    }
+
+    // 保存
+    $("body").on("click", "#saveCheckBox", function() {
+        var selectedData = tableCheckBoxUtil.getValueList({
+            gridId: 'messageTable'
+        });
+        if (selectedData.length == 0) {
+            winui.window.msg("请选择资产", {icon: 2, time: 2000});
+            return false;
+        }
+        parent.adminAssistantUtil.checkAssetMation = [].concat(selectedData);
+        parent.layer.close(index);
+        parent.refreshCode = '0';
+    });
+
+    form.render();
+    $("body").on("click", "#reloadTable", function() {
+        loadTable();
+    });
+
+    function loadTable() {
+        table.reloadData("messageTable", {where: getTableParams()});
+    }
+
+    function getTableParams() {
+        return $.extend(true, {}, initTableSearchUtil.getSearchValue("messageTable"));
+    }
+
+    exports('assetManageChoose', {});
+});
\ No newline at end of file

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

@@ -100,11 +100,13 @@ layui.config({
         if (item.types != "project") {
             console.log(item)
             _openNewWindows({
-                url:  systemCommonUtil.getUrl('FP2023100300003&id=' + '7b0d17eb2e334bc0b0b51e33425cb29d', null),
+                url: "../../tpl/departmentMachining/arrange.html?id=" + id,
                 title: "车间任务安排",
                 pageId: "workshopTaskArrangement",
                 area: ['90vw', '90vh'],
                 callBack: function (refreshCode) {
+                    winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                    loadTable();
                 }});
         }
         // 返回true以允许默认行为继续，返回false可以阻止默认行为

erp-produce/src/main/resources/template/js/erpPreProductionPlan/preProductionTurnToProduction.js

@@ -18,7 +18,6 @@ layui.config({
     // 预生产计划 转 生产计划
     AjaxPostUtil.request({url: sysMainMation.erpBasePath + "queryProductionPlanTransById", params: {id: id}, type: 'json', method: 'GET', callback: function (json) {
             let data = json.bean;
-            // 因为要调生产计划的编辑布局，所以把预生产计划里的productionPlanChildList给到生产计划里的productionChildList
             data.productionChildList = data.productionPlanChildList
             // 生产计划的【编辑布局】
             dsFormUtil.initEditPageForStatic('content', 'FP2023092200002', data, {

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

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+<div class="time">
+    <div>
+        <label for="planned-start">计划开始时间：</label>
+        <input type="date" id="planned-start" name="planned-start">
+    </div>
+    <div>
+        <label for="planned-end">计划结束时间：</label>
+        <input type="date" id="planned-end" name="planned-end">
+    </div>
+</div>
+<div class="time">
+    <div>
+        <label for="actual-start">实际开始时间：</label>
+        <input type="date" id="actual-start" name="actual-start">
+    </div>
+    <div>
+        <label for="actual-end">实际结束时间：</label>
+        <input type="date" id="actual-end" name="actual-end">
+    </div>
+</div>
+
+<div style="margin:0 auto;padding:20px;">
+    <form class="layui-form" action="" autocomplete="off">
+        <div class="layui-form-item layui-col-xs12">
+            <label class="layui-form-label">详细安排</label>
+            <div class="layui-input-block" id="arrangeList">
+            </div>
+        </div>
+
+        <div class="layui-form-item layui-col-xs12">
+            <div class="layui-input-block">
+                <button class="winui-btn" id="cancle"><language showName="com.skyeye.cancel"></language></button>
+                <button class="winui-btn" lay-submit lay-filter="formAddBean"><language showName="com.skyeye.save"></language></button>
+            </div>
+        </div>
+    </form>
+</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('arrange');
+</script>
+</body>
+<style>
+    .time {
+        display: flex;
+        margin-top: 50px;
+    }
+    .time > div {
+        display: flex;
+        margin-left: 97px;
+        align-items: center;
+    }
+    .time > div:not(:last-child) {
+        margin-right: 100px;
+    }
+    .time input[type="date"] {
+        width: 150px;
+        border: 1px solid #ccc;
+        padding: 5px;
+    }
+</style>
+</html>
\ No newline at end of file

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

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8" />
+    <title></title>
+    <link href="../../assets/lib/layui/css/layui.css" rel="stylesheet" />
+    <link href="../../assets/lib/winui/css/winui.css" rel="stylesheet" />
+</head>
+<body>
+<div class="winui-tip alert-info" id="showInfo">
+
+</div>
+<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="saveCheckBox" class="winui-toolbtn search-table-btn-right" type="button"><i class="fa fa-save" aria-hidden="true"></i><language showName="com.skyeye.save"></language></button>
+    </div>
+</div>
+<div style="margin:auto 10px;">
+    <table id="messageTable" lay-filter="messageTable"></table>
+</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('arrangeFarmChoose');
+</script>
+</body>
+</html>
\ No newline at end of file

erp-produce/src/main/resources/template/tpl/processOut/processOutList.html

-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file

erp-produce/src/main/resources/template/tpl/workshopTaskArrangement/workshopTaskArrangementList.html

-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file