1

yangle

2024-11-29 75947c32124b9cd82c7b3b3f0ca3682d39c390e8

1

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -3,13 +3,13 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    /*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:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //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/¹¤×ʹÜÀí/Òì³£¹¤Ê±ÉêÇëµ¥/Pay_ErrWorkTimesRequestBillList.html

@@ -557,7 +557,127 @@

            //#region å¯¼å‡ºExecel
            function btn_Export() {
                table.exportFile(ins.config.id, option.data, "xls");
                var data;
                //设置sWhere
                var ajaxLoad = layer.load();
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HBillNo = $("#HBillNo").val();//单据号
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();
                var ColName2 = $("#ColName2").val();//复选框
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (ColName1 != 0 && Comparator1 != 0) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
                if (HBeginDate) {
                    sWhere += " and æ—¥æœŸ >= '" + HBeginDate + "'";
                }
                if (HEndDate) {
                    sWhere += " and æ—¥æœŸ <= '" + HEndDate + "'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/Pay_ErrWorkTimesRequestBillController/GetPay_ErrWorkTimesRequestBillList_Json',
                    async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    data: { "sWhere": sWhere, "HMaker": HMaker },
                    success: function (data1) {
                        if (data1.count == 1) {
                            data = data1.data
                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
                            layer.alert(data1.Message, { icon: 5 });
                        }
                    },
                    error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
                sWhere = "";
                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, data, "xls");
            }
            //#endregion


 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²»Á¼²É¼¯/Sc_QualityReportStepBill_New.html

@@ -1260,9 +1260,23 @@
                    $("#HUpDater").val(sessionStorage["HUserName"]);

                    $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));

                }

                //筛选删除之后不为空的数据组

                var row = [];

                for (var i = 0; i < table.cache['mainTable'].length; i++) {

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

                        if (table.cache["mainTable"][i].物料名称.indexOf("\"") != -1 || table.cache["mainTable"][i].物料名称.indexOf(";") != -1) {

                            table.cache["mainTable"][i].物料名称 = table.cache["mainTable"][i].物料名称.replaceAll("\"", "”").replaceAll(";", "；")

                        }

                        if (table.cache["mainTable"][i].规格型号.indexOf("\"") != -1 || table.cache["mainTable"][i].规格型号.indexOf(";") != -1) {

                            table.cache["mainTable"][i].规格型号 = table.cache["mainTable"][i].规格型号.replaceAll("\"", "”").replaceAll(";", "；")

                        }



                        row.push(table.cache['mainTable'][i])

                    }

                }

                //序列化表头信息和子表信息

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

                var sSubStr = JSON.stringify(option.data);

                var sSubStr = JSON.stringify(row);

                //拼接参数

                var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav + ";" + sessionStorage["HUserName"];




 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/JIT_DayPlanPlatFormImport.html

@@ -241,15 +241,32 @@
            for (var i = 0; i < table.cache["mainTable"].length; i++) {
                if (table.cache["mainTable"][i] != "") {
                    table.cache["mainTable"][i].LAY_TABLE_INDEX = i;

                    if (table.cache["mainTable"][i].物料名称.indexOf("\"") != -1 || table.cache["mainTable"][i].物料名称.indexOf(";") != -1) {
                        table.cache["mainTable"][i].物料名称 = table.cache["mainTable"][i].物料名称.replaceAll("\"", "”").replaceAll(";", "；")
                    }
                    if (table.cache["mainTable"][i].规格型号.indexOf("\"") != -1 || table.cache["mainTable"][i].规格型号.indexOf(";") != -1) {
                        table.cache["mainTable"][i].规格型号 = table.cache["mainTable"][i].规格型号.replaceAll("\"", "”").replaceAll(";", "；")
                    }

                    num.push(table.cache["mainTable"][i])
                }
            }

            for (var i = 0; i < option.data.length; i++) {
                if (option.data[i].物料名称.indexOf("\"") != -1 || option.data[i].物料名称.indexOf(";") != -1) {
                    option.data[i].物料名称 = option.data[i].物料名称.replaceAll("\"", "”").replaceAll(";", "；")
                }
                if (option.data[i].规格型号.indexOf("\"") != -1 || option.data[i].规格型号.indexOf(";") != -1) {
                    option.data[i].规格型号 = option.data[i].规格型号.replaceAll("\"", "”").replaceAll(";", "；")
                }
            }

            var HDataSub = [];

            //JIT导入计划，每次导入100行数据,可修改i的自增值决定每次循环导入的行数
            for (var i = 0; i < num.length; i += 100) {
                HDataSub = num.slice(i, i + 100)
            for (var i = 0; i < option.data.length; i += 100) {
                HDataSub = option.data.slice(i, i + 100)

                data.field.HPRDORGID = sessionStorage["OrganizationID"];//组织
                var sMainStr = JSON.stringify(data.field);

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html

@@ -1679,16 +1679,53 @@
            //#endregion

            //#region å¤šçº§ åå®¡æ ¸/审核数据
            //function set_CheckBill_Flow(num) {
            //    var checkStatus = table.checkStatus('mainTable')
            //        , data = checkStatus.data;
            //    if (checkStatus.data.length === 1) {
            //        var InterID = data[0].hmainid.toString();
            //        //逻辑审核方法
            //        $.ajax({
            //            type: "GET",
            //            url: GetWEBURL() + "/Gy_Routing/AuditFlow", //方法所在页面和方法名
            //            data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
            //            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_CheckBill_Flow(num) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                if (checkStatus.data.length != 0) {
                    var uniqueIds = [...new Set(data.map(obj => obj.hmainid))];//将对象数组id提取去重
                    var queryString = uniqueIds.join(",");//将ids变成数组
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Routing/AuditFlow", //方法所在页面和方法名
                        data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
                        url: GetWEBURL() + "/Gy_Routing/CheckAllFlow", //方法所在页面和方法名
                        data: { "HInterIDS": queryString, "IsAudit": num, "CurUserName": sessionStorage["HUserName"], "CurUserID": sessionStorage["Czybm"] },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -1698,6 +1735,7 @@
                                    layer.close(index);
                                    //修改为功后刷新界面
                                    $("#btnSearch").trigger('click');
                                    
                                });

                            } else {
@@ -1709,7 +1747,7 @@
                    });
                }
                else {
                    layer.msg('请选择一行数据审核！');
                    layer.msg('请选择至少一行数据审核！');
                }
            }
            //#endregion

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -2093,7 +2093,7 @@
                                //, page: true
                                , totalRow: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limit: size
                                //, limits: [50, 500, 5000, 20000]
                                , done: function (res, curr, count) {
                                    soulTable.render(this);

 WebTM/views/²É¹º¹ÜÀí/¸¶¿îµ¥/YF_PayMentBill.html

@@ -828,12 +828,13 @@
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗？', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                            layer.msg('首行无法删除！！！');
                        } else {
                            obj.del();
                            obj.del();//假删除
                            table.cache["mainTable"].splice(rowIndex, 1);  //②彻底移除元素，从缓存里移除这一行
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.reload(option);
                            table.render(option);
                            layer.close(index);
                        }
                    });

 WebTM/views/²É¹º¹ÜÀí/¸¶¿îµ¥/YF_PayMentBillQuery.html

@@ -197,7 +197,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>
                            </div>
                        </script>
                        <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
                        <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
                        <script type="text/html" id="toolbarDemoSub">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>行关闭</button>
@@ -434,7 +434,7 @@
                //初始化表格
                set_InitGrid();
                //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                /*get_FastQuery(table, option,1)*/
                get_FastQuery(table, option,1)

                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
