Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yangle

2024-06-18 ac5962f71fe0f4fd4e7e44fb74a02bba7ff816b4

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

 WebTM/views/²Ö´æ¹ÜÀí/ÌõÂ뱨±í/KF_ICinventoryQueryReport.html

@@ -447,6 +447,30 @@
            }
            //#endregion

            //#region åº“存校对
            function get_Proofread() {
            
                var ajaxLoad = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/WEBSController/UpdateKf_ICInvBal',
                    async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    data: {},
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                               
                            });
                        }
                    },
                    error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

            //#region é‡ç½®æŒ‰é’®
            form.on('submit(btnReSearch)', function (data) {
                //清空过滤条件

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_DotCheckList.html

@@ -9,12 +9,19 @@
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/layui/layui1.js"></script>
    <script src="../../../layuiadmin/treeTable.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <style>
        /*树状图点击高亮变色*/
        .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
            background: #aef0f7;
        }
    </style>
    <style media="screen">
        .custom-tree-item-clicked {
            color: #FC9003
@@ -81,7 +88,16 @@
                                </div>
                            </div>
                        </div>
                        <div class="layui-row" style="padding:10px 0">
                            <div class="layui-col-xs3 layui-inline" style="border: solid 1.5px #e0d6d64d;">
                                <div id="TreeTable" class="demo-tree demo-tree-box"></div>
                            </div>
                            <div class="layui-col-xs8 layui-inline" style="padding-left: 10px; width: 73%">
                                <div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                                </div>
                            </div>
                        </div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
@@ -233,6 +249,8 @@

                //查询
                get_Display(sWhere);
                //查询设备分类
                get_Display_Tree();
            }

            //#region初始化表格
@@ -580,6 +598,90 @@

            }

            // æ ‘状图查询
            function get_Display_Tree() {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Gy_DotCheckBill/TreeGetList',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            layer.close(ajaxLoad);
                            var data = JSON.parse(data1.data);
                            MenuMain(data);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }

            //遍历生成主菜单
            function MenuMain(data) {
                var liStr = '[';
                //遍历生成主菜单
                for (var i = 0; i < data.length; i++) {
                    // åˆ¤æ–­æ˜¯å¦å­˜åœ¨å­èœå•
                    if (data[i].children != null && data[i].children.length > 0) {
                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '","spread":true, "children":[ ';
                        // éåŽ†èŽ·å–子菜单
                        for (var k = 0; k < data[i].children.length; k++) {
                            liStr += getChildMenu(data[i].children[k], 0);
                        }
                        liStr = liStr.substring(0, liStr.length - 1);
                        liStr += ']},';
                    } else {
                        liStr += '{"title": "' + data[i].id + "-" + data[i].title + '", "id": "' + data[i].id + '"},';
                    }
                };
                liStr = liStr.substring(0, liStr.length - 1);
                liStr += "]";
                var treeTable = JSON.parse(liStr);
                tree.render({
                    elem: '#TreeTable' //默认是点击节点可进行收缩
                    , data: treeTable
                    , click: function (obj) {
                        //高亮变色
                        $(".layui-tree-set").removeClass('layui-tree-set-active');
                        obj.elem.addClass('layui-tree-set-active');

                        var data = obj.data;  //获取当前点击的节点数据
                        var sql = "";
                        if (data.id == "0") {
                            sql = "";
                        } else {
                            sql = " and HDotCheckItemClassID='" + data.id + "' ";
                        }
                        get_Display(sql);
                    }
                });
            }

            // é€’归生成子菜单
            function getChildMenu(subMenu, num) {
                num++;
                var subStr = '';
                if (subMenu.children != null && subMenu.children.length > 0) {
                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '", "children":[';
                    for (var j = 0; j < subMenu.children.length; j++) {
                        subStr += getChildMenu(subMenu.children[j], num);
                        if (j + 1 == subMenu.children.length) {
                            subStr = subStr.substring(0, subStr.length - 1);
                        }
                    }
                    subStr += ']},';
                } else {
                    subStr += '{"title": "' + subMenu.id + "-" + subMenu.title + '", "id": "' + subMenu.id + '"},';
                }
                return subStr;
            }


            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";
@@ -615,6 +717,7 @@
                })
            }
            //#endregion

            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Í£¹¤/Sc_Add_MESStopStepWorkBillList.html

@@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8" />
    <title>完工单</title>
    <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">
