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

zrg

2024-03-07 cbf09f88d0e6f44d428c76c9ede8bc095edfbc5e

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

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

@@ -29,7 +29,7 @@
            </div>
        </div>
    </div>
    <table class="layui-hide" id="mainTable"></table>
    <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
@@ -38,7 +38,8 @@
        layui.use(['table', 'form', 'layer'], function () {
            var table = layui.table
            , form = layui.form
            , layer = layui.layer;
            , layer = layui.layer;          

            //快速查询
            form.on('submit(HQuery)', function () {
                //var sMainStr = JSON.stringify(table.cache['mainTable']);
@@ -53,14 +54,35 @@
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            RoadQuery($('#Value').val());

            RoadQuery($('#Value').val());            

            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            })

            table.render({
                elem: '#mainTable'
                // , url: '/demo/table/user/'
               , data: []
              //, cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 æ–°å¢ž
              , cols: [[
                  { type: 'radio' }
                  { type: 'checkbox' }
                  , { field: 'HItemID', title: 'HItemID', hide: true }
                  , { field: '工作中心代码', title: '工作中心代码' }
                  , { field: '工作中心', title: '工作中心', sort: true }

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_EquipType.html

@@ -52,6 +52,8 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>禁用</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>反禁用</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
@@ -123,6 +125,14 @@
                        break;
                    //反关闭
                    case 'set_CancelCloseBill': set_CloseBill(2);
                    //禁用按钮
                    case 'btn-Stop':
                        set_De_Stop(0);
                        break;
                    //反禁用按钮
                    case 'btn-DeStop':
                        set_De_Stop(1);
                        break;
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
@@ -395,7 +405,44 @@
                else {
                    layer.msg("请选择一条数据!");
                }
            }  
            }

            // åç¦ç”¨/禁用数据
            function set_De_Stop(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].HItemID.toString();
                    layer.confirm("确认要禁用吗?", function (index) {
                        //逻辑审核方法
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "/Gy_EquipTypeBill/StopGy_EquipTypeBill", //方法所在页面和方法名
                            data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(index);
                                        //修改为功后刷新界面
                                        $("#btnSearch").trigger('click');
                                    });

                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                            }
                        });
                    })
                }
                else {
                    layer.msg('请选择一行数据审核！');
                }
            }

            //修改按钮
            function set_ShowBill() {

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_ProcPrice.html

@@ -58,6 +58,7 @@
                                            <div class="layui-input-block">
                                                <input type="radio" name="FixedItems" value="SProc" title="工序">
                                                <input type="radio" name="FixedItems" value="SMater" title="物料">
                                                <input type="radio" name="FixedItems" value="SWorkCenter" title="工作中心">
                                                <input type="radio" name="FixedItems" value="SFree" title="自由" checked>
                                            </div>
                                        </div>
@@ -114,6 +115,22 @@
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchDept" id="btnSearchDept" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </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="HWorkCenterName" id="HWorkCenterName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HWorkCenterID" id="HWorkCenterID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkCenter" id="btnSearchWorkCenter" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </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="HWorkCenterNumber" id="HWorkCenterNumber" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                    </div>
@@ -251,7 +268,7 @@
            var option = [];
            var HModName = "Gy_ProcPrice";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID","HDeptID","HMaterIDCol","HProcIDCol","HSourceIDCol"];
            var titleData = ["HItemID", "HDeptID", "HMaterIDCol", "HProcIDCol", "HSourceIDCol"];
            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            //if (sessionStorage.login != "login") {
            //    layer.confirm("登录失效，请重新登录！", {
@@ -295,9 +312,11 @@
                //新增行表格数据
                var NewRow = {
                    "HMaterIDCol": "", "HMaterNumberCol": "", "HMaterNameCol": "", "HMaterModelCol": "", "HProcIDCol": "",
                    "HProcNumberCol": "", "HProcNameCol": "","HSourceIDCol":"", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": "",
                    "HProcNumberCol": "", "HProcNameCol": "", "HSourceIDCol": "", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": "0",
                    "HBeginDateCol": "", "HEndDateCol": "", "HCostFlagCol": "false", "HFlowFlagCol": "false", "HPayFlagCol": "false",
                    "HRemarkCol": ""
                    "HRemarkCol": "",
                    "HWorkCenterID": 0, "HWorkCenterNumber": "", "HWorkCenterName": "", "HWorkQty": 0, "HStdEmp": 0, "HChangeTimes": 0,
                    "HChangeMoney": 0, "HProcNo": 0, "HPieceTimes": 0, "HMouldQty": 0, "HChangeMouldMoney": 0, "HRushQty": 0
                };
                switch (obj.event) {
                    case 'btn-AddLine':
@@ -315,6 +334,11 @@
                            NewRow.HProcIDCol = $("#HProcID").val();
                            NewRow.HProcNumberCol = $("#HProcNumber").val();
                            NewRow.HProcNameCol = $("#HProcName").val();
                        }
                        else if (FixedItems == "SWorkCenter") {
                            NewRow.HWorkCenterID = $("#HWorkCenterID").val();
                            NewRow.HWorkCenterNumber = $("#HWorkCenterNumber").val();
                            NewRow.HWorkCenterName = $("#HWorkCenterName").val();
                        }
                        NewRow.HBeginDateCol = Format(new Date(), "yyyy-MM-dd");
                        NewRow.HEndDateCol = "2100-01-01";
@@ -404,7 +428,7 @@
                    var field = $(this).data('field');
                    laydate.render({
                        elem: this.firstChild
                        , show: true //直接显示  
                        , show: true //直接显示
                        , closeStop: this
                        , done: function (nowDate) {
                            //时间选择完成，行数据更新
@@ -419,7 +443,7 @@
                    var field = $(this).data('field');
                    laydate.render({
                        elem: this.firstChild
                        , show: true //直接显示  
                        , show: true //直接显示
                        , closeStop: this
                        , done: function (nowDate) {
                            //时间选择完成，行数据更新
@@ -429,14 +453,84 @@
                        }
                    });
                }
                else if (obj.event == 'inputHPrice') {
                    $(obj.tr).find(".layui-table-edit").keyup(function () {
                        var $input = $(this), val = $input.val();
                        if (!val) val = "0";
                        //只能输入小数点和数字，保留6位小数
                        $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
                    });
                }
                else if (obj.event == 'inputHWorkQty') {
                    $(obj.tr).find(".layui-table-edit").keyup(function () {
                        var $input = $(this), val = $input.val();
                        if (!val) val = "0";
                        $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
                    });
                }
                else if (obj.event == 'inputHStdEmp') {
                    $(obj.tr).find(".layui-table-edit").keyup(function () {
                        var $input = $(this), val = $input.val();
                        if (!val) val = "0";
                        $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
                    });
                }
                else if (obj.event == 'inputHChangeTimes') {
                    $(obj.tr).find(".layui-table-edit").keyup(function () {
                        var $input = $(this), val = $input.val();
                        if (!val) val = "0";
                        $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
                    });
                }
                else if (obj.event == 'inputHChangeMoney') {
                    $(obj.tr).find(".layui-table-edit").keyup(function () {
                        var $input = $(this), val = $input.val();
                        if (!val) val = "0";
                        $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
                    });
                }
                else if (obj.event == 'inputHProcNo') {
                    $(obj.tr).find(".layui-table-edit").keyup(function () {
                        var $input = $(this), val = $input.val();
                        if (!val) val = "0";
                        $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
                    });
                }
                else if (obj.event == 'inputHPieceTimes') {
                    $(obj.tr).find(".layui-table-edit").keyup(function () {
                        var $input = $(this), val = $input.val();
                        if (!val) val = "0";
                        $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
                    });
                }
                else if (obj.event == 'inputHMouldQty') {
                    $(obj.tr).find(".layui-table-edit").keyup(function () {
                        var $input = $(this), val = $input.val();
                        if (!val) val = "0";
                        $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
                    });
                }
                else if (obj.event == 'inputHChangeMouldMoney') {
                    $(obj.tr).find(".layui-table-edit").keyup(function () {
                        var $input = $(this), val = $input.val();
                        if (!val) val = "0";
                        $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
                    });
                }
                else if (obj.event == 'inputHRushQty') {
                    $(obj.tr).find(".layui-table-edit").keyup(function () {
                        var $input = $(this), val = $input.val();
                        if (!val) val = "0";
                        $input.val(val.replace(/^\D*([0-9]\d*\.?\d{0,6})?.*$/, '$1', ''));
                    });
                }

                $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
                    if (event.key == "F7") {
                        if (obj.event == 'HMaterCheck')
                        {
                        if (obj.event == 'HMaterCheck') {
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', 
                                skin: 'layui-layer-rim',
                                title: '物料列表',
                                closeBtn: 1,
                                shift: 2,
@@ -445,7 +539,7 @@
                                content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {
                                    var iframeWindow = window['layui-layer-iframe' + index]  
                                    var iframeWindow = window['layui-layer-iframe' + index]
                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
@@ -472,11 +566,10 @@
                                }
                            });
                        }
                        if (obj.event == 'HProcCheck')  
                        {
                        if (obj.event == 'HProcCheck') {
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim', 
                                skin: 'layui-layer-rim',
                                title: '工序列表',
                                closeBtn: 1,
                                shift: 2,
@@ -485,7 +578,7 @@
                                content: ['../../Baseset/基础资料/Gy_ProcList.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {
                                    var iframeWindow = window['layui-layer-iframe' + index] 
                                    var iframeWindow = window['layui-layer-iframe' + index]
                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
@@ -504,7 +597,7 @@
                                            , HMaterModelCol: $("#HMaterModel").val()
                                        });
                                    }
                                    layer.close(layer.index); 
                                    layer.close(layer.index);
                                }
                                , btn2: function (index, layero) {
                                },
@@ -542,7 +635,37 @@
                                }
                            });
                        }
                        
                        if (obj.event == 'HWorkCenterCheck') {
                            layer.open({
                                type: 2,
                                skin: 'layui-layer-rim',
                                title: '工作中心列表',
                                closeBtn: 1,
                                shift: 2,
                                area: ['90%', '90%'],
                                maxmin: true,
                                content: ['../../Baseset/基础资料/Gy_WorkCenterList.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {
                                    var iframeWindow = window['layui-layer-iframe' + index]
                                    var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');
                                    if (checkStatus.data.length === 0) {
                                        return layer.msg('请选择数据');
                                    }
                                    obj.update({
                                        HWorkCenterID: checkStatus.data[0].HItemID
                                        , HWorkCenterNumber: checkStatus.data[0].工作中心代码
                                        , HWorkCenterName: checkStatus.data[0].工作中心
                                    });
                                    layer.close(layer.index);
                                }
                                , btn2: function (index, layero) {
                                },
                                end: function () {
                                }
                            });
                        }

                        obj.event = "";
                        return false;