@@ -461,7 +461,7 @@
                    elem: '#mainTableSub'
                    , toolbar: '#toolbarDemoSub'
                    , height: 'full-500'
                    , page: true
                    , page: false
                    , totalRow: true
                    , cellMinWidth: 90
                    , limit: 50
@@ -479,6 +479,7 @@
                $.ajax({
                    url: GetWEBURL() + '/YF_PayMentBill/QueryList',
                    type: "GET",
                    async:"false",
                    data: { "sWhere": sWhere  , "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
@@ -497,7 +498,7 @@
                                }
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'radio', fixed: 'left', totalRowText: '合计'});
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计'});
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
@@ -1431,13 +1432,25 @@

            //#region è¡Œç‚¹å‡»äº‹ä»¶
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
                //显示子表
                get_DisplaySub(obj.data);
                //判断是否已经被选中
                if (obj.tr.find('.layui-form-radioed').length == 0) {
                    //触发单选框选中事件
                    obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
                }
                


            })

 WebTM/views/²É¹º¹ÜÀí/Ó¦¸¶µ¥/Cg_PayableBill.html

@@ -2858,15 +2858,16 @@
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗？', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                            layer.msg('首行无法删除！！！');
                        } else if (haveSource == true) {
                            layer.msg('有源单无法删除！！！');
                        }
                        else {
                            obj.del();
                            obj.del();//假删除
                            table.cache["mainTable"].splice(rowIndex, 1);  //②彻底移除元素，从缓存里移除这一行
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.reload(option);
                            table.render(option);
                            layer.close(index);
                        }
                    });

 WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBillList.html

