设备档案 增加 字段； IP地址，MAC地址，联网方式，采集类型，采集方式 HMacAddress varchar(50) //数采MAC地址 HIP...

zrg

2025-01-14 bd4065b171f3159e2f944d2f533aa284788dbf10

设备档案 增加 字段； IP地址，MAC地址，联网方式，采集类型，采集方式 HMacAddress varchar(50) //数采MAC地址 HIPAddress varchar(50) //数采IP地址 HLinkNETMode varchar(50) //联网方式 HCollectMode varchar(50) //采集方式 HCollectClass varchar(50) //采集类型
PDA版： 测试并完善 器具维修记录单 单据编辑 功能； 测试并完善 器具故障登记单 单据编辑功能；
优化一些其他模块页面

 WebTM/WebTM.csproj.user

@@ -4,7 +4,7 @@
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/views/PublicPage/FaultReasonInformation.html

@@ -35,21 +35,12 @@
                                        </div>
                                        <div class="layui-col-xs12 layui-inline">
                                            <div class="layui-row">
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">代码</label>
                                                    <div class="layui-input-block">
                                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                                    </div>
                                                <label class="layui-form-label">过滤列</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="请输入过滤列" class="layui-input">
                                                </div>
                                                <div class="layui-inline">
                                                    <label class="layui-form-label">名称</label>
                                                    <div class="layui-input-block">
                                                        <input type="text" class="layui-input" name="HName" id="HName">
                                                    </div>
                                                </div>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearch">快速查询</button>
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>                                              
                                            </div>
                                            <div>
                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -136,23 +127,30 @@
            //});

            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                // æ¸…除所有行的背景色和选中状态
                $(".layui-table-body tr").attr({ "style": "background:" }); // æ¢å¤æ‰€æœ‰è¡ŒèƒŒæ™¯é¢œè‰²
                $(".layui-table-body .layui-form-checkbox").removeClass('layui-form-checked'); // æ¸…除复选框选中样式

                // è®¾ç½®å½“前行的选中状态
                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背景颜色和字体颜色
                    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颜色
                    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;
                    }
                });
            })
            });


            var option = {
                elem: '#mainTable'
@@ -169,55 +167,72 @@
                ]]
            };

            var index = layer.load(0, { shade: false });
            //进入页面显示的缓存列表
            $.ajax({
                url: GetWEBURL() + '/PublicPageMethod/FaultReasonList',
                type: "GET",
                data: { "sWhere": sWhere },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);
                        layer.close(index);
                    } else {
                        layer.close(index);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });


            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
                    sWhere += " and HNumber like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and HName like '%" + HName + "%'";
                }
            get_Display(sWhere);
           
            function get_Display(sWhere) {
                var index = layer.load(0, { shade: false });
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/PublicPageMethod/FaultReasonList',
                    url: GetWEBURL() + '/PublicPageMethod/Gy_ConkReasonList_PDA',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.alert("查询成功", { icon: 1 });
                            layer.close(index);
                        } else {
                            layer.close(index);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";//调用接口后清空sWhere缓存
            }


            form.on('submit(FH)', function () {//选择仓库
                var index = parent.layer.getFrameIndex(window.name);
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length == 0) {
                    parent.layer.close(index);
                    return;
                }
                parent.GetConkReasonValue(data);
                parent.layer.close(index);
            });

            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                //var HNumber = $("#HNumber").val();
                //var HName = $("#HName").val();
                //if (HNumber) {
                //    sWhere += " and HNumber like '%" + HNumber + "%'";
                //}
                //if (HName) {
                //    sWhere += " and HName like '%" + HName + "%'";
                //}
                //$.ajax({
                //    url: GetWEBURL() + '/PublicPageMethod/FaultReasonList',
                //    type: "GET",
                //    data: { "sWhere": sWhere },
                //    success: function (data1) {
                //        if (data1.count == 1) {
                //            option.data = data1.data;
                //            table.render(option);
                //            layer.alert("查询成功", { icon: 1 });
                //        } else {
                //            layer.alert(data1.code + data1.Message, { icon: 5 });
                //        }
                //    }, error: function () {
                //        layer.alert("接口请求失败!", { icon: 5 });
                //    }
                //});
                //sWhere = "";//调用接口后清空sWhere缓存
                get_Display($('#Value').val());
            });

            //以上是layui模块

 WebTM/views/PublicPage/RepairItemInformation_PDA.html

@@ -34,7 +34,15 @@
                                            <div id="treeRepairItem" lay-filter="treeRepairItem" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
                                        </div>
                                        <div>
                                            <div class="layui-inline" style="margin-left:5px;">
                                              <div class="layui-row">
                                                <label class="layui-form-label">过滤列</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="请输入过滤列" class="layui-input">
                                                </div>
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="btnSearch">快速查询</button>
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>                                              
                                            </div>
                                            <!--<div class="layui-inline" style="margin-left:5px;">
                                                <label style="width: 28px;">代码</label>

                                                <input type="text" name="HNumber" id="HNumber" style="width:75px">
@@ -45,7 +53,7 @@
                                                <button type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                            </div>-->
                                            <div>
                                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                                            </div>
