作业指导书删除，批量下推流转卡页面，排产添加操作工字段，

yusijie

2024-08-16 7064c2d55de5e3a6d8ef14029db1898b278e3afe

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -151,6 +151,60 @@
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤1</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px;display:none;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤2</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">单据号</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HBillno2" id="HBillno2" style="width:190px;">
@@ -170,10 +224,17 @@
                                                <input type="date" class="layui-input ForFilteringSchemes" id="HDate1">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">日期间隔</label>
                                            <div class="layui-input-block">
                                                <select name="HInitTimeCycle" id="HInitTimeCycle" class="ForFilteringSchemes" lay-filter="HInitTimeCycle" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>                        
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <!--<div class="layui-btn-container">
@@ -198,18 +259,23 @@
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="get-print"><i class="layui-icon layui-icon-print"></i>打印</button>-->
                            <div class="layui-btn-container" id="HideButtonList">
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill" id="ShowBill"><i class="layui-icon layui-icon-form"></i>下推</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_BatchSplitPushDown" id="set_BatchSplitPushDown"><i class="layui-icon layui-icon-form"></i>批量拆分下推</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="Exits"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_pl" id="ShowBill_pl"><i class="layui-icon layui-icon-form"></i>批量下推</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Resume" id="set_Resume"><i class="layui-icon layui-icon-form"></i>履历查询</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ShowBill_dh"><i class="layui-icon layui-icon-form"></i>多行下推</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushICMOChangeBill" id="btn-PushICMOChangeBill"><i class="layui-icon layui-icon-delete"></i>下推(生产订单变更单)</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushProductReportBill" id="btn-PushProductReportBill"><i class="layui-icon layui-icon-delete"></i>下推(生产汇报单)</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushProductInBill" id="btn-PushProductInBill"><i class="layui-icon layui-icon-delete"></i>下推(生产入库单)</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushQualityReportBill" id="btn-PushQualityReportBill"><i class="layui-icon layui-icon-delete"></i>下推(生产质量汇报单)</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushProductionReturnBill" id="btn-PushProductionReturnBill"><i class="layui-icon layui-icon-delete"></i>下推(生产退库单)</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushWorkLinkBill" id="btn-PushWorkLinkBill"><i class="layui-icon layui-icon-delete"></i>联系单</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew" id="AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy" id="copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew_NT" id="AddNew_NT"><i class="layui-icon layui-icon-file-b"></i>新增(无列表)</button>-->
    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit" id="Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy" id="copy"><i class="layui-icon layui-icon-form"></i>复制</button>
    <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AddNew_NT" id="AddNew_NT"><i class="layui-icon layui-icon-file-b"></i>新增(无列表)</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Edit_NT" id="Edit_NT"><i class="layui-icon layui-icon-form"></i>编辑(无列表)</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_copy_NT" id="copy_NT"><i class="layui-icon layui-icon-form"></i>复制(无列表)</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>审核</button>
@@ -261,12 +327,14 @@
            var sWhere = "";
            var HModName = "Sc_ICMOBillList";
            var HDeptID = 0;
           

            var params = getUrlVars();
            var HDeptID = params[params[0]];
            var option = [];
            var ins;                        //用于导出excel
           
            var titleData = ["hmainid", "HEntryID", "作废人", "作废日期", "销售订单日期", "订单跟踪号", "HDeptID", "HMaterID", "hunitid", "hempid", "业务员代码", "业务员", "hcusid", "客户代码", "客户", "HCenterID", "工作中心代码", "工作中心", "hbomid", "BOM单编码", "HRoutingInterID", "工艺路线代码", "工艺路线", "订单包装备注", "hsubid", "源单单号", "源单主内码", "源单子内码", "行关闭人", "关闭类型", "单据类型", "计划跟踪号"];//不需要显示的字段 å¯æ‰©å±•
            //var titleData = ["hmainid", "HEntryID", "作废人", "作废日期", "销售订单日期", "订单跟踪号", "HDeptID", "HMaterID", "hunitid", "hempid", "业务员代码", "业务员", "hcusid", "客户代码", "客户", "HCenterID", "工作中心代码", "工作中心", "hbomid", "BOM单编码", "HRoutingInterID", "工艺路线代码", "工艺路线", "订单包装备注", "hsubid", "源单单号", "源单主内码", "源单子内码", "行关闭人", "关闭类型", "单据类型", "计划跟踪号"];//不需要显示的字段 å¯æ‰©å±•
            //titleData = [];
            //判断是否有参数传递

            //#region ã€åŠ¨æ€èŽ·å–模块名称】
