From fef7cdb9a7402aafb225b03ecc0e0e09eaebe58c Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 08 四月 2025 08:59:17 +0800
Subject: [PATCH] 1

---
 WebTM/views/设备管理/Sb_EquipDotCheckBillList.html |  143 ++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 115 insertions(+), 28 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
index 33aaaf9..4997b4a 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipDotCheckBillList.html"
@@ -9,9 +9,10 @@
     <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
     <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
     <script src="../../layuiadmin/layui/layui.js"></script>
-    <script src="../../layuiadmin/HideButton.js"></script>
     <script src="../../layuiadmin/soulTable.slim.js"></script>
     <script src="../../layuiadmin/PageTitle.js"></script>
+    <script src="../../../layuiadmin/SetColumn.js"></script>
+    <script src="../../../layuiadmin/HideButton_New.js"></script>
 
     <style type="text/css">
         input.layui-input.layui-unselect {
@@ -40,15 +41,28 @@
                                 </div>
                                
                                 <div class="layui-inline">
+                                    <label class="layui-form-label">鍒跺崟浜�</label>
+                                    <div class="layui-input-block">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HCreateBy" id="HCreateBy">
+                                    </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 class="layui-inline">
                                     <label class="layui-form-label">寮�濮嬫椂闂�</label>
                                     <div class="layui-input-block">
-                                        <input type="date" class="layui-input ForFilteringSchemes" name="BenginHCreateDate" id="BenginHCreateDate">
+                                        <input type="date" class="layui-input ForFilteringSchemes" name="HBeginDate" id="HBeginDate">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">缁撴潫鏃堕棿</label>
                                     <div class="layui-input-block">
-                                        <input type="date" class="layui-input ForFilteringSchemes" name="EndHCreateDate" id="EndHCreateDate">
+                                        <input type="date" class="layui-input ForFilteringSchemes" name="HEndDate" id="HEndDate">
                                     </div>
                                 </div>
                                 <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -98,12 +112,12 @@
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
                                             <div class="layui-input-block">
-                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
+                                                <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" lay-filter="Comparator1" style="width:190px;">
+                                            <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>
@@ -118,19 +132,19 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
                                         </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">
-                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
+                                                <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" lay-filter="Comparator2" style="width:190px;">
+                                            <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>
@@ -145,7 +159,7 @@
                                             </select>
                                         </div>
                                         <div class="layui-inline">
-                                            <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
+                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                         </div>
                                     </div>
                                 </div>
@@ -156,6 +170,7 @@
                         <script type="text/html" id="toolbarDemo">
                             <div class="layui-btn-container">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_LookDown" id="btn_LookDown"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
+                            <div class="layui-btn-container"  id="toolbarDemo_ButtonSet">
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="AddNew"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="ShowBill"><i class="layui-icon layui-icon-edit"></i>缂栬緫</button>
                                 <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="DeleteBill"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
@@ -214,12 +229,14 @@
             var ins;
             var HModName = "Sb_EquipDotCheckBillList";
 
+            var HBillType = "3903";
+            var set_HideButton_ID = "toolbarDemo_ButtonSet";//闇�瑕佽缃殑鎸夐挳鐨勭埗绾ц妭鐐圭殑id
 
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "3903";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
             var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
-        //#endregion
+            //#endregion
 
             var titleData = ["hmainid", "hsubid", "璁惧ID", "鍐呴儴鍗曟嵁鍙�", "鐐规椤圭洰ID", "璐熻矗浜篒D", "璁惧鐐规瑙勭▼ID", "HBillType", "sorderid","HShiftsID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
 
@@ -270,7 +287,7 @@
                     case 'btn_LookDown': get_Export();
                         break;
                     //鍒楄缃�
-                    case 'set_HideColumn': get_HideColumn();
+                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
                         break;
                     //瀹℃牳
                     case 'set_CheckBill': set_CheckBill(1);
@@ -286,9 +303,7 @@
                         break;
                     //鎸夐挳璁剧疆
                     case 'set_HideButton':
-                        var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                        var HBillType = "3903";
-                        get_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                        get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                         break;
                     //淇濆瓨鏂规
                     case 'set_SaveScheme': set_SaveScheme();
@@ -310,13 +325,43 @@
             form.on('submit(btnReSearch)', function (data) {
                 set_ClearQuery();
             });
+            //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
+            form.on('select(HInitTimeCycle)', function (data) {
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+
+                    $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                    $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+                    //鎵ц鏌ヨ鏂规硶
+                    get_FastQuery();
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+            });
            //#endregion
 
             //#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
             //鍒濆鍖栫晫闈�
             function set_ClearBill() {
-                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
-                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+                //鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+                setSelect_HInitTimeCycle();
+                //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                if (HInitTimeCycle != -1) {
+                    $('#HBeginDate').prop('disabled', true);
+                    $('#HEndDate').prop('disabled', true);
+                } else {
+                    $('#HBeginDate').prop('disabled', false);
+                    $('#HEndDate').prop('disabled', false);
+                }
+
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鏌ヨ
@@ -554,14 +599,18 @@
                             option.data = data1.data;
                             option.totalRow = true;
                             laypage.render(optionPage);
-                            //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
+                            //鍒楄缃�
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
+
+                            ////鍒锋柊琛ㄦ牸鏁版嵁
+                            ins = table.render(option);
 
                             layer.close(ajaxLoad);
                             if ($("#ColName option").length < 1) {
                                 ColFilter();
                             }
-
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                         } else {
                             layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
@@ -666,8 +715,8 @@
                 //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
                 var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
                 var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
-                var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
-                var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
+                var HBeginDate = $("#HBeginDate").val();//寮�濮嬪埗鍗曟椂闂�
+                var HEndDate = $("#HEndDate").val();//缁撴潫鍒跺崟鏃堕棿
                 var ColName = $("#ColName").val();//澶嶉�夋
                 var Comparator = $("#Comparator").val()
                 var ColContent = $("#ColContent").val();
@@ -737,7 +786,7 @@
                             com2 = "not like'%" + ColContent2 + "%'";
                             break;
                         default:
-                            com2 = "" + Comparator + "'" + ColContent + "'";
+                            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                             break;
                     }
                     sWhere += " and " + ColName2 + " " + com2;
@@ -748,11 +797,11 @@
                 if (HCreateBy) {
                     sWhere += " and 鍒跺崟浜� like '%" + HCreateBy + "%'";
                 }
-                if (BenginHCreateDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
+                if (HBeginDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
                 }
-                if (EndHCreateDate) {
-                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
+                if (HEndDate) {
+                    sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HEndDate + "'";
                 }
                 //get_Display(sWhere);
                 //鏁版嵁搴撳垎椤�
@@ -762,11 +811,12 @@
             //閲嶇疆杩囨护鏉′欢鏂规硶
             function set_ClearQuery() {
                 //$("#HBillType").val("");//鍗曟嵁绫诲瀷
+                var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
                 $("#HBillNo").val("");//鍗曟嵁鍙�
                 $("#HSourceBillNo").val("");//婧愬崟鍙�
                 $("#HCreateBy").val("");//鍒跺崟浜�
-                $("#BenginHCreateDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
-                $("#EndHCreateDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 $("#ColContent").val("");
                 $("#ColName").val("0");
                 $("#Comparator").val("0");
@@ -1006,6 +1056,25 @@
                 form.render('select');
             }
             //#endregion
+
+            //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
+            function setSelect_HInitTimeCycle() {
+                var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
+                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
+
             //#endregion
 
             //#region 銆愯繃婊ゆ柟妗堛��
@@ -1038,6 +1107,24 @@
                                     $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
                                 }
                             }
+
+                            var HInitTimeCycle = $("#HInitTimeCycle").val() * 1;
+                            //鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
+                            if (HInitTimeCycle != -1) {
+                                $('#HBeginDate').prop('disabled', true);
+                                $('#HEndDate').prop('disabled', true);
+
+                                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));
+                                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
+
+                                //鎵ц鏌ヨ鏂规硶
+                                get_FastQuery();
+                            } else {
+                                $('#HBeginDate').prop('disabled', false);
+                                $('#HEndDate').prop('disabled', false);
+                            }
+
                             //鎵ц鏌ヨ鏂规硶
                             get_FastQuery()
                             form.render("select");

--
Gitblit v1.9.1