@@ -730,15 +853,54 @@
                    }
                });
            });
            //表头信息工作中心弹窗
            form.on('submit(btnSearchWorkCenter)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '工作中心列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../Baseset/基础资料/Gy_WorkCenterList.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HWorkCenterID").val(checkStatus.data[0].HItemID);
                        $("#HWorkCenterName").val(checkStatus.data[0].工作中心);
                        $("#HWorkCenterNumber").val(checkStatus.data[0].工作中心代码);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //初始化表格
            function set_InitGrid() {
                rowdata = [{
                    "HMaterIDCol": "", "HMaterNumberCol": "", "HMaterNameCol": "", "HMaterModelCol": "", "HProcIDCol": "",
                    "HProcNumberCol": "", "HProcNameCol": "", "HSourceIDCol": "", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": "",
                    "HProcNumberCol": "", "HProcNameCol": "", "HSourceIDCol": "", "HSourceNumberCol": "", "HSourceNameCol": "", "HPriceCol": "0",
                    "HBeginDateCol": "", "HEndDateCol": "", "HCostFlagCol": "false", "HFlowFlagCol": "false", "HPayFlagCol": "false",
                    "HRemarkCol": ""
                    "HRemarkCol": "",
                    "HWorkCenterID": 0, "HWorkCenterNumber": "", "HWorkCenterName": "", "HWorkQty": 0, "HStdEmp": 0, "HChangeTimes": 0,
                    "HChangeMoney": 0, "HProcNo": 0, "HPieceTimes": 0, "HMouldQty": 0, "HChangeMouldMoney": 0, "HRushQty": 0
                }];
                option = {
                    elem: '#mainTable'
@@ -748,11 +910,11 @@
                    , limit: 50
                    , height: 'full-250'
                    , cellMinWidth: 90
                    , cols: [[ 
                    , cols: [[
                        { type: 'checkbox' }
                        , { field: 'HMaterIDCol', title: '物料ID', edit: 'text', hide: true }
                        , { field: 'HMaterNumberCol', title: '物料代码', edit: 'text', event: "HMaterCheck", width: 200 }
                        , { field: 'HMaterNameCol', title: '物料名称', width:200 }
                        , { field: 'HMaterNameCol', title: '物料名称', width: 200 }
                        , { field: 'HMaterModelCol', title: '规格型号', width: 200 }
                        , { field: 'HProcIDCol', title: '工序ID', edit: 'text', hide: true }
                        , { field: 'HProcNumberCol', title: '工序代码', edit: 'text', event: "HProcCheck" }
@@ -760,7 +922,19 @@
                        , { field: 'HSourceIDCol', title: '资源ID', edit: 'text', hide: true }
                        , { field: 'HSourceNumberCol', title: '资源代码', edit: 'text', event: "HSourceCheck" }
                        , { field: 'HSourceNameCol', title: '资源名称' }
                        , { field: 'HPriceCol', title: '单价', edit: 'text' }
                        , { field: 'HPriceCol', title: '单价', edit: 'text', event: "inputHPrice" }
                        , { field: 'HWorkCenterID', title: '工作中心ID', edit: 'text', hide: true }
                        , { field: 'HWorkCenterNumber', title: '工作中心代码', edit: 'text', event: "HWorkCenterCheck", width: 120 }
                        , { field: 'HWorkCenterName', title: '工作中心', edit: 'text', width: 120 }
                        , { field: 'HWorkQty', title: '小时产能', edit: 'text', event: "inputHWorkQty" }
                        , { field: 'HStdEmp', title: '标准人力', edit: 'text', event: "inputHStdEmp" }
                        , { field: 'HChangeTimes', title: '换线时间', edit: 'text', event: "inputHChangeTimes" }
                        , { field: 'HChangeMoney', title: '换线补贴', edit: 'text', event: "inputHChangeMoney" }
                        , { field: 'HProcNo', title: '工艺路线流水号', edit: 'text', width: 150, event: "inputHProcNo" }
                        , { field: 'HPieceTimes', title: '单件加工时间', edit: 'text', width: 150, event: "inputHPieceTimes" }
                        , { field: 'HMouldQty', title: '模具数量', edit: 'text', event: "inputHMouldQty" }
                        , { field: 'HChangeMouldMoney', title: '换模补贴', edit: 'text', event: "inputHChangeMouldMoney" }
                        , { field: 'HRushQty', title: '单件冲次次数', edit: 'text', width: 150, event: "inputHRushQty" }
                        , { field: 'HBeginDateCol', title: '开始日期', event: "HBeginDateCol" }
                        , { field: 'HEndDateCol', title: '结束日期', event: "HEndDateCol" }
                        , { field: 'HCostFlagCol', title: '成本必选', templet: '#HCostFlagCol' }
@@ -839,7 +1013,7 @@
                if (HItemID == '' || HItemID == null) {
                    HItemID = 0;
                }
                var ajaxLoad = layer.load(); 
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + "/Gy_ProcPrice/GetProcPriceValue",
                    type: "GET",
@@ -860,16 +1034,26 @@
                                , "HDeptID": d.data[0].Hdeptid
                                , "HMakeDate": Format(new Date(d.data[0].制单日期), 'yyyy-MM-dd')
                                , "HMaker": d.data[0].制单人
                                , "HWorkCenterID": d.data[0].HWorkCenterID
                                , "HWorkCenterNumber": d.data[0].工作中心代码
                                , "HWorkCenterName": d.data[0].工作中心
                            });

                            var rowdata = [];
                            for (var i = 0; i < d.data.length; i++) {
                                //子表  èµ‹å€¼
                                rowdata.push({
                                    "HMaterIDCol": d.data[i].HMaterID, "HMaterNumberCol": d.data[i].物料代码, "HMaterNameCol": d.data[i].物料名称, "HMaterModelCol": d.data[i].规格型号, "HProcIDCol": d.data[i].HProcID,
                                    "HProcNumberCol": d.data[i].工序代码, "HProcNameCol": d.data[i].工序名称, "HSourceIDCol": d.data[i].HSourceID, "HSourceNumberCol": d.data[i].资源代码, "HSourceNameCol": d.data[i].资源名称, "HPriceCol": d.data[i].单价,
                                    "HBeginDateCol": Format(new Date(d.data[i].开始日期), 'yyyy-MM-dd'), "HEndDateCol": Format(new Date(d.data[i].结束日期), 'yyyy-MM-dd'), "HCostFlagCol": (d.data[i].HCostFlag == 0 ? false : true), "HFlowFlagCol": (d.data[i].HFlowFlag == 0 ? false : true), "HPayFlagCol": (d.data[i].HPayFlag == 0 ? false : true),
                                    "HRemarkCol": d.data[i].备注
                                    "HMaterIDCol": d.data[i].HMaterID, "HMaterNumberCol": d.data[i].物料代码, "HMaterNameCol": d.data[i].物料名称,
                                    "HMaterModelCol": d.data[i].规格型号, "HProcIDCol": d.data[i].HProcID, "HProcNumberCol": d.data[i].工序代码,
                                    "HProcNameCol": d.data[i].工序名称, "HSourceIDCol": d.data[i].HSourceID, "HSourceNumberCol": d.data[i].资源代码,
                                    "HSourceNameCol": d.data[i].资源名称, "HPriceCol": d.data[i].单价, "HBeginDateCol": Format(new Date(d.data[i].开始日期), 'yyyy-MM-dd'),
                                    "HEndDateCol": Format(new Date(d.data[i].结束日期), 'yyyy-MM-dd'), "HCostFlagCol": (d.data[i].HCostFlag == 0 ? false : true),
                                    "HFlowFlagCol": (d.data[i].HFlowFlag == 0 ? false : true), "HPayFlagCol": (d.data[i].HPayFlag == 0 ? false : true),
                                    "HRemarkCol": d.data[i].备注,
                                    "HWorkCenterID": d.data[i].HWorkCenterID, "HWorkCenterNumber": d.data[i].工作中心代码, "HWorkCenterName": d.data[i].工作中心,
                                    "HWorkQty": d.data[i].小时产能, "HStdEmp": d.data[i].标准人力, "HChangeTimes": d.data[i].换线时间, "HChangeMoney": d.data[i].换线补贴,
                                    "HProcNo": d.data[i].工艺路线流水号, "HPieceTimes": d.data[i].单件加工时间, "HMouldQty": d.data[i].模具数量,
                                    "HChangeMouldMoney": d.data[i].换模补贴, "HRushQty": d.data[i].单件冲次次数
                                });
                            }
                            option.data = rowdata;

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_MouldFile.html

@@ -358,6 +358,20 @@
                                                <input type="text" class="layui-input" name="HNextMainDate" id="HNextMainDate" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline" style="margin-left:10px;">
                                            <label class="layui-form-label">器具分类</label>
                                            <div class="layui-input-block">
                                                <select name="HMouldClass" lay-filter="HMouldClass" id="HMouldClass">
                                                    <option value="模具" selected="selected">模具</option>
                                                    <option value="工装">工装</option>
                                                    <option value="夹具">夹具</option>
                                                    <option value="刀具">刀具</option>
                                                    <option value="检具">检具</option>
                                                    <option value="周转器具">周转器具</option>
                                                    <option value="其他">其他</option>
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
@@ -1250,6 +1264,7 @@
                        $("#HBarCode").val(d.data[0].条码编号);
                        $("#HMadeSupID").val(d.data[0].HMadeSupID);
                        $("#HMadeSupName").val(d.data[0].制造厂商);
                        $("#HMouldClass").val(d.data[0].器具分类);
                        //$("#HNowSupID").val(d.data[0].HNowSupID);
                        //$("#HNowSupName").val(d.data[0].虚拟仓);
                        var HCycleUnit = d.data[0].周期单位;
@@ -1258,6 +1273,8 @@
                        if ( !(HCycleUnit == null || HCheckCycle == null ) ) {
                            calculateHNextMainDate(d.data[0].hmainid, HCycleUnit, HCheckCycle);
                        }

                        form.render('select');
                    }
                });
            }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_MouldFileList.html

@@ -8,11 +8,18 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <style type="text/css">
    </style>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>

    <script src="../../../layuiadmin/layui/layui1.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/table.js"></script>
    <style>
        /*树状图点击高亮变色*/
        .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
            background: #aef0f7;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
@@ -47,7 +54,16 @@

                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <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="btnAdd"><i class="layui-icon layui-icon-add-1"></i>新增</button>
@@ -68,27 +84,23 @@
            </div>
        </div>
    </div>
    <script src="../../../layuiadmin/layui/layui.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/PubCustom.js"></script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tree'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element
            , laypage = layui.laypage
            , laydate = layui.laydate
            , soulTable = layui.soulTable
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , soulTable = layui.soulTable
                , tree = layui.tree
            var sWhere = "";
            var option = [];
            //#endregion
@@ -156,6 +168,8 @@

                //查询
                get_Display(sWhere);
                //查询器具分类
                get_Display_Tree();
            }

            //初始化表格