@@ -237,6 +237,33 @@
                                                    </div>
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">停工类型</label>
                                                        <div class="layui-input-inline">
                                                            <div class="layui-form">
                                                                <div class="layui-form-item">
                                                                    <select name="HStopType" id="HStopType" lay-verify="HStopType">
                                                                        <option value="">请选择停工原因</option>
                                                                        <option value="模具保养">模具保养</option>
                                                                        <option value="断料">断料</option>
                                                                        <option value="人员不足">人员不足</option>
                                                                        <option value="停气">停气</option>
                                                                        <option value="停水">停水</option>
                                                                        <option value="停电">停电</option>
                                                                        <option value="模具故障">模具故障</option>
                                                                        <option value="监控报警">监控报警</option>
                                                                        <option value="自动化故障">自动化故障</option>
                                                                        <option value="注塑机故障">注塑机故障</option>
                                                                        <option value="尺寸异常">尺寸异常</option>
                                                                        <option value="计划停机">计划停机</option>
                                                                        <option value="外观不良调机">外观不良调机</option>
                                                                        <option value="模具清洁">模具清洁</option>
                                                                        <option value="模温机故障">模温机故障</option>
                                                                        <option value="烘料机故障">烘料机故障</option>
                                                                    </select>
                                                                </div>
                                                            </div>
                                                        </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">停工原因</label>
                                                        <div class="layui-input-inline">
@@ -577,8 +604,9 @@
                                , "HDeptName": data.部门名称               //部门名称
                                , "HICMOInterID": data.HICMOInterID                       //生产订单主ID
                                , "HICMOEntryID": data.HICMOEntryID                        //生产订单子ID
                                , "HICMOBillNo": data.HICMOBillNo                        //生产订单
                                , "HStopReason": data.停工原因                         //停工原因
                                , "HICMOBillNo": data.HICMOBillNo
                                , "HStopType": data.停工类型     //生产订单
                                , "HStopReason": data.停工原因描述                         //停工原因
                                , "HRemark": data.备注                            //备注
                                , "HMaker": data.制单人                            //制单人
                                , "HMakeDate": data.制单日期                          //制单日期
@@ -960,6 +988,10 @@
                layer.msg("生产订单不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HStopType").val() == '' || $("#HStopType").val() == null) {
                layer.msg("停工类型不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
            if ($("#HStopReason").val() == '' || $("#HStopReason").val() == null) {
                layer.msg("停工原因不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Í£¹¤/Sc_MESStopStepWorkBillList.html

@@ -409,7 +409,8 @@
                        , { field: 'HEmpID', title: 'HEmpID', hide: true, sort: true }
                        , { field: '申请停工人员代码', title: '申请停工人员代码', sort: true }
                        , { field: '申请停工人员', title: '申请停工人员', sort: true }
                        , { field: '停工原因', title: '停工原因', sort: true }
                        , { field: '停工类型', title: '停工类型', sort: true }
                        , { field: '停工原因描述', title: '停工原因描述', sort: true }
                        , { field: '停工汇报类型', title: '停工汇报类型', sort: true }
                        , { field: '条形码', title: '条形码', sort: true }
                        , { field: '机器地址', title: '机器地址', sort: true }

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÍ£¹¤µ¥/Sc_Add_MESStopWorkBillList.html

@@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8" />
    <title>完工单</title>
    <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">
@@ -237,7 +237,34 @@
                                                </div>
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">停工原因</label>
                                                        <label class="layui-form-label">停工类型</label>
                                                        <div class="layui-input-inline">
                                                            <div class="layui-form">
                                                                <div class="layui-form-item">
                                                                    <select name="HStopType" id="HStopType" lay-verify="HStopType">
                                                                        <option value="">请选择停工原因</option>
                                                                        <option value="模具保养">模具保养</option>
                                                                        <option value="断料">断料</option>
                                                                        <option value="人员不足">人员不足</option>
                                                                        <option value="停气">停气</option>
                                                                        <option value="停水">停水</option>
                                                                        <option value="停电">停电</option>
                                                                        <option value="模具故障">模具故障</option>
                                                                        <option value="监控报警">监控报警</option>
                                                                        <option value="自动化故障">自动化故障</option>
                                                                        <option value="注塑机故障">注塑机故障</option>
                                                                        <option value="尺寸异常">尺寸异常</option>
                                                                        <option value="计划停机">计划停机</option>
                                                                        <option value="外观不良调机">外观不良调机</option>
                                                                        <option value="模具清洁">模具清洁</option>
                                                                        <option value="模温机故障">模温机故障</option>
                                                                        <option value="烘料机故障">烘料机故障</option>
                                                                    </select>
                                                                </div>
                                                            </div>
                                                        </div>
                                                        <div class="layui-inline">
                                                            <label class="layui-form-label">停工描述</label>
                                                        <div class="layui-input-inline">
                                                            <textarea placeholder="请输入原因" class="layui-textarea" name="HStopReason" id="HStopReason"></textarea>
                                                        </div>
@@ -572,7 +599,8 @@
                                , "HICMOInterID": data.HICMOInterID                       //生产订单主ID
                                , "HICMOEntryID": data.HICMOEntryID                        //生产订单子ID
                                , "HICMOBillNo": data.HICMOBillNo                        //生产订单
                                , "HStopReason": data.停工原因                         //停工原因
                                , "HStopType": data.停工原因                         //停工原因
                                , "HStopReason": data.停工原因描述                         //停工原因
                                , "HRemark": data.备注                            //备注
                                , "HMaker": data.制单人                            //制单人
                                , "HMakeDate": data.制单日期                          //制单日期
@@ -585,7 +613,7 @@
                                , "HDeleteMan": data.作废人               //作废人
                                , "HDeleteDate": data.作废日期       //作废日期
                            });

                            form.render('select');
                        } else {
                            layer.alert(result.msg, { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        }
@@ -618,14 +646,10 @@

            //保存提交
            form.on('submit(Saver)', function (data) {
               
                if (AllowLoadData(data)) {
                    var index = layer.load();
                var sMainStr = JSON.stringify(data.field);
                var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
                if (!AllowLoadData())//数据验证
                {
                    return false;
                }
                var index = layer.load();
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sc_MESStopWorkBill/SaveGetMESStopFrom", //方法所在页面和方法名
@@ -670,6 +694,9 @@
                        layer.alert(err, { icon: 5 })
                    }
                })
                }

           
            });

            //审核按钮提交