@@ -138,7 +146,7 @@
                , page: true
                , cellMinWidth: 90
                , cols: [[
                    { type: 'radio', fixed: 'left' }
                    { type: 'checkbox', fixed: 'left' }
                    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                    , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
                    , { field: 'HNumber', title: '维修项目代码' }
@@ -146,38 +154,35 @@
                ]]
            };

            var index = layer.load(0, { shade: false });
            //进入页面显示的缓存列表
            $.ajax({
                url: GetWEBURL() + '/PublicPageMethod/RepairItemList',
                type: "GET",
                data: { "sWhere": sWhere },
                success: function (data1) {
                    if (data1.count == 1) {
                        option.data = data1.data;
                        table.render(option);

            get_Display(sWhere);

            function get_Display(sWhere) {
                var index = layer.load(0, { shade: false });
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/PublicPageMethod/Gy_RepairList_PDA',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.close(index);
                        } else {
                            layer.close(index);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                    } else {
                        layer.close(index);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                }, error: function () {
                    layer.close(index);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
                });
            }


            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                var HNumber = $("#HNumber").val();
                var HName = $("#HName").val();
                if (HNumber) {
                    sWhere += " and HNumber like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and HName like '%" + HName + "%'";
                }
            function get_Display_old(sWhere) {
                var index = layer.load(0, { shade: false });
                //进入页面显示的缓存列表
                $.ajax({
                    url: GetWEBURL() + '/PublicPageMethod/RepairItemList',
                    type: "GET",
@@ -186,15 +191,84 @@
                        if (data1.count == 1) {
                            option.data = data1.data;
                            table.render(option);
                            layer.alert("查询成功", { icon: 1 });
                            layer.close(index);
                        } else {
                            layer.close(index);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";//调用接口后清空sWhere缓存
            }

         
            form.on('submit(FH)', function () {//选择仓库
                var index = parent.layer.getFrameIndex(window.name);
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length == 0) {
                    parent.layer.close(index);
                    return;
                }
                parent.GetRepairValue(data);
                parent.layer.close(index);
            });

            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                //var HNumber = $("#HNumber").val();
                //var HName = $("#HName").val();
                //if (HNumber) {
                //    sWhere += " and HNumber like '%" + HNumber + "%'";
                //}
                //if (HName) {
                //    sWhere += " and HName like '%" + HName + "%'";
                //}
                //$.ajax({
                //    url: GetWEBURL() + '/PublicPageMethod/RepairItemList',
                //    type: "GET",
                //    data: { "sWhere": sWhere },
                //    success: function (data1) {
                //        if (data1.count == 1) {
                //            option.data = data1.data;
                //            table.render(option);
                //            layer.alert("查询成功", { icon: 1 });
                //        } else {
                //            layer.alert(data1.code + data1.Message, { icon: 5 });
                //        }
                //    }, error: function () {
                //        layer.alert("接口请求失败!", { icon: 5 });
                //    }
                //});
                //sWhere = "";//调用接口后清空sWhere缓存
                get_Display($('#Value').val());
            });

            table.on('row(mainTable)', function (obj) {
                // æ¸…除所有行的背景色和选中状态
                $(".layui-table-body tr").attr({ "style": "background:" }); // æ¢å¤æ‰€æœ‰è¡ŒèƒŒæ™¯é¢œè‰²
                $(".layui-table-body .layui-form-checkbox").removeClass('layui-form-checked'); // æ¸…除复选框选中样式

                // è®¾ç½®å½“前行的选中状态
                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颜色
                }

                // æ›´æ–°è¡¨æ ¼ç¼“存中的选中状态
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            });

            //以上是layui模块

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

@@ -673,6 +673,12 @@
            //以上是layui模块
        });
    </script>

    <script src="https://cdn.staticfile.net/translate.js/3.12.0/translate.js"></script>
    <script>
        translate.language.setLocal('English'); //设置本地语种（当前网页的语种）。如果不设置，默认自动识别当前网页显示文字的语种。 å¯å¡«å†™å¦‚ 'english'、'chinese_simplified' ç­‰ï¼Œå…·ä½“参见文档下方关于此的说明。
        translate.service.use('client.edge'); //设置机器翻译服务通道，直接客户端本身，不依赖服务端 ã€‚相关说明参考 http://translate.zvo.cn/43086.html
        translate.execute();//进行翻译
    </script>
</body>

</html>

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

@@ -21,35 +21,19 @@
                            <div class="layui-colla-item">
                                <div style="margin-top:5px;margin-bottom:5px;">
                                    <div class="layui-inline" style="margin-left:5px;">
                                        <label style="width: 28px;">代码</label>

                                        <input type="text" name="HNumber" id="HNumber" style="width:75px">

                                        <label style="width: 28px;">名称</label>

                                        <input type="text" name="HName" id="HName" style="width:75px">
                                        <button type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                        <label class="layui-form-label">过滤列</label>
                                        <div class="layui-input-inline">
                                            <input type="text" name="Value" id="Value" lay-verify="Value" autocomplete="off" placeholder="请输入过滤列" class="layui-input">
                                        </div>
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HQuery">快速查询</button>
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="FH">返回</button>
                                    </div>
                                    <div style="margin-top:5px;">
                                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                                    </div>
                                </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>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh"></i>刷新</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><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>

                            </div>
                        </script>
                        </div>                                             
                    </form>
                </div>
            </div>
@@ -88,6 +72,12 @@
            set_ClearBill();

            //#endregion

            $('#Value').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    get_Display($('#Value').val());
                }
            });

            //#region è§¦å‘事件：包括form.on(){}格式的所有点击事件、选择事件等

