修改 SET表 PNL表 展示 编码 ,PNL布局编辑 页面布局1

chenhaozhe

2025-06-18 b24f97de0b8bf86f17f50ac4471dd4c6e24fa22d

修改 SET表 PNL表 展示 编码 ,PNL布局编辑 页面布局1

 WebTM/WebTM.csproj

@@ -88,7 +88,6 @@
    <Content Include="HtmlPage1.html" />
    <Content Include="img\AI芯片.png" />
    <Content Include="img\ic芯片.png" />
    <Content Include="img\华远直方图背景.jpeg" />
    <Content Include="img\智能芯片.png" />
    <Content Include="img\智能芯片＊.png" />
    <Content Include="img\电子技术.png" />
@@ -660,11 +659,8 @@
    <Content Include="views\生产管理\日计划基础资料\JIT_NeedMaterPlanConfigBill_Excel.html" />
    <Content Include="views\生产管理\日计划报表\JIT_DayPlanPlatFormHistoryNoteReport.html" />
    <Content Include="views\生产管理\日计划报表\JIT_FuHeFenXiReportDetail.html" />
<<<<<<< HEAD
    <Content Include="views\生产管理\日计划报表\ReportMOMaterReadysBillTotalList.html" />
=======
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysisReport_His.html" />
>>>>>>> 0adef152d8494601c9665fd2d690774c662a02fd
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysis.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysisDetailReport.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysisReport.html" />

 WebTM/layuiadmin/zy_dropdown.js

@@ -40,6 +40,7 @@
    // å¯æ‰©å±•å…¶ä»–类型
    switch (type) {
        case "icon": createIconCardItem([dropItems], dataList); break;
        default: console.error("未知type类型"); return;
    }
    globalDropdownWrapper.addEventListener("click", function (e) {
        callback.call(e)
@@ -55,6 +56,7 @@
        dropItem.style.flexDirection = "column"
        dropItem.style.justifyContent = "center"
        dropItem.style.alignItems = "center"
        dropItem.style.padding = "5px"
        dropItem.style.width = "96px";
        dropItem.style.height = "96px";
        dropItem.style.boxSizing = "border-box";
@@ -68,7 +70,7 @@

        let span = document.createElement("span");
        span.setAttribute('databinding', true)
        span.setAttribute('data-value', data.imgUrl)
        span.setAttribute('data-value', data.imgValue)
        span.innerText = data.imgName;
        span.style.maxWidth = "100%" // é™åˆ¶æœ€å¤§å®½åº¦
        span.style.height = "20%"

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

@@ -188,10 +188,10 @@
                        <div id="page" style="position: relative; bottom: 0;"></div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>新增</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ShowBill" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-transfer"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-form"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-form"></i>删除</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
@@ -485,16 +485,16 @@
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
                                        break;
                                    default:
                                        if (data[i].name === '条码编号') {
                                            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.条码编号 + '</span>'
                                                }, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
                                            });
                                        } else {
                                        //if (data[i].name === '条码编号') {
                                        //    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.条码编号 + '</span>'
                                        //        }, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
                                        //    });
                                        //} else {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
                                        }
                                        //}
                                }
                            }
                        }

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

@@ -188,10 +188,10 @@
                        <div id="page" style="position: relative; bottom: 0;"></div>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>新增</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ShowBill" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-transfer"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-form"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-form"></i>删除</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
@@ -484,16 +484,16 @@
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
                                        break;
                                    default:
                                        if (data[i].name === '条码编号') {
                                            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.条码编号 + '</span>'
                                                }, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
                                            });
                                        } else {
                                        //if (data[i].name === '条码编号') {
                                        //    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.条码编号 + '</span>'
                                        //        }, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
                                        //    });
                                        //} else {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
                                        }
                                        //}
                                }
                            }
                        }

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

@@ -337,24 +337,34 @@
                // æ¸²æŸ“图标下拉框
                setDropdownContent([
                    {
                        imgUrl: "https://img.icons8.com/?size=100&id=NoLd9XxtUety&format=png&color=000000",
                        imgName: "图片1"
                        imgUrl: "../../../img/AI芯片.png",
                        imgName: "AI芯片.png",
                        imgValue: "/img/AI芯片.png"
                    }, {
                        imgUrl: "https://img.icons8.com/?size=100&id=34LwnMbJnkXt&format=png&color=000000",
                        imgName: "图片2"
                        imgUrl: "../../../img/ic芯片.png",
                        imgName: "ic芯片.png",
                        imgValue: "/img/ic芯片.png"
                    }, {
                        imgUrl: "https://img.icons8.com/?size=100&id=2wWIUxJLzUPN&format=png&color=000000",
                        imgName: "图片3"
                        imgUrl: "../../../img/电脑主板.png",
                        imgName: "电脑主板.png",
                        imgValue: "/img/电脑主板.png"
                    }, {
                        imgUrl: "https://img.icons8.com/?size=100&id=113560&format=png&color=000000",
                        imgName: "图片4"
                        imgUrl: "../../../img/电子技术.png",
                        imgName: "电子技术.png",
                        imgValue: "/img/电子技术.png"
                    }, {
                        imgUrl: "https://img.icons8.com/?size=100&id=119961&format=png&color=000000",
                        imgName: "图片5"
                        imgUrl: "../../../img/芯片.png",
                        imgName: "芯片.png",
                        imgValue: "/img/芯片.png"
                    }, {
                        imgUrl: "https://img.icons8.com/?size=100&id=uorqa1hwCGPC&format=png&color=000000",
                        imgName: "图片6"
                    },
                        imgUrl: "../../../img/智能芯片＊.png",
                        imgName: "智能芯片＊.png",
                        imgValue: "/img/智能芯片＊.png"
                    }, {
                        imgUrl: "../../../img/智能芯片.png",
                        imgName: "智能芯片.png",
                        imgValue: "/img/智能芯片.png"
                    }
                ]
                    , type = "icon"
                    , function () {
@@ -425,7 +435,7 @@
                    , { templet: '#xuhao', field: "序号", title: '序号', sort: true, fixed: 'left', event: "qwe", width: 100 }
                    , { field: 'HInterID', title: '主表ID', hide: true, width: 100 }
                    , { field: 'HEntryID', title: '子表ID', hide: true, width: 100 }
                    , { field: 'HLayOutName', title: 'PNL布局名称', width: 100, edit: 'text', event: 'onHLayoutNameKeyDownHandler'}
                    , { field: 'HLayOutName', title: 'PNL布局名称', width: 100, event: 'onHLayoutNameKeyDownHandler'}
                    , { field: 'HSetNo', title: 'set号', width: 100, edit: 'text' }
                    , { field: 'HPCSNo', title: 'PCS号', width: 100, edit: 'text' }
                    , { field: 'HPosition_x', title: 'PCS行索引', width: 100, totalRow: true, edit: 'text' }