Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

wtt

2024-10-28 07cf94734c36d4eae6ddbc4dd338bf5af81a2193

 WebTM/views/Éú²ú¹ÜÀí/Òì³£·´À¡µ¥/OA_ErrMsgBackReceiveBillMainList.html

@@ -100,7 +100,6 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose"><i class="layui-icon layui-icon-radio"></i>反关闭</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop"><i class="layui-icon layui-icon-radio"></i>作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop"><i class="layui-icon layui-icon-radio"></i>反作废</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTSign"><i class="layui-icon layui-icon-radio"></i>下推异常反馈签到单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-XTHand"><i class="layui-icon layui-icon-radio"></i>下推异常反馈处理单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
@@ -205,10 +204,7 @@
                    case 'btn-DeDrop':
                        set_DropBill(1);
                        break;
                    //下推异常反馈签到按钮
                    case 'btn-XTSign':
                        set_XTSign();
                        break;

                    //下推异常反馈处理按钮
                    case 'btn-XTHand':
                        set_XTHand();
@@ -349,7 +345,9 @@

                            layer.close(ajaxLoad);

                           
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }

                            //layer.alert("查询成功", { icon: 1 });
                        } else {
@@ -409,7 +407,7 @@
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }

             

                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }
@@ -472,27 +470,7 @@
            }
            //#endregion

            //下推异常反馈签到单
            function set_XTSign() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].hmainid.toString();
                    layer.open({
                        type: 2
                        , skin: 'layui-layer-rim' //加上边框
                        , area: ['100%', '100%']
                        , title: '新增异常反馈签到单'
                        , shift: 0//弹出动画
                        , content: '../../生产管理/异常反馈单/OA_ErrMsgBackSignBillMain.html?OperationType=2&linterid=' + HInterID + '&HEntryID=&HSouceBillType=' + 4529 + ''
                        , btn: [],
                        end: function (index, layero, that) {
                            //刷新页面
                            $("#btnSearch").trigger('click');
                        }
                    })
                }
            }


            //下推异常反馈处理单
            function set_XTHand() {
@@ -790,6 +768,21 @@
            }
            //#endregion


            //#region ä»»æ„å­—段过滤：列名显示下拉框
            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].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }
            //#endregion

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

            //获取当前用户的默认过滤方案
@@ -998,7 +991,7 @@

            //#endregion

         

        });

            //#endregion