智云MES-UI前端
parent: 58721e39 | 补丁 | 提交 | ignore whitespace
duhe
2025-08-26 17ad9a2a3e6e1a5d053f626d3740d1e20fd4d3a2 
华远：PNL布局信息导入
4个文件已修改
1个文件已添加
5313 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user 5065 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_PNLInfoEdit_Import.html 226 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_PNLInfoList.html 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebTM/Properties/PublishProfiles/LAYUI.pubxml.user


Diff too large




 WebTM/WebTM.csproj


@@ -473,6 +473,7 @@


    <Content Include="views\基础资料\公用基础资料\Gy_BarCodeReport.html" />


    <Content Include="views\基础资料\公用基础资料\Gy_PNLInfoEdit.html" />


    <Content Include="views\基础资料\公用基础资料\Gy_BarCodeBill_PNL_TempEdit.html" />


    <Content Include="views\基础资料\公用基础资料\Gy_PNLInfoEdit_Import.html" />


    <Content Include="views\基础资料\公用基础资料\Gy_PNLInfoList.html" />


    <Content Include="views\基础资料\公用基础资料\Gy_BarCodeBill_PNL_TempList.html" />


    <Content Include="views\基础资料\公用基础资料\Gy_BarCodeBill_Set_TempEdit.html" />




 WebTM/WebTM.csproj.user


@@ -2,7 +2,7 @@


<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">


  <PropertyGroup>


    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>


    <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>


    <NameOfLastUsedPublishProfile>D:\网站发布\后端代码\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>


    <ProjectView>ProjectFiles</ProjectView>


    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>


    <UseIISExpress>true</UseIISExpress>




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


New file


@@ -0,0 +1,226 @@


<!DOCTYPE html>


<html>


<head>


    <meta charset="utf-8" />


    <title>PNL布局信息导入</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>


    <script src="../../../layuiadmin/layui/layui.js"></script>


    <script src="../../../layuiadmin/Scripts/json2.js"></script>


    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>


    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>


    <script src="../../../layuiadmin/PubCustom.js"></script>


</head>


<body>


    <div class="layui-fluid" style="padding: 0;">


        <div class="layui-card" style="padding: 2px;background-color: #efefef;">


            <div class="layui-card-body" style="padding: 1px;">


                <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">


                    <div style="padding: 10px; ">


                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnSave" id="btnSave">导入数据</button>


                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">退出</button>


                        <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="UpLoad" id="UpLoad">文件上传</button>


                    </div>


                    <div class="layui-tab" lay-filter="tab-POStockInBill">


                        <div class="layui-tab-content">


                            <!--基本信息-->


                            <div class="layui-tab-item layui-show">


                                <div class="layui-form-item" style="padding-top: 10px;">




                                </div>


                            </div>


                        </div>


                    </div>




                    <table class="" id="mainTable" lay-filter="mainTable"></table>


                    <script type="text/html" id="toolbarDemo">


                        <div class="layui-btn-container">


                        </div>


                    </script>


                </form>


            </div>


        </div>


    </div>


</body>


</html>


<script type="text/html" id="barDemo">


    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>


</script>


