1.销售订单、生产订单、工序流转卡：点击查询后若第一个任意字段过滤没有设置值则其他任意字段过滤会被清空问题解决 2.生产订单、工序流转卡：时间组件禁用取消

duhe

2024-05-21 9bd5624f66142be382d3dd90c21cd063df226799

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

@@ -159,7 +159,7 @@
                                        </div>
                                    </div>

                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;display:none;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
@@ -215,6 +215,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>反作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>打印</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print_StockIn" lay-event="btn-print_StockIn"><i class="layui-icon layui-icon-form"></i>打印(入库码单)</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="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_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>按钮设置</button>
@@ -396,6 +397,9 @@
                    //打印
                    case 'btn-print': get_PrintReport();
                        break;
                    //打印（入库码单）
                    case 'btn-print_StockIn': btn_print_StockIn();
                        break;
                    //导出excel
                    case 'get_export':
                        get_Export();
@@ -448,7 +452,7 @@
                            table.render(option);
                            layer.close(ajaxLoad);

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
                                ColFilter();
                            }
                        } else {
@@ -739,7 +743,7 @@
                            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();
                            }
                        } else {
@@ -1476,7 +1480,7 @@
                            table.render(option);
                            layer.close(ajaxLoad);

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
                                ColFilter();
                            }
                        } else {
@@ -1688,6 +1692,34 @@
            }
            //#endregion

            //#region æ‰“印（入库码单）
            function btn_print_StockIn() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {

                    if (data[0].状态 != "已审核") {
                        layer.alert("打印失败!原因：单据状态不为'已审核'状态!!", { icon: 5 });
                        return;
                    }

                    layer.open({
                        type: 2
                        , area: ['50%', '50%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Xs_SeOrderBill_StockInCodeNote', 'yes']
                        , resize: false
                    })
                }
                else {
                    layer.msg('请选择一行数据打印！');
                }
            }
            //#endregion

            //#region å¯¼å‡ºExecel
            function get_Export() {
                var ModRightNameCheck = "Xs_SeOrderBillList_ExportExcel";
@@ -1850,7 +1882,7 @@
                    data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
                    success: function (data1) {
                        if (data1.count == 1) {
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
                                ColFilter();
                            }