@@ -277,10 +345,10 @@

            //#region ã€è¿‡æ»¤æ–¹æ¡ˆã€‘

            //过滤条件的classç±» 
            var HClassTag = "ForFilteringSchemes"; 
            //过滤条件的classç±»
            var HClassTag = "ForFilteringSchemes";
            //模块名称（中文版） æ¯ä¸ªæ¨¡å—页面都需要修改
            window.HModuleName = "生产订单"; 
            window.HModuleName = "生产订单";
            //是否已经选择了过滤方案（全局变量）
            window.HDefaultFilter = "";
            //选择的过滤方案内码（全局变量）
@@ -348,11 +416,26 @@
                    //多行下推
                    case 'set_ShowBill_dh': set_ShowBill_dh();
                        break;
                    //批量拆分下推
                    case 'set_BatchSplitPushDown': set_BatchSplitPushDown();
                        break;                        
                    //履历查询
                    case 'set_Resume': set_Resume();
                        break;
                    //下推(生产订单变更单)
                    case 'btn-PushICMOChangeBill': set_PushICMOChangeBill();
                        break;
                    //下推(生产汇报单)
                    case 'btn-PushProductReportBill': set_PushProductReportBill();
                        break;                        
                    //联系单
                    case 'btn-PushWorkLinkBill': set_PushWorkLinkBill();
                        break;
                    //下推(生产入库单)
                    case 'btn-PushProductInBill': set_PushProductInBill();
                        break;
                    //下推(生产质量汇报单)
                    case 'btn-PushQualityReportBill': set_PushQualityReportBill();
                        break;
                    //下推(生产退库单)
                    case 'btn-PushProductionReturnBill':set_PushProductionReturnBill();
@@ -464,8 +547,27 @@
                get_FastQuery();
            });

            //#region æ—¥æœŸé—´éš”下拉列表监听
            form.on('select(HInitTimeCycle)', function (data) {
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
                if (HInitTimeCycle != -1) {
                    //$('#HDate').prop('disabled', true);
                    //$('#HDate1').prop('disabled', true);

         //获取组织
                    $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                    $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));

                    //执行查询方法
                    get_FastQuery();
                } else {
                    //$('#HDate').prop('disabled', false);
                    //$('#HDate1').prop('disabled', false);
                }
            });
            //#endregion

            //获取组织
            function Organ() {
                //获取登录页组织列
                $.ajax({
@@ -506,14 +608,40 @@
                });
            });

            //#region åŒå‡»è¿”回数据
            table.on('rowDouble(mainTable)', function (obj) {
                var data = [];
                data.push(obj.data);
                parent.GetICMOBillValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });
            //#endregion

            //#region åˆå§‹åŒ–界面
            function set_ClearBill() {               
            function set_ClearBill() {
                //初始化日期间隔、开始日期、结束日期
                setSelect_HInitTimeCycle();
                //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                if (HInitTimeCycle != -1) {
                    //$('#HDate').prop('disabled', true);
                    //$('#HDate1').prop('disabled', true);
                } else {
                    //$('#HDate').prop('disabled', false);
                    //$('#HDate1').prop('disabled', false);
                }

                //根据日期间隔设置开始时间与结束时间
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));

                //初始化表格
                set_InitGrid();
                //查询
                get_FastQuery();
                //查询当前登录用户有没有在当前模块设置默认过滤方案
                get_DefaultModule();               
                get_DefaultModule();
            }
            //#endregion

