MES-WEB-LayUI.git

			@@ -98,6 +98,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>ç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></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="get_export" id="get_export"><i class="layui-icon layui-icon-export"></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>
			@@ -129,7 +130,9 @@
			var option = [];
			var HModName = "Gy_Source";
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HItemID","Hprocid","HUSEORGID"];
			var titleData = ["HItemID", "Hprocid", "HUSEORGID"];

			var ins; //ç¨äºå¯¼åºexcel
			//#endregion


			@@ -194,6 +197,10 @@
			//éåºæé®
			case 'get_Exit': Pub_Close(2);
			break;
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			break;
			@@ -207,10 +214,10 @@
			obj.tr.find(':checkbox').prop('checked', flag);
			if (flag) {
			obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //è®¾ç½®å¤éæ¡éä¸æ ·å¼
			//$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			$(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//æ¹åå½åtrèæ¯é¢è²ååä½é¢è²
			} else {
			obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			//$(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
			$(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
			}
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.mainTable, function (i, l) {
			@@ -223,8 +230,24 @@
			//#region æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			get_FastQuery(2);
			//åå¨æ¡ä»¶
			get_WriteConfigFile();
			});
			//#endregion

			//ä»£ç åè½¦æ¹æ³
			$('#HNumber').on('keydown', function (event) {
			if (event.keyCode == 13) {
			get_FastQuery(2);
			}
			});

			//åç§°åè½¦æ¹æ³
			$('#HName').on('keydown', function (event) {
			if (event.keyCode == 13) {
			get_FastQuery(2);
			}
			});

			//#region éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			@@ -247,11 +270,9 @@
			Organ();
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//åå§å éç½®
			get_ReadConfigFile();
			//æ¥è¯¢
			get_FastQuery(1);


			}
			//#endregion

			@@ -260,6 +281,7 @@
			//è·åç»å½é¡µç»ç»å
			$.ajax({
			type: "get",
			async: false,
			url: GetWEBURL() + "/Web/GetOrganizations",
			success: function (result) {
			var Organization = "";
			@@ -335,6 +357,13 @@
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
			break;
			case 'long':
			case 'Int32':
			case 'Int64':
			case 'double':
			case 'Decimal':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			@@ -352,14 +381,12 @@
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			, cellMinWidth: 90
			, totalRow: true
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			}
			table.render(option);

			//åå¨æ¡ä»¶
			get_WriteConfigFile();
			ins = table.render(option);

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			@@ -368,6 +395,8 @@
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			//åå§å éç½®
			get_ReadConfigFile();
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			@@ -382,6 +411,27 @@
			}
			//#endregion

			//#region å¯¼åºExecel
			function get_Export() {
			var ModRightNameCheck = "Gy_Source_ExportExcel";

			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			table.exportFile(ins.config.id, option.data, "xls");
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//åå¨éç½®æä»¶
			function get_WriteConfigFile() {
			@@ -531,10 +581,11 @@
			}

			function btnrowDouble(obj) {
			var index = parent.layer.getFrameIndex(window.name);
			var data = obj.data;
			var data = [];
			data.push(obj.data);
			//è¿åæ¹æ³
			parent.GetGySource(data);
			var index = parent.layer.getFrameIndex(window.name);
			parent.layer.close(index);
			}

			@@ -752,7 +803,9 @@
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;