@@ -2515,7 +2515,7 @@

                            table.cache["mainTable"].splice(rowIndex, 1); //从缓存里删除行数据
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.reload(option);
                            table.render(option);
                            layer.close(index);
                        }
                    });

 WebTM/views/²É¹º¹ÜÀí/ÍËÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBackBillList.html

@@ -1740,7 +1740,7 @@
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗？', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                            layer.msg('首行无法删除！！！');
                        } else {
                            obj.del();

 WebTM/views/²É¹º¹ÜÀí/²É¹º±¨±í/Cg_POOrderInStockSumReport.html

@@ -228,10 +228,7 @@
                //初始化表格
                set_InitGrid();
                //加载数据到网格
                //get_FastQuery();
                //DisPlay_HideColumn();
                table.render(option)
                //ColFilter();
                get_FastQuery();
            }

            //初始化表格
@@ -264,18 +261,20 @@
            function get_Display(sWhere) {
                var wait = layer.load();//遮罩
                $.ajax({
                    url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/OrderProcFlowAllReportICMOList',
                    url: GetWEBURL() + '/Cg_PoOrderInStockSumReport/Cg_PoOrderInStockSumReportList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
                            var totalArray = ["异常评审次数", "计划数量", "接受工序数量1", "汇报工序数量1", "汇报不合格工序数量1", "接收工序数量2", "汇报工序数量2", "汇报不合格工序数量2", "接收工序数量3", "汇报工序数量3", "汇报不合格工序数量3", "接收工序数量4","汇报工序数量4","汇报不合格工序数量4","接收工序数量5","汇报工序数量5","汇报不合格工序数量5","接收工序数量6","汇报工序数量6","汇报不合格工序数量6","接收工序数量7","汇报工序数量7","汇报不合格工序数量7"];
                            var totalArray = [];
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加序号列
                            col.push({ type: 'numbers', fixed: 'left', field: '序号', title:'序号' });
                            //判断是否是纯英文
                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
                            for (var i = 0; i < data.length; i++) {
@@ -313,89 +312,12 @@

            //快速过滤
            function get_FastQuery() {
                var txtHOrderProcNo = $("#txtHOrderProcNo").val();//订单跟踪号
                var txtHMaterNumber = $("#txtHMaterNumber").val(); //物料
                var txtHDeptName = $("#txtHDeptName").val(); //物料
                var chkHShowUnFinish = $("input[name='chkHShowUnFinish']").prop("checked");//复选框
                var check = "";
                if (chkHShowUnFinish) {
                    check = "Y";
                }
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();
                var ColName2 = $("#ColName2").val();//复选框
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }

                if (ColName1 != 0 && Comparator1 != 0) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
                sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'" ;
                var HBeginDate = $("#HBeginDate").val();
                var HEndDate = $("#HEndDate").val(); 
                var HPriceType = $("#HPriceType").val(); 
                var HSupID = $("#HSupID").val();
                var HWHID = $("#HWHID").val();
                sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HPriceType + "'" + ",'" + HSupID + "'," + HWHID;
                get_Display(sWhere);
                //调用接口后清空sWhere缓存
                sWhere = "";
@@ -403,19 +325,13 @@

            //重置过滤条件
            function set_ClearQuery() {
                $("#txtHOrderProcNo").val("");
                $("#txtHMaterNumber").val("");
                $("#txtHDeptName").val("");
                $("input[type='checkbox'][name='chkHShowUnFinish']").prop("checked", false);
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //开始日期
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));  //结束日期
                $("#HSupID").val("0");
                $("#HSupName").val("");
                $("#HWHID").val("0");
                $("#HWHName").val("");
                form.render('select');
               
                sWhere = " ";
@@ -504,7 +420,7 @@
            //隐藏列设置
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["field"] + ",";
                }

@@ -563,7 +479,7 @@

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                var dataCols = dataCol[i].split('|');
                                //隐藏列
                                if (dataCols[1] == 1) {

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillEdit.html

@@ -1882,12 +1882,13 @@
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗？', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                            layer.msg('首行无法删除！！！');
                        } else {
                            obj.del();
                            obj.del();//假删除
                            table.cache["mainTable"].splice(rowIndex, 1);  //②彻底移除元素，从缓存里移除这一行
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.reload(option);
                            table.render(option);
                            layer.close(index);
                        }
                    });

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html