@@ -602,8 +730,6 @@
            };

            function set_InitGrid() {
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
@@ -630,7 +756,11 @@
                        , { field: '业务员', title: '业务员', sort: true }
                        , { field: 'HWidth', title: '门幅', sort: true }
                        , { field: '规格型号', title: '规格型号', sort: true }
                        , { field: '特殊订单', title: '特殊订单', sort: true, width: 150 }
                        , { field: '生产任务单数量', title: '生产订单数量', totalRow: true, sort: true, totalRow: true }
                        , { field: '流转卡数量', title: '流转卡数量', totalRow: true, sort: true, totalRow: true }
                        , { field: '生产入库数量', title: '生产入库数量', totalRow: true, sort: true, totalRow: true }
                        , { field: '报废数量', title: '报废数量', totalRow: true, sort: true, totalRow: true }
                        , { field: '计量单位', title: '计量单位', sort: true }
                        , { field: '是否下推生成流转卡', title: '是否下推生成流转卡', sort: true }
                        , { field: '是否取库存', title: '是否取库存', sort: true }
@@ -697,9 +827,39 @@
                        //, { field: '关闭类型', title: '关闭类型', hide: true}
                        //, { field: '单据类型', title: '单据类型', hide: true}
                        //, { field: '计划跟踪号', title: '计划跟踪号', hide: true}
                        , { field: '物料分类', title: '物料分类', sort: true }
                    ]]
                };
            }
            //#endregion  ç›‘听网格表体事件
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;

                //单据号超链接
                if (obj.event == '单据号') {                  //检查 obj.event æ˜¯å¦ç­‰äºŽå­—符串 '单据号'。如果等于，则执行if循环
                    var linterid = data.hmainid.toString();    //声明变量linterid ä¸º data.hmainid   
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({                //使用 layer的open打开弹出 å±‚ 
                        type: 2                         //表示弹出层的内容是一个 iframe
                        , area: ['100%', '100%']
                        , title: '编辑' + HPageTitle  //设置弹出层的名字和变量
                        , closeBtn: 1//显示关闭按钮
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../生产任务单/Sc_ICMOBillEdit.html?OperationType=3&linterid=' + linterid + ''  //设置 iframe çš„ URL，URL ä¸­åŒ…含了查询参数，来调用所需要的值

                        , resize: false,  //是否允许用户调整弹出大小
                        end: function () {  //当关闭时调用
                            get_FastQuery(table, option);
                        }
                        , cancel: function () {  //点击取消时使用回调
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });
             //#endregion

            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
@@ -712,6 +872,111 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            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', 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) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                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: 200 });
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }

                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , totalRow: true
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-120'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 500
                                , cellMinWidth: 90
                                , done: function (res, curr, count) {
                                    soulTable.render(this);
                                }
                            }
                            ins = table.render(option);

                            ////刷新表格数据
                            //DisPlay_HideColumn();
                            var data = [];//列字段数据
                            var col = [];
                            var totalArray = [];
                            //给空的数组赋值
                            for (var key in data1.list) {//循序遍历数组
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//从每个对象中提取数据
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计' });
                            for (var i = 0; i < data.length; i++) {//遍历data数组重的数据
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {//检查data【i】.name是否在数组中  //计算列
                                    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: '单据号' });
                                } 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 == "行关闭日期" ? "行关闭人" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
                                }
                            }
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 800
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                                , done: function (res, curr, count) {
                                    soulTable.render(this);
                                }
                            }

                            DisPlay_HideColumn();
                            option.data = data1.data;
                            ins = table.render(option);
                            layer.close(ajaxLoad);
@@ -721,7 +986,7 @@
                            var HBillType = "3710";
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "" ) {
                                ColFilter();
                            }
                            layer.close(ajaxLoad);
@@ -754,6 +1019,13 @@
                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 = "";
@@ -775,6 +1047,50 @@
                            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 = "" + Comparator2 + "'" + ColContent2 + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }

                //传递的参数不为NAN
@@ -833,7 +1149,7 @@
                if (GetDataCols != "") {
                    sWhere += GetDataCols;
                }
                 sWhere += addSWhereByOpenType();
                sWhere += addSWhereByOpenType();
                //根据用户过滤用户关联客户的记录
                sWhere += getSWhereByHUser();

@@ -845,8 +1161,10 @@

            //#region é‡ç½®è¿‡æ»¤æ¡ä»¶æ–¹æ³•
            function set_ClearQuery() {
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//开始日期
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));;//结束日期
                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //开始日期
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));  //结束日期

                $("#HOrderProcNO").val("");//订单跟踪号
                $("#WorkCenter").val("");//单据号
                $("#HDeptName").val("0");//单据号
@@ -857,6 +1175,12 @@
                $("#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');
                sWhere = "";
            }
