From 6611008fafac5d3464c38d6806d30e1b311e7e3c Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期五, 16 九月 2022 08:44:14 +0800
Subject: [PATCH] 隐藏列功能（工艺路线模块、生产订单模块、工序流转模块-出站汇报单）
---
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 172 +++++++++++++--
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 132 +++++++++++
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 123 +++++++++++
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 182 +++++++++++++--
4 files changed, 551 insertions(+), 58 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index e0749d5..a3aafb9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -135,6 +135,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="get-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
</form>
@@ -164,7 +165,7 @@
//var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
var sWhere = "";
var sWhere = "";
-
+ var HModName = "Sc_ICMOBillList";
//鍒濆鍖栫晫闈�
set_ClearBill();
@@ -214,6 +215,10 @@
//鎵撳嵃
case 'btn-print':
get_PrintReport();
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
break;
};
});
@@ -371,9 +376,9 @@
, { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
, { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
, { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', hide: true }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', hide: true }
- , { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 120, hide: true }
+ //, { field: '浣滃簾浜�', title: '浣滃簾浜�', hide: true }
+ //, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', hide: true }
+ //, { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 120, hide: true }
, { field: '閿�鍞鍗曟棩鏈�', title: '閿�鍞鍗曟棩鏈�', sort: true, width: 200 }
, { field: '閿�鍞鍗曠紪鍙�', title: '閿�鍞鍗曠紪鍙�', sort: true, width: 200 }
@@ -382,32 +387,32 @@
, { field: '閿�鍞暟閲�', title: '閿�鍞暟閲�', sort: true, width: 150 }
, { field: '閿�鍞鍗曡仈绯讳汉', title: '閿�鍞鍗曡仈绯讳汉', sort: true, width: 150 }
, { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', sort: true, width: 150 }
- , { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', sort: true, width: 120, hide: true }
- , { field: 'HDeptID', title: 'HDeptID', hide: true}
- , { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: 'hunitid', title: 'hunitid', hide: true }
- , { field: 'hempid', title: 'hempid' , hide: true}
- , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100, hide: true}
- , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', hide: true}
- , { field: 'hcusid', title: 'hcusid', hide: true }
- , { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜', hide: true }
- , { field: '瀹㈡埛', title: '瀹㈡埛', hide: true }
- , { field: 'HCenterID', title: 'HCenterID' , hide: true}
- , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', hide: true}
- , { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', hide: true}
- , { field: 'hbomid', title: 'hbomid' , hide: true}
- , { field: 'BOM鍗曠紪鐮�', title: 'BOM鍗曠紪鐮�', hide: true }
- , { field: 'HRoutingInterID', title: 'HRoutingInterID' , hide: true}
- , { field: '宸ヨ壓璺嚎浠ｇ爜', title: '宸ヨ壓璺嚎浠ｇ爜', hide: true }
- , { field: '宸ヨ壓璺嚎', title: '宸ヨ壓璺嚎', hide: true}
- , { field: 'hsubid', title: 'hsubid' , hide: true}
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', hide: true}
- , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', hide: true}
- , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', hide: true}
- , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', hide: true}
- , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', hide: true}
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true}
- , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', hide: true}
+ //, { field: '璁㈠崟璺熻釜鍙�', title: '璁㈠崟璺熻釜鍙�', sort: true, width: 120, hide: true }
+ //, { field: 'HDeptID', title: 'HDeptID', hide: true}
+ //, { field: 'HMaterID', title: 'HMaterID', hide: true }
+ //, { field: 'hunitid', title: 'hunitid', hide: true }
+ //, { field: 'hempid', title: 'hempid' , hide: true}
+ //, { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100, hide: true}
+ //, { field: '涓氬姟鍛�', title: '涓氬姟鍛�', hide: true}
+ //, { field: 'hcusid', title: 'hcusid', hide: true }
+ //, { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜', hide: true }
+ //, { field: '瀹㈡埛', title: '瀹㈡埛', hide: true }
+ //, { field: 'HCenterID', title: 'HCenterID' , hide: true}
+ //, { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', hide: true}
+ //, { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', hide: true}
+ //, { field: 'hbomid', title: 'hbomid' , hide: true}
+ //, { field: 'BOM鍗曠紪鐮�', title: 'BOM鍗曠紪鐮�', hide: true }
+ //, { field: 'HRoutingInterID', title: 'HRoutingInterID' , hide: true}
+ //, { field: '宸ヨ壓璺嚎浠ｇ爜', title: '宸ヨ壓璺嚎浠ｇ爜', hide: true }
+ //, { field: '宸ヨ壓璺嚎', title: '宸ヨ壓璺嚎', hide: true}
+ //, { field: 'hsubid', title: 'hsubid' , hide: true}
+ //, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', hide: true}
+ //, { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', hide: true}
+ //, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', hide: true}
+ //, { field: '琛屽叧闂汉', title: '琛屽叧闂汉', hide: true}
+ //, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', hide: true}
+ //, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true}
+ //, { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', hide: true}
]]
};
}
@@ -681,6 +686,123 @@
}
}
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["hmainid", "HEntryID", "浣滃簾浜�", "浣滃簾鏃ユ湡", "閿�鍞鍗曟棩鏈�", "璁㈠崟璺熻釜鍙�", "HDeptID", "HMaterID", "hunitid", "hempid", "涓氬姟鍛樹唬鐮�", "涓氬姟鍛�", "hcusid", "瀹㈡埛浠ｇ爜", "瀹㈡埛", "HCenterID", "宸ヤ綔涓績浠ｇ爜", "宸ヤ綔涓績", "hbomid", "BOM鍗曠紪鐮�", "HRoutingInterID", "宸ヨ壓璺嚎浠ｇ爜", "宸ヨ壓璺嚎", "hsubid", "婧愬崟鍗曞彿", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "琛屽叧闂汉", "鍏抽棴绫诲瀷", "鍗曟嵁绫诲瀷", "璁″垝璺熻釜鍙�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ 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 (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 (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ 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;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ 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
//浠ヤ笂鏄痩ayui妯″潡
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
index dac8543..53be30d 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBill.html"
@@ -368,6 +368,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
</form>
@@ -458,7 +459,7 @@
, "HICMOReadyTimes": 0, "HAutoTrunFlag": false, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
, "HProcWorkNum": ""
}];
-
+ var HModName = "Sc_MouldDotCheckBillList";
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -517,7 +518,7 @@
, { field: 'HProcID_S', title: '宸ユ', edit: 'text' }
, { field: 'HProcType', title: '宸ュ簭绫诲瀷', templet: '#HProcType' }//閫夋嫨
, { field: 'HCenterID_SName', title: '浜х嚎涓績', edit: 'text', event: "CheckHCenterID_S" }//f7
- , { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
+ //, { field: 'HCenterID_S', title: '浜х嚎涓績id', hide: true }//hide: true
, { field: 'HWorkQty_S', title: '浜х嚎浜ц兘', edit: 'text' }
, { field: 'HSubStdEmpQty_S', title: '浜х嚎浜烘暟', edit: 'text' }
, { field: 'HMouldNo', title: '妯″叿缂栧彿', edit: 'text' }
@@ -528,11 +529,11 @@
, { field: 'HMyWorkDays', title: '鐢熶骇鍛ㄦ湡', edit: 'text' }
, { field: 'HMyFixWorkDays', title: '鍥哄畾鐢熶骇澶╂暟', edit: 'text' }
, { field: '宸ュ簭', title: '宸ュ簭', edit: 'text', event: "CheckHProcID" }//f7
- , { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
+ //, { field: 'HProcID', title: '宸ュ簭ID', hide: true }//, hide: true
, { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' }//涓嶅～
- , { field: 'HCenterID', title: '宸ヤ綔涓績id', hide: true }//, hide: true
+ //, { field: 'HCenterID', title: '宸ヤ綔涓績id', hide: true }//, hide: true
, { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', edit: 'text', event: "CheckHCenterID" }//f7
- , { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
+ //, { field: 'HSupID', title: '渚涘簲鍟咺D', hide: true }
, { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
, { field: '渚涘簲鍟�', title: '渚涘簲鍟�', edit: 'text', width: 110, event: "CheckHSupID" }//f7
, { field: 'HSupFlag', title: '澶栧崗鏍囪', templet: "#HSupFlag" }//checkbox
@@ -795,6 +796,10 @@
form.render('select');
form.render('checkbox');
}
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn':
+ get_HideColumn();
break;
}
});
@@ -1516,6 +1521,123 @@
}
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["鍗曟嵁ID", "HMouldID", "hsubid", "HManagerID", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ 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 (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 (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ 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;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ 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
});
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 9599f56..0ce0c22 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -96,7 +96,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
-
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>鍒楄缃�</button>
</div>
</script>
</form>
@@ -123,6 +123,8 @@
//var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
var sWhere = "";
var option = [];
+ var HModName = "Gy_RoutingBillList";
+
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -154,6 +156,9 @@
break;
//閫�鍑烘寜閽�
case 'get_Exit': Pub_Close(2);
+ break;
+ //鍒楄缃�
+ case 'set_HideColumn': get_HideColumn();
break;
};
});
@@ -485,7 +490,123 @@
get_Display(sWhere);
}
//#endregion
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ 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 (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 (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ 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;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ 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
//浠ヤ笂鏄痩ayui妯″潡
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index f13a049..6d56eba 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -42,6 +42,7 @@
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">鍙嶅鏍�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="btn-InStorage" lay-filter="btn-InStorage" id="btn-InStorage"></i>鍏ュ簱</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_HideColumn" id="set_HideColumn">鍒楄缃�</button>
</div>
</div>
<div class="layui-form-item" style="padding-top: 10px;">
@@ -563,6 +564,9 @@
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
$("#HBarCode").focus();
var option;
+ var HModName = "Cj_StationOutBill";
+
+
//杩涘叆椤甸潰鍏ュ簱鎸夐挳缃伆
//$('#btn-InStorage').addClass("layui-btn-disabled").attr("disabled", true);
@@ -609,26 +613,26 @@
var HBillNo = params[params[3]]; //鑾峰彇鍗曟嵁鍙�
var closeType = params[params[4]]; //鍏抽棴绫诲瀷
}
- /*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
+ /*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
function set_InitGrid() {
//琛ㄥご
columns = [ //琛ㄥご
- { type: 'numbers', title: '搴忓彿', totalRow: true }
+ { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
, { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
, { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', edit: 'text' }
, { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
- , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text'}
+ , { field: '娴佹按鍙�', title: '娴佹按鍙�', edit: 'text' }
, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
, { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績' }
- , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text'}
+ , { field: '鏄惁濮斿', title: '鏄惁濮斿', edit: 'text' }
, { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
, { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
- , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text'}
+ , { field: '杩涚珯鏁伴噺', title: '杩涚珯鏁伴噺', edit: 'text' }
, { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
];
option = {
@@ -640,6 +644,7 @@
, height: 400
, cols: [columns]
, limit: Number.MAX_VALUE//榛樿鏄剧ず鍏ㄩ儴
+ ,loading:false
, done: function (res, curr, count) {
option.data = res.data;
//鍘绘帀涓嬫媺妗嗗け鐒︿簨浠跺惁鍒欏湪涓嬫媺妗嗛噷杈撳叆鍊�
@@ -655,15 +660,12 @@
});
});
}
- , done: function (res, curr, count) {
-
- }
};
}
//鍒ゆ柇鏄惁鏂板
- if (OperationType == 1 || OperationType==2) {
+ if (OperationType == 1 || OperationType == 2) {
$("#HInterID").val("");
$("#HBillNo").val("");
//鑾峰彇鏈�澶у崟鎹彿
@@ -699,8 +701,7 @@
//鍔犺浇琛ㄥご
- function RoadBillMain(linterid)
- {
+ function RoadBillMain(linterid) {
var index = layer.load();
$.ajax({
url: GetWEBURL() + "/Cj_StationOutBill/GetStationOutBill",
@@ -799,7 +800,7 @@
"HPlanQty": data.娴佽浆鍗℃暟閲�,
"lngBillKey": data.hmainid,
"HProcExchBillNo": data.鍗曟嵁鍙�,
- "HProcExchHinteID":data.hmainid,
+ "HProcExchHinteID": data.hmainid,
"HICMOQty": data.浠诲姟鍗曟暟閲�,
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�
});
@@ -815,7 +816,7 @@
// data: { HProcExchHinteID: HProcExchHinteID},
// success: function (result) {
// if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
-
+
// }
// else {
// layer.msg(result.Message);
@@ -824,15 +825,14 @@
// }
//});
-
- table.render({
+ option = {
elem: '#mainTable',
- url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
//, cellMinWidth: 80
- toolbar: '#toolbarDemo'
+ toolbar: '#toolbarDemo'
, where: { HProcExchHinteID: HProcExchHinteID }
, cols: [[
- { type: 'numbers', title: '搴忓彿', totalRow: true }
+ { type: 'numbers', title: '搴忓彿', totalRow: true }
, { field: 'HOrderProcNO', title: '璁㈠崟璺熻釜鍙�', edit: 'text' }
, { field: 'hbillno', title: '娴佽浆鍗″彿', hide: true }
, { field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', edit: 'text' }
@@ -849,10 +849,15 @@
, { field: '鍑虹珯鏁伴噺', title: '鍑虹珯鏁伴噺' }
]]
, height: 500
- })
- layer.close(index);
-
+ }
+ table.render(option)
//layer.close(index);
+ //set_InitGrid();
+ //table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ layer.close(index);
}
else {
layer.close(index);
@@ -1134,6 +1139,12 @@
layer.alert(err.Message, { icon: 5 });
}
});
+ });
+
+ //鍒楄缃�
+ form.on('submit(set_HideColumn)', function () {
+ //璋冪敤闅愯棌鍒楄缃柟娉�
+ get_HideColumn()
});
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
@@ -1487,6 +1498,124 @@
}
});
}
+
+ //闅愯棌鍒楄缃�
+ function get_HideColumn() {
+ var colName = "";
+ var contentUrl = "";
+
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+ var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
+ var urlLen = urlStr.split('/');
+ for (var i = 0; i < urlLen.length - 4; i++) {
+ contentUrl += "../";
+ }
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
+
+ contentUrl += '鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
+
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "闅愯棌鍒楄缃�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "90%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: [contentUrl, "yes"]
+ , btn: ["纭畾", "鍙栨秷"]
+ , btn1: function (index, laero) {
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ layer.close(index);//鍏抽棴寮圭獥
+ }
+ })
+ }
+
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ 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 (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 (data1.data[0].HColumnWidth != 0) {
+ // option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ //} else {
+ // option.cols[0][i + 1]["width"] = "";
+ //}
+ //鏄剧ず鍒�
+ 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;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ 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
@@ -1592,7 +1721,6 @@
$("#HMaterNumber").val(obj[0].HNumber);
$("#HMaterID").val(obj[0].HItemID);
}
-
</script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.1