龙山汽配专用调整MES-UI前端界面
yusijie
2023-06-16 5c6ebab24efa070940066aebb7450b1dc701d5f5
流转卡编辑模块添加一键打印功能,列设置按钮统一命名
13个文件已修改
193 ■■■■ 已修改文件
WebTM/views/PublicPage/PowerInformation.html 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/home/console.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Xt_UserList.html 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转/MES_StationOutBill_PDA.html 66 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Sc_EmployeePiecePayReport.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Sc_EmployeePiecePaySumReport.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Sc_EmployeePieceWorkReport.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Sc_RoutingBillMulLevBOMReport.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Sc_WorkShopProcessWIPReport.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/报表分析/Sc_WorkShopProcessWIPSumReport.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/PublicPage/PowerInformation.html
@@ -205,7 +205,7 @@
            //刷新按钮
            form.on('submit(get_Refresh)', function () {//提交
                layer.confirm('继续对当前所选用户进行更改权限?', { icon: 3, title: '提示' }, function (index) {
                    location.replace('PowerInformation.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=');
                    location.replace('PowerInformation.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=yh');
                });
            })
@@ -265,8 +265,9 @@
                    layer.alert("左侧点击树型数据已失效!", { icon: 5 });
                    return false;
                }
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = TagId + ';' + sSubStr + ';' + linterid;
                var sMainSub = TagId + ';' + sSubStr + ';' + linterid + ";" + HSouceBillType;
                //console.log(sMainSub);
                //return false;
                $.ajax(
@@ -297,12 +298,13 @@
            });
            //加载数据表格
            function get_Display(sGnbm) {
                $.ajax({
                    url: GetWEBURL() + '/PublicPageMethod/PowerList',
                    type: "GET",
                    data: { "czybm": linterid, "sGnbm": sGnbm },
                    data: { "czybm": linterid, "sGnbm": sGnbm, "HSouceBillType": HSouceBillType },
                    success: function (data1) {
                        if (data1.count == 1) {
                            option.data = data1.data;
@@ -319,6 +321,7 @@
            //以上是layui模块
        });
        //查询树状数据
        function getData() {
            var treeData;
WebTM/views/home/console.html
@@ -66,6 +66,12 @@
                                                    <cite>条码拆码</cite>
                                                </a>
                                            </li>
                                            <li class="layui-col-xs3">
                                                <a lay-href="车间管理/工序流转卡/Sc_ProcessExchangeIssueBillList.html">
                                                    <i class="layui-icon layui-icon-addition"></i>
                                                    <cite>工序批量汇报</cite>
                                                </a>
                                            </li>
                                        </ul>
                                        <ul class="layui-row layui-col-space10">
                                            <li class="layui-col-xs3">
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserList.html
@@ -349,7 +349,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: '../../PublicPage/PowerInformation.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
                        , content: '../../PublicPage/PowerInformation.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=yh'
                        , resize: false,
                        end: function () {
                            //刷新页面,
@@ -465,7 +465,9 @@
                            dataCol = data1.data[0].HGridString.split(',');
                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                var dataCols = dataCol[i].split('|');
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationOutBill_PDA.html
@@ -1360,41 +1360,41 @@
                            var HMaterID = $("#HMaterID").val();
                            var HWorkProcID = $("#HProcID").val();
                            var HProcExchBillNo = $("#HProcExchBillNo").val();
                            $.ajax({
                                url: GetWEBURL() + '/Cj_StationOutBill_Detail/get_Display2',
                                type: "GET",
                                data: { "HMaterID": HMaterID, "HWorkProcID": HWorkProcID, "HProcExchBillNo": HProcExchBillNo },
                                success: function (data1) {
                                    if (data1.data.length > 1) {
                                        $('#Detail').removeClass("layui-btn-disabled").attr("disabled", false);//明细按钮启用
                            //$.ajax({
                            //    url: GetWEBURL() + '/Cj_StationOutBill_Detail/get_Display2',
                            //    type: "GET",
                            //    data: { "HMaterID": HMaterID, "HWorkProcID": HWorkProcID, "HProcExchBillNo": HProcExchBillNo },
                            //    success: function (data1) {
                            //        if (data1.data.length > 1) {
                            //            $('#Detail').removeClass("layui-btn-disabled").attr("disabled", false);//明细按钮启用
                                        var HBillNo = $("#HBillNo").val();
                                        var HProcExchBillNo = $("#HProcExchBillNo").val();
                                        var HProcNo = $("#HProcNo").val();
                                        var HPlanQty = $("#HPlanQty").val();
                                        var HProcID = $("#HProcID").val();
                                        var HMaterID = $("#HMaterID").val();
                                        var HProcExchHinteID = $("#HProcExchHinteID").val();
                                        var HInterID = $("#HInterID").val();
                            //            var HBillNo = $("#HBillNo").val();
                            //            var HProcExchBillNo = $("#HProcExchBillNo").val();
                            //            var HProcNo = $("#HProcNo").val();
                            //            var HPlanQty = $("#HPlanQty").val();
                            //            var HProcID = $("#HProcID").val();
                            //            var HMaterID = $("#HMaterID").val();
                            //            var HProcExchHinteID = $("#HProcExchHinteID").val();
                            //            var HInterID = $("#HInterID").val();
                                        layer.open({
                                            type: 2
                                            , area: ['100%', '100%']
                                            , title: '出站明细'
                                            , shade: 0.6 //遮罩透明度
                                            , maxmin: true //允许全屏最小化
                                            , anim: 0 //0-6的动画形式,-1不开启
                                            , content: './MES_StationOutBill_PDA_Detail.html?HBillNo=' + HBillNo + '&HProcExchBillNo=' + HProcExchBillNo + '&HProcNo=' + HProcNo + '&HPlanQty=' + HPlanQty + '&HProcID=' + HProcID + '&HMaterID=' + HMaterID + '&HProcExchHinteID=' + HProcExchHinteID + '&OperationType=1' + '&HInterID=' + HInterID
                                            , resize: false
                                            , cancel: function () {
                                                //$(".layui-btn").removeClass("layui-btn-disabled");
                                            }
                                        })
                                    }
                                }, error: function () {
                                    layer.alert("接口请求失败!", { icon: 5 });
                                }
                            });
                            //            layer.open({
                            //                type: 2
                            //                , area: ['100%', '100%']
                            //                , title: '出站明细'
                            //                , shade: 0.6 //遮罩透明度
                            //                , maxmin: true //允许全屏最小化
                            //                , anim: 0 //0-6的动画形式,-1不开启
                            //                , content: './MES_StationOutBill_PDA_Detail.html?HBillNo=' + HBillNo + '&HProcExchBillNo=' + HProcExchBillNo + '&HProcNo=' + HProcNo + '&HPlanQty=' + HPlanQty + '&HProcID=' + HProcID + '&HMaterID=' + HMaterID + '&HProcExchHinteID=' + HProcExchHinteID + '&OperationType=1' + '&HInterID=' + HInterID
                            //                , resize: false
                            //                , cancel: function () {
                            //                    //$(".layui-btn").removeClass("layui-btn-disabled");
                            //                }
                            //            })
                            //        }
                            //    }, error: function () {
                            //        layer.alert("接口请求失败!", { icon: 5 });
                            //    }
                            //});
                            //if (data.Verify == "Y") {
                            //    location.replace('MES_StationOutBill_PDA.html?OperationType=1&linterid=0&HSouceBillType=&HBillNo=&closeType=2');
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html
@@ -57,7 +57,8 @@
                            <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">保存</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">退出</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn_print">打印</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">隐藏列设置</button>
                            <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Print_Convenient">一键打印</button>
                            <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">列设置</button>
                        </div>
                    </div>
                    <div class="layui-tab" lay-filter="tab-POStockInBill">
@@ -1149,7 +1150,7 @@
                                shift: 2,
                                area: ['90%', '90%'],
                                maxmin: true,
                                content: ['../../../../views/基础资料/采购基础资料/Gy_Supplier.html', 'yes'],
                                content: ['../../../views/基础资料/采购基础资料/Gy_Supplier.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {
                                    //按钮【按钮一】的回调
@@ -1377,6 +1378,77 @@
                    }
                });
               
            });
            //一键打印
            form.on('submit(set_Print_Convenient)', function () {
                var sWhere = " and HPRDORGID=" + sessionStorage["OrganizationID"] + " and å•据号='" + $("#HBillNo").val() + "' ";
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuery_Json',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var hinterid = "";
                            if (data1.data.length != 0) {
                                hinterid = data1.data[0]["hmainid"];
                            }
                            layer.close(ajaxLoad);
                            if (hinterid != "") {
                                $.ajax({
                                    url: GetWEBURL() + '/Sc_ProcessExchangeBillList/QJQD',
                                    type: "GET",
                                    data: { "HProcExchHinteID": hinterid },
                                    success: function (res) {
                                        if (res.count == 1) {
                                            if (res.data.length != 0) {
                                                hinterid += ",1";
                                            } else {
                                                hinterid += ",0";
                                            }
                                            $.ajax({
                                                type: "get",
                                                url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
                                                async: true,
                                                data: { "HNumber": 'HProcessExchange' },
                                                //data: { "Value": Value },
                                                success: function (result) {
                                                    if (result.count == 1) {
                                                        var OpenTmp = result.data[0].模板名称
                                                        window.open("../../基础资料/公用基础资料/HBarPlanPrint.html?linterid=" + hinterid + "&Type=" + 'HProcessExchange' + "&OpenTmp=" + OpenTmp.toString());
                                                    } else {
                                                        layer.msg(result.Message);
                                                    }
                                                },
                                                error: function (result) {
                                                    console.log(result);
                                                    //layer.msg('获取采购订单出现异常', { icon: 2, time: 2000 });
                                                }
                                            });
                                        } else {
                                            layer.close(ajaxLoad);
                                        }
                                    }, error: function () {
                                        layer.close(ajaxLoad);
                                        layer.alert("接口请求失败!", { icon: 5 });
                                    }
                                })
                            } else {
                                layer.msg("请先保存,在进行打印!");
                            }
                        } else {
                            layer.close(ajaxLoad);
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            });
            //选择子件弹窗PartInformation.html
@@ -1724,13 +1796,13 @@
                        layer.msg("第" + indexRow + "行,工作中心不能为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                    if (sSubTable[i].HSupFlag == "true") {
                        if (!sSubTable[i].HSupID) {
                            var indexRow = i + 1;
                            layer.msg("第" + indexRow + "行,供应商不能为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return;
                        }
                    }
                    //if (sSubTable[i].HSupFlag == "true") {
                    //    if (!sSubTable[i].HSupID) {
                    //        var indexRow = i + 1;
                    //        layer.msg("第" + indexRow + "行,供应商不能为空!", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    //        return;
                    //    }
                    //}
                }
                data.field.HPRDORGID = sessionStorage["OrganizationID"];//组织
                //var HBLFlag = data.field.HBLFlag;
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeIssueBillList.html
@@ -110,7 +110,7 @@
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchReport"><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-file-b"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                   <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print_Convenient"><i class="layui-icon layui-icon-print"></i>一键打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Print_Convenient"><i class="layui-icon layui-icon-print"></i>一键打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_StationOut"><i class="layui-icon layui-icon-form"></i>工序出站汇报单</button>-->
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_EmployeePiecePayReport.html
@@ -118,7 +118,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                    </form>
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_EmployeePiecePaySumReport.html
@@ -118,7 +118,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                    </form>
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_EmployeePieceWorkReport.html
@@ -118,7 +118,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                    </form>
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_RoutingBillMulLevBOMReport.html
@@ -62,7 +62,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                    </form>
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_WorkShopProcessWIPReport.html
@@ -118,7 +118,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                    </form>
WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/Sc_WorkShopProcessWIPSumReport.html
@@ -118,7 +118,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                    </form>
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBillList.html
@@ -117,7 +117,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><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-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>隐藏列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                            </div>
                        </script>
                    </form>