<script>




    layui.config({


        base: '../../../layuiadmin/' //静态资源所在路径


    }).extend({


        index: 'lib/index' //主入口模块


    }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util', 'upload'], function () {


        //#region å…¬ç”¨å˜é‡


        var $ = layui.$


            , admin = layui.admin


            , layer = layui.layer


            , table = layui.table


            , form = layui.form


            , element = layui.element


            , laypage = layui.laypage


            , laydate = layui.laydate


            , util = layui.util


            , tree = layui.tree


            , util = layui.util


            , upload = layui.upload






        var option = [];


        //#endregion




        //#region è¿›å…¥é¡µé¢å³åŠ è½½


        //初始化界面


        set_ClearBill();


        //#endregion




        //#region è§¦å‘事件


        //#region æ–‡ä»¶ä¸Šä¼ 


        upload.render({


            elem: '#UpLoad',


            url: GetWEBURL() + '/Gy_PNLInfo/Gy_PNLInfo_Excel',


            contentType: 'application/json',


            exts: 'xls|xlsx', //允许上传的类型


            done: function (data1) {


                if (data1.count == 1) {


                    option.data = data1.data;


                    table.render(option);


                } else {


                    layer.alert(data1.code + data1.Message, { icon: 5 });


                }


            },


            error: function (err) {


                debugger


                layer.alert('导入出现异常', { icon: 2 });


            }


        });


        //#endregion




        //#region å¯¼å…¥ æŒ‰é’®ç›‘听


        form.on('submit(btnSave)', function (data) {


            if (table.cache["mainTable"] != null) {


                set_AddNew(data);


            }


            else {


                layer.msg("无数据,请先导入数据!");


            }


        })




        //#region å¯¼å…¥(保存)


        function set_AddNew(data) {


            var num = [];


            for (var i = 0; i < option.data.length; i++) {


                if (option.data[i] != "") {


                    num.push(option.data[i])


                }


            }




            //data.field.HOrgID = sessionStorage["OrganizationID"];//组织


            //var sMainStr = JSON.stringify(data.field);


            var sSubStr = JSON.stringify(num);


            var sMainSub = sSubStr + '&和' + sessionStorage["HUserName"];


            var index = layer.load();




            $.ajax({


                type: "POST",


                url: GetWEBURL() + "/Gy_PNLInfo/Gy_PNLInfo_btnSave",


                async: true,


                data: { "sMainSub": sMainSub },


                dataType: "json",


                success: function (data) {


                    if (data.count == 1) {


                        layer.close(index);


                        layer.msg(data.Message);


                        option.data = null;


                        table.cache["mainTable"] = null;


                        table.render(option);


                    }


                    else {


                        layer.close(index);


                        layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });


                    }


                },


                error: function (err) {


                    layer.close(index);


                    layer.msg("错误:" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });


                }


            });


        }


        //#endregion


        //#endregion




        //#region é€€å‡º


        form.on('submit(Cancel)', function () {


            Pub_Close(1);


        })


        //#endregion




        //#region è¡Œå†…事件


        table.on('tool(mainTable)', function (obj) {


            set_GridDelete(obj);   //行内删除


        });


        //#endregion


        //#endregion




        //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法


        //#region åˆå§‹åŒ–界面


        function set_ClearBill() {


            //初始化表格


            set_InitGrid();


        }


        //#endregion




        //#region åˆå§‹åŒ–表格


        function set_InitGrid() {


            option = {


                elem: '#mainTable'


                , toolbar: '#toolbarDemo'


                , height: 'full-120'


                , page: true


                , cellMinWidth: 90


                , limit: 50


                , limits: [50, 500, 5000, 20000]


                , loading: false


                , cols: [[


                    { type: 'checkbox', fixed: 'left' }


                    , { field: '料号', title: '料号', width: 120 }


                    , { field: 'HPNLInfoTypeID', title: 'HPNLInfoTypeID', width: 120 }


                    , { field: '分类', title: '分类', width: 120 }


                    , { field: 'Set号', title: 'Set号' }


                    , { field: 'PCS号', title: 'PCS号' }


                    , { field: '行索引', title: '行索引' }


                    , { field: '列索引', title: '列索引' }


                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }


                ]]


            };




            //渲染页面


            table.render(option);


            //DisPlay_HideColumn();


        }


        //#endregion




        //#region è¡Œå†…删除


        function set_GridDelete(obj) {


            var data = obj.data;


            var rowIndex = $(obj.tr).attr("data-index");


            if (obj.event === 'del') {


                layer.confirm('真的删除行吗？', function (index) {


                    console.log("索引为:" + rowIndex);


                    var oldData = option.data;


                    oldData.splice(obj.tr.data('index'), 1)


                    option.data = oldData;//将数据绑定到data上


                    table.render(option);


                    layer.close(index);


                });


            }


        }


        //#endregion


        //#endregion




    });




</script>




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


@@ -191,6 +191,7 @@




                        <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_ImportExcel" lay-event="set_ImportExcel"><i class="layui-icon layui-icon-form"></i>Excel导入</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>-->


@@ -282,6 +283,10 @@


        //头工具栏事件


        table.on('toolbar(mainTable)', function (obj) {


            switch (obj.event) {


                //Excel导入


                case 'set_ImportExcel':


                    set_ImportExcel();


                    break;


                //新增


                case 'set_AddNew':


                    set_AddNew();


@@ -1147,6 +1152,20 @@


            }


        }




        //导入         


        function set_ImportExcel() {


            layer.open({


                type: 2


                , skin: "layui-layer-rim" //加上边框


                , title: "PNL布局信息导入"  //标题


                , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼


                , shift: 2 //弹出动画


                , area: ["100%", "100%"] //窗体大小


                , maxmin: true //设置最大最小按钮是否显示


                , content: ['./Gy_PNLInfoEdit_Import.html', "yes"]


            })


        }




        //读取方案


        function set_ReadScheme() {


            var HIsClose_Manual = false;