智云MES-UI前端
parent: 1fd5ba3a | 补丁 | 提交 | ignore whitespace
cwjbxqmz
2023-09-27 6e4102750cb08b9c1910bddf2a60f99197fe37d2 
计量单位列表：增加 审核，反审核，禁用，反禁用，按钮设置 等按钮；并修改视图，将 审核人，审核日期，禁用人，禁用日期 4列 显示出来；
5个文件已修改
3703 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user 3582 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Unit.html 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_Unit.html 107 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebTM/Properties/PublishProfiles/LAYUI.pubxml.user


Diff too large




 WebTM/WebTM.csproj.user


@@ -1,7 +1,7 @@


<?xml version="1.0" encoding="utf-8"?>


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


  <PropertyGroup>


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


    <NameOfLastUsedPublishProfile>D:\乔一计量单位列表\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>


    <ProjectView>ProjectFiles</ProjectView>


    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>


    <UseIISExpress>true</UseIISExpress>




 WebTM/layuiadmin/Scripts/webConfig.js


@@ -7,7 +7,8 @@


    //var WEBURL = "http://localhost/WEBAPI/";   //颜家台式机本地配置


    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置


    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置


    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置


  /*  var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置*/


     var WEBURL = "http://localhost:81/API/";  //陈雯静本地配置


    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置


    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)


    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW


@@ -17,7 +18,7 @@


    //var WEBURL = "http://220.189.218.154:8092/API/";   //丸井四维尔服务器


    //var WEBURL = "http://192.168.0.214/API/";   //瑞与祺服务器


    //var WEBURL = "http://192.168.10.66/API/";   //森楷服务器


    //var WEBURL = "http://localhost/API/";


    //var WEBURL = "http://localhost/API/"; 


    //var WEBURL = "http://192.168.80.90:9090/API/";    //安瑞服务器


    //var WEBURL = "http://192.168.16.53:8081/API/";    //龙山汽配


    //var WEBURL = "http://122.227.158.218:8090/API/";    //龙山汽配外网




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


@@ -22,14 +22,15 @@


                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>


                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>




            




                            </div>




                        </div>




                        <div class="layui-card-body">


                            <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">


                                <!--<ul class="layui-tab-title">


                                <li class="layui-this">基本信息</li>-->


            <li class="layui-this">基本信息</li>-->


                                <!--<li>其他信息</li>-->


                                <!--</ul>-->


                                <h1 style="text-align:center;"><b>计量单位</b></h1>


@@ -396,7 +397,7 @@


                        type: "POST",


                        url: GetWEBURL() + "/SaveGy_UnitList", //方法所在页面和方法名


                        async: true,


                        data: { "msg": sMainStr},


                        data: { "msg": sMainStr },


                        dataType: "json",


                        success: function (data) {


                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ




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


@@ -9,7 +9,7 @@


    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">


    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">


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




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


</head>


<body>


    <div class="layui-fluid">


@@ -86,7 +86,13 @@


                                <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="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>删除</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>审核</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>反审核</button>




                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>禁用</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></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="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>


                            </div>


                        </script>


                    </form>


@@ -229,7 +235,10 @@


                                , cellMinWidth: 90


                            }


                            table.render(option);




                            //刷新按钮显示


                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象


                            var HBillType = "Gy_Unit";


                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);


                            //刷新表格数据


                            DisPlay_HideColumn();




@@ -319,9 +328,31 @@


                            layer.msg('请选择一行数据删除！');


                        }


                        break;


                    //审核按钮


                    case 'btn-Audit':


                        set_CheckBill(0);


                        break;


                    //反审核按钮


                    case 'btn-DeAudit':


                        set_CheckBill(1);


                        break;


                    //禁用按钮


                    case 'btn-Stop':


                        set_De_Stop(0);


                        break;


                    //反禁用按钮


                    case 'btn-DeStop':


                        set_De_Stop(1);


                        break;


                    //列设置


                    case 'set_HideColumn':


                        get_HideColumn();


                        break;


                    //按钮设置


                    case 'set_HideButton':


                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象


                        var HBillType = "Gy_Unit";


                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);


                        break;


                };


            });


@@ -547,6 +578,78 @@


            }


            //#endregion




            //#region åå®¡æ ¸/审核数据


            function set_CheckBill(num) {


                var checkStatus = table.checkStatus('mainTable')


                    , data = checkStatus.data;


                if (checkStatus.data.length === 1) {


                    var InterID = data[0].HItemID.toString();


                    //逻辑审核方法


                    $.ajax({


                        type: "GET",


                        url: GetWEBURL() + "/Gy_Unit/AuditGy_Unit", //方法所在页面和方法名


                        data: { "HInterID": InterID, "Type": num, "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);


                                    //修改为功后刷新界面


                                    $("#btnSearch").trigger('click');


                                });




                            } else {


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


                            }


                        }, error: function () {


                            layer.alert("接口请求失败!", { icon: 5 });


                        }


                    });


                }


                else {


                    layer.msg('请选择一行数据审核！');


                }


            }


            //#endregion




            //#region åç¦ç”¨/禁用数据


            function set_De_Stop(num) {


                var checkStatus = table.checkStatus('mainTable')


                    , data = checkStatus.data;


                if (checkStatus.data.length === 1) {


                    var InterID = data[0].HItemID.toString();


                    //逻辑审核方法


                    $.ajax({


                        type: "GET",


                        url: GetWEBURL() + "/Gy_Unit/StopGy_Unit", //方法所在页面和方法名


                        data: { "HInterID": InterID, "IsStop": num, "CurUserName": sessionStorage["HUserName"] },


                        success: function (result) {


                            if (result.count == 1) {


                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {


                                    // å¾—到frame索引


                                    var index = layer.getFrameIndex(window.name);


                                    //关闭当前frame


                                    layer.close(index);


                                    //修改为功后刷新界面


                                    $("#btnSearch").trigger('click');


                                });




                            } else {


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


                            }


                        }, error: function () {


                            layer.alert("接口请求失败!", { icon: 5 });


                        }


                    });


                }


                else {


                    layer.msg('请选择一行数据审核！');


                }


            }


            //#endregion




            //#region åˆ—明显示下拉框


            function ColFilter() {


                var Organization = '<option  value="0" selected="selected" ></option>';