@@ -132,10 +122,38 @@
            //#endregion

            //#region æŸ¥è¯¢æŒ‰é’®
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            form.on('submit(HQuery)', function () {//选择仓库           
                get_Display($('#Value').val());
            });
            //#endregion

            table.on('row(mainTable)', function (obj) {
                // æ¸…除所有行的背景色和选中状态
                $(".layui-table-body tr").attr({ "style": "background:" }); // æ¢å¤æ‰€æœ‰è¡ŒèƒŒæ™¯é¢œè‰²
                $(".layui-table-body .layui-form-checkbox").removeClass('layui-form-checked'); // æ¸…除复选框选中样式

                // è®¾ç½®å½“前行的选中状态
                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颜色
                }

                // æ›´æ–°è¡¨æ ¼ç¼“存中的选中状态
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            });


         

            //#endregion

@@ -154,20 +172,11 @@
            function set_InitGrid() {
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , limits: [50, 500, 5000, 50000]
                    , limit: 50
                    , cellMinWidth: 90
                    //, cols: [[
                    //    { type: 'checkbox', fixed: 'left' }
                    //    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                    //    , { field: '故障类别代码', title: '故障类别代码' }
                    //    , { field: '故障类别', title: '故障类别名称' }
                    //    , { field: 'hlevel', title: '等级' }
                    //    , { field: '备注', title: '备注' }
                    //]]
                    , cellMinWidth: 90                 
                };
            }
            //#endregion
@@ -176,10 +185,9 @@

            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                var ajaxLoad = layer.load();
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                    url: GetWEBURL() + '/Gy_ConkType/list',
                var ajaxLoad = layer.load();               
                $.ajax({                
                    url: GetWEBURL() + '/Gy_ConkType/List_PDA',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
@@ -224,14 +232,9 @@
                            table.render(option);

                            //刷新表格数据
                            DisPlay_HideColumn();
                           /* DisPlay_HideColumn();*/

                            layer.close(ajaxLoad);

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -283,7 +286,18 @@
                sWhere = "";//调用接口后清空sWhere缓存
            }
            //#endregion

         
            form.on('submit(FH)', function () {//选择仓库
                var index = parent.layer.getFrameIndex(window.name);
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length == 0) {
                    parent.layer.close(index);
                    return;
                }
                parent.GetConkTypeValue(data);
                parent.layer.close(index);
            });

            //#region åˆ·æ–°é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£¾ß¹ÊÕÏάÐÞµ¥PDA/Sc_MouldConkBookBillList_PDA.html

@@ -220,7 +220,7 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£¾ß¹ÊÕÏάÐÞµ¥PDA/Sc_MouldConkBookBill_PDA.html

@@ -86,9 +86,9 @@
                                            <td class="bz_td">
                                                <input type="text" name="HConkTypeName" class="layui-input" id="HConkTypeName" placeholder="选择故障类别" style="background-color:#efefef4d;">
                                                <input type="hidden" name="HConkTypeID" id="HConkTypeID" value="0" autocomplete="off" class="layui-input">
                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ConkType" id="ConkType" style="font-weight:bolder">...</button>
                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="btn_ConkType" id="btn_ConkType" style="font-weight:bolder">...</button>
                                            </td>
                                        </tr>  
                                        </tr>
                                        <tr>
                                            <th>故障原因<span style="color:red">*</span></th>
                                            <td class="bz_td">
@@ -345,8 +345,8 @@
            //进入页面默认光标在条形码上
            $("#HBarCode").focus();
            //初始基本信息赋值
            $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //点检开始时间
            $("#HRepairEndDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));    //点检结束时间
            $("#HConkBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //故障发生日期

            $("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));      //单据日期
            $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));  //创建日期

@@ -385,7 +385,7 @@
            form.on('submit(Saver)', function (data) {//提交
                option.data = [{ "HConkReasonID": $("#HConkReasonID").val(), "HConkReasonCode": "", "HConkReasonName": $("#HConkReasonName").val(), "HConkExplanation": $("#HExplanation").val(), "HManagerID": $("#HManagerID").val(), "HManagerCode": "", "HManagerName": $("#HManagerName").val(), "HRemark": "  " }];
                table.render(option);
                

                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var oMain = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
@@ -432,7 +432,7 @@
            //#endregion

            //故障类别
            form.on('submit(ConkType)', function () {
            form.on('submit(btn_ConkType)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
@@ -467,7 +467,7 @@
                    }
                });
            });
            

            //故障原因
            form.on('submit(ConkReason)', function () {
                //页面层-自定义
@@ -579,7 +579,7 @@
                    }
                });
            });
           

            //负责人弹窗
            form.on('submit(HManager)', function () {
                //页面层-自定义
@@ -591,7 +591,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../Baseset/基础资料/Gy_EmployeeList.html?Type=HEmp', 'yes'],
                    content: ['../../Baseset/基础资料/Gy_EmployeeList.html?Type=HManager', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

@@ -617,7 +617,7 @@
                    }
                });
            });
           


            //以下为此页面所有方法
            //初始化表格