@@ -8,6 +8,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/tableFilter.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
@@ -18,6 +19,7 @@
    <script src="../../../layuiadmin/HideButton_New.js"></script>
    <script src="../../../layuiadmin/soulTable.slim.js"></script>
    <script src="../../../layuiadmin/PageTitle.js"></script>
    <script src="../../../layuiadmin/modules//tableFilter2.js"></script>
</head>
<body>
    <div class="layui-fluid">
@@ -330,7 +332,7 @@
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable', 'tableFilter'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
@@ -342,6 +344,7 @@
                , laydate = layui.laydate
                , util = layui.util
                , soulTable = layui.soulTable
                , tableFilter = layui.tableFilter
            //查询条件
            var sWhere = "";
            var option = [];
@@ -849,7 +852,7 @@
                //初始化表格
                set_InitGrid();
                //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                get_FastQuery(table, option,1)
                 get_FastQuery(table, option,1)
                //加载业务员
                //get_HEmpName();
                //隐藏勾选字段
@@ -970,6 +973,22 @@
               
                    , done: function (res, curr, count) {
                        soulTable.render(this);
                        tableFilter.render({
                            'elem': '#mainTable',
                            'mode': 'local',
                            'filters': [
                                { field: '供应商', type: 'checkbox' },
                                { field: '主管', type: 'checkbox' },
                                { field: '业务员', type: 'checkbox' },
                                { field: '部门', type: 'checkbox' },
                                { field: '物料代码', type: 'checkbox' },
                                { field: '物料名称', type: 'checkbox' },
                                { field: '规格型号', type: 'checkbox' },
                                { field: '制单人', type: 'checkbox' },
                                { field: '审核人', type: 'checkbox' },
                            ],
                            'done': function (filters) { }
                        }).reload();
                    }
                };
                optionPage = {
@@ -1155,10 +1174,6 @@
                            //刷新表格数据
                            DisPlay_HideColumn();

                            //刷新按钮显示
                            var set_HideButton_ID = "toolbarDemo_ButtonSet";                    //需要设置的按钮的父级节点的id
                            var HBillType = "1102";
                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }

 WebTM/views/ÏúÊÛ¹ÜÀí/·¢»õ֪ͨµ¥/Add_Edit_Xs_SeOutStockBillList.html

