MES-WEB-LayUI.git

			@@ -137,14 +137,14 @@
			var option1 = [];
			var option2 = [];
			var HModName = "Sb_EquipMaintainRuleList";
			var col = [];
			var titleData = ["hmainid", "åæ®ç±»å", "éä»¶ID", "åä½ID", "è´è´£äººä»£ç ", "è¡å³éäºº", "ä½åºæ¥æ", "æºåä¸»åç ", "æºåååç ","åé¨åæ®å·","hsubid","ä¿å»é¡¹ç®ID","è´è´£äººID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//#endregion


			//#region è¿å¥é¡µé¢å³å è½½
			//åå§åçé¢
			set_ClearBill();
			//åå§åè¡¨æ ¼
			DisPlay_HideColumn();
			//#endregion

			//å¤´å·¥å·æ äºä»¶
			@@ -241,48 +241,48 @@
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'hmainid', title: 'hmainid', hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 160, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 160 }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 160, hide: true }
			, { field: 'å¨æåä½', title: 'å¨æåä½', width: 200 }
			, { field: 'ä¿å»å¨æ', title: 'ä¿å»å¨æ', width: 200 }
			, { field: 'éä»¶ID', title: 'éä»¶ID', width: 200, hide: true }
			, { field: 'éä»¶ä»£ç ', title: 'éä»¶ä»£ç ', width: 200 }
			, { field: 'éä»¶åç§°', title: 'éä»¶åç§°', width: 200 }
			, { field: 'æè¦', title: 'æè¦', width: 200 }
			, { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 200 }
			, { field: 'å¤æ³¨', title: 'å¤æ³¨', width: 200 }
			, { field: 'åä½ID', title: 'åä½ID', width: 200,hide: true }
			, { field: 'è®¡éåä½åç§°', title: 'è®¡éåä½åç§°', width: 200 }
			, { field: 'ç¨é', title: 'ç¨é', width: 200 }
			, { field: 'åå¤æ³¨', title: 'åå¤æ³¨', width: 200 }
			, { field: 'ä¿å»é¡¹ç®', title: 'ä¿å»é¡¹ç®', width: 115}
			, { field: 'ä¿å»é¨ä½', title: 'ä¿å»é¨ä½', width: 200 }
			, { field: 'å·ä½è¦æ±', title: 'å·ä½è¦æ±', width: 200 }
			, { field: 'è´è´£äººä»£ç ', title: 'è´è´£äººä»£ç ', width: 200, hide: true }
			, { field: 'è´è´£äººåç§°', title: 'è´è´£äººåç§°', width: 200 }
			, { field: 'è¡å³éäºº', title: 'è¡å³éäºº', width: 115, hide: true }
			, { field: 'å³éç±»å', title: 'å³éç±»å', width: 200 }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 200 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 115 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 200 }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 200 }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 115, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 200 }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 200 }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 115, hide: true }
			, { field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 200, hide: true }
			, { field: 'æºåååç ', title: 'æºåååç ', width: 200, hide: true }
			, { field: 'æºååå·', title: 'æºååå·', width: 200 }
			, { field: 'æºåç±»å', title: 'æºåç±»å', width: 200 }
			, { field: 'hbilltype', title: 'hbilltype', width: 200 }
			]]
			//, cols: [[
			// { type: 'checkbox', fixed: 'left' }
			// , { field: 'hmainid', title: 'hmainid', hide: true }
			// , { field: 'æ¥æ', title: 'æ¥æ', width: 160, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'åæ®å·', title: 'åæ®å·', width: 160 }
			// , { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 160, hide: true }
			// , { field: 'å¨æåä½', title: 'å¨æåä½', width: 200 }
			// , { field: 'ä¿å»å¨æ', title: 'ä¿å»å¨æ', width: 200 }
			// , { field: 'éä»¶ID', title: 'éä»¶ID', width: 200, hide: true }
			// , { field: 'éä»¶ä»£ç ', title: 'éä»¶ä»£ç ', width: 200 }
			// , { field: 'éä»¶åç§°', title: 'éä»¶åç§°', width: 200 }
			// , { field: 'æè¦', title: 'æè¦', width: 200 }
			// , { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 200 }
			// , { field: 'å¤æ³¨', title: 'å¤æ³¨', width: 200 }
			// , { field: 'åä½ID', title: 'åä½ID', width: 200,hide: true }
			// , { field: 'è®¡éåä½åç§°', title: 'è®¡éåä½åç§°', width: 200 }
			// , { field: 'ç¨é', title: 'ç¨é', width: 200 }
			// , { field: 'åå¤æ³¨', title: 'åå¤æ³¨', width: 200 }
			// , { field: 'ä¿å»é¡¹ç®', title: 'ä¿å»é¡¹ç®', width: 115}
			// , { field: 'ä¿å»é¨ä½', title: 'ä¿å»é¨ä½', width: 200 }
			// , { field: 'å·ä½è¦æ±', title: 'å·ä½è¦æ±', width: 200 }
			// , { field: 'è´è´£äººä»£ç ', title: 'è´è´£äººä»£ç ', width: 200, hide: true }
			// , { field: 'è´è´£äººåç§°', title: 'è´è´£äººåç§°', width: 200 }
			// , { field: 'è¡å³éäºº', title: 'è¡å³éäºº', width: 115, hide: true }
			// , { field: 'å³éç±»å', title: 'å³éç±»å', width: 200 }
			// , { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 200 }
			// , { field: 'å¶åäºº', title: 'å¶åäºº', width: 115 }
			// , { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 200 }
			// , { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 200 }
			// , { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 115, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'å³éäºº', title: 'å³éäºº', width: 200 }
			// , { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			// , { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 200 }
			// , { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 115, hide: true }
			// , { field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', width: 200, hide: true }
			// , { field: 'æºåååç ', title: 'æºåååç ', width: 200, hide: true }
			// , { field: 'æºååå·', title: 'æºååå·', width: 200 }
			// , { field: 'æºåç±»å', title: 'æºåç±»å', width: 200 }
			// , { field: 'hbilltype', title: 'hbilltype', width: 200 }
			//]]
			}
			}
			//åå§åè¡¨æ ¼(åè¡¨1)
			@@ -296,6 +296,7 @@
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, loading: false
			, cols: [[
			//{ type: 'checkbox', fixed: 'left' }
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe" }
			@@ -324,6 +325,7 @@
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, loading: false
			, cols: [[
			//{ type: 'checkbox', fixed: 'left' }
			, { templet: '#xuhao1', title: 'åºå·', sort: true, fixed: 'left', event: "qwe" }
			@@ -344,6 +346,7 @@
			}
			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			var ajaxLoad = layer.load();
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			@@ -352,17 +355,54 @@
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;
			var data = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, titleData) > -1 ) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			switch (data[i].Type) {
			//int
			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;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}

			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.unshift({ type: 'checkbox', fixed: 'left' })
			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 550
			, page: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			}
			table.render(option);
			layer.close(index);

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			option.data = data1.data;
			table.render(option);
			layer.close(index);
			layer.alert("æ²¡ææ°æ®è®°å½!", { icon: 5 });
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(index);
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			@@ -557,7 +597,7 @@


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["hmainid", "åæ®ç±»å", "éä»¶ID", "åä½ID", "è´è´£äººä»£ç ", "è¡å³éäºº", "ä½åºæ¥æ", "æºåä¸»åç ","æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			/var titleData = ["hmainid", "åæ®ç±»å", "éä»¶ID", "åä½ID", "è´è´£äººä»£ç ", "è¡å³éäºº", "ä½åºæ¥æ", "æºåä¸»åç ","æºåååç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±/

			dataCol = data1.data[0].HGridString.split(',');

			@@ -628,6 +668,7 @@
			}
			})
			}
			layer.close(index);

			//#endregion
			});