@@ -497,6 +511,89 @@
                }
            }

            // æ ‘状图查询
            function get_Display_Tree() {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Gy_Mould/TreeList',
                    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 HMouldTypeID='" + 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;
            }

            //刷新
            function get_Refresh() {
                $("#HNumber").val("");

 WebTM/views/É豸¹ÜÀí/Sb_EqpMaintenanceBillList_PDA.html

@@ -98,7 +98,8 @@
            var sWhere = "";
            var option = [];
            var HModName = "Sb_EqpMaintenanceBillList_PDA";

            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "HEquipID", "HEmpID", "HDeptID", "HManagerID", "hsubid", "HRepairCheckID1", "HManagerID1", "HBillType", "源单主内码", "源单子内码"];
            //#endregion

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
@@ -194,7 +195,7 @@
                    url: GetWEBURL() + "/Web/GetEquipmentBillsList",
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "Type": "WX" },
                    data: { "sWhere": sWhere, "Type": "WX", "user": sessionStorage["HUserName"] },
                    success: function (data1) {

                        if (data1.count == 1) {
@@ -209,7 +210,7 @@
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, "") > -1) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {

 WebTM/views/É豸¹ÜÀí/Sb_EquipConkBookBillList_PDA.html

@@ -98,7 +98,8 @@
            var sWhere = "";
            var option = [];
            var HModName = "Sb_EquipConkBookBillList_PDA";

            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "HEquipID", "HEmpID", "HDeptID", "HManagerID", "hsubid", "HConkTypeID", "HManagerID", "HBillType", "源单主内码", "源单子内码", "HConkReasonID","HManagerID1"];
            //#endregion

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
@@ -194,7 +195,7 @@
                    url: GetWEBURL() + "/Web/GetEquipmentBillsList",
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "Type": "GZ" },
                    data: { "sWhere": sWhere, "Type": "GZ", "user": sessionStorage["HUserName"]},
                    success: function (data1) {

                        if (data1.count == 1) {
@@ -209,7 +210,7 @@
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, "") > -1) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {

 WebTM/views/É豸¹ÜÀí/Sb_EquipDotCheckBillList_PDA.html

@@ -98,6 +98,8 @@
            var sWhere = "";
            var option = [];
            var HModName = "Sb_EquipDotCheckBillList_PDA";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "设备ID", "点检项目ID","负责人ID","hsubid","HBillType"];

            //#endregion