@@ -907,23 +934,6 @@
                });
            });

            //#endregion

            //以上为layui模块
        });

        function formatDate(date) {
            var d = new Date(date),
                month = '' + (d.getMonth() + 1),
                day = '' + d.getDate(),
                year = d.getFullYear();

            if (month.length < 2) month = '0' + month;
            if (day.length < 2) day = '0' + day;

            return [year, month, day].join('-');
        }

        function AllowLoadData() {  //非空验证
            var Result = true;
            if ($("#HBillNo").val() == '' || $("#HBillNo").val() == null) {
@@ -970,6 +980,10 @@
                layer.msg("生产订单不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
            }
                if ($("#HStopType").val() == '' || $("#HStopType").val() == null) {
                    layer.msg("停工类型不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return Result = false;
                }
            if ($("#HStopReason").val() == '' || $("#HStopReason").val() == null) {
                layer.msg("停工原因不能为空！", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                return Result = false;
@@ -977,6 +991,23 @@
            return Result;
        }

            //#endregion

            //以上为layui模块
        });

        function formatDate(date) {
            var d = new Date(date),
                month = '' + (d.getMonth() + 1),
                day = '' + d.getDate(),
                year = d.getFullYear();

            if (month.length < 2) month = '0' + month;
            if (day.length < 2) day = '0' + day;

            return [year, month, day].join('-');
        }        

        //操作员
        function GetHEmpValue(obj) {
            $("#HEmpName").val(obj[0].职员名称);

 WebTM/views/Éú²ú¹ÜÀí/ÖÊÁ¿»ã±¨µ¥/Sc_QualityReportBill.html

@@ -82,6 +82,12 @@
                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">不良数量</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBadReasonHQty" id="HBadReasonHQty" value="0">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
@@ -392,6 +398,8 @@
                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
                        $("#HMaker").val(sessionStorage["HUserName"]);
                        $("#HGroupID").val(sessionStorage["HGroupID"]); //根据登录用户带出班组ID
                        $("#HGroupName").val(sessionStorage["HGroup"]); //根据登录用户带出班组
                        layer.close(ajaxLoad);
                    }
                });
@@ -410,6 +418,8 @@
                        $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                        $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss"));
                        $("#HMaker").val(sessionStorage["HUserName"]);
                        $("#HGroupID").val(sessionStorage["HGroupID"]); //根据登录用户带出班组ID
                        $("#HGroupName").val(sessionStorage["HGroup"]); //根据登录用户带出班组
                        layer.close(ajaxLoad);
                    }
                });

 WebTM/views/³µ¼ä¹ÜÀí/Æô¶¯µã¼ìµ¥/Sc_WorkBeginDotCheckBill.html

@@ -381,6 +381,8 @@
                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));

                $("#HGroupID").val(sessionStorage["HGroupID"]); //根据登录用户带出班组ID
                $("#HGroupName").val(sessionStorage["HGroup"]); //根据登录用户带出班组
                //初始化子表
                get_InitGrid();

@@ -407,6 +409,8 @@
                $("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化日期
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HGroupID").val(sessionStorage["HGroupID"]); //根据登录用户带出班组ID
                $("#HGroupName").val(sessionStorage["HGroup"]); //根据登录用户带出班组

                //初始化子表
                get_InitGrid();