From 0c430e21840dadc0e924b6588e91009b45ee71d2 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期五, 23 八月 2024 16:05:37 +0800
Subject: [PATCH] bug修改
---
WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide_New.html | 2
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 30 +++++-----
WebTM/views/采购管理/询价单/Sup_AskPriceBillEdit.html | 107 +++++++++++++++++++++++++++++++++++
3 files changed, 123 insertions(+), 16 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index f53810d..c531078 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -3555,7 +3555,7 @@
<publishTime>08/22/2024 08:55:57</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html">
- <publishTime>08/22/2024 10:31:52</publishTime>
+ <publishTime>08/23/2024 14:32:01</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_QueryCondition.html">
<publishTime>04/15/2024 13:00:48</publishTime>
@@ -6423,19 +6423,19 @@
<publishTime>07/10/2024 16:06:15</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/浠樻鍗�/YF_PayMentBill.html">
- <publishTime>08/23/2024 10:22:54</publishTime>
+ <publishTime>08/23/2024 15:37:59</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/浠樻鍗�/YF_PayMentBillList.html">
<publishTime>08/23/2024 09:12:12</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鍏朵粬搴斾粯鍗�/YF_PayMentOtherBillMain.html">
- <publishTime>05/17/2024 08:07:20</publishTime>
+ <publishTime>08/23/2024 15:07:33</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鍏朵粬搴斾粯鍗�/YF_PayMentOtherBillMainList.html">
<publishTime>07/18/2024 16:45:16</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鍏朵粬搴斾粯鍗�/YF_PayMentOtherBillMain.html">
- <publishTime>05/17/2024 08:07:20</publishTime>
+ <publishTime>08/23/2024 15:07:33</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鍏朵粬搴斾粯鍗�/YF_PayMentOtherBillMainList.html">
<publishTime>07/18/2024 16:45:16</publishTime>
@@ -6444,7 +6444,7 @@
<publishTime>07/18/2024 15:09:02</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/搴斾粯鍗�/Cg_PayableBill.html">
- <publishTime>08/16/2024 10:30:58</publishTime>
+ <publishTime>08/23/2024 13:51:18</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/搴斾粯鍗�/Cg_PayableBillList.html">
<publishTime>08/23/2024 09:43:25</publishTime>
@@ -6456,31 +6456,31 @@
<publishTime>07/18/2024 16:14:27</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鎶ヤ环鍗�/Sup_QuotePriceBillEdit.html">
- <publishTime>08/13/2024 10:55:19</publishTime>
+ <publishTime>08/23/2024 15:03:51</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鎶ヤ环鍗�/Sup_QuotePriceBillList.html">
<publishTime>07/18/2024 16:37:42</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html">
- <publishTime>08/16/2024 10:13:05</publishTime>
+ <publishTime>08/23/2024 13:21:42</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Cg_POInStockBillList.html">
<publishTime>08/22/2024 12:21:53</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/璇环鍗�/Sup_AskPriceBillEdit.html">
- <publishTime>08/13/2024 10:47:56</publishTime>
+ <publishTime>08/23/2024 15:14:23</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/璇环鍗�/Sup_AskPriceBillList.html">
<publishTime>07/18/2024 16:31:00</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閫�鏂欓�氱煡鍗�/Add_Edit_Cg_POInStockBackBillList.html">
- <publishTime>08/13/2024 10:08:10</publishTime>
+ <publishTime>08/23/2024 13:26:08</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閫�鏂欓�氱煡鍗�/Cg_POInStockBackBillList.html">
<publishTime>07/18/2024 15:35:56</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘鍚堝悓/Add_Edit_Cg_ContractBillList.html">
- <publishTime>08/13/2024 10:45:13</publishTime>
+ <publishTime>08/23/2024 14:58:10</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘鍚堝悓/Cg_ContractBillList.html">
<publishTime>07/18/2024 16:35:38</publishTime>
@@ -6507,7 +6507,7 @@
<publishTime>08/15/2024 14:53:43</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘鐢宠鍗�/Cg_PORequestBill.html">
- <publishTime>08/12/2024 11:20:31</publishTime>
+ <publishTime>08/23/2024 14:51:02</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘鐢宠鍗�/Cg_PORequestBillList.html">
<publishTime>07/18/2024 16:08:55</publishTime>
@@ -6519,7 +6519,7 @@
<publishTime>08/23/2024 13:09:28</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
- <publishTime>08/22/2024 10:39:35</publishTime>
+ <publishTime>08/23/2024 14:43:52</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList1111.html">
<publishTime>10/19/2021 16:08:25</publishTime>
@@ -6660,7 +6660,7 @@
<publishTime>07/18/2024 15:35:56</publishTime>
</File>
<File Include="views/閲囪喘绠＄悊/閲囪喘璁㈠崟/Cg_POOrderBillList.html">
- <publishTime>08/22/2024 10:39:35</publishTime>
+ <publishTime>08/23/2024 14:43:52</publishTime>
</File>
<File Include="views/閿�鍞鐞�/鍙戣揣閫氱煡鍗�/Xs_SeOutStockBillList.html">
<publishTime>08/22/2024 09:51:06</publishTime>
@@ -7092,7 +7092,7 @@
<publishTime>03/07/2024 09:59:11</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html">
- <publishTime>08/22/2024 15:00:23</publishTime>
+ <publishTime>08/23/2024 13:29:42</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill.html">
<publishTime>04/15/2024 13:00:49</publishTime>
@@ -7101,7 +7101,7 @@
<publishTime>07/18/2024 16:02:58</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBackBill_Add_Up.html">
- <publishTime>08/13/2024 10:26:45</publishTime>
+ <publishTime>08/23/2024 13:32:37</publishTime>
</File>
<File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBillList.html">
<publishTime>08/22/2024 10:09:05</publishTime>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
index be3d19b..8f2ff2f 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide_New.html"
@@ -301,7 +301,7 @@
//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
dataCol = data1.data[0].HGridString.split(',');
}
-
+ debugger
colNames = colName.split(',');
if (data1.data.length != 0 && dataCol.length == colNames.length) {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html"
index 4c46b76..c4ce325 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\350\257\242\344\273\267\345\215\225/Sup_AskPriceBillEdit.html"
@@ -833,7 +833,114 @@
}
}
//#endregion
+ //#region 鍒楄缃�
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
+ if (dataCols[4] != null && dataCols[4] != "") {
+ option.cols[0][i + 1]["title"] = dataCols[4];
+ }
+ }
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+ //#endregion
//缂栬緫 椤甸潰璧嬪��
function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
--
Gitblit v1.9.1