@@ -1469,16 +1469,29 @@
                                        })
                                        layer.close(index);//关闭弹窗
                                    } else {
                                        table.cache["mainTable"].splice(0, 1);
                                        for (var rowData of checkStatus.data) {
                                            var NewRow = {
                                                "HMaterID": rowData.HItemID, "物料代码": rowData.物料代码, "物料名称": rowData.物料名称, "规格型号": rowData.规格型号, "HUnitID": rowData.HUnitID, "计量单位": rowData.计量单位名称, "HWHID": "0", "发货仓库": "",
                                                "HQty": "1", "HPrice": "0", "HMoney": "0", "HRemark": "",
                                                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                                            };
                                            table.cache["mainTable"].push(NewRow);
                                        var rowIndex = $(obj.tr).attr("data-index") * 1;  //attr("data-index")用于获取该tr元素上data-index属性的值*1转换类型然后赋值给rowIndex
                                        for (var i = 0; i < checkStatus.data.length; i++) {  //判断选中的数据的长度  ç”¨äºŽéåŽ†checkStatus.data数组中的每个元素
                                            if (rowIndex + i >= option.data.length) {           //判断rowIndex + i的索引超出了option.data数组的长度，说明option.data数组需要扩展以包含更多行
                                                //新增行表格数据
                                                var NewRow = {
                                                    "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "HWHID": "0", "发货仓库": "",
                                                    "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": "",
                                                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                                                };

                                                table.cache["mainTable"].push(NewRow);    //创建新的包含数组  ä¼ å…¥table.cache["mainTable"]数组
                                                option.data = table.cache["mainTable"];  //把传入 table.cache["mainTable"]数组的值赋值给option.data çš„属性

                                                table.render(option);//渲染界面
                                            }
                                            option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID;  //将option.data数组中对应行的HMaterID属性更新为从resultData对象中获取的物料ID
                                            option.data[rowIndex + i].物料代码 = checkStatus.data[i].物料代码; //将option.data数组中对应行的 ç‰©æ–™ä»£ç  å±žæ€§æ›´æ–°ä¸ºä»ŽresultData对象中获取的物料ID
                                            option.data[rowIndex + i].物料名称 = checkStatus.data[i].物料名称; //将option.data数组中对应行的  ç‰©æ–™åç§°  å±žæ€§æ›´æ–°ä¸ºä»ŽresultData对象中获取的物料ID
                                            option.data[rowIndex + i].规格型号 = checkStatus.data[i].规格型号; //将option.data数组中对应行的  è§„格型号  å±žæ€§æ›´æ–°ä¸ºä»ŽresultData对象中获取的物料ID
                                            option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID; //将option.data数组中对应行的 HUnitID å±žæ€§æ›´æ–°ä¸ºä»ŽresultData对象中获取的物料ID
                                            option.data[rowIndex + i].计量单位 = checkStatus.data[i].计量单位名称; //将option.data数组中对应行的 è®¡é‡å•ä½ å±žæ€§æ›´æ–°ä¸ºä»ŽresultData对象中获取的物料ID   æ›´æ–°è®¡é‡å•ä½å±žæ€§
                                            option.data[rowIndex + i].HQty = 1;  //将对应行的HQty属性（可能代表数量）设置为1。这表示对于每个选中的物料，其默认数量被设置为1
                                        }
                                        option.data = table.cache["mainTable"];
                                        table.render(option);
                                        layer.close(index);//关闭弹窗
                                    }
@@ -1615,16 +1628,29 @@
                                })
                                layer.close(index);//关闭弹窗
                            } else {
                                table.cache["mainTable"].splice(0, 1);
                                for (var rowData of checkStatus.data) {
                                    var NewRow = {
                                        "HMaterID": rowData.HItemID, "物料代码": rowData.物料代码, "物料名称": rowData.物料名称, "规格型号": rowData.规格型号, "HUnitID": rowData.HUnitID, "计量单位": rowData.计量单位名称, "HWHID": "0", "发货仓库": "",
                                        "HQty": "1", "HPrice": "0", "HMoney": "0", "HRemark": "",
                                        "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                                    };
                                    table.cache["mainTable"].push(NewRow);
                                var rowIndex = $(obj.tr).attr("data-index") * 1;  //attr("data-index")用于获取该tr元素上data-index属性的值*1转换类型然后赋值给rowIndex
                                for (var i = 0; i < checkStatus.data.length; i++) {  //判断选中的数据的长度  ç”¨äºŽéåŽ†checkStatus.data数组中的每个元素
                                    if (rowIndex + i >= option.data.length) {           //判断rowIndex + i的索引超出了option.data数组的长度，说明option.data数组需要扩展以包含更多行
                                        //新增行表格数据
                                        var NewRow = {
                                            "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "HWHID": "0", "发货仓库": "",
                                            "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": "",
                                            "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                                        };

                                        table.cache["mainTable"].push(NewRow);    //创建新的包含数组  ä¼ å…¥table.cache["mainTable"]数组
                                        option.data = table.cache["mainTable"];  //把传入 table.cache["mainTable"]数组的值赋值给option.data çš„属性

                                        table.render(option);//渲染界面
                                    }
                                    option.data[rowIndex + i].HMaterID = checkStatus.data[i].HItemID;  //将option.data数组中对应行的HMaterID属性更新为从resultData对象中获取的物料ID
                                    option.data[rowIndex + i].物料代码 = checkStatus.data[i].物料代码; //将option.data数组中对应行的 ç‰©æ–™ä»£ç  å±žæ€§æ›´æ–°ä¸ºä»ŽresultData对象中获取的物料ID
                                    option.data[rowIndex + i].物料名称 = checkStatus.data[i].物料名称; //将option.data数组中对应行的  ç‰©æ–™åç§°  å±žæ€§æ›´æ–°ä¸ºä»ŽresultData对象中获取的物料ID
                                    option.data[rowIndex + i].规格型号 = checkStatus.data[i].规格型号; //将option.data数组中对应行的  è§„格型号  å±žæ€§æ›´æ–°ä¸ºä»ŽresultData对象中获取的物料ID
                                    option.data[rowIndex + i].HUnitID = checkStatus.data[i].HUnitID; //将option.data数组中对应行的 HUnitID å±žæ€§æ›´æ–°ä¸ºä»ŽresultData对象中获取的物料ID
                                    option.data[rowIndex + i].计量单位 = checkStatus.data[i].计量单位名称; //将option.data数组中对应行的 è®¡é‡å•ä½ å±žæ€§æ›´æ–°ä¸ºä»ŽresultData对象中获取的物料ID   æ›´æ–°è®¡é‡å•ä½å±žæ€§
                                    option.data[rowIndex + i].HQty = 1;  //将对应行的HQty属性（可能代表数量）设置为1。这表示对于每个选中的物料，其默认数量被设置为1
                                }
                                option.data = table.cache["mainTable"];
                                table.render(option);
                                layer.close(index);//关闭弹窗
                            }
@@ -1831,12 +1857,13 @@
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗？', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                            layer.msg('首行无法删除！！！');
                        } else {
                            obj.del();
                            obj.del();//假删除
                            table.cache["mainTable"].splice(rowIndex, 1);  //②彻底移除元素，从缓存里移除这一行
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.reload(option);
                            table.render(option);
                            layer.close(index);
                        }
                    });

 WebTM/views/ÏúÊÛ¹ÜÀí/·¢»õ֪ͨµ¥/Xs_SeOutStockBillList.html

