From 65968b3e0e9e03ef0904de35b78872224b9ce00a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 23 九月 2025 14:15:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

---
 WebTM/views/采购管理/应付单/Cg_PayableBillQuery.html |  138 +++++++++++++++++++++++++++++++---------------
 1 files changed, 93 insertions(+), 45 deletions(-)

diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html"
index b1f41a9..62ae6f0 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBillQuery.html"
@@ -1,5 +1,6 @@
 锘�<!DOCTYPE html>
 <html>
+
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>搴斾粯鍗曟煡璇�</title>
@@ -42,49 +43,58 @@
                                 <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 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" id="HBeginDate" style="width:190px;">
+                                        <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;">
+                                        <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate"
+                                            style="width:190px;">
                                     </div>
                                 </div>
                                 <div class="layui-inline">
                                     <label class="layui-form-label">鍗曟嵁鍙�</label>
                                     <div class="layui-input-block">
-                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
+                                        <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo"
+                                            id="HBillNo" style="width:190px;">
                                     </div>
                                 </div>
-                                
-                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+
+                                <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>
+                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+                                    lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
                                 <!--鏄剧ず褰撳墠杩囨护鏂规-->
                                 <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 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" style="margin-top:5px">
                                         <div class="layui-inline">
                                             <label class="layui-form-label">涓氬姟鍛�</label>
                                             <div class="layui-input-block">
-                                                <input type="text" class="layui-input ForFilteringSchemes" name="HEmpName" id="HEmpName" style="width:190px;">
+                                                <input type="text" class="layui-input ForFilteringSchemes"
+                                                    name="HEmpName" id="HEmpName" style="width:190px;">
                                             </div>
                                         </div>
                                         <div class="layui-inline">
                                             <label class="layui-form-label">渚涘簲鍟�</label>
                                             <div class="layui-input-block">
-                                                <input type="text" class="layui-input ForFilteringSchemes" name="HSupName" id="HSupName" style="width:190px;">
+                                                <input type="text" class="layui-input ForFilteringSchemes"
+                                                    name="HSupName" id="HSupName" style="width:190px;">
                                             </div>
                                         </div>
                                     </div>
@@ -93,19 +103,25 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">杩囨护</label>
                                                 <div class="layui-input-block">
-                                                    <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
+                                                    <select name="ColName" id="ColName" class="ForFilteringSchemes"
+                                                        lay-filter="ColName" style="width:190px;">
                                                     </select>
                                                 </div>
                                             </div>
                                             <div class="layui-inline">
-                                                <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
+                                                <select name="Comparator" id="Comparator" class="ForFilteringSchemes"
+                                                    lay-filter="Comparator" style="width:190px;">
                                                     <option value="0" selected="selected"></option>
                                                     <option value="=">=</option>
                                                     <option value=">=">>=</option>
                                                     <option value=">">></option>
-                                                    <option value="<="><=</option>
-                                                    <option value="<"><</option>
-                                                    <option value="<>"><></option>
+                                                    <option value="<=">
+                                                        <=< /option>
+                                                    <option value="<">
+                                                        << /option>
+                                                    <option value="<>">
+                                                        <>
+                                                    </option>
                                                     <option value="7">鍖呭惈</option>
                                                     <option value="8">宸﹀寘鍚�</option>
                                                     <option value="9">鍙冲寘鍚�</option>
@@ -113,7 +129,8 @@
                                                 </select>
                                             </div>
                                             <div class="layui-inline">
-                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value=""
+                                                    name="ColContent" id="ColContent">
                                             </div>
                                         </div>
 
@@ -121,19 +138,25 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">杩囨护</label>
                                                 <div class="layui-input-block">
-                                                    <select name="ColName1" id="ColName1" class="ForFilteringSchemes" 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" class="ForFilteringSchemes" 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>
                                                     <option value=">">></option>
-                                                    <option value="<="><=</option>
-                                                    <option value="<"><</option>
-                                                    <option value="<>"><></option>
+                                                    <option value="<=">
+                                                        <=< /option>
+                                                    <option value="<">
+                                                        << /option>
+                                                    <option value="<>">
+                                                        <>
+                                                    </option>
                                                     <option value="7">鍖呭惈</option>
                                                     <option value="8">宸﹀寘鍚�</option>
                                                     <option value="9">鍙冲寘鍚�</option>
@@ -141,7 +164,8 @@
                                                 </select>
                                             </div>
                                             <div class="layui-inline">
-                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value=""
+                                                    name="ColContent1" id="ColContent1">
                                             </div>
                                         </div>
 
@@ -149,19 +173,25 @@
                                             <div class="layui-inline">
                                                 <label class="layui-form-label">杩囨护</label>
                                                 <div class="layui-input-block">
-                                                    <select name="ColName2" id="ColName2" class="ForFilteringSchemes" 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" class="ForFilteringSchemes" 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>
                                                     <option value=">">></option>
-                                                    <option value="<="><=</option>
-                                                    <option value="<"><</option>
-                                                    <option value="<>"><></option>
+                                                    <option value="<=">
+                                                        <=< /option>
+                                                    <option value="<">
+                                                        << /option>
+                                                    <option value="<>">
+                                                        <>
+                                                    </option>
                                                     <option value="7">鍖呭惈</option>
                                                     <option value="8">宸﹀寘鍚�</option>
                                                     <option value="9">鍙冲寘鍚�</option>
