From 3425237a2b54ca28fc3e3c5f7c35a7fbef4e15fa Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 29 十二月 2025 09:19:29 +0800
Subject: [PATCH] 1

---
 WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
index 1f2b554..ca3e5a1 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
@@ -304,7 +304,7 @@
             //#region 銆愬姩鎬佽幏鍙栨ā鍧楀悕绉般��
             var HModuleType = "1601";
             //閫氳繃鍗曟嵁绫诲瀷锛屼粠鏁版嵁搴撳姩鎬佽幏鍙栧崟鎹ā鍧楀懡鍚�,寮曠敤js鏂囦欢 PageTitle.js
-            var HPageTitle = get_PageTitle(HModuleType) == "" ? document.title : get_PageTitle(HModuleType);
+            var HPageTitle = get_PageTitle(HModuleType) || document.title;
             //#endregion
             var titleData = ["hmainid", "HBillType", "HSupID", "涓氬姟鐘舵��", "HUnitID", "渚涘簲鍟嗕唬鐮�", "涓氬姟鍛樹唬鐮�", "HPriority", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
             //#region 銆愯繃婊ゆ柟妗堛��
@@ -472,9 +472,9 @@
                 //鍔犺浇涓氬姟鍛�
                 get_HEmpName();
                 //闅愯棌鍕鹃�夊瓧娈�
-                DisPlay_HideColumn();
+                // DisPlay_HideColumn();
                 //浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
-                ColFilter();
+                
                 //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
                 get_DefaultModule();
             }
@@ -630,6 +630,7 @@
                 $.ajax({
                     url: GetWEBURL() + '/WW_EntrustOrderBill/list',
                     type: "GET",
+                    async: false,
                     data: { "sWhere": sWhere, "user": sessionStorage["HUserName"],},
                     success: function (data1) {
                         if (data1.count == 1) {
@@ -650,7 +651,10 @@
                                 else if ($.inArray(data[i].name, totalArray) > -1) { //璁$畻鍒�  
                                     col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                 } else if (data[i].name == '鍗曟嵁鍙�') {
-                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+                                    col.push({
+                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�', event: '鍗曟嵁鍙�', templet: function (d) {
+                                            return '<span style="color: blue;">' + d.鍗曟嵁鍙� + '</span>'
+                                        }, style: 'cursor: pointer;' });
                                 } else {
                                     switch (data[i].Type) {
                                         //int
@@ -682,6 +686,11 @@
 
                             DataList = data1.data;
                             option.data = data1.data;
+                             if ($("#ColName option").length < 1) {
+                                ColFilter();
+                                // get_DefaultModule();//鍔犺浇鏂规
+                            }
+
                             table.render(option);
                             //鍒锋柊琛ㄦ牸鏁版嵁
                             DisPlay_HideColumn();
@@ -1453,6 +1462,7 @@
 
             //#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
             function ColFilter() {
+                console.log(option.cols)
                 var Organization = '<option  value="0" selected="selected" ></option>';
                 for (var i = 1; i < option.cols[0].length; i++) {
                     if (option.cols[0][i].hide != true) {
@@ -1677,7 +1687,7 @@
 
 
                                 //鎵ц鏌ヨ鏂规硶
-                                get_FastQuery();
+                                // get_FastQuery();
                             } else {
                                 $('#HBeginDate').prop('disabled', false);
                                 $('#HEndDate').prop('disabled', false);
@@ -1691,7 +1701,7 @@
                             //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
                             document.getElementById("HFilterScheme_Now").style.display = "none";
                             //鎵ц鏌ヨ鏂规硶
-                            get_FastQuery()
+                            //get_FastQuery()
                             form.render("select");
                         }
                     }, error: function () {

--
Gitblit v1.9.1