@@ -167,9 +169,9 @@
                //初始化时间
                $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

                //加载数据到网格
                get_FastQuery();
                //初始化表格
                DisPlay_HideColumn();
            }

@@ -194,7 +196,7 @@
                    url: GetWEBURL() + "/Web/GetEquipmentBillsList",
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "Type": "DJ" },
                    data: { "sWhere": sWhere, "Type": "DJ", "user": sessionStorage["HUserName"] },
                    success: function (data1) {

                        if (data1.count == 1) {
@@ -209,7 +211,7 @@
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, "") > -1) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
@@ -370,7 +372,7 @@
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["hmainid","HMaterID"];//不需要显示的字段 å¯æ‰©å±•
                            var titleData = ["hmainid","设备ID"];//不需要显示的字段 å¯æ‰©å±•

                            dataCol = data1.data[0].HGridString.split(',');


 WebTM/views/É豸¹ÜÀí/Sb_EquipMaintainBillList_PDA.html

@@ -98,7 +98,8 @@
            var sWhere = "";
            var option = [];
            var HModName = "Sb_EquipMaintainBillList_PDA";

            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "设备ID", "点检项目ID", "负责人ID", "hsubid","配件ID","单位ID","hmaterid","HBillType","HEquipMaintainRuleInterID","源单主内码","源单子内码"];
            //#endregion

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
@@ -194,7 +195,7 @@
                    url: GetWEBURL() + "/Web/GetEquipmentBillsList",
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "Type": "BY" },
                    data: { "sWhere": sWhere, "Type": "BY", "user": sessionStorage["HUserName"] },
                    success: function (data1) {

                        if (data1.count == 1) {
@@ -209,7 +210,7 @@
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, "") > -1) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {

 WebTM/views/É豸¹ÜÀí/Sb_EquipRepairCheckBillList_PDA.html

@@ -108,7 +108,8 @@
            var sWhere = "";
            var option = [];
            var HModName = "Sb_EquipRepairCheckBillList_PDA";

            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "HEquipID", "HEmpID", "HDeptID", "HManagerID", "hsubid", "HConkTypeID", "HManagerID", "HBillType", "源单主内码", "源单子内码", "HConkReasonID", "HManagerID1","HRepairCheckID1"];
            //#endregion

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½
@@ -204,7 +205,7 @@
                    url: GetWEBURL() + "/Web/GetEquipmentBillsList",
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "Type": "YS" },
                    data: { "sWhere": sWhere, "Type": "YS", "user": sessionStorage["HUserName"] },
                    success: function (data1) {

                        if (data1.count == 1) {
@@ -219,7 +220,7 @@
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                if ($.inArray(data[i].name, "") > -1) {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {

 WebTM/views/É豸¹ÜÀí/É豸µµ°¸/Gy_EquipFileMainList.html

@@ -8,9 +8,18 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <style type="text/css"></style>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/layui/layui1.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/table.js"></script>
    <style>
        /*树状图点击高亮变色*/
        .layui-tree-set-active > .layui-tree-entry .layui-tree-main {
            background: #aef0f7;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
@@ -45,7 +54,16 @@

                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <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="btnAdd"><i class="layui-icon layui-icon-add-1"></i>新增</button>
@@ -66,27 +84,23 @@
            </div>
        </div>
    </div>
    <script src="../../../layuiadmin/layui/layui.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/PubCustom.js"></script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tree'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element
            , laypage = layui.laypage
            , laydate = layui.laydate
            , soulTable = layui.soulTable
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , soulTable = layui.soulTable
                , tree = layui.tree
            var sWhere = "";
            var option = [];
            //#endregion
@@ -153,6 +167,8 @@

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

            //初始化表格
@@ -268,6 +284,7 @@
                    }
                });
            }


            //快速过滤
            function get_FastQuery() {
@@ -484,6 +501,89 @@
                }
            }

            // æ ‘状图查询
            function get_Display_Tree() {
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Gy_EquipFileMain/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 HEquipFileTypeID='" + 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;
            }

            //刷新
            function get_Refresh() {
                $("#HNumber").val("");

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/MES_ProcessCheckBill_PDA.html

@@ -290,6 +290,10 @@
                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
                    <input type="hidden" name="eventType" id="eventType" value="Add">
                    <input type="hidden" name="HMainInterID" id="HMainInterID" value="0">
                    <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
                    <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0">
                    <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="0">
                    <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" value="0">
                </form>
            </div>
        </div>
@@ -655,14 +659,18 @@
                                        "HMaterName": data.产品,
                                        "HMaterNumber": data.产品代码,
                                        "HMaterModel": data.规格型号,
                                        "HPRDORGID": data.组织,
                                        "HPRDORGName": data.组织名称,
                                        "HPRDORGID": 0,//data.组织,
                                        "HPRDORGName": '',//data.组织名称,
                                        "HUnitID": data.HUnitID,
                                        "HUnitName": data.单位,
                                        "HProcName": data.工序,
                                        "HProcID": data.HProcID,
                                        "HQCSchemeID": data.检验方案ID,
                                        "HQCSchemeName": data.检验方案名称
                                        "HQCSchemeName": data.检验方案名称,
                                        "HMainSourceInterID": data.hmainid,
                                        "HMainSourceEntryID": data.hsubid,
                                        "HMainSourceBillNo": data.单据号,
                                        "HMainSourceBillType": data.HBillType,
                                    });
                                    //获取检验方案/检验项目信息
                                    get_CheckItem();