@@ -923,7 +1247,48 @@
                    layer.msg('请选择一行数据下推！');
                }
            }
            
            //批量拆分下推流转卡
            function set_BatchSplitPushDown() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length > 0) {
                    var linterid = [];

                    for (var i = 0; i < data.length; i++) {
                        linterid.push(data[i].hmainid + '@' + data[i].hsubid);
                    }

                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '工序流转卡-编辑'
                        , shift: 0//弹出动画
                        , content: '../../车间管理/工序流转卡/Sc_ProcessExchangeBill_BatchSplit.html?OperationType=2&linterid=' + linterid.toString() + '&HSouceBillType=3710'
                    })
                } else {
                    layer.msg('请选择数据下推！');
                }
            }

            //履历查询
            function set_Resume() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var HEntryID = data[0].HEntryID.toString();
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '生产订单-履历'
                        , shift: 0//弹出动画
                        , content: '../生产任务单/Sc_ICMOBillOrProcessExchangeResumeList.html?OperationType=1&HInterID=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=3710'
                    })
                } else {
                    layer.msg('请选择一行数据查询！');
                }
            }
            //多行批量下推单据
            function set_ShowBill_dh() {
                var checkStatus = table.checkStatus('mainTable')
@@ -1011,9 +1376,59 @@
                }
            }
            //#endregion
            
            //#region ä¸‹æŽ¨ï¼ˆç”Ÿäº§æ±‡æŠ¥å•ï¼‰
            function set_PushProductReportBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length > 0) {
                    var dataArray = [];
                    for (var i = 0; i < data.length; i++) {
                        var temp = {
                            "hmainid": data[i].hmainid
                            , "hsubid": data[i].hsubid
                            , "HBillStatus": data[i].单据状态
                            , "HSourceBillType": "3710"
                        }
                        dataArray.push(temp);
                        if (data[i].单据状态 != "已审核") {
                            var err = "下推失败!单据【" + data[i].单据号 + "】的状态为“" + data[0].单据状态 + "”,不允许下推！";
                            layer.alert(err, { icon: 5 });
                            return;
                        }

                        if (data[i].行状态 != "") {
                            var err = "下推失败!单据【" + data[i].单据号 + "】的状态为“" + data[0].行状态 + "”,不允许下推！";
                            layer.alert(err, { icon: 5 });
                            return;
                        }
                    }

          //#region ä¸‹æŽ¨ï¼ˆç”Ÿäº§å…¥åº“单）
                    var datajson = {
                        "data": dataArray
                    };

                    var url = encodeURI('../../生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html?OperationType=4&linterid=0&HSouceBillType=3710&res=' + JSON.stringify(datajson))
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '生产订单-下推生产汇报单'
                        , shift: 0//弹出动画
                        , content: url
                        , btn: [],
                        // æŒ‰é’®1 çš„回调
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
                        }
                    })
                } else {
                    layer.msg('请选择数据下推！');
                }
            }
            //#endregion

            //#region ä¸‹æŽ¨ï¼ˆç”Ÿäº§å…¥åº“单）
            function set_PushProductInBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
@@ -1034,7 +1449,7 @@
                        }

                        if (data[i].行状态 != "" ) {
                             var err = "下推失败!单据【" + data[i].单据号 + "】的状态为“" + data[0].行状态 + "”,不允许下推！";
                            var err = "下推失败!单据【" + data[i].单据号 + "】的状态为“" + data[0].行状态 + "”,不允许下推！";
                            layer.alert(err, { icon: 5 });
                            return;
                        }
