update：删除多余文件、增加安排车间任务的操作

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/departmentMachiningList.js

@@ -111,7 +111,7 @@ layui.config({
     // 甘特图
     function gantt(data) {
         parent._openNewWindows({
-            url: "../../tpl/departmentMachining/machiningGantt.html?id=" + data.id,
+            url: "../../tpl/departmentMachining/machiningGantt.html?id=" + data.id + "&state=" + data.state,
             title: "车间任务安排甘特图",
             pageId: "machiningGantt",
             area: ['100vw', '100vh'],

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

@@ -9,6 +9,7 @@ layui.config({
     var $ = layui.$,
         form = layui.form;
     var id = GetUrlParam("id");
+    var state = GetUrlParam("state");
 
     let noteList = [];
     loadDate();
@@ -103,17 +104,20 @@ layui.config({
         // e 参数是点击事件的事件对象
         let item = getInPoingArr(noteList, "id", id, null);
         if (item.types != "project") {
-            _openNewWindows({
-                url: "../../tpl/departmentMachining/arrange.html?id=" + item.data.id,
-                title: "车间任务安排",
-                pageId: "workshopTaskArrangement",
-                area: ['90vw', '90vh'],
-                callBack: function (refreshCode) {
-                    winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
-                    loadDate();
-                }});
+            if (state == 'pass') {
+                _openNewWindows({
+                    url: "../../tpl/departmentMachining/arrange.html?id=" + item.data.id,
+                    title: "车间任务安排",
+                    pageId: "workshopTaskArrangement",
+                    area: ['90vw', '90vh'],
+                    callBack: function (refreshCode) {
+                        winui.window.msg(systemLanguage["com.skyeye.successfulOperation"][languageType], {icon: 1, time: 2000});
+                        loadDate();
+                    }});
+            } else {
+                winui.window.msg("单据未通过审核，暂不支持车间任务安排工作", {icon: 0, time: 2000});
+            }
         }
-        // 返回true以允许默认行为继续，返回false可以阻止默认行为
         return true;
     });
     gantt.config.show_tasks_outside_timescale = true;

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