@@ -690,10 +698,16 @@
                                        "HProcName": data.当前工序,
                                        "HProcID": data.HProcID,
                                        "HQCSchemeID": data.检验方案ID,
                                        "HQCSchemeName": data.检验方案名称
                                        "HQCSchemeName": data.检验方案名称,
                                        "HMainSourceInterID": data.hmainid,
                                        "HMainSourceEntryID": 0,
                                        "HMainSourceBillNo": data.单据号,
                                        "HMainSourceBillType": data.单据类型,
                                    });
                                    //获取检验方案/检验项目信息
                                    get_CheckItem();

                                    HProcExchBillNoFlag = true;
                                    break;
                                case "MO00":
                                    form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
@@ -714,10 +728,16 @@
                                        "HProcName": data.当前工序,
                                        "HProcID": data.HProcID,
                                        "HQCSchemeID": data.检验方案ID,
                                        "HQCSchemeName": data.检验方案名称
                                        "HQCSchemeName": data.检验方案名称,
                                        "HMainSourceInterID": data.hmainid,
                                        "HMainSourceEntryID": data.hsubid,
                                        "HMainSourceBillNo": data.单据号,
                                        "HMainSourceBillType": data.HBillType,
                                    });
                                    //获取检验方案/检验项目信息
                                    get_CheckItem();

                                    HProcExchBillNoFlag = true;
                                    break;
                            }
                            layer.close(index);

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_ColorRecordBill_PDA.html

@@ -290,6 +290,7 @@
                    <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
                    <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0">
                    <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="0">
                    <input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" value="0">
                </form>
            </div>
        </div>
@@ -670,6 +671,7 @@
                                    "HMainSourceInterID": data.hmainid,
                                    "HMainSourceEntryID": data.hsubid,
                                    "HMainSourceBillNo": data.单据号,
                                    "HMainSourceBillType": data.HBillType,
                                });
                                //获取检验方案/检验项目信息
                                get_CheckItem();
@@ -701,6 +703,7 @@
                                    "HMainSourceInterID": data.hmainid,
                                    "HMainSourceEntryID": 0,
                                    "HMainSourceBillNo": data.单据号,
                                    "HMainSourceBillType": data.HBillType,
                                });
                                //获取检验方案/检验项目信息
                                get_CheckItem();
@@ -729,6 +732,7 @@
                                    "HMainSourceInterID": data.hmainid,
                                    "HMainSourceEntryID": data.hsubid,
                                    "HMainSourceBillNo": data.单据号,
                                    "HMainSourceBillType": data.单据类型,
                                });
                                //获取检验方案/检验项目信息
                                get_CheckItem();