@@ -599,7 +599,7 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
                    success: function (data1) {
                        option.limit = size;//改变表格页大小
                        if (data1.count != 0) {
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var data = [];//列字段数据
                            var col = [];
@@ -653,12 +653,8 @@
                            }

                        } else {
                            optionPage.count = data1.count;//改变列表数据总数
                            laypage.render(optionPage);

                            option.data = [];
                            table.render(option);
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                            /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
                        }
                    }, error: function (e) {

 WebTM/views/ÏúÊÛ¹ÜÀí/Ó¦ÊÕµ¥/Xs_ReceivableBill.html

@@ -3049,14 +3049,15 @@
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗？', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                            layer.msg('首行无法删除！！！');
                        } else if (haveSource == true) {
                            layer.msg('有源单无法删除！！！');
                        }else {
                            obj.del();
                            obj.del();//假删除
                            table.cache["mainTable"].splice(rowIndex, 1);  //②彻底移除元素，从缓存里移除这一行
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.reload(option);
                            table.render(option);
                            layer.close(index);
                        }
                    });

 WebTM/views/ÏúÊÛ¹ÜÀí/Ó¦ÊÕµ¥/Xs_ReceivableBillList.html

@@ -622,7 +622,7 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size},
                    success: function (data1) {
                        option.limit = size;//改变表格页大小
                        if (data1.count != 0) {
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var totalArray = ["", ""];
                            var data = [];
@@ -682,54 +682,8 @@
                                ColFilter();
                            }
                        } else {
                            var totalArray = ["", ""];
                            var data = [];
                            optionPage.count = data1.count;//改变列表数据总数
                            laypage.render(optionPage);
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                //动态获取列表所有列名
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                                //获取不需要显示的列（H开头的列不显示）
                                var patrn = new RegExp(/^h/i);
                                if (patrn.test(data1.list[key].ColmCols)) {
                                    titleData[key] = data1.list[key].ColmCols;
                                }
                            }

                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else if (data[i].name == '单据号') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号', event: '单据号', templet: function (d) {
                                            return '<span style="color: blue;">' + d.单据号 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }
                                }
                            }  //动态显示列名
                            option.data = [[]];
                            option.cols = [col];
                            table.render(option);
                            layer.close(ajaxLoad);
                            /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);

 WebTM/views/ÏúÊÛ¹ÜÀí/ÊÕ¿îµ¥/YS_ReceiveBill.html