@@ -169,7 +199,8 @@
                                                 </select>
                                             </div>
                                             <div class="layui-inline">
-                                                <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+                                                <input type="text" class="layui-input ForFilteringSchemes" value=""
+                                                    name="ColContent2" id="ColContent2">
                                             </div>
                                         </div>
                                     </div>
@@ -220,7 +251,7 @@
             base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
         }).extend({
             index: 'lib/index', //涓诲叆鍙fā鍧�
-        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
             //#region 鍏叡鍙橀噺
             var $ = layui.$
                 , admin = layui.admin
@@ -242,7 +273,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1114";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion
 
             ////涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
@@ -369,7 +400,7 @@
                 set_ClearQuery();
             });
 
-            table.on('tool(mainTable)' , function (obj) {
+            table.on('tool(mainTable)', function (obj) {
                 var data = obj.data;
                 if (obj.event == '鍗曟嵁鍙�') {
                     var linterid = data.hmainid.toString();
@@ -396,7 +427,7 @@
 
             //鏌ヨ鎸夐挳
             form.on('submit(btnSearch)', function (data) {
-                get_FastQuery(table, option,2);
+                get_FastQuery(table, option, 2);
             });
 
             //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鐩戝惉
@@ -439,7 +470,7 @@
                 //鍒濆鍖栬〃鏍�
                 set_InitGrid();
                 //鐩存帴鎵ц鍒楄〃绛涢�� 鍔犺浇鏁版嵁鍒扮綉鏍�
-                get_FastQuery(table, option,1)
+                get_FastQuery(table, option, 1)
 
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
                 get_DefaultModule();
@@ -470,7 +501,7 @@
                     , totalRow: true
                     , cellMinWidth: 90
                     , limit: 50
-                    , cols:[[]]
+                    , cols: [[]]
                     , limits: [50, 500, 5000, 20000]
                     , done: function (res, curr, count) {
                         soulTable.render(this);
@@ -485,7 +516,7 @@
                     url: GetWEBURL() + '/Cg_PayableBill/QueryList',
                     type: "GET",
                     async: false,
-                    data: { "sWhere": sWhere  , "user": sessionStorage["HUserName"]},
+                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                     success: function (data1) {
                         if (data1.count == 1) {
                             var data = [];//鍒楀瓧娈垫暟鎹�
@@ -503,7 +534,7 @@
                                 }
                             }
                             //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
-                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣'});
+                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
                             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) {
@@ -523,7 +554,7 @@
                                             return '<span style="color: blue;">' + d.褰撳墠瀹℃牳椤圭洰 + '</span>'
                                         }, style: 'cursor: pointer;'
                                     });
-                                }else {
+                                } else {
                                     switch (data[i].Type) {
                                         //int
                                         case 'DateTime':
@@ -537,13 +568,13 @@
 
                             option.cols = [col];
                             option.data = data1.data;
-                            table.render(option);
+
 
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
+                            table.render(option);
 
-
-                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
+                            if ($("#ColName option").length < 1) {
                                 ColFilter();
                             }
                             layer.close(ajaxLoad);
@@ -573,7 +604,7 @@
                         if (data1.count == 1) {
                             var data = [];//鍒楀瓧娈垫暟鎹�
                             var col = [];
-                            var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�","鍏ュ簱鏁伴噺", "閲戦"];
+                            var totalArray = ["鏁伴噺", "鍏宠仈鏁伴噺", "鏈叧鑱旀暟閲�", "鍏ュ簱鏁伴噺", "閲戦"];
                             titleData = [];
                             //缁欑┖鐨勬暟缁勮祴鍊�
                             for (var key in data1.list) {
@@ -1026,7 +1057,7 @@
 
 
             //蹇�熻繃婊�
-            function get_FastQuery(table, option,number) {
+            function get_FastQuery(table, option, number) {
                 var HBeginDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
                 var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
                 var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
@@ -1434,7 +1465,7 @@
 
                 //鏄剧ず瀛愯〃
                 get_DisplaySub(obj.data);
-                
+
 
 
             })
@@ -1448,6 +1479,22 @@
             })
             //#endregion
 
+            //#region 鎺掑簭鍚庨�夋嫨
+            table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+                table.reload('mainTable', {
+                    initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟
+                    , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級
+                        field: obj.field //鎺掑簭瀛楁   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                        , order: obj.type //鎺掑簭鏂瑰紡   鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈�  field order
+                    }
+                });
+                option.data = layui.table.cache["mainTable"];
+                table.render(option);
+                //鍒锋柊鎸夐挳鏄剧ず
+                var btns = document.getElementsByTagName("button");     //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+                Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
+            });
+            //#endregion
 
             //#region 鍒濆鏃ユ湡闂撮殧 涓嬫媺鍒楄〃
             function setSelect_HInitTimeCycle() {
@@ -1543,8 +1590,8 @@
                             //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
                             document.getElementById("HFilterScheme_Now").style.display = "none";
                             ////鎵ц鏌ヨ鏂规硶
-                            get_FastQuery()
-                            //form.render("select");
+                            //get_FastQuery()
+                            form.render("select");
                         }
                     }, error: function () {
                         layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -1786,4 +1833,5 @@
         //#endregion
     </script>
 </body>
+
 </html>
\ No newline at end of file

--
Gitblit v1.9.1