From 2b0f02b1b22e82f54c99b3e3f45a840f5246ea1d Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期四, 05 六月 2025 13:58:48 +0800
Subject: [PATCH] 完成 20250604 测试记录 修复20250527 通过复制进入编辑页面时 审核按钮启用的问题
---
WebTM/layuiadmin/SetColumn.js | 271 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 155 insertions(+), 116 deletions(-)
diff --git a/WebTM/layuiadmin/SetColumn.js b/WebTM/layuiadmin/SetColumn.js
index 3dcda43..79f400d 100644
--- a/WebTM/layuiadmin/SetColumn.js
+++ b/WebTM/layuiadmin/SetColumn.js
@@ -6,13 +6,13 @@
}
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
- var contentUrl = "";
+ var contentUrl = "";
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
var urlLen = urlStr.split('/');
for (var i = 0; i < urlLen.length - 4; i++) {
contentUrl += "../";
}
- contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -51,7 +51,7 @@
contentUrl += "../";
}
contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;
-
+
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -73,7 +73,7 @@
//#endregion
//#region 璁剧疆琛ㄦ牸椤靛ぇ灏忓垵濮�
-function DisPlay_HideColumn_GetPageSize(HModName, user,optionPage) {
+function DisPlay_HideColumn_GetPageSize(HModName, user, optionPage) {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
type: "GET",
@@ -85,113 +85,8 @@
optionPage.limit = data1.data[0].HPageSize;
optionPage.limits.push(data1.data[0].HPageSize);
}
-
+
} else {
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- })
-}
-//#endregion
-//#region 鏄剧ず鍒楁暟鎹�
-function DisPlay_HideColumn(HModName, user, option, titleData) {
- $.ajax({
- url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
- type: "GET",
- async: false,
- data: { "HModName": HModName, "user": user },
- success: function (data1) {
- if (data1.data.length != 0) {
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- /* var titleData = [];*/
- var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
- newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
- dataCol = data1.data[0].HGridString.split(',');
- //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
- if (dataCol.length == option.cols[0].length - 1) {
- //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
- for (var j = 0; j < option.cols[0].length - 1; j++) {
- for (var i = 0; i < option.cols[0].length - 1; i++) {
- var dataCols = dataCol[j].split('|');
- //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
- if (option.cols[0][i + 1]["field"] == dataCols[5]) {
- //闅愯棌鍒�
- if (dataCols[1] == 1) {
- option.cols[0][i + 1]["hide"] = true;
- }
- //璁剧疆鍒楀
- if (dataCols[3] > 0) {
- option.cols[0][i + 1]["width"] = dataCols[3];
- }
- //璁剧疆鍐呭瀛椾綋澶у皬
- 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[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
- option.cols[0][i + 1]["hide"] = false;
- }
- //缁熻鍒�
- if (dataCols[6] == 1) {
- option.cols[0][i + 1]["totalRow"] = true;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- 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];
- }
- newCols[0].push(option.cols[0][i + 1]);
- break;
- }
- }
- }
- //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
- if (dataCol.length == newCols[0].length - 1) {
- option.cols = newCols;
- //鍙栨秷鍐荤粨鍒�
- 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";
- }
- }
- //璁剧疆鍒楁帓搴�
- for (var i = 1; i < option.cols[0].length; i++) {
- if (data1.data[0].HSortFlag == "鏄�") {
- option.cols[0][i]["sort"] = true;
- }
- else {
- option.cols[0][i]["sort"] = false;
- }
- }
- }
- }
- } else {
}
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
@@ -210,7 +105,7 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- /* var titleData = [];*/
+ /* var titleData = [];*/
var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
dataCol = data1.data[0].HGridString.split(',');
@@ -303,12 +198,121 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
})
+}
+//#endregion
+
+//#region 鏄剧ず鍒楁暟鎹� 鏈夊洖璋冨嚱鏁�
+function DisPlay_HideColumnWithCallback(HModName, user, option, titleData, callback) {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ async: false,
+ data: { "HModName": HModName, "user": user },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ /* var titleData = []; */
+ var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
+ newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
+ dataCol = data1.data[0].HGridString.split(',');
+ //鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
+ if (dataCol.length == option.cols[0].length - 1) {
+ //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
+ for (var j = 0; j < option.cols[0].length - 1; j++) {
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ var dataCols = dataCol[j].split('|');
+ //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
+ if (option.cols[0][i + 1]["field"] == dataCols[5]) {
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i + 1]["hide"] = true;
+ }
+ //璁剧疆鍒楀
+ if (dataCols[3] > 0) {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ 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[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //缁熻鍒�
+ if (dataCols[6] == 1) {
+ option.cols[0][i + 1]["totalRow"] = true;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ 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];
+ }
+ break;
+ }
+ }
+ }
+ //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
+ if (dataCol.length == newCols[0].length - 1) {
+ option.cols = newCols;
+ //鍙栨秷鍐荤粨鍒�
+ 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";
+ }
+ }
+ //璁剧疆鍒楁帓搴�
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (data1.data[0].HSortFlag == "鏄�") {
+ option.cols[0][i]["sort"] = true;
+ }
+ else {
+ option.cols[0][i]["sort"] = false;
+ }
+ }
+ }
+ _newCols = data1.data[0];
+ }
+ } else {
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ if (_newCols !== undefined) {
+ callback.call([option]);
+ }
}
//#endregion
//#region 闅愯棌鍒楄缃紪杈戦〉闈�
-function get_HideColumnEdit(HModName,user,option,table) {
+function get_HideColumnEdit(HModName, user, option, table) {
var colName = "";
for (var i = 1; i < option.cols[0].length - 1; i++) {
colName += option.cols[0][i]["field"] + ",";
@@ -332,9 +336,43 @@
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鍒锋柊琛ㄦ牸鏁版嵁
- DisPlay_HideColumnEdit(HModName, user, option,table);
+ DisPlay_HideColumnEdit(HModName, user, option, table);
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+}
+//#endregion
+
+//#region 闅愯棌鍒楄缃紪杈戦〉闈� 甯﹀洖璋冿紝鐢ㄤ簬璁剧疆涓嶅彲缂栬緫鍒�
+function get_HideColumnEditWithCallback(HModName, user, option, table, callback) {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["field"] + ",";
+ }
+ var colTitleName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colTitleName += option.cols[0][i]["title"] + ",";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ colTitleName = encodeURI(colTitleName.substring(0, colTitleName.length - 1));
+ /*urlStr.replace(/%/g, '%25');*/
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumnEdit(HModName, user, option, table);
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ callback.call()
}
})
}
@@ -406,7 +444,7 @@
}
//閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
if (dataCol.length == newCols[0].length - 1) {
- newCols[0].push(option.cols[0][dataCol.length+1])//鏀惧叆鏈�鍚庣殑鎿嶄綔鍒�
+ newCols[0].push(option.cols[0][dataCol.length + 1])//鏀惧叆鏈�鍚庣殑鎿嶄綔鍒�
option.cols = newCols;
//鍙栨秷鍐荤粨鍒�
for (var i = 1; i < option.cols[0].length - 1; i++) {
@@ -427,7 +465,7 @@
}
}
//璁剧疆鍒楁帓搴�
- for (var i = 1; i < option.cols[0].length-1; i++) {
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
if (data1.data[0].HSortFlag == "鏄�") {
option.cols[0][i]["sort"] = true;
}
@@ -438,6 +476,7 @@
}
}
table.render(option);
+
} else {
}
}, error: function () {
@@ -494,7 +533,7 @@
colName += option.cols[0][i]["field"] + ",";
colTitleName += option.cols[0][i]["title"] + ",";
}
-
+
}
colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
--
Gitblit v1.9.1