From a16d0d40755d4da86242ef12472aed2d1a8b2ffb Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期三, 17 十二月 2025 13:11:29 +0800
Subject: [PATCH] 1

---
 WebTM/views/设备管理/Sb_EquipMaintainBillList.html |  113 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 67 insertions(+), 46 deletions(-)

diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
index bbe6910..80c8897 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/Sb_EquipMaintainBillList.html"
@@ -11,8 +11,13 @@
     <script src="../../layuiadmin/layui/layui.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>
+    <script src="../../layuiadmin/SetColumn.js"></script>
+    <script src="../../layuiadmin/HideButton_New.js"></script>
+    <script src="../../layuiadmin/Scripts/json2.js"></script>
+    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
+    <script src="../../layuiadmin/PubCustom.js"></script>
+    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
 
     <style type="text/css">
         input.layui-input.layui-unselect {
@@ -72,14 +77,7 @@
                                 <div class="layui-inline" style="margin-left:5px;">
                                     <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
                                 </div>
-                                <div class="layui-colla-content">
-                                    <div class="layui-row">
-                                        <div class="layui-inline">
-                                            <div class="layui-inline">
-                                                <span>鍏朵粬鏉′欢></span>
-                                            </div>
-                                        </div>
-                                    </div>
+                                <div class="layui-colla-content">                                    
                                     <div class="layui-row">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">杩囨护</label>
@@ -111,12 +109,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" lay-filter="ColName1" class="ForFilteringSchemes" 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" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
@@ -131,19 +129,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" lay-filter="ColName2" class="ForFilteringSchemes" 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" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
                                                 <option value="0" selected="selected"></option>
                                                 <option value="=">=</option>
                                                 <option value=">=">>=</option>
@@ -158,7 +156,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>
@@ -214,12 +212,7 @@
             </div>
         </div>
     </div>
-    <script src="../../layuiadmin/layui/layui.js"></script>
-    <script src="../../layuiadmin/Scripts/json2.js"></script>
-    <script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
-    <script src="../../layuiadmin/Scripts/webConfig.js"></script>
-    <script src="../../layuiadmin/PubCustom.js"></script>
-    <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+  
     <script>
         layui.config({
             base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -261,7 +254,7 @@
             var titleData = ["hmainid", "鍗曟嵁绫诲瀷", "琛ㄥご澶囨敞", "閰嶄欢浠g爜", "hsubid", "琛屽叧闂汉", "琛ㄤ綋澶囨敞", "浣滃簾鏃ユ湡", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "HEquipID", "鍐呴儴鍗曟嵁鍙�", "HMaterID", "鍗曚綅ID", "璐熻矗浜篒D", "HBillType", "sorderid"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             //#region 銆愯繃婊ゆ柟妗堛��
 
-            //杩囨护鏉′欢鐨刢lass绫� 
+            //杩囨护鏉′欢鐨刢lass绫�
             var HClassTag = "ForFilteringSchemes";
             //妯″潡鍚嶇О锛堜腑鏂囩増锛� 姣忎釜妯″潡椤甸潰閮介渶瑕佷慨鏀�
             window.HModuleName = "璁惧淇濆吇璁板綍鍗曞垪琛�";
@@ -351,7 +344,31 @@
                 } else {
                     get_FastQuery(table, option);
                 }
-                
+
+            });
+
+
+
+            table.on('tool(mainTable)', function (obj) {
+                var data = obj.data;
+                if (obj.event == '鍗曟嵁鍙�') {
+                    var linterid = data.hmainid.toString();
+                    //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+                    layer.open({
+                        type: 2
+                        , area: ['100%', '100%']
+                        , title: '缂栬緫' + HPageTitle
+                        , shade: 0.6 //閬僵閫忔槑搴�
+                        , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+                        , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+                        , content: '../璁惧绠$悊/Sb_EquipMaintainBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+                        , resize: false
+                        , cancel: function () {
+                            //$(".layui-btn").removeClass("layui-btn-disabled");
+                        }
+                    })
+
+                }
             });
             //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
             form.on('select(HInitTimeCycle)', function (data) {
@@ -396,7 +413,7 @@
                 //鍒濆鍖栬〃鏍�(瀛愯〃2)
                 set_InitGrid2();
                 //鏌ヨ
-                //get_Display(sWhere);
+                get_FastQuery();
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
                 get_DefaultModule();
             }
@@ -541,10 +558,10 @@
                         , { field: 'HManagerName', title: '璐熻矗浜�', width: 200 }
                         , { field: 'HRemark', title: '澶囨敞', width: 200 }
                     ]]
