MES-WEB-LayUI.git

			@@ -309,7 +309,11 @@
			</div>

			<table id="mainTable" lay-filter="mainTable" ></table>

			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<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>
			</div>
			</div>
			@@ -343,7 +347,6 @@

			//åè¡¨æ¸²æåæ°
			var option = {};
			var tableShow = false;
			//#region è¿å¥é¡µé¢å³å è½½
			//#region å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			if (sessionStorage.login != "login") {
			@@ -391,7 +394,17 @@
			//#endregion

			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) { //çå¬mainTableè¡¨æ ¼ä¸çå·¥å·æ äºä»¶ è§¦ååè°å½æ°objåæ°
			var checkStatus = table.checkStatus('mainTable') // çå¬éä¸ççç¶æ
			, data = checkStatus.data; //ä»éä¸ç¶æä¸æåæ°æ®ï¼è¿äºæ°æ®æ¯è¡¨æ ¼ä¸è¢«éä¸çè¡
			switch (obj.event) { // switch (obj.event)ç¨äºæ ¹æ®obj.eventçå¼æ¥å³å®æ§è¡åªä¸ªcaseå
			////åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			break;
			}
			});
			//#region è¡åäºä»¶
			table.on('tool(mainTable)', function (obj) {
			set_GridDelete(obj); //è¡åå é¤
			@@ -724,7 +737,8 @@
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			}

			option.data = [];
			table.render(option);
			}
			//#endregion

			@@ -1046,7 +1060,6 @@
			}
			option.data = rowdata;
			table.render(option);
			tableShow = true;
			}
			//#endregion

			@@ -1178,7 +1191,7 @@
			//è·åè¡¨å¤´æ°æ®å¹¶åºåå
			var sMainStr = JSON.stringify(data.field); //ä¸»è¡¨æ°æ®
			//åè¡¨æ°æ®
			if (tableShow == true) {
			if (table.cache["mainTable"].length!= 0 ) {
			var num = [];
			for (var i = 0; i < table.cache["mainTable"].length; i++) {
			if (table.cache["mainTable"][i] != "") {
			@@ -1238,8 +1251,8 @@
			var data = result.data[0];

			form.val("formData", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HMainSourceInterID": data.HMainSourceInterID
			, "HMainSourceEntryID": data.HMainSourceEntryID
			"HMainSourceInterID": data.HMainSourceInterID == null ? 0 : data.HMainSourceInterID
			, "HMainSourceEntryID": data.HMainSourceEntryID == null ? 0 : data.HMainSourceEntryID
			, "HMainSourceBillNo": data.HMainSourceBillNo
			, "HMainSourceBillType": data.HMainSourceBillType
			, "HBillNo": data.åæ®å·
			@@ -1327,7 +1340,6 @@
			}
			option.data = rowdata;
			table.render(option);
			tableShow = true;
			}

			layer.close(ajaxLoad);
			@@ -1343,6 +1355,132 @@
			}
			//#endregion

			//#region éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}

			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_New.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			//#endregion

			//#region æ¾ç¤ºåæ°æ®
			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", "HBillType", "HSupID", "ä¸å¡ç¶æ", "HUnitID", "ä¾åºåä»£ç ", "ä¸å¡åä»£ç ", "HPriority", "HPSStyleID", "HSSID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var newCols = [[]];//å¯¹åºæ°æ®åºåé¡ºåºcol
			newCols[0].push(option.cols[0][0]);//æ¾å¥ç¬¬ä¸ä¸ªcheckbox
			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('\|');
			//éæ©ä¸datacolsç¸åºåè¿è¡ä¿®æ¹
			if (option.cols[0][i + 1]["field"] == dataCols[4]) {
			//éèå
			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;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			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;
			}
			newCols[0].push(option.cols[0][i + 1]);
			}
			}
			}
			//éåå¾ªç¯åå¤æå¯¹åºåæ°æ¯å¦ä¸è´
			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";
			}
			}
			}
			}
			table.render(option);
			var HBillType = "1102";
			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			} else {
			table.render(option);
			var HBillType = "1102";
			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//#endregion

			//#region éç©ºéªè¯
			function AllowLoadData(data) {
			//#region æ°æ®æ ¡éªå·¥å·