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

yangle

2024-11-05 8066717769fced33300ce3ba86fa74e128aa34ef

 WebTM/views/ÖÊÁ¿¹ÜÀí/Òì³£·´À¡/OA_ErrMsgBackSelfQuery.html

@@ -25,6 +25,44 @@
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-inline">
                            <label class="layui-form-label">事件状态</label>
                            <div class="layui-input-block">
                                <select id="HReadFlag" name="HReadFlag" lay-filter="HReadFlag" class="ForFilteringSchemes" style="width:190px;">
                                    <option value="" selected="selected">全部</option>
                                    <option value="2">已反馈</option>
                                    <option value="13">已签到</option>
                                    <option value="9">已处理</option>
                                    <option value="10">已验收</option>
                                </select>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">生产资源</label>
                            <div class="layui-input-block">
                                <input type="text" class="layui-input" lay-verify="HSourceName" name="HSourceName" id="HSourceName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                <input type="hidden" class="layui-input" lay-verify="HSourceID" name="HSourceID" id="HSourceID" value="0">
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHDeptID" id="btnHDeptID" style="padding: 0 10px;float: right;margin-right: 3px;">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label">开始日期</label>
                            <div class="layui-input-block">
                                <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label">结束日期</label>
                            <div class="layui-input-block">
                                <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
                            </div>
                        </div>
                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                        </button>
                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                        <div class="layui-tab layui-tab-card" style="margin-top:20px;">
                            <ul class="layui-tab-title">
                                <li class="layui-this">我接收的</li>
@@ -118,8 +156,10 @@
                set_InitGrid_send();
                //初始化抄送列表
                set_InitGrid_copy();
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //查询
                get_Display();
                get_FastQuery();
            }

            table.on('toolbar(mainTable_receive)', function (obj) {
@@ -157,6 +197,15 @@
                };
            });

            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });

            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });

            //初始化接收列表
            function set_InitGrid_notStart() {
@@ -209,7 +258,7 @@
                    url: GetWEBURL() + '/Sc_MESTransFerWorkBill/GetSc_MESTransFerWorkBillQuery',
                    type: "GET",
                    async: false,
                    data: {  "user": sessionStorage["HUserName"] },
                    data: { "sWhere":sWhere,"user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.count == 1) {

@@ -311,6 +360,34 @@
            }
            //#endregion

            function get_FastQuery() {
                var HStatus = $("#HReadFlag").val();//阅读状态
                var HBeginDate = $("#HBeginDate").val();//开始日期
                var HEndDate = $("#HEndDate").val();//结束日期
                var HSourceID = $("#HSourceID").val();//发送人                           
                sWhere = {
                    HStatus: HStatus
                    , HBeginDate: HBeginDate
                    , HEndDate: HEndDate
                    , HSourceID: HSourceID
                }
                get_Display(JSON.stringify(sWhere));
                //调用接口后清空sWhere缓存
                sWhere = "";
            }

            //重置过滤条件
            function set_ClearQuery() {
                $('#HReadFlag').val("");
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HSourceName").val("");
                $('#HSourceID').val("0");
                sWhere = "";
                get_Display(sWhere);
            }
            //#endregion

            //#region å¯¼å‡ºExecel
            function get_Export() {
                var data = option_receive.data