MES-WEB-LayUI.git

			@@ -12,6 +12,7 @@
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/SetColumn.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -372,9 +373,6 @@
			setSelect_HArrangeProductDayQty();

			//åå§åçé¢
			$(document).ready(function () {
			set_InitGrid();
			});
			set_ClearBill();

			//#endregion
			@@ -550,7 +548,7 @@
			break;
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
			break;
			//å é¤è¡
			case 'set_DeleteBill':
			@@ -700,12 +698,22 @@

			//é½å¥åæ
			form.on('submit(btnCompleteSetAnalysis)', function (data) {
			get_btnCompleteSetAnalysis();
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function () {
			get_btnCompleteSetAnalysis();
			}
			})
			})

			//ææè¿ç®
			form.on('submit(btnTLYS)', function (data) {
			get_btnTLYS();
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function () {
			get_btnTLYS();
			}
			})
			})

			//çäº§è®¢åéå
			@@ -715,29 +723,39 @@

			//åå¤
			form.on('submit(btnReady)', function (data) {
			get_btnReady();
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function () {
			get_btnReady();
			}
			})
			})

			//æäº§
			form.on('submit(btnProPC)', function (data) {
			var HWorkShopID = $("#HWorkShopID").val();//çäº§è½¦é´
			if (HWorkShopID == 0) {
			return layer.msg("çäº§è½¦é´ä¸è½ä¸ºç©º!");
			} else {
			var index = layer.open({
			type: 1, // page å±ç±»å
			area: ['20%', '20%'],
			shade: 0.6, // é®ç½©éæåº¦
			shadeClose: false, // ç¹å»é®ç½©åºåï¼ä¸å³éå¼¹å±
			maxmin: false, // ä¸åè®¸å¨å±æå°å
			anim: 0, // 0-6 çå¨ç»å½¢å¼ï¼-1 ä¸å¼å¯
			content: '<div style="padding: 12px;">æ£å¨è¿ç®,è¯·èå¿çå¾!!!</div>'
			});
			setTimeout(function () {
			get_btnProPC(HWorkShopID);
			layer.close(index);
			}, 1000)
			}
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æäº§åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function () {
			var HWorkShopID = $("#HWorkShopID").val();//çäº§è½¦é´
			if (HWorkShopID == 0) {
			return layer.msg("çäº§è½¦é´ä¸è½ä¸ºç©º!");
			} else {
			var index = layer.open({
			type: 1, // page å±ç±»å
			area: ['20%', '20%'],
			shade: 0.6, // é®ç½©éæåº¦
			shadeClose: false, // ç¹å»é®ç½©åºåï¼ä¸å³éå¼¹å±
			maxmin: false, // ä¸åè®¸å¨å±æå°å
			anim: 0, // 0-6 çå¨ç»å½¢å¼ï¼-1 ä¸å¼å¯
			content: '<div style="padding: 12px;">æ£å¨è¿ç®,è¯·èå¿çå¾!!!</div>'
			});
			setTimeout(function () {
			get_btnProPC(HWorkShopID);
			layer.close(index);
			}, 1000)
			}
			}
			})
			})

			//å·¥èºè·¯çº¿ç¼è¾
			@@ -778,7 +796,13 @@
			if (HWorkShopID == 0) {
			return layer.msg("çäº§è½¦é´ä¸è½ä¸ºç©º!");
			} else {
			get_btnLock(HWorkShopID);
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function () {
			get_btnLock(HWorkShopID);
			}
			})

			}

			})
			@@ -789,18 +813,33 @@
			if (HWorkShopID == 0) {
			return layer.msg("çäº§è½¦é´ä¸è½ä¸ºç©º!");
			} else {
			get_btnUnlock(HWorkShopID);
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function () {
			get_btnUnlock(HWorkShopID);
			}
			})
			}
			})

			//éå®å·¥å
			form.on('submit(btnLockOrder)', function (data) {
			get_btnLockOrder();
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function () {
			get_btnLockOrder();
			}
			})
			})

			//è§£éå·¥å
			form.on('submit(btnUnlockOrder)', function (data) {
			get_btnUnlockOrder();
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function () {
			get_btnUnlockOrder();
			}
			})
			})

			//#region ä¸æåè¡¨çå¬-æäº§æ¶é´
			@@ -847,7 +886,6 @@
			set_InitGrid();
			get_FastQuery(1);
			//éèå¾éåæ®µ
			DisPlay_HideColumn();
			get_Display2(sWhere_ICMO);

			layer.close(ajaxLoad);
			@@ -872,8 +910,6 @@
			//åå§åè¡¨æ ¼
			set_InitGrid();
			get_FastQuery(1);
			//éèå¾éåæ®µ
			DisPlay_HideColumn();
			get_FastQuery_ICMO();
			}
			//#region åå§åä¸æåè¡¨ æäº§æ¶é´
			@@ -1110,26 +1146,26 @@
			var myDate = new Date();
			var oneday = 1000 * 60 * 60 * 24;

			columns.push({ type: 'checkbox', fixed: 'left', sort: true });
			columns.push({ type: 'numbers', field: 'åºå·', title: 'åºå·', sort: true });
			columns.push({ field: 'åæ®å·', title: 'åæ®å·', hide: true, sort: true });
			columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150, sort: true });
			columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;', sort: true });
			columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150, sort: true });
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', width: 150, sort: true });
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150, sort: true });
			columns.push({ field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 150, sort: true });
			columns.push({ field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 150, sort: true, edit: 'text' });
			columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150, sort: true });//0
			columns.push({ field: 'è®¡åæ°é', title: 'çäº§è®¢åæ°é', width: 150, sort: true });//0
			columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150, sort: true });//0
			columns.push({ field: 'ä»æ¥ä¹åæ¥è®¡åæ°é', title: 'ä»æ¥ä¹åæ¥è®¡åæ°é', width: 150, sort: true });//0
			columns.push({ field: 'è®¡åå¼å§æ¥æ', title: 'é¢è®¡å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.è®¡åå¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å§æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true });
			columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, templet: "<div>{{d.è®¡åç»ææ¥æ ==null ?'':layui.util.toDateString(d.è®¡åç»ææ¥æ, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate", sort: true });
			columns.push({ type: 'checkbox', fixed: 'left'});
			columns.push({ type: 'numbers', field: 'åºå·', title: 'åºå·'});
			columns.push({ field: 'åæ®å·', title: 'åæ®å·', hide: true});
			columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150});
			columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;'});
			columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150 });
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', width: 150});
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150});
			columns.push({ field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 150 });
			columns.push({ field: 'å°æ¶äº§è½', title: 'å°æ¶äº§è½', width: 150, edit: 'text' });
			columns.push({ field: 'éå®è®¢åæ°é', title: 'éå®è®¢åæ°é', width: 150 });//0
			columns.push({ field: 'è®¡åæ°é', title: 'çäº§è®¢åæ°é', width: 150 });//0
			columns.push({ field: 'æ¥è®¡åæ°éæ»é', title: 'æ¥è®¡åæ°éæ»é', width: 150 });//0
			columns.push({ field: 'ä»æ¥ä¹åæ¥è®¡åæ°é', title: 'ä»æ¥ä¹åæ¥è®¡åæ°é', width: 150 });//0
			columns.push({ field: 'è®¡åå¼å§æ¥æ', title: 'é¢è®¡å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.è®¡åå¼å§æ¥æ ==null ?'':layui.util.toDateString(d.è®¡åå¼å§æ¥æ, 'yyyy-MM-dd')}}</div>" });
			columns.push({ field: 'è®¡åç»ææ¥æ', title: 'è®¡åç»ææ¥æ', width: 150, templet: "<div>{{d.è®¡åç»ææ¥æ ==null ?'':layui.util.toDateString(d.è®¡åç»ææ¥æ, 'yyyy-MM-dd')}}</div>", event: "HPlanEndDate" });
			columns.push({ field: 'è®¢åå¯ææ°é', title: 'è®¢åå¯ææ°é', width: 150 });
			columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150, edit: 'text' });
			columns.push({ field: 'æ¨æ¥æ°é', title: 'æ¨æ¥æ°é' });
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text', sort: true });
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text' });
			columns.push({ field: 'çäº§èµæº', title: 'çäº§èµæº', width: 150, edit: 'text', event: "HSourceID" });
			columns.push({ field: 'æä½å·¥', title: 'æä½å·¥', width: 150, edit: 'text', event: "HEmpID" });

			@@ -1139,27 +1175,26 @@
			columns.push(dateColumns[i]);//0
			}

			columns.push({ field: 'çäº§è®¢åæç»è¡å·', title: 'çäº§è®¢åæç»è¡å·', width: 150, sort: true });
			columns.push({ field: 'çäº§è®¢åæç»è¡å·', title: 'çäº§è®¢åæç»è¡å·', width: 150 });
			columns.push({ field: 'T31', title: 'T31', width: 70 });//0
			columns.push({ field: 'è®¢åç±»å', title: 'è®¢åç±»å', width: 150, sort: true });
			columns.push({ field: 'çäº§è®¢ååæ®ç±»å', title: 'æºåè®¢ååæ®ç±»å', width: 150, sort: true });
			columns.push({ field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 150, sort: true });
			columns.push({ field: 'äº§çº¿å¥åºæ°é', title: 'äº§çº¿å¥åºæ°é', width: 150, sort: true });
			columns.push({ field: 'æªææ°é', title: 'å¯ææ°é', width: 150, sort: true });
			columns.push({ field: 'è®¢åççº§', title: 'è®¢åççº§', width: 150, sort: true });
			columns.push({ field: 'è®¢åäº¤è´§æ', title: 'è®¢åäº¤è´§æ', width: 150, templet: "<div>{{d.è®¢åäº¤è´§æ =='1900-01-01' ?'':layui.util.toDateString(d.è®¢åäº¤è´§æ, 'yyyy-MM-dd')}}</div>", sort: true });
			columns.push({ field: 'è®¢åéæ±æ°é', title: 'è®¢åéæ±æ°é', width: 150, sort: true });
			columns.push({ field: 'å¼å·¥ä½é', title: 'å¼å·¥ä½é', width: 150, sort: true });
			columns.push({ field: 'çäº§å¨æ', title: 'çäº§å¨æ', width: 150, sort: true });
			columns.push({ field: 'æè¿å¼å·¥æ¥æ', title: 'æè¿å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å¼å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true });
			columns.push({ field: 'æè¿å®å·¥æ¥æ', title: 'æè¿å®å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å®å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true });
			columns.push({ field: 'è®¢åç±»å', title: 'è®¢åç±»å', width: 150 });
			columns.push({ field: 'çäº§è®¢ååæ®ç±»å', title: 'æºåè®¢ååæ®ç±»å', width: 150 });
			columns.push({ field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 150 });
			columns.push({ field: 'äº§çº¿å¥åºæ°é', title: 'äº§çº¿å¥åºæ°é', width: 150 });
			columns.push({ field: 'æªææ°é', title: 'å¯ææ°é', width: 150 });
			columns.push({ field: 'è®¢åççº§', title: 'è®¢åççº§', width: 150 });
			columns.push({ field: 'è®¢åäº¤è´§æ', title: 'è®¢åäº¤è´§æ', width: 150, templet: "<div>{{d.è®¢åäº¤è´§æ =='1900-01-01' ?'':layui.util.toDateString(d.è®¢åäº¤è´§æ, 'yyyy-MM-dd')}}</div>" });
			columns.push({ field: 'è®¢åéæ±æ°é', title: 'è®¢åéæ±æ°é', width: 150 });
			columns.push({ field: 'å¼å·¥ä½é', title: 'å¼å·¥ä½é', width: 150 });
			columns.push({ field: 'çäº§å¨æ', title: 'çäº§å¨æ', width: 150 });
			columns.push({ field: 'æè¿å¼å·¥æ¥æ', title: 'æè¿å¼å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å¼å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>" });
			columns.push({ field: 'æè¿å®å·¥æ¥æ', title: 'æè¿å®å·¥æ¥æ', width: 150, templet: "<div>{{d.æè¿å®å·¥æ¥æ =='' ?'':layui.util.toDateString(d.æè¿å®å·¥æ¥æ, 'yyyy-MM-dd')}}</div>" });
			columns.push({ field: 'çäº§è½¦é´', title: 'çäº§è½¦é´', width: 150 });
			columns.push({ field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 150, sort: true });
			columns.push({ field: 'æºåååç ', title: 'æºåååç ', width: 150, sort: true });
			columns.push({ field: 'hmainid', title: 'æ¥è®¡åå·¥åä¸»ç ', width: 150, sort: true });
			columns.push({ field: 'çµå/åç/åºæ¿', title: 'çµå/åç/åºæ¿', width: 150, sort: true });
			columns.push({ field: 'è®¡éåä½', title: 'è®¡éåä½', width: 150, sort: true });
			columns.push({ field: 'æåæ°é', title: 'æåæ°é', width: 150 });//0
			columns.push({ field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 150 });
			columns.push({ field: 'æºåååç ', title: 'æºåååç ', width: 150 });
			columns.push({ field: 'hmainid', title: 'æ¥è®¡åå·¥åä¸»ç ', width: 150 });
			columns.push({ field: 'çµå/åç/åºæ¿', title: 'çµå/åç/åºæ¿', width: 150 });
			columns.push({ field: 'è®¡éåä½', title: 'è®¡éåä½', width: 150 });
			columns.push({ field: 'æªå¥åºæ°é', title: 'æªå¥åºæ°é', width: 150 });//0
			columns.push({ field: 'HICMOInterID', title: 'HICMOInterID', width: 150, hide: true });
			columns.push({ field: 'HGroupID', title: 'HGroupID', width: 150, hide: true });
			@@ -1171,8 +1206,8 @@
			columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
			columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
			columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
			columns.push({ field: 'æåæ±æ¥æ°é', title: 'æåæ±æ¥æ°é', width: 150, edit: 'text', sort: true });
			columns.push({ field: 'éå®å·¥å', title: 'éå®å·¥å', width: 150, sort: true, filter: true });//0
			columns.push({ field: 'æåæ±æ¥æ°é', title: 'æåæ±æ¥æ°é', width: 150, edit: 'text' });
			columns.push({ field: 'éå®å·¥å', title: 'éå®å·¥å', width: 150, filter: true });//0
			//columns.push({ fixed: 'right', title: 'æä½', toolbar: '#barDemo' });
			option_columns = columns;
			option = {
			@@ -1282,6 +1317,8 @@
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			//åè®¾ç½®
			DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option);
			ins = table.render(option);
			var HinterID_S = [];
			for (var i = 0; i < data1.data.length; i++) {
			@@ -2792,51 +2829,62 @@

			//ä¼åçº§
			function set_Priority() {
			var data = table.cache["mainTable"];
			for (var i = 0; i < data.length; i++) {
			data[i]["ä¼åçº§"] = ((i + 1) * 5);
			}
			option.data = data;
			table.render(option);
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function () {
			var data = table.cache["mainTable"];
			for (var i = 0; i < data.length; i++) {
			data[i]["ä¼åçº§"] = ((i + 1) * 5);
			}
			option.data = data;
			table.render(option);
			}
			})
			}

			//åå¤æåº
			function set_ReadyAsc() {
			if (option.data.length != 0) {
			for (var i = 0; i < option.data.length - 1; i++) {
			for (var j = 0; j < option.data.length - i - 1; j++) {
			var tables = [];
			//æç§è®¡åç»ææ¥æ çäº§è®¢åå· çäº§è®¢åæç»è¡å·çé¡ºåºå»æ
			if (option.data[j]["è®¡åç»ææ¥æ"] > option.data[j + 1]["è®¡åç»ææ¥æ"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			} else if (option.data[j]["è®¡åç»ææ¥æ"] == option.data[j + 1]["è®¡åç»ææ¥æ"]) {
			if (option.data[j]["çäº§è®¢åå·"] > option.data[j + 1]["çäº§è®¢åå·"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			} else if (option.data[j]["çäº§è®¢åå·"] == option.data[j + 1]["çäº§è®¢åå·"]) {
			if (option.data[j]["çäº§è®¢åæç»è¡å·"] > option.data[j + 1]["çäº§è®¢åæç»è¡å·"]) {
			layer.confirm('ä½ ç¡®å®è¦æ§è¡æä½åï¼è¯·åç¡®ä¿æäº§æ°æ®å·²ä¿åï¼', {
			btn: ['ç¡®å®', 'åæ¶'] //æé®
			, btn1: function () {
			if (option.data.length != 0) {
			for (var i = 0; i < option.data.length - 1; i++) {
			for (var j = 0; j < option.data.length - i - 1; j++) {
			var tables = [];
			//æç§è®¡åç»ææ¥æ çäº§è®¢åå· çäº§è®¢åæç»è¡å·çé¡ºåºå»æ
			if (option.data[j]["è®¡åç»ææ¥æ"] > option.data[j + 1]["è®¡åç»ææ¥æ"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			} else if (option.data[j]["è®¡åç»ææ¥æ"] == option.data[j + 1]["è®¡åç»ææ¥æ"]) {
			if (option.data[j]["çäº§è®¢åå·"] > option.data[j + 1]["çäº§è®¢åå·"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			} else if (option.data[j]["çäº§è®¢åå·"] == option.data[j + 1]["çäº§è®¢åå·"]) {
			if (option.data[j]["çäº§è®¢åæç»è¡å·"] > option.data[j + 1]["çäº§è®¢åæç»è¡å·"]) {

			tables.push(option.data[j + 1]);
			option.data[j + 1] = option.data[j];
			option.data[j] = tables[0];

			}
			}
			}
			}
			}
			table.render(option);
			}
			else {
			return layer.msg("æ æ°æ®!")
			}
			}
			table.render(option);
			}
			else {
			return layer.msg("æ æ°æ®!")
			}
			})

			}

			//éäº§çº¿
			@@ -3540,137 +3588,6 @@
			else {
			layer.msg('è¯·éæ©æ°æ®ï¼');
			}
			}

			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["field"] + ",";
			}
			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_New.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) {
			titleData = [];
			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			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[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]);
			}
			}
			}
			//éåå¾ªç¯åå¤æå¯¹åºåæ°æ¯å¦ä¸è´
			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);
			} else {
			table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}

			function get_HideColumn_ICMO() {

	WebTM/layuiadmin/SetColumn.js	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/生产基础资料/Gy_Source.html	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/宝工排产/JIT_DayPlanPlatForm.html	381 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -1067,12 +1067,15 @@
			//#region å¤ææ¯ç´æ¥æå¼é¡µé¢è¿æ¯å¶å®é¡µé¢éè¿éæ©æé®æå¼ï¼å¹¶æ¾ç¤ºç¸åºæ°æ®
			function addSWhereByOpenType() {
			//è·ååæ°
			var sWhere = "";
			var params = get_UrlVars();
			var openType = params[params[1]]; //ä»åæ°ä¸è·å æå¼æ¹å¼ 1ç´æ¥æå¼ 2å¶å®é¡µé¢éè¿éæ©æé®æå¼

			var openType = params[params[0]]; //ä»åæ°ä¸è·å
			if (typeof (openType) != "undefined") {
			return " and ç¦ç¨æ è®° != 'Y'";
			sWhere += " and ç¦ç¨æ è®° != 'Y'"
			return sWhere;
			}
			return "";
			return sWhere;
			}
			//#endregion

			@@ -30,7 +30,7 @@
			//#endregion

			//#region éèåè®¾ç½® æ²¡åé¡µæä»¶
			function get_HideColumnNoPage(HModName, user, option, get_Display) {
			function get_HideColumnNoPage(HModName, user, option, get_FastQuery) {
			var colName = "";
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["field"] + ",";
			@@ -49,7 +49,7 @@
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_Display();
			get_FastQuery();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			@@ -140,6 +140,7 @@
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			newCols[0].push(option.cols[0][i + 1]);
			break;
			}
			}
			}