duhe
2025-06-23 7dca38e7b698b4648eae0fd98121ff3c3af30f92
华远:
直方图:点击PCS 设置PCS检验信息功能完善
5个文件已修改
317 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_PNLInfoEdit.html 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/案例代码/华远/HY_HistogramReport.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/案例代码/华远/HY_HistogramReport_ForPCSCheckNote.html 251 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/质量管理/PNL检验信息/QC_CheckNote_PNL_TempEdit.html 39 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -3656,7 +3656,7 @@
      <publishTime>04/08/2025 10:03:42</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_PNLInfoEdit.html">
      <publishTime>06/23/2025 09:37:48</publishTime>
      <publishTime>06/23/2025 14:25:58</publishTime>
    </File>
    <File Include="views/基础资料/公用基础资料/Gy_PNLInfoList.html">
      <publishTime>06/23/2025 11:02:52</publishTime>
@@ -4909,10 +4909,10 @@
      <publishTime>09/13/2024 15:42:13</publishTime>
    </File>
    <File Include="views/案例代码/华远/HY_HistogramReport.html">
      <publishTime>06/23/2025 11:17:43</publishTime>
      <publishTime>06/23/2025 14:28:24</publishTime>
    </File>
    <File Include="views/案例代码/华远/HY_HistogramReport_ForPCSCheckNote.html">
      <publishTime>06/10/2025 16:46:17</publishTime>
      <publishTime>06/23/2025 14:35:05</publishTime>
    </File>
    <File Include="views/案例代码/华远/HY_InterfaceTest.html">
      <publishTime>06/20/2025 14:20:44</publishTime>
@@ -6815,7 +6815,7 @@
      <publishTime>06/16/2025 08:38:36</publishTime>
    </File>
    <File Include="views/质量管理/PNL检验信息/QC_CheckNote_PNL_TempEdit.html">
      <publishTime>06/23/2025 09:37:48</publishTime>
      <publishTime>06/23/2025 14:36:14</publishTime>
    </File>
    <File Include="views/质量管理/PNL检验信息/QC_CheckNote_PNL_TempList.html">
      <publishTime>06/23/2025 09:37:48</publishTime>
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_PNLInfoEdit.html
@@ -54,7 +54,7 @@
                                            <div class="layui-tab-item layui-show">
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">PNL布局: </label>
                                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">PNL布局<label style="color:red"> * </label> </label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" class="layui-input" lay-verify="HLayOutName" name="HLayOutName"
                                                                   id="HLayOutName"
@@ -71,7 +71,7 @@
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">PCS图标: </label>
                                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">PCS图标 </label>
                                                        <div class="layui-input-block" style="margin-left: 77px;">
                                                            <input type="text" class="layui-input" lay-verify="HIcon" name="HIcon"
                                                                   id="HIcon"
@@ -84,19 +84,19 @@
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                    <div class="layui-inline" style="display:none;">
                                                        <label class="layui-form-label">行数:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="number" name="HRowCount" id="HRowCount"
                                                                   class="layui-input">
                                                                   class="layui-input" value="0">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                    <div class="layui-inline" style="display:none;">
                                                        <label class="layui-form-label">列数:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="number" name="HColCount" id="HColCount"
                                                                   class="layui-input">
                                                                   class="layui-input" value="0">
                                                        </div>
                                                    </div>
@@ -104,7 +104,7 @@
                                                        <label class="layui-form-label">PNL二维码烧蚀x坐标:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="number" name="HPNLPosition_x" id="HPNLPosition_x"
                                                                   class="layui-input">
                                                                   class="layui-input" value="0">
                                                        </div>
                                                    </div>
@@ -112,7 +112,7 @@
                                                        <label class="layui-form-label">PNL二维码烧蚀y坐标:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="number" name="HPNLPosition_y" id="HPNLPosition_y"
                                                                   class="layui-input">
                                                                   class="layui-input" value="0">
                                                        </div>
                                                    </div>