@@ -1064,8 +1479,58 @@
            }
            //#endregion

        
         //#region ä¸‹æŽ¨ï¼ˆç”Ÿäº§é€€åº“单）
            //#region ä¸‹æŽ¨(生产质量汇报单)
            function set_PushQualityReportBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var hID = data[0].hmainid.toString();
                    var HEntryID = data[0].hsubid.toString();

                    //#region åˆ¤æ–­æºå•çŠ¶æ€
                    var HSourceBillData = "";
                    var HSourceBillData = getSourceBillStatus_ICMOBill(hID);            //获取源单数据
                    if (HSourceBillData != "none") {
                        if (HSourceBillData.length == 0) {
                            layer.alert("保存失败!未查询到生产订单单据!", { icon: 5 });
                            return;
                        } else if (HSourceBillData[0]["单据状态"] != "已审核") {
                            var err = "保存失败!原因：生产订单单据状态为“" + HSourceBillData[0]["单据状态"] + "”，不允许下推生产质量汇报单！";
                            layer.alert(err, { icon: 5 });
                            return;
                        }
                    } else {
                        return;
                    }
                    //#endregion


                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '下推-生产质量汇报单'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html?OperationType=4&linterid=' + hID + '&HSouceBillType=3710&closeType=1&HEntryID=' + HEntryID
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            $("#btnSearch").trigger('click');
                        }
                        , cancel: function () {

                        }
                    })

                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }
            //#endregion

            //#region ä¸‹æŽ¨ï¼ˆç”Ÿäº§é€€åº“单）
            function set_PushProductionReturnBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
@@ -1085,8 +1550,8 @@
                            return;
                        }

                        if (data[i].行状态 != "" ) {
                             var err = "下推失败!单据【" + data[i].单据号 + "】的状态为“" + data[0].行状态 + "”,不允许下推！";
                        if (data[i].行状态 != "") {
                            var err = "下推失败!单据【" + data[i].单据号 + "】的状态为“" + data[0].行状态 + "”,不允许下推！";
                            layer.alert(err, { icon: 5 });
                            return;
                        }
@@ -1112,6 +1577,73 @@
                    })
                } else {
                    layer.msg('请选择数据下推！');
                }
            }
            //#endregion

            //#region è”系单
            function set_PushWorkLinkBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var temp = {
                        "HRelationInterID":data[0].hmainid,
                        "HRelationEntryID":data[0].hsubid,
                        "HRelationBillNo":data[0].单据号,
                        "HRelationBillType":"3710"
                    }
                    var HRelationInterID = data[0].hmainid;
                    var HRelationEntryID = data[0].hsubid;
                    $.ajax({
                        url: GetWEBURL() + '/Sc_MESTransFerWorkBill/GetOA_WorkLinkBillListBySourceID',
                        type: "GET",
                        data: { "HRelationInterID": HRelationInterID.toString(), "HRelationEntryID": HRelationEntryID.toString() },
                        success: function (result) {
                            if (result.count == 1) {
                                var HInterID = result.data[0].HInterID;
                                var HEntryID = result.data[0].HEntryID;
                                var url = encodeURI('../../质量管理/工作联系单/OA_Reply_WorkLinkBill.html?OperationType=2&linterid=' + HInterID + '&HEntryID=' + HEntryID + '&HSouceBillType=3710&res=' + JSON.stringify(temp));
                                layer.open({
                                    type: 2
                                    , area: ['100%', '100%']
                                    , title: '生产订单回复工作联系单'
                                    , closeBtn: 1
                                    , shade: 0.6 //遮罩透明度
                                    , maxmin: true //允许全屏最小化
                                    , anim: 0 //0-6的动画形式，-1不开启
                                    , content: url
                                    , resize: false,
                                    end: function () {
                                        get_FastQuery(table, option);
                                    }
                                    , cancel: function () {
                                        //$(".layui-btn").removeClass("layui-btn-disabled");
                                    }
                                })
                            } else {
                                var url = encodeURI('../../质量管理/工作联系单/OA_Add_Edit_WorkLinkBill.html?OperationType=2&linterid=&HEntryID=&HSouceBillType=3710&res=' + JSON.stringify(temp))
                                layer.open({
                                    type: 2,
                                    skin: 'layui-layer-rim', //加上边框
                                    title: '下推新增工作联系单',
                                    closeBtn: 1,
                                    shift: 2,
                                    area: ['100%', '100%'],
                                    maxmin: true,
                                    content: url,
                                    end: function () {
                                        //刷新页面,
                                        get_FastQuery(table, option);
                                    },
                                });
                            }
                        }, error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                            layer.close(wait);
                        }
                    });
                } else {
                    layer.msg('请选择数据联系！');
                }
            }
            //#endregion
@@ -1218,7 +1750,7 @@
                } else {
                    layer.msg('请选择一行数据编辑！');
                }
            }           
            }

            // å¤åˆ¶
            function set_copy() {
@@ -1805,6 +2337,10 @@
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                $("#ColName1").empty();
                $("#ColName1").append(Organization);
                $("#ColName2").empty();
                $("#ColName2").append(Organization);
                form.render('select');
            }