-                };                               
+                };
                 option1.data = [];
                 table1.render(option1);
-                layer.close(ajaxLoad);              
+                layer.close(ajaxLoad);
             }
             //鍒濆鍖栬〃鏍�(瀛愯〃2)
             function set_InitGrid2() {
@@ -582,11 +599,9 @@
             }
             //鍔犺浇缃戞牸
             function get_Display(sWhere) {
-                var ajaxLoad = layer.load();    
+                var ajaxLoad = layer.load();
                 //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
                 $.ajax({
-                    //h_v_Sc_EquipMaintain
-                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
                     url: GetWEBURL() + '/Sb_EquipMaintainBill/GetEquipMaintainBillList',
                     type: "GET",
                     async: false,
@@ -610,6 +625,7 @@
                                 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
@@ -622,7 +638,7 @@
                                         case 'double':
                                         case 'Decimal':
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
-                                            break;  
+                                            break;
                                         default:
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                     }
@@ -645,21 +661,18 @@
                                     soulTable.render(this);
                                 }
                             }
-                            table.render(option);
+                            //鍒楄缃�
+                            DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData);
 
-                            //鍒锋柊琛ㄦ牸鏁版嵁
-                            DisPlay_HideColumn();
-                            //鍒锋柊鎸夐挳鏄剧ず
-                            var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
-                            var HBillType = "3901";
-                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+                            ////鍒锋柊琛ㄦ牸鏁版嵁
+                            ins = table.render(option);
 
                             layer.close(ajaxLoad);
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            if ($("#ColName option").length < 1) {
                                 ColFilter();
                             }
-                            //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
-                        } else {
+                            //鍒锋柊鎸夐挳鏄剧ず
+                            Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
                             layer.close(ajaxLoad);
                             layer.alert(data1.code + data1.Message, { icon: 5 });
                         }
@@ -669,13 +682,14 @@
                     }
                 })
             }
-
+           
             //#region 鍒嗛〉鏌ヨ
             function get_DisplayPage(sWhere) {
                 var ajaxLoad = layer.load();
                 $.ajax({
                     url: GetWEBURL() + '/Sb_EquipMaintainBill/GetEquipMaintainBillListPage',
                     type: "GET",
+                    async: false,
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
                     success: function (data1) {
                         option.limit = size;//鏀瑰彉琛ㄦ牸椤靛ぇ灏�
@@ -699,11 +713,18 @@
                                 if ($.inArray(data[i].name, titleData) > -1) {
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
                                 }
+                                else if (data[i].name == '鍗曟嵁鍙�') {//娣诲姞瓒呴摼鎺�
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+                                        }, style: 'cursor: pointer;'
+                                    });
+                                }
                                 else {
                                     switch (data[i].Type) {
                                         //int
                                         case 'DateTime':
-                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 160 });
                                             break;
                                         case 'Decimal':
                                             col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
@@ -898,7 +919,7 @@
                 else {
                     layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
                 }
-            }  
+            }
 
             //棰勮
             function get_ViewReport() {
@@ -1035,7 +1056,7 @@
                 $("#HBillNo").val("");//鍗曟嵁鍙�
                 $("#HSourceBillNo").val("");//婧愬崟鍙�
                 $("#HCreateBy").val("");//鍒跺崟浜�
-                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * (HInitTimeCycle+1)), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
                 $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
                 $("#ColContent").val("");
                 $("#ColName").val("0");
@@ -1170,7 +1191,7 @@
                 for (var i = 0; i < Filter.length; i++) {
                     HFilterIdList = Filter[i].id; //杩囨护鏉′欢ID
                     HFilterIdLists += Filter[i].id + ","; //杩囨护鏉′欢ID(鎷兼帴)
-                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�                    
+                    HValue += $("#" + HFilterIdList).val() + ","; //杩囨护鏉′欢涓緭鍏ョ殑鍊�
                     HElement_type += document.getElementById(HFilterIdList).tagName + ",";//閫氳繃鏍囩id鑾峰彇鏍囩绫诲瀷
                 }
 

--
Gitblit v1.9.1