WebTM/views/°¸Àý´úÂë/»ªÔ¶/HY_HistogramReport.html
@@ -346,6 +346,9 @@
                                    , area: ["50%", "80%"] //窗体大小
                                    , maxmin: true //设置最大最小按钮是否显示
                                    , content: ['./HY_HistogramReport_ForPCSCheckNote.html?HBarCode_PNL=' + HBarCode_PNL_Note + "&HSetNo=" + SetNo + "&PCSNo=" + PCSNo, "yes"]
                                    , end: function () {
                                        $("#btnSearch").trigger('click');
                                    }
                                })
                            });
                        }
WebTM/views/°¸Àý´úÂë/»ªÔ¶/HY_HistogramReport_ForPCSCheckNote.html
@@ -2,7 +2,7 @@
<html>
<head>
    <meta charset="utf-8" />
    <title>批改小时产能</title>
    <title>直方图-PCS检验信息维护</title>
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
@@ -11,6 +11,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/SetColumn.js"></script>
    <style>
        /* é˜²æ­¢ä¸‹æ‹‰æ¡†çš„下拉列表被隐藏---必须设置--- */
        .layui-table-cell {
@@ -33,8 +34,11 @@
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="add" id="add">新增</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="edit" id="edit">修改</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="delete" id="delete">删除</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="refresh" id="delete">刷新</button>
                        <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="exit" id="exit">退出</button>
                    </div>
                    <table class="" id="mainTable" lay-filter="mainTable"></table>
                </form>
            </div>
        </div>
@@ -46,14 +50,27 @@
        base: '../../../layuiadmin/' //静态资源所在路径
    }).extend({
        index: 'lib/index' //主入口模块
    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'soulTable'], function () {
        //#region å…¬å…±å˜é‡
        var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element;
            , element = layui.element
            , laypage = layui.laypage
            , laydate = layui.laydate
            , util = layui.util
            , tree = layui.tree
            , util = layui.util
            , soulTable = layui.soulTable;
        var HPageTitle = "";
        var sWhere = "";
        var option = [];
        var titleData = ['sorderid', 'hmainid', 'HInterid'];
        var HModName = "HY_HistogramReport_ForPCSCheckNote";
        //#endregion
        //#region èŽ·å–å‚æ•°ä¿¡æ¯
@@ -64,30 +81,250 @@
        var HPCSNo = params[params[2]];         //PCS号
        //#endregion
        set_ClearBill();
        //#region è§¦å‘事件:包括form.on(){}格式的所有点击事件、选择事件等
        //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
        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;
                }
            });
        })
        //#endregion
        //#region按钮监听 æ–°å¢ž
        form.on('submit(add)', function (data) {
            alert("1");
            set_AddNew();
        });
        //#endregion
        //#region按钮监听 ä¿®æ”¹
        form.on('submit(edit)', function (data) {
            alert("2");
            set_ShowBill();
        });
        //#endregion
        //#region按钮监听 åˆ é™¤
        form.on('submit(delete)', function (data) {
            alert("3");
            set_DeleteBill();
        });
        //#endregion
        //#region退出
        //#region æŒ‰é’®ç›‘听 åˆ·æ–°
        form.on('submit(refresh)', function (data) {
            get_FastQuery();
        });
        //#endregion
        //#region æŒ‰é’®ç›‘听 é€€å‡º
        form.on('submit(exit)', function () {
            Pub_Close(1);
        })
        //#endregion
        //#region åˆå§‹åŒ–查询
        function set_ClearBill() {
            set_InitGrid();
            get_FastQuery();
        }
        //#endregion
        //#region åˆå§‹åŒ–表格
        function set_InitGrid() {
            option = {
                elem: '#mainTable'
                //, toolbar: '#toolbarDemo'
                , height: 'full-130'
                , page: false
                , cellMinWidth: 90
                , limit: 5000
                , limits: [50, 500, 5000, 20000]
            }
        };
        //#endregion
        //#region åˆ†é¡µæŸ¥è¯¢
        function get_DisplayPage(sWhere) {
            var ajaxLoad = layer.load();
            $.ajax({
                url: GetWEBURL() + '/QC_CheckNote_PNL_TempController/GetQC_CheckNote_PNL_TempListPage',
                type: "GET",
                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": 1, "size": 10000 },
                success: function (data1) {
                    if (data1.code == 1) {
                        var data = [];
                        var col = [];
                        //给空的数组赋值
                        for (var key in data1.list) {
                            //动态获取列表所有列名
                            data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            //获取不需要显示的列(H开头的列不显示)
                            var patrn = new RegExp(/^h/i);
                            if (patrn.test(data1.list[key].ColmCols)) {
                                titleData[key] = data1.list[key].ColmCols;
                            }
                        }
                        //在列表左边添加勾选框
                        col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                        for (var i = 0; i < data.length; i++) {
                            if ($.inArray(data[i].name, titleData) > -1) {
                                col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                            }
                            else if (data[i].name === '标识ID') {
                                col.push({
                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
                                    templet: function (d) {
                                        return '<span style="color: blue;" lay-unrow >' + d.标识ID + '</span>'
                                    }, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
                                });
                            }
                            else {
                                switch (data[i].Type) {
                                    //int
                                    case 'DateTime':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
                                        break;
                                    case 'Decimal':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
                                        break;
                                    case 'Int32':
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
                                }
                            }
                        }
                        option.cols = [col];
                        option.data = data1.data;
                        option.totalRow = true;
                        //列设置
                        DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
                        //刷新表格数据
                        table.render(option);
                        layer.close(ajaxLoad);
                    } else {
                        layer.close(ajaxLoad);
                        layer.alert(data1.code + data1.Message, { icon: 5 });
                    }
                }, error: function () {
                    layer.close(ajaxLoad);
                    layer.alert("接口请求失败!", { icon: 5 });
                }
            });
        }
        //#endregion
        //#region å¿«é€Ÿè¿‡æ»¤
        function get_FastQuery() {
            sWhere += " and PNL条码编号 = '" + HBarCode_PNL + "'";
            sWhere += " and set号 = '" + HSetNo + "'";
            sWhere += " and PCS号 = '" + HPCSNo + "'";
            //get_Display(sWhere);
            get_DisplayPage(sWhere);
            sWhere = ""//调用接口后清空sWhere缓存
        }
        //#endregion
        //#region æ–°å¢ž
        function set_AddNew() {
            layer.open({
                type: 2,
                skin: 'layui-layer-rim', //加上边框
                title: '新增' + HPageTitle,
                closeBtn: 1,
                shift: 2,
                area: ['100%', '100%'],
                maxmin: true,
                content: '../../质量管理/PNL检验信息/QC_CheckNote_PNL_TempEdit.html?OperationType=4&linterid=&HSouceBillType=10004&HBarCode_PNL=' + HBarCode_PNL + "&HSetNo=" + HSetNo + "&HPCSNo=" + HPCSNo,
                end: function () {
                    //刷新页面,
                    get_FastQuery();
                },
                success: function (layero, index) {
                }
            });
        }
        //#endregion
        //#region ç¼–辑
        function set_ShowBill() {
            var checkStatus = table.checkStatus('mainTable')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                var linterid = data[0]['HItemID'];
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '编辑' + HPageTitle
                    , shift: 0//弹出动画
                    , content: '../../质量管理/PNL检验信息/QC_CheckNote_PNL_TempEdit.html?OperationType=5&linterid=' + linterid + '&HSouceBillType=10004'
                    , end: function () {
                        get_FastQuery()
                    }
                })
            } else {
                layer.msg('请选择一行数据编辑!');
            }
        }
        //#endregion
        //#region åˆ é™¤
        function set_DeleteBill() {
            var checkStatus = table.checkStatus('mainTable')
                , data = checkStatus.data;
            if (checkStatus.data.length === 1) {
                //逻辑删除方法
                layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/QC_CheckNote_PNL_TempController/DeleteBill", //方法所在页面和方法名
                        data: { "HItemID": data[0]['HItemID'], "user": 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);
                                    //修改为功后刷新界面
                                    get_FastQuery();
                                });
                            } else {
                                layer.alert(result.code + result.Message, { icon: 5 });
                            }
                        }, error: function (e) {
                            console.error(e)
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                })
            }
            else {
                layer.msg('请选择一行数据删除!');
            }
        }
        //#endregion
    });