@@ -696,7 +696,7 @@
                            }
                            if (HManagerID == "") {
                                return layer.msg('请选择负责人');
                            }                            
                            }
                            buttonArr = [];//清空数组
                            var checkrow = {
                                "HRepairID": HRepairID, "HRepairCode": HRepairCode, "HRepairName": HRepairName,
@@ -764,7 +764,7 @@
                    layer.msg("发现人没有选择！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                

                if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
                    layer.msg("没有设备明细记录", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
@@ -788,7 +788,7 @@
                return true;
            }
            //扫条码
            function GetMeesageByBarCode(obj) {  
            function GetMeesageByBarCode(obj) {
                var HBarCode = $('#HBarCode').val();//条形码
                if (!HBarCode) {
                    layer.msg("条形码不能为空！")
@@ -827,6 +827,29 @@
            }
            //以上为layui模块
        });
        function GetHEmpValue(obj) {  //返回发现人
            $("#HEmpName").val(obj[0].HName);
            $("#HEmpID").val(obj[0].HItemID);
        }
        function GetConkTypeValue(obj) {  //故障类别
            $("#HConkTypeName").val(obj[0].故障类别);
            $("#HConkTypeID").val(obj[0].hitemid);
        }

        function GetConkReasonValue(obj) {  //不良原因
            $("#HConkReasonName").val(obj[0].HName);
            $("#HConkReasonID").val(obj[0].hitemid);
        }

        function GetHManagerValue(obj) {  //返回负责人
            $("#HManagerName").val(obj[0].HName);
            $("#HManagerID").val(obj[0].HItemID);
        }

        function GetHEmpValue(obj) {  //返回发现人
            $("#HEmpName").val(obj[0].HName);
            $("#HEmpID").val(obj[0].HItemID);
        }

    </script>
</body>

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£¾ß¹ÊÕÏάÐÞµ¥PDA/Sc_MouldRepairWorkBillList_PDA.html

@@ -220,7 +220,7 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>",  sort: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£¾ß¹ÊÕÏάÐÞµ¥PDA/Sc_MouldRepairWorkBill_PDA.html

@@ -79,7 +79,7 @@
                                            <th>源单类型</th>
                                            <td class="bz_td">
                                                <select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType">
                                                    <option value="手工录入" selected="selected">手工录入</option>
                                                    <option value="1" selected="selected">手工录入</option>
                                                    <option value="3815">模具故障登记单</option>
                                                </select>
                                            </td>
@@ -115,6 +115,18 @@
                                            <th>维修内容</th>
                                            <td class="bz_td">
                                                <textarea name="HRepairContent" id="HRepairContent" placeholder="请输入内容" class="layui-textarea"></textarea>
                                            </td>
                                        </tr>
                                        <tr>
                                            <th>计划维修工时</th>
                                            <td class="bz_td">
                                                <input type="text" name="HPlanTimes" class="layui-input" id="HPlanTimes" placeholder="请输入计划维修工时" value="0">
                                            </td>
                                        </tr>
                                        <tr>
                                            <th>实际维修工时</th>
                                            <td class="bz_td">
                                                <input type="text" name="HTimes" class="layui-input" id="HTimes" placeholder="请输入实际维修工时" value="0">
                                            </td>
                                        </tr>
                                        <tr>
@@ -157,7 +169,7 @@
                                        <tr>
                                            <th>维修项目<span style=" color:red">*</span></th>
                                            <td class="bz_td">
                                                <input type="text" name="HRepair" class="layui-input" id="HRepair" placeholder="选择维修项目" style="background-color:#efefef4d;">
                                                <input type="text" name="HRepairName" class="layui-input" id="HRepairName" placeholder="选择维修项目" style="background-color:#efefef4d;">
                                                <input type="hidden" name="HRepairID" id="HRepairID" value="0" autocomplete="off" class="layui-input">
                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HRepairList" id="HRepairList" style="font-weight:bolder">...</button>
                                            </td>
@@ -588,7 +600,7 @@
                    shift: 2,
                    area: ['80%', '80%'],
                    maxmin: true,
                    content: ['../../Baseset/基础资料/Gy_EmployeeList.html?Type=HEmp', 'yes'],
                    content: ['../../Baseset/基础资料/Gy_EmployeeList.html?Type=HManager', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

@@ -625,7 +637,7 @@
                        title: '设备维修登记单',
                        shift: 2,
                        area: ['90%', '90%'],
                        content: ['../../模治具管理/模治具管理/Sc_MouldConkBookBillList.html', 'yes'],
                        content: ['../../模治具管理/模具故障维修单PDA/Sc_MouldConkBookBillList_PDA.html', 'yes'],
                        btn: ['确定', '取消']
                        , btn1: function (index, layero) {
                            var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
@@ -677,7 +689,7 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HRepair").val(checkStatus.data[0].HName);
                        $("#HRepairName").val(checkStatus.data[0].HName);
                        $("#HRepairID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
@@ -940,7 +952,22 @@
            }
            //以上为layui模块
        });

        function GetHManagerValue(obj) {  //返回负责人
            $("#HManagerName").val(obj[0].HName);
            $("#HManagerID").val(obj[0].HItemID);
        }
        function GetHEmpValue(obj) {  //返回维修人
            $("#HEmpName").val(obj[0].HName);
            $("#HEmpID").val(obj[0].HItemID);
        }
        function GetHSupValue(obj) {  //返回供应商
            $("#HSupName").val(obj[0].HName);
            $("#HSupID").val(obj[0].HItemID);
        }
        function GetRepairValue(obj) {  //返回维修项
            $("#HRepairName").val(obj[0].HName);
            $("#HRepairID").val(obj[0].HItemID);
        }
    </script>
</body>
</html>

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

@@ -40,7 +40,7 @@
                                    <div class="layui-inline">
                                        <span>更多</span>
                                    </div>
                                </div>
                                </div>                               
                                <div class="layui-inline">
                                    <label class="layui-form-label">日期间隔</label>
                                    <div class="layui-input-block">
@@ -66,30 +66,33 @@
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBarCode" id="HBarCode">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">源单单号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HSourceBillNo" id="HSourceBillNo">
                                <div class="layui-row" style="margin-top: 5px; margin-left: 70px;" >
                                    <div class="layui-inline">
                                        <label class="layui-form-label">源单单号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HSourceBillNo" id="HSourceBillNo">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">物料名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料名称</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMaterName" id="HMaterName">
                                        </div>
                                    </div> <div class="layui-inline">
                                        <label class="layui-form-label">物料代码</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
                                        </div>
                                    </div>
                                </div> <div class="layui-inline">
                                    <label class="layui-form-label">物料代码</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <!--显示当前过滤方案-->
                                <div class="layui-inline" style="margin-left:5px;">
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                    <!--显示当前过滤方案-->
                                    <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                </div>                               

                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
@@ -117,7 +120,7 @@
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                    <div class="layui-row" style=" margin-top: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
@@ -144,7 +147,7 @@
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                    <div class="layui-row" style=" margin-top: 10px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
@@ -220,7 +223,7 @@
            var option = [];
            var ins;

            var titleData = ["单据ID", "HMaterID", "HDeptID", "HSupID"];//不需要显示的字段 å¯æ‰©å±•
            var titleData = ["单据ID", "HMaterID", "HDeptID", "HSupID", "HItemID", "hmainid", "hsubid", "HInterID", "HUnitID", "HAuxPropID","HSTOCKORGID"];//不需要显示的字段 å¯æ‰©å±•
            var page = 1;//分页数据
            var size = 50;
            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘

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

@@ -211,9 +211,9 @@
                                                <label class="layui-form-label">源单类型</label>
                                                <div class="layui-input-inline">
                                                    <select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType">
                                                        <option value="2" selected="selected">故障登记单</option>
                                                        <option value="3815" selected="selected">故障登记单</option>
                                                        <option value="1">手工录入</option>
                                                        <option value="3">维修派工单</option>
                                                        <option value="3843">维修派工单</option>
                                                    </select>
                                                </div>
                                            </div>
@@ -223,7 +223,7 @@
                                                    <input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="" style="float:left;width:150px;">
                                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
                                                    <button type="button" lay-submit="XDHList" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
                                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                    </button>
                                                </div>
@@ -383,12 +383,12 @@
                        $('#XDHList').addClass("layui-btn-disabled").attr("disabled", true);
                        break;
                    //有源单新增  Â  æ•…障登记单
                    case '2':
                    case '3815':
                        $('#HMainSourceBillNo').attr("disabled", true);
                        $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
                        break;
                    //有源单新增  Â  ç»´ä¿®æ´¾å·¥å•
                    case '3':
                    case '3843':
                        $('#HMainSourceBillNo').attr("disabled", true);
                        $('#XDHList').removeClass("layui-btn-disabled").attr("disabled", false);
                        break;
@@ -712,7 +712,7 @@
            //#region è¡¨å¤´ä¿¡æ¯é€‰æ‹©å•æ®å¼¹çª—
            form.on('submit(XDHList)', function () {
                var HMainSourceBillType = $("#HMainSourceBillType").val();
                if (HMainSourceBillType == "2") {
                if (HMainSourceBillType == "3815") {
                    //页面层-自定义
                    layer.open({
                        type: 2,
@@ -821,7 +821,7 @@
                            //layer.full(index);
                        }
                    });
                } else if (HMainSourceBillType == "3") {
                } else if (HMainSourceBillType == "3843") {
                    //页面层-自定义
                    layer.open({
                        type: 2,

 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/OA_ErrMsgBackSignBill_BrushCard.html

@@ -52,6 +52,9 @@
        #mainTable tr {
            height: 100px; /* ä½ æƒ³è¦çš„行高 */
        }
        #btnSignIn,#btnErrMSg,#btnQuery,#btnEdit {
            font-size: 36px; /* è®¾ç½®å­—体大小 */
        }
    </style>

</head>

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -31,6 +31,25 @@
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">日期间隔</label>
                                    <div class="layui-input-block">
                                        <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HDate">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input ForFilteringSchemes" id="HDate1">
                                    </div>
                                </div>
                                <div class="layui-row">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">物料编码</label>
@@ -75,7 +94,7 @@
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-row">
                                <div class="layui-row" style="margin-bottom:20px">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">规格型号</label>
                                        <div class="layui-input-block">
@@ -131,6 +150,13 @@
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HERPID" id="HERPID">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">单据号</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
                                            </div>
                                        </div>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>

                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">组织</label>
@@ -222,36 +248,7 @@
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">单据号</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
                                            </div>
                                        </div>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">重新同步</button>

                                        <div class="layui-inline">
                                            <label class="layui-form-label">开始日期</label>
                                            <div class="layui-input-block">
                                                <input type="date" class="layui-input ForFilteringSchemes" id="HDate">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">结束日期</label>
                                            <div class="layui-input-block">
                                                <input type="date" class="layui-input ForFilteringSchemes" id="HDate1">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">日期间隔</label>
                                            <div class="layui-input-block">
                                                <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                    </div>                                   
                                </div>
                            </div>
                        </div>

 WebTM/views/Éú²ú¹ÜÀí/¶©µ¥×´Ì¬·Ö²¼/Sc_OrderStateDistribution.html

@@ -356,7 +356,7 @@

        // æ ‘状图查询
        function get_Display_Tree() {
            var sWhere = " and HUSEORGID=" + sessionStorage["OrganizationID"];
            var sWhere = " and  HWorkShopFlag =1   and HUSEORGID=" + sessionStorage["OrganizationID"];
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/Gy_Department/Gy_DepartmentTreeList',
@@ -453,7 +453,7 @@

        $('.cns').removeClass('check1');  //删除不同父级clss样式相同的所有元素
        $("#bs" + i + "").addClass('check1'); // æ·»åŠ å½“前元素的样式
        if (workcode != "" && workcode != null) {
        if (HEquipID != "" && HEquipID != null) {
            wktag = 1;
        }
        sWhere = {
@@ -464,8 +464,7 @@
    }

    //查询 éƒ¨é—¨+产线 4个图表 èµ‹å€¼
    function FourReport(sWhere) {
        wktag = 0;
    function FourReport(sWhere) {      
        $.ajax({
            url: GetWEBURL() + '/Sc_HEquipStateDistribution/Get_EquipStateDistribution_FourReport',
            type: "GET",
@@ -499,7 +498,7 @@
        // é»˜è®¤çš„option结构
        var option = {
            title: {
                text: '产能', // é»˜è®¤æ ‡é¢˜ä¸ºç©º
                text: '近七天产能', // é»˜è®¤æ ‡é¢˜ä¸ºç©º
                left: 'center',
                top: '10%', // è°ƒæ•´æ ‡é¢˜ä½ç½®ï¼Œæ”¾åˆ°æœ€ä¸Šé¢
                textStyle: {
@@ -530,7 +529,7 @@

        // å¦‚果有数据，更新option的内容
        if (chartData && chartData.length > 0) {
            option.title.text = '产能'; // æ­£å¸¸æ•°æ®æ—¶æ²¡æœ‰æ ‡é¢˜
            option.title.text = '近七天产能'; // æ­£å¸¸æ•°æ®æ—¶æ²¡æœ‰æ ‡é¢˜
            option.xAxis.data = chartData.map(item => item.日期); // è®¾ç½®x轴数据
            option.series[0].data = chartData.map(item => item['生产总数']); // è®¾ç½®y轴数据

@@ -561,12 +560,12 @@
        mychart11.setOption(option);
    }

    //折线图
    //柱状图2
    function get_LineChart(mychart22, chartData1) {
        // é»˜è®¤çš„option结构
        var option = {
            title: {
                text: '不良原因', // é»˜è®¤æ ‡é¢˜ä¸ºç©º
                text: 'ç»´ä¿®', // é»˜è®¤æ ‡é¢˜ä¸ºç©º
                left: 'center',
                top: '10%', // è°ƒæ•´æ ‡é¢˜ä½ç½®ï¼Œæ”¾åˆ°æœ€ä¸Šé¢
                textStyle: {
@@ -616,35 +615,46 @@
            series: [
                {
                    data: [], // é»˜è®¤series数据为空
                    type: 'line', // å°†æŸ±çŠ¶å›¾æ”¹ä¸ºæŠ˜çº¿å›¾
                    smooth: true, // ä½¿æŠ˜çº¿å›¾å¹³æ»‘
                    lineStyle: {
                        color: '#15b1fa' // è®¾ç½®çº¿æ¡é¢œè‰²
                    },
                    label: {
                        show: true, // åœ¨æŠ˜çº¿å›¾ä¸Šæ˜¾ç¤ºæ•°æ®
                        position: 'top',
                        formatter: function (params) {
                            return echarts.format.addCommas(params.value);
                        }
                    }
                    type: 'bar'
                }
            ]
        };



        // å¦‚果有数据，更新option的内容
        if (chartData1 && chartData1.length > 0) {
            option.title.text = '不良原因'; // æ­£å¸¸æ•°æ®æ—¶æ²¡æœ‰æ ‡é¢˜
            option.xAxis.data = chartData1.map(item => item.不良原因); // è®¾ç½®x轴数据
            option.series[0].data = chartData1.map(item => item['数量']); // è®¾ç½®y轴数据

            option.series[0].label = {
                normal: {
                    show: true,
                    position: 'top',
                    formatter: function (params) {
                        return echarts.format.addCommas(params.value);
                    }
                }
            };

            option.series[0].itemStyle = {
                normal: {
                    color: '#15b1fa',
                    label: {
                        show: true // åœ¨æŸ±çŠ¶å›¾ä¸Šæ˜¾ç¤ºæ•°æ®
                    }
                }
            };
        } else {
            // æ²¡æœ‰æ•°æ®æ—¶ï¼Œæ˜¾ç¤º"暂无数据"提示
            option.title.text = '暂无数据';
        }

        // æ›´æ–°å›¾è¡¨
        mychart22.setOption(option);
    }

 
    //饼图
    function get_Statistics(mychart3, chartData2) {
        // å¦‚æžœ chartData2 ä¸ºç©ºï¼Œæä¾›ä¸€ä¸ªâ€œæ— æ•°æ®â€æç¤º

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

@@ -51,7 +51,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">日期</label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                    <input class="layui-input" name="HDate" id="HDate" autocomplete="off"  type="date">                                                   
                                                </div>
                                            </div>
                                            <div class="layui-inline">
@@ -119,7 +119,7 @@
                                            <div class="layui-inline">
                                                <label class="layui-form-label">故障日期<label style="color:red"> * </label></label>
                                                <div class="layui-input-inline">
                                                    <input class="layui-input" name="HConkBeginDate" id="HConkBeginDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
                                                    <input class="layui-input" name="HConkBeginDate" id="HConkBeginDate" autocomplete="off" type="date">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
@@ -184,7 +184,7 @@
    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../layuiadmin/PubCustom.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script>
        var OptionData = [];
        //获取参数
@@ -229,15 +229,15 @@
                , element = layui.element;

            //常规用法
            laydate.render({
                elem: '#HDate',
                format: 'yyyy-MM-dd',
            //laydate.render({
            //    elem: '#HDate',
            //    format: 'yyyy-MM-dd',

            });
            laydate.render({
                elem: '#HConkBeginDate',
                format: 'yyyy-MM-dd',
            });
            //});
            //laydate.render({
            //    elem: '#HConkBeginDate',
            //    format: 'yyyy-MM-dd',
            //});
            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            //if (sessionStorage.login != "login") {
            //    layer.confirm("登录失效，请重新登录！", {

 WebTM/views/É豸¹ÜÀí/É豸¹¤ÒÕ²ÎÊý¶©µ¥µã¼ì±í/SB_EquipICMOTechParamBillEdit.html

@@ -456,6 +456,20 @@
                $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));              
            }
            else if (OperationType == 2) {  //编辑
               
                //编辑状态时，根据内码，获取信息并写入界面
                RoadBillMain(HInterID);
                //文件选择初始化
                PicUpload();
                getFile();
                //获取最大单据号
                get_MAXNum();
                $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                $("#HMaker").val(HMaker);
                $("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                OperationType = 1;
            }
            else if (OperationType == 3) {  //编辑
                $("#HInterID").val(HInterID);//修改时主表ID
                //编辑状态时，根据内码，获取信息并写入界面
                RoadBillMain(HInterID);
@@ -521,7 +535,7 @@
                                $('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
                            }
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HBillNo": data.单据号
                                "HBillNo": OperationType== 2? '': data.单据号
                                , "HDate": formatDate(data.日期)
                                , "HICMOInterID": data.HICMOInterID
                                , "HICMOEntryID": data.HICMOEntryID

 WebTM/views/É豸¹ÜÀí/É豸¹¤ÒÕ²ÎÊý¶©µ¥µã¼ì±í/SB_EquipICMOTechParamBillList.html

@@ -116,6 +116,7 @@
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-file-b"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
@@ -417,6 +418,9 @@
                    //新增按钮
                    case 'btn_Add': btn_Add();
                        break;
                    //复制
                    case 'set_Copy': set_Copy();
                        break;
                    //编辑按钮
                    case 'btn_Edit': btn_Edit();
                        break;
@@ -509,6 +513,28 @@
            }
            //#endregion

            //复制
            function set_Copy() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '设备启动点检清单列表-新增'
                        , shift: 0//弹出动画
                        , content: '../../设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html?OperationType=2&linterid=' + linterid
                        , end: function () {
                            //刷新页面,
                            location.reload();
                        }
                    })
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }

            //#region ç¼–辑
            function btn_Edit() {
                var checkStatus = table.checkStatus('mainTable')
@@ -520,7 +546,7 @@
                        , area: ['100%', '100%']
                        , title: HPageTitle + '- ç¼–辑'
                        , shift: 0  //弹出动画
                        , content: '../../设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html?OperationType=2&linterid=' + HInterID
                        , content: '../../设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html?OperationType=3&linterid=' + HInterID
                        , btn: ['确定'],
                        // æŒ‰é’®1 çš„回调
                        end: function (index, layero, that) {

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

@@ -292,6 +292,32 @@
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">数采IP地址</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HIPAddress" id="HIPAddress">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">联网方式</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HLinkNETMode" id="HLinkNETMode">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">采集方式</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HCollectMode" id="HCollectMode">
                                                </div>
                                            </div>
                                        </div>
                                        <div class="layui-form-item">
                                            <div class="layui-inline">
                                                <label class="layui-form-label">采集类型</label>
                                                <div class="layui-input-inline">
                                                    <input type="text" class="layui-input" name="HCollectClass" id="HCollectClass">
                                                </div>
                                            </div>
                                            <div class="layui-inline">
                                                <label class="layui-form-label">是否主生产设备</label>
                                                <div class="layui-input-block" style="margin-left: 125px;width:55%;">
                                                    <select name="HMainSourceFlag" lay-filter="HMainSourceFlag" id="HMainSourceFlag">
@@ -1338,6 +1364,10 @@
                        $("#HSourceID").val(d.data[0].HSourceID);
                        $("#HSourceName").val(d.data[0].HSourceName);
                        $("#HMacAddress").val(d.data[0].数采物理地址);
                        $("#HIPAddress").val(d.data[0].数采IP地址);
                        $("#HLinkNETMode").val(d.data[0].联网方式);
                        $("#HCollectMode").val(d.data[0].采集方式);
                        $("#HCollectClass").val(d.data[0].采集类型);
                        $("#HMainSourceFlag").val(d.data[0].是否主生产设备);
                        $("#HMainSourceID").val(d.data[0].HMainSourceID);
                        $("#HMainSourceName").val(d.data[0].所属主生产设备);

 WebTM/views/ÖÊÁ¿¹ÜÀí/»ù´¡½¨Ä£/Gy_ErrMsgBackType.html

@@ -28,16 +28,16 @@
                                        <span>更多</span>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">异常反馈类型代码</label>
                                <div class="layui-inline" style="width:400px">
                                    <label class="layui-form-label" style="white-space: nowrap;width:100px">异常反馈类型代码</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber" style="width:200px">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">异常反馈类型名称</label>
                                <div class="layui-inline" style="width:400px">
                                    <label class="layui-form-label"  style="white-space: nowrap;width:100px">异常反馈类型名称</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                        <input type="text" class="layui-input" name="HName" id="HName" style="width:200px">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">

 WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_CheckProjectList.html

@@ -25,35 +25,42 @@
                    <div class="layui-card-body">
                        <!--<div class="test-table-reload-btn" style="margin-bottom: 10px;">-->
                        <form class="layui-form" action="">
                            <div class="layui-form-item">
                                <div class="layui-inline">
                                    <label class="layui-form-label">单据号</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                            <div class="layui-collapse">
                                <div class="layui-colla-item">
                                    <div class="layui-colla-title layui-inline">
                                        <div class="layui-inline">
                                            <span>更多</span>
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">检验方案名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">单据号</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="HDate1" id="HDate1">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="white-space: nowrap">检验方案名称</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" name="HDate2" id="HDate2">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">开始日期</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input" name="HDate1" id="HDate1">
                                        </div>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">结束日期</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input" name="HDate2" id="HDate2">
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                        </button>
                                    </div>
                                </div>
                            </div>

@@ -87,14 +94,7 @@
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>
    <script>
        //获取页面跳转参数  //单据编辑状态： 1.无源单新增  Â 2.有源单新增  Â 3.编辑  4.浏览  5.变更
        var params = get_UrlVars();
        if (typeof (params[params[0]]) == "undefined") {
            var OperationType = 1;//操作类型          
        } else {
            var OperationType = params[params[0]];//操作类型
            var HName = decodeURI(params[params[1]]);//物料名称
        }
       
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
@@ -110,11 +110,19 @@
                , soulTable = layui.soulTable
                , element = layui.element;



            var sWhere = "";
            var HName = "";
            var option = [];
            var HModName = "QC_CheckProjectList";

            //获取页面跳转参数  //单据编辑状态： 1.无源单新增  Â 2.有源单新增  Â 3.编辑  4.浏览  5.变更
            var params = get_UrlVars();
            if (typeof (params[params[0]]) == "undefined") {
                var OperationType = 1;//操作类型          
            } else {
                var OperationType = params[params[0]];//操作类型
                HName = decodeURI(params[params[1]]) == "undefined" ? "" : decodeURI(params[params[1]]);//物料名称
            }
            //#endregion

            //初始化表格
@@ -223,7 +231,7 @@
                    sWhere += " and ç‰©æ–™åç§° = '" + HName + "'";
                    get_Display(sWhere);
                }
                

            }

            //初始化网格

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_FiveMenOneRingList.html

@@ -1221,7 +1221,7 @@
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=0'
                            , content: '../../设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                            , resize: false,
                            end: function () {
                            }

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -56,7 +56,7 @@
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-row" style="margin-top:5px">
                                <div class="layui-row" style="margin-top:5px;margin-bottom:20px;margin-left:80px">
                                    <div class="layui-inline">
                                        <label class="layui-form-label">开始日期</label>
                                        <div class="layui-input-block">
@@ -313,7 +313,7 @@
            var HModName2 = "Sc_StationOutBillSub_Note";
            var HModName3 = "Sc_StationOutBillSub_SN";
            var HModName4 = "Sc_StationOutBillSub_Emp";
            var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "选择", "查询日期", "成本对象", "成本对象名称", "HBillStatus", "HBillType", "HPRDORGID"];//不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "选择", "查询日期", "成本对象", "成本对象名称", "HBillStatus", "HBillType", "HPRDORGID", "HCenterID", "HbillSubType"];//不需要显示的字段 å¯æ‰©å±•

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘


 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBillList.html

@@ -223,7 +223,7 @@

            var ins;                        //用于导出excel
            var HModName = "Cj_StationInBillList";
            var titleData = ["hmainid", "HProcID", "HMaterID", "HEmpID", "HSourceID", "HGroupID", "HInterID", "HProcExchInterID", "HProcExchEntryID", "HICMOInterID", "HICMOEntryID"];//不需要显示的字段 å¯æ‰©å±•
            var titleData = ["hmainid", "HProcID", "HMaterID", "HEmpID", "HSourceID", "HGroupID", "HInterID", "HDeptID", "HProcExchInterID", "HProcExchEntryID", "HICMOInterID", "HICMOEntryID", "HICMOQty", "HRemark", "HBillType", "hsubid", "HBillStatus", "HBillSubType"];//不需要显示的字段 å¯æ‰©å±•

            //工序流转卡下查标记
            var lookDownBar = 0;              //(0:下查操作；1：直接查看)