@@ -1878,6 +2414,24 @@
                                    $("#" + data[i].过滤字段ID).find("option[value='" + data[i].过滤值 + "']").attr("selected", true);
                                }
                            }

                            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                            //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
                            if (HInitTimeCycle != -1) {
                                //$('#HDate').prop('disabled', true);
                                //$('#HDate1').prop('disabled', true);

                                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
                                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));

                                //执行查询方法
                                get_FastQuery();
                            } else {
                                //$('#HDate').prop('disabled', false);
                                //$('#HDate1').prop('disabled', false);
                            }


                            //执行查询方法
                            get_FastQuery()
                            form.render("select");
@@ -1901,7 +2455,7 @@
                //判断用户是否点击了右上角的“叉号”关闭弹窗页面
                var HIsClose_Manual = false;
                //获取本页所有过滤条件对象(class中包含"ForFilteringSchemes"的元素)
                var Filter = document.getElementsByClassName(HClassTag); 
                var Filter = document.getElementsByClassName(HClassTag);

                var HFilterIdList = "";//过滤条件
                var HFilterIdLists = "";//拼接多个过滤条件
@@ -1911,7 +2465,7 @@
                for (var i = 0; i < Filter.length; i++) {
                    HFilterIdList = Filter[i].id; //过滤条件ID
                    HFilterIdLists += Filter[i].id + ","; //过滤条件ID(拼接)
                    HValue += $("#" + HFilterIdList).val() + ","; //过滤条件中输入的值                    
                    HValue += $("#" + HFilterIdList).val() + ","; //过滤条件中输入的值
                    HElement_type += document.getElementById(HFilterIdList).tagName + ",";//通过标签id获取标签类型
                }

@@ -2112,7 +2666,7 @@

            //#endregion

            

            //#endregion

            //#region èŽ·å–源单-生产订单单据状态
@@ -2138,7 +2692,26 @@
            }
            //#endregion

        //#region èŽ·å–参数

            //#region åˆå§‹æ—¥æœŸé—´éš” ä¸‹æ‹‰åˆ—表
            function setSelect_HInitTimeCycle() {
                var valueList = [0, 1, 2, 3, 4, 5, 6, 29,365];
                var titleList = ["今天", "近两天", "近三天", "近四天", "近五天", "近六天", "近七天", "近30天","近一年"];

                var HInitTimeCycle_ArrayList = '<option  value="-1" selected="selected" >任意间隔</option>';
                for (var i = 0; i < valueList.length; i++) {
                    HInitTimeCycle_ArrayList += '<option  style="color:blue;" value="' + valueList[i] + '">' + titleList[i] + '</option>';
                }

                $("#HInitTimeCycle").empty();
                $("#HInitTimeCycle").append(HInitTimeCycle_ArrayList);
                form.render('select');

                $("#HInitTimeCycle").val("29");
            }
            //#endregion

            //#region èŽ·å–参数
            function getUrlVars() {
                var vars = [], hash;
                var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -2150,7 +2723,7 @@
                return vars;
            }
            //#endregion
          //#region åˆ¤æ–­æ˜¯ç›´æŽ¥æ‰“开页面还是其它页面通过选择按钮打开，并显示相应数据
            //#region åˆ¤æ–­æ˜¯ç›´æŽ¥æ‰“开页面还是其它页面通过选择按钮打开，并显示相应数据
            function addSWhereByOpenType() {
                //获取参数
                var params = getUrlVars();
@@ -2186,7 +2759,7 @@
                        var HRemark = data[0].备注
                        //显示当前的过滤方案
                        document.getElementById("HFilterScheme_Now").style.display = "block";
                        document.getElementById('HFilterScheme_Now').innerHTML = "当前过滤方案：" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>'; 
                        document.getElementById('HFilterScheme_Now').innerHTML = "当前过滤方案：" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb">  ' + "(" + HRemark + ")" + '</span>';
                        HInterID = data[0].hmainid
                        //根据选择的过滤方案回填数据到列表过滤条件
                        for (let i = 0; i < data.length; i++) {
@@ -2206,7 +2779,7 @@
                }
            });
        }
        //#endregion 
        //#endregion

        function GetDataCol(data) {
            GetDataCols = data;