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

yusijie

2023-08-30 b9500010e1d8687171b42c320342fe2dd5b6c704

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

@@ -41,7 +41,7 @@
                                <div class="layui-inline">
                                    <label class="layui-form-label">阅读状态</label>
                                    <div class="layui-input-block">
                                        <select name="HReadFlag" lay-filter="HReadFlag" style="width:190px;">
                                        <select id="HReadFlag" name="HReadFlag" lay-filter="HReadFlag" style="width:190px;">
                                            <option value="-1" selected="selected">全部</option>
                                            <option value="0">未阅</option>
                                            <option value="1">已阅</option>
@@ -80,10 +80,10 @@
                                    <div class="layui-inline">
                                        <label class="layui-form-label">紧急程度</label>
                                        <div class="layui-input-block">
                                            <select name="HLevel" lay-filter="HLevel" style="width:190px;">
                                                <option value="-1" selected="selected">全部</option>
                                                <option value="0">普通</option>
                                                <option value="1">紧急</option>
                                            <select id="HLevel" name="HLevel" lay-filter="HLevel" style="width:190px;">
                                                <option value="全部" selected="selected">全部</option>
                                                <option value="普通">普通</option>
                                                <option value="紧急">紧急</option>
                                            </select>
                                        </div>
                                    </div>
@@ -130,6 +130,7 @@
            //查询条件
            var sWhere = "";
            var option = [];
            var titleData = ["HInterID", "HEntryID", "HDeptID","HBillStatus"];
            //#endregion

            var HModName = "Sc_MESExecptFeedBackBillList";
@@ -154,10 +155,10 @@
                    case 'btn-Delete':set_DeleteBill();
                        break;
                    //审核按钮
                    case 'btn-Audit': set_CheckBill();
                    case 'btn-Audit': set_AuditBill();
                        break;
                    //反审核按钮
                    case 'btn-DeAudit': set_AbandonCheck();
                    case 'btn-DeAudit': set_DeAuditBill();
                        break;
                    //刷新
                    case 'get_Refresh': set_Refresh();
@@ -184,8 +185,8 @@


            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
                //初始化表格
                function set_InitGrid() {
            //初始化表格
            function set_InitGrid() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                var columns = [
@@ -232,7 +233,7 @@
            }
            //加载网格
            function get_Display(sWhere) {
                var wait = layer.load();//遮罩
                var ajaxLoad = layer.load();//遮罩

                $.ajax({
                    url: GetWEBURL() + '/Sc_MESTransFerWorkBill/Get_TransFerBillList',
@@ -240,16 +241,43 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {
                            DataList = data1.data;
                            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 });
                            }
                            //在列表左边添加勾选框
                            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 {
                                    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.cols = [col];
                            option.data = data1.data;
                            table.render(option);
                            layer.close(wait);

                            layer.close(ajaxLoad);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            layer.close(wait);
                            layer.alert(data1.Message, { icon: 5 });
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
@@ -257,14 +285,22 @@
            }


            //隐藏列设置
            //#region éšè—åˆ—设置
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length - 1; i++) {
                var contentUrl = "";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }

                var urlStr = window.document.location.pathname;//获取文件路径
                var urlLen = urlStr.split('/');
                for (var i = 0; i < urlLen.length - 4; i++) {
                    contentUrl += "../";
                }
                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码

                contentUrl += '基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;

                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
@@ -273,7 +309,7 @@
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                    , content: [contentUrl, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
@@ -283,8 +319,8 @@
                    }
                })
            }

            //显示列数据
            //#endregion
            //#region æ˜¾ç¤ºåˆ—数据
            function DisPlay_HideColumn() {
                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
@@ -293,13 +329,12 @@
                    success: function (data1) {
                        if (data1.data.length != 0) {


                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["HMaterID", "HUnitID", "HICMOEmpID"];//不需要显示的字段 å¯æ‰©å±•
                            //var titleData = ["单据ID", "HMouldID", "hsubid", "HManagerID", "源单主内码", "源单子内码"];//不需要显示的字段 å¯æ‰©å±•

                            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) {
@@ -366,6 +401,7 @@
                    }
                })
            }
            //#endregion



@@ -425,9 +461,9 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    var InterID = data[0].HInterID.toString();
                    var HEntryID = data[0].HEntryID.toString();
                    var HReadFlag = data[0].HReadFlag.toString();
                    var HReadFlag = data[0].阅读状态.toString();
                    if (HReadFlag == "未阅") {
                        //逻辑删除方法
                        layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
@@ -473,44 +509,44 @@
            }

            function get_FastQuery() {
                var HStatus = $("select[name='HReadFlag']").val();//状态
                var HStatus = $("#HReadFlag").val();//阅读状态
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HSendMan = $("#HSendMan").val();//发送人
                var HLevel = $("select[name='HLevel']").val();//紧急程度
                var HLevel = $("#HLevel").val();//紧急程度
                if (HStatus) {
                    switch (HStatus) {
                        case '-1':   //全部
                            sWhere += "";
                            break;
                        case '0':    //未阅
                            sWhere += " and B.HReadFlag='0'";
                            sWhere += " and é˜…读状态 = '未阅'";
                            break;
                        case '1':    //已阅
                            sWhere += " and B.HReadFlag='1'";
                            sWhere += " and é˜…读状态 = '已阅'";
                            break;
                        default:
                    }
                }
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),A.HDate, 23) >= '" + HBeginDate + "'";
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HBeginDate + "'";
                }
                if (HEndDate) {
                    sWhere += " and CONVERT(varchar(100),A.HDate, 23) <= '" + HEndDate + "'";
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HEndDate + "'";
                }
                if (HSendMan) {
                    sWhere += " and A.HSendMan like '%" + HSendMan + "%'";
                    sWhere += " and å‘送人 like '%" + HSendMan + "%'";
                }
                if (HLevel) {
                    switch (HLevel) {
                        case '-1':   //全部
                        case '全部':   //全部
                            sWhere += "";
                            break;
                        case '0':    //普通
                            sWhere += " and A.HLevel='0'";
                        case '普通':    //普通
                            sWhere += " and ç´§æ€¥ç¨‹åº¦ ='普通'";
                            break;
                        case '1':    //紧急
                            sWhere += " and A.HLevel='1'";
                        case '紧急':    //紧急
                            sWhere += " and ç´§æ€¥ç¨‹åº¦ ='紧急'";
                            break;
                        default:
                    }
@@ -522,11 +558,11 @@

            //重置过滤条件
            function set_ClearQuery() {
                $('#HReadFlag').find("option[value='-1']").attr("selected", true);
                $('#HReadFlag').val("-1");
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HSendMan").val("");
                $('#HLevel').find("option[value='-1']").attr("selected", true);
                $('#HLevel').val("普通");
                sWhere = "";
                get_Display(sWhere);
            }
@@ -538,8 +574,8 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HBillStatus = data[0].HBillStatus.toString(); //单据状态
                    var InterID = data[0].hmainid.toString();
                    if (HBillStatus > 0) {
                    var InterID = data[0].HInterID.toString();
                    if (HBillStatus > 1) {
                        layer.msg('单据不为未审核状态,不能再次审核！');
                        return false;
                    }
@@ -579,8 +615,8 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HBillStatus = data[0].HBillStatus.toString(); //单据状态
                    var InterID = data[0].hmainid.toString();
                    if (HBillStatus=0) {
                    var InterID = data[0].HInterID.toString();
                    if (HBillStatus==1) {
                        layer.msg('单据未审核状态,无需反审核！');
                        return false;
                    }