@@ -539,7 +539,7 @@
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗？', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                            layer.msg('首行无法删除！！！');
                        } else {
                            obj.del();

 WebTM/views/ÏúÊÛ¹ÜÀí/ÊÕ¿îµ¥/YS_ReceiveBillList.html

@@ -625,7 +625,7 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size},
                    success: function (data1) {
                        option.limit = size;//改变表格页大小
                        if (data1.code != "") {
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var totalArray = ["单据金额", "折扣后金额"];
                            var data = [];

 WebTM/views/ÏúÊÛ¹ÜÀí/ÊÕ¿îµ¥/YS_ReceiveBillQuery.html

@@ -189,7 +189,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>读取方案</button>
                            </div>
                        </script>
                        <table class="" id="mainTableSub" lay-filter="mainTableSub"></table>
                        <table class="" id="mainTableSub" lay-filter="mainTableSub" style="margin-top:35px"></table>
                        <script type="text/html" id="toolbarDemoSub">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>行关闭</button>
@@ -427,7 +427,7 @@
                //初始化表格
                set_InitGrid();
                //直接执行列表筛选 åŠ è½½æ•°æ®åˆ°ç½‘æ ¼
                /*get_FastQuery(table, option,1)*/
                get_FastQuery(table, option,1)

                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();
@@ -454,7 +454,7 @@
                    elem: '#mainTableSub'
                    , toolbar: '#toolbarDemoSub'
                    , height: 'full-500'
                    , page: true
                    , page: false
                    , totalRow: true
                    , cellMinWidth: 90
                    , limit: 50
@@ -472,6 +472,7 @@
                $.ajax({
                    url: GetWEBURL() + '/YS_ReceiveBill/QueryList',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere  , "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
@@ -490,7 +491,7 @@
                                }
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'radio', fixed: 'left', totalRowText: '合计'});
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计'});
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
@@ -1416,13 +1417,24 @@

            //#region è¡Œç‚¹å‡»äº‹ä»¶
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
                //显示子表
                get_DisplaySub(obj.data);
                //判断是否已经被选中
                if (obj.tr.find('.layui-form-radioed').length == 0) {
                    //触发单选框选中事件
                    obj.tr.find('i[class="layui-anim layui-icon"]').trigger("click");
                }


            })

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ±¨±í/Xs_SeOrderOutStockSumReport.html

@@ -148,11 +148,6 @@
                get_FastQuery();
            });

            //物料
            form.on('submit(btnHMaterID)', function (data) {//选择仓位
                get_btnHMaterID();
            });

            //#endregion

            //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法
@@ -168,10 +163,7 @@

                table.render(option);
                //加载数据到网格
                //get_FastQuery();
                //DisPlay_HideColumn();

                //ColFilter();
                get_FastQuery();
            }

            //初始化表格