</script>
WebTM/views/ÖÊÁ¿¹ÜÀí/PNL¼ìÑéÐÅÏ¢/QC_CheckNote_PNL_TempEdit.html
@@ -46,7 +46,7 @@
                                                <div class="layui-form-item">
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">条码编号:</label>
                                                        <label class="layui-form-label">条码编号<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HBarCode" id="HBarCode"
                                                                   class="layui-input">
@@ -56,7 +56,7 @@
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">set号:</label>
                                                        <label class="layui-form-label">set号<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HSetNo" id="HSetNo"
                                                                   class="layui-input">
@@ -64,32 +64,32 @@
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">PCS号:</label>
                                                        <label class="layui-form-label">PCS号<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <input type="text" name="HPCSNo" id="HPCSNo"
                                                                   class="layui-input">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                    <div class="layui-inline" style="display:none;">
                                                        <label class="layui-form-label">PCS行索引:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="number" name="HPosition_x" id="HPosition_x"
                                                                   class="layui-input">
                                                                   class="layui-input" value="0">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                    <div class="layui-inline"  style="display:none;">
                                                        <label class="layui-form-label">PCS列索引:</label>
                                                        <div class="layui-input-inline">
                                                            <input type="number" name="HPosition_y" id="HPosition_y"
                                                                   class="layui-input">
                                                                   class="layui-input" value="0">
                                                        </div>
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">检验工序:</label>
                                                        <label class="layui-form-label">检验工序<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <select name="HCheckProc" lay-filter="HCheckProc" id="HCheckProc">
                                                                <option value="炬森VRS内层" selected="selected">炬森VRS内层</option>
@@ -101,7 +101,7 @@
                                                    </div>
                                                    <div class="layui-inline">
                                                        <label class="layui-form-label">正反面:</label>
                                                        <label class="layui-form-label">正反面<label style="color:red"> * </label></label>
                                                        <div class="layui-input-inline">
                                                            <select name="HPageIndex" lay-filter="HPageIndex" id="HPageIndex">
                                                                <option value="正面" data-value="1" selected="selected">正面</option>
@@ -164,6 +164,9 @@
            var OperationType = params[params[0]];//操作类型
            var linterid = params[params[1]];//源单id
            var HSouceBillType = params[params[2]];//源单类型
            var HBarCode_PNL = params[params[3]]; //PNL条码编号
            var HSetNo = params[params[4]]; //set号
            var HPCSNo = params[params[5]]; //PCS号
        }
        layui.config({
@@ -208,6 +211,20 @@
            }
            else if (OperationType == 3) {//编辑
                roadBillMain();
            } else if (OperationType == 4) {//直方图新增
                set_AddFNew();
                $("#HBarCode").val(HBarCode_PNL);
                $("#HSetNo").val(HSetNo);
                $("#HPCSNo").val(HPCSNo);
                document.getElementById("HBarCode").setAttribute("disabled", "disabled");
                document.getElementById("HSetNo").setAttribute("disabled", "disabled");
                document.getElementById("HPCSNo").setAttribute("disabled", "disabled");
            } else if (OperationType == 5) {//直方图编辑
                roadBillMain();
                document.getElementById("HBarCode").setAttribute("disabled", "disabled");
                document.getElementById("HSetNo").setAttribute("disabled", "disabled");
                document.getElementById("HPCSNo").setAttribute("disabled", "disabled");
            }
            else {
                layer.alert("未知操作类型!", { icon: 5 });
@@ -226,9 +243,9 @@
                debugger
                let url = GetWEBURL()
                if (OperationType == 3) {
                if (OperationType == 3 || OperationType == 5) {
                    url += "/QC_CheckNote_PNL_TempController/EditBill"
                } else if (OperationType == 1 || OperationType == 2) {
                } else if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
                    url += "/QC_CheckNote_PNL_TempController/AddBill"
                }
                $.ajax(