pda 界面 需要把样品销售出库单和缓存(新增进去左上角把样品加上)网页端 价目表 价目表新添加的价目显示在最后一页,查阅不方便,需要改一下排序网页端 价目表 价目表页面没有”按钮设置“选项。没有导出功能,需要添加。PDA 其他出库 其他出库单里“退出“按键报错,网页端 用户列表 编辑完信息点保存后,页面会崩掉网页端 价目表 价目表编辑里的仓库改为必填项,不填写不让保存。
5个文件已修改
99 ■■■■ 已修改文件
WebTM/layuiadmin/Scripts/webConfig.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/home/console_Mobile.html 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/基础资料/Gy_MatePrice.html 54 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/系统管理/用户管理/Xt_UserList.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/其他出库/Kf_OtherOutBillList.html 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,11 +6,12 @@
    /*var WEBURL = "http://localhost/API/";             //颜晓军本地配置*/
    //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/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
   /* var WEBURL = "http://localhost:8082/LuBaoAPI/";  //余思杰本地配置*/
    var WEBURL = "http://localhost:8082/LuBaoAPI/";  //李林俊本地配置*/
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦
    //var WEBURL = "http://10.1.4.155/API/";            //江丰客户NEW
WebTM/views/home/console_Mobile.html
@@ -219,6 +219,18 @@
                                                <cite style="white-space:pre-wrap">车间定位库存查询</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a href="../WMS扫码模块/销售出库/Kf_SellOutBill_YP_QiaoYi_PDA.html" target="main_self_frame">
                                                <i class="layui-icon layui-icon-find-fill"></i>
                                                <cite style="white-space:pre-wrap">样品销售出库单</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a href="../WMS扫码模块/生产调拨/Kf_MoveStockBill_PDA.html" target="main_self_frame">
                                                <i class="layui-icon layui-icon-template-1"></i>
                                                <cite style="white-space:pre-wrap">调拨</cite>
                                            </a>
                                        </li>
                                    </ul>
                                </div>
                            </div>
@@ -438,6 +450,12 @@
                                                <cite style="white-space:pre-wrap">车间下架单缓存</cite>
                                            </a>
                                        </li>
                                        <li class="layui-col-xs3">
                                            <a href="../WMS扫码模块/销售出库/Kf_SellOutBillList_YP_QiaoYi_PDA.html" target="main_self_frame">
                                                <i class="layui-icon layui-icon-down"></i>
                                                <cite style="white-space:pre-wrap">样品出库单缓存</cite>
                                            </a>
                                        </li>
                                    </ul>
                                </div>
                            </div>
WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_MatePrice.html
@@ -9,6 +9,15 @@
    <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/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/PageTitle.js"></script>
    <script src="../../../layuiadmin/SetColumn.js"></script>
    <script src="../../../layuiadmin/QueryScheme.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script src="../../../layuiadmin/HideButton.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -134,7 +143,9 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="Stop"><i class="layui-icon layui-icon-radio"></i>禁用</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="DeStop"><i class="layui-icon layui-icon-radio"></i>反禁用</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-iconlayuiiconrefresh-3"></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" lay-event="set_HideColumn"><i class="layui-icon layuiiconform"></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>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>保存方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Close"><i class="layui-icon layui-icon-logout"></i>退出</button>
@@ -146,13 +157,7 @@
            </div>
        </div>
    </div>
    <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/SetColumn.js"></script>
    <script src="../../../layuiadmin/QueryScheme.js"></script>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
@@ -171,7 +176,9 @@
            var sWhere = "";
            var option = [];
            var Organization = sessionStorage["Organization"];
            var HBillType = "Gy_MaterPrice";
            var HModName = "Gy_MaterPrice";
            var set_HideButton_ID = "toolbarDemo_ButtonSet";//需要设置的按钮的父级节点的id
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["HItemID", "HUSEORGID", "HCREATEORGID", "父级ID", "HMaterID", "HUnitID", "HRelationID"];
@@ -226,6 +233,13 @@
                    case 'set_HideColumn':
                        get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
                        break;
                    //按钮设置
                    case 'set_HideButton':
                        var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                        var HBillType = "7505";
                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                        break;
                        break;
                    //保存方案
                    case 'set_SaveScheme': set_SaveScheme(get_FastQuery);
                        break;
@@ -234,6 +248,9 @@
                        break;
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
                    //导出按钮
                    case 'btn_Export': btn_Export();
                        break;
                    //退出按钮
                    case 'btn-Close':
@@ -379,8 +396,11 @@
                            //刷新表格数据
                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
                            ins = table.render(option);
                            ///刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            var HBillType = "7505";
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                            layer.close(ajaxLoad);
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                                get_DefaultModule();//加载方案
@@ -477,9 +497,6 @@
                if (HNumber) {
                    sWhere += " and ç‰©æ–™ç¼–码 like '%" + HNumber + "%'";
                }
                //if (HName) {
                //    sWhere += " and åç§° like '%" + HName + "%'";
                //}
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -873,7 +890,22 @@
                }
            }
            //#region å¯¼å‡ºExecel
            function btn_Export() {
                option.data.forEach((item) => {
                    for (let itemobj in item) {
                        if (item[itemobj] == null) {
                            item[itemobj] = "";
                        }
                        if (item[itemobj].length > 0) {  // å‡è®¾å­—段名为field
                            item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                        }
                    }
                });
                table.exportFile(ins.config.id, option.data, "xls");
            }
            //#endregion
            //读取方案
            function set_ReadScheme() {
                var HIsClose_Manual = false;
WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserList.html
@@ -427,7 +427,8 @@
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                            layer.closeAll("loading");
                            //location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
WebTM/views/ÁìÁÏ·¢»õ/ÆäËû³ö¿â/Kf_OtherOutBillList.html
@@ -202,7 +202,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-exit" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="ExitButton" lay-event="get_Exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="get_Refresh" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Add" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-Edit" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
@@ -358,6 +358,9 @@
                        break;
                    //删除按钮
                    case 'btn-Delete': set_DeleteBill();
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;
                    //明细
                    case 'btn-WmsSub':
@@ -1228,8 +1231,18 @@
            }
            //#endregion
            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘
            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘、
            //退出
            function Pub_Close(closeType) {
                if (closeType == 1) {
                    //关闭弹窗
                    var index = parent.layer.getFrameIndex(window.name);
                    parent.layer.close(index);
                } else if (closeType == 2) {
                    //关闭页签
                    parent.layui.admin.events.closeThisTabs();
                }
            }
            //获取当前用户的默认过滤方案
            function get_DefaultModule() {
                $.ajax({