@@ -204,18 +196,20 @@
            function get_Display(sWhere) {
                var wait = layer.load();//遮罩
                $.ajax({
                    url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/OrderProcFlowAllReportICMOList',
                    url: GetWEBURL() + '/Xs_SeOrderOutStockSumReport/Xs_SeOrderOutStockSumReportList',
                    type: "GET",
                    data: { "sWhere": sWhere },
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
                            var totalArray = ["异常评审次数", "计划数量", "接受工序数量1", "汇报工序数量1", "汇报不合格工序数量1", "接收工序数量2", "汇报工序数量2", "汇报不合格工序数量2", "接收工序数量3", "汇报工序数量3", "汇报不合格工序数量3", "接收工序数量4","汇报工序数量4","汇报不合格工序数量4","接收工序数量5","汇报工序数量5","汇报不合格工序数量5","接收工序数量6","汇报工序数量6","汇报不合格工序数量6","接收工序数量7","汇报工序数量7","汇报不合格工序数量7"];
                            var totalArray = [];
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加序号列
                            col.push({ type: 'numbers', fixed: 'left', field: '序号', title: '序号' });
                            //判断是否是纯英文
                            var patrn = new RegExp("[\u4E00-\u9FA5]+");
                            for (var i = 0; i < data.length; i++) {
@@ -253,89 +247,11 @@

            //快速过滤
            function get_FastQuery() {
                var txtHOrderProcNo = $("#txtHOrderProcNo").val();//订单跟踪号
                var txtHMaterNumber = $("#txtHMaterNumber").val(); //物料
                var txtHDeptName = $("#txtHDeptName").val(); //物料
                var chkHShowUnFinish = $("input[name='chkHShowUnFinish']").prop("checked");//复选框
                var check = "";
                if (chkHShowUnFinish) {
                    check = "Y";
                }
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();
                var ColName2 = $("#ColName2").val();//复选框
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }

                if (ColName1 != 0 && Comparator1 != 0) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }
                sWhere = "'" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'" ;
                var HBeginDate = $("#HBeginDate").val();//订单跟踪号
                var HEndDate = $("#HEndDate").val(); //物料
                var HPriceType = $("#HPriceType").val(); //物料
                
                sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HPriceType + "'";
                get_Display(sWhere);
                //调用接口后清空sWhere缓存
                sWhere = "";
@@ -343,92 +259,18 @@

            //重置过滤条件
            function set_ClearQuery() {
                $("#txtHOrderProcNo").val("");
                $("#txtHMaterNumber").val("");
                $("#txtHDeptName").val("");
                $("input[type='checkbox'][name='chkHShowUnFinish']").prop("checked", false);
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                form.render('select');
               
                //根据日期间隔设置开始时间与结束时间
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                sWhere = " ";
                get_FastQuery();
            }
            //销售订单下拉框
            function HOrderBillNo() {
                //获取登录页组织列
                var HOrderBillNo = '<option  style="color:blue;" value=""></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Mes_OrderProcFlowAllReport/getHSeOrderBillNo",
                    async: false,
                    data: { "sWhere": "", "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HOrderBillNo += '<option  style="color:blue;" value="' + data[i]["HSeOrderBillNo"] + '">' + data[i]["HSeOrderBillNo"] + '</option>';
                            }

                            $("#txtHOrderProcNo").append(HOrderBillNo);
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }

            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].title + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization); $("#ColName1").empty();
                $("#ColName1").append(Organization); $("#ColName2").empty();
                $("#ColName2").append(Organization);
                form.render('select');
            }
            //#endregion
            //物料
            function get_btnHMaterID() {
                layer.open({
                    type: 2
                    , area: ['80%', '80%']
                    , title: '物料'
                    , shade: 0.6 //遮罩透明度
                    //, maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式，-1不开启
                    , content: ['../../Baseset/基础资料/Gy_MaterialList.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#txtHMaterNumber").val(checkStatus.data[0].HNumber);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                })
            }

            //隐藏列设置
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["field"] + ",";
                }

@@ -487,7 +329,7 @@

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                var dataCols = dataCol[i].split('|');
                                //隐藏列
                                if (dataCols[1] == 1) {

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Add_Edit_Xs_SeOrderBillList.html

@@ -2615,7 +2615,7 @@
                if (obj.event === 'del') {
                    layer.confirm('真的删除行么', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                            layer.msg('首行无法删除！！！');
                        } else {
                            //obj.del();

 WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛ¶©µ¥/Xs_SeOrderBillList.html

@@ -963,7 +963,7 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
                    success: function (data1) {
                        option.limit = size;//改变表格页大小
                        if (data1.count != 0) {
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var data = [];//列字段数据
                            var col = [];
@@ -1035,10 +1035,8 @@
                            }
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            option.data = [];
                            table.render(option);
                            layer.close(ajaxLoad);
                            /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill.html

@@ -3456,12 +3456,13 @@
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗？', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                            layer.msg('首行无法删除！！！');
                        } else {
                            obj.del();
                            obj.del();//假删除
                            table.cache["mainTable"].splice(rowIndex, 1);  //②彻底移除元素，从缓存里移除这一行
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.reload(option);
                            table.render(option);
                            layer.close(index);
                        }
                    });

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBillList.html

@@ -771,7 +771,7 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
                    success: function (data1) {
                        option.limit = size;//改变表格页大小
                        if (data1.count != 0) {
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var data = [];//列字段数据
                            var col = [];
@@ -854,12 +854,8 @@

                            layer.close(ajaxLoad);
                        } else {
                            optionPage.count = data1.count;//改变列表数据总数
                            laypage.render(optionPage);

                            option.data = [];
                            table.render(option);
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                            /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
                        }
                    }, error: function () {

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Add_Edit_Kf_POStockInBillList.html

@@ -2769,13 +2769,13 @@
                if (obj.event === 'del') {
                    layer.confirm('真的删除行吗？', function (index) {
                        console.log("索引为:" + rowIndex);
                        if (rowIndex === '0') {
                        if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
                            layer.msg('首行无法删除！！！');
                        } else {
                            obj.del();//假删除
                            table.cache["mainTable"].splice(rowIndex, 1);  //②彻底移除元素，从缓存里移除这一行
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.reload(option);
                            table.render(option);
                            layer.close(index);
                        }
                    });