MES-WEB-LayUI.git

			@@ -334,11 +334,12 @@
			, toolbar: '#toolbarDemo'
			, height: '400'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡è¡'}
			, { 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 }
			@@ -354,13 +355,13 @@
			, { field: 'éä»¶ä»£ç ', title: 'éä»¶ä»£ç ', width: 115, hide: true }
			, { field: 'éä»¶åç§°', title: 'éä»¶åç§°', width: 200 }
			, { field: 'åä½åç§°', title: 'åä½åç§°', width: 200 }
			, { field: 'å®éç¨é', title: 'å®éç¨é', width: 200 }
			, { field: 'æ åç¨é', title: 'æ åç¨é', width: 200 }
			, { field: 'å®éç¨é', title: 'å®éç¨é', width: 200, totalRow: true}
			, { field: 'æ åç¨é', title: 'æ åç¨é', width: 200 , totalRow: true}
			, { field: 'è´è´£äºº', title: 'è´è´£äºº', width: 200 }
			, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 200 }
			, { field: 'å³èæ°é', title: 'å³èæ°é', width: 200 }
			, { field: 'å³èéé¢', title: 'å³èéé¢', width: 200 }
			, { field: 'å³èæ°é', title: 'å³èæ°é', width: 200 , totalRow: true}
			, { field: 'å³èéé¢', title: 'å³èéé¢', width: 200, totalRow: true}
			, { field: 'è¡å³éäºº', title: 'è¡å³éäºº', width: 115, hide: true }
			, { field: 'å³éç±»å', title: 'å³éç±»å', width: 200 }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', width: 200, hide: true }
			@@ -412,6 +413,7 @@
			//, toolbar: '#toolbarDemo'
			, height: '350'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			@@ -440,6 +442,7 @@
			elem: '#mainTable2'
			//, toolbar: '#toolbarDemo'
			, height: '350'
			, totalRow: true
			, page: true
			, cellMinWidth: 90
			, limit: 50
			@@ -457,8 +460,8 @@
			//, { field: 'HManagerID', title: 'è´è´£äººID', width: 200, hide: true }
			//, { field: 'HManagerNumber', title: 'è´è´£äººä»£ç ', width: 200 }
			//, { field: 'HManagerName', title: 'è´è´£äºº', width: 200 }
			, { field: 'HQty', title: 'å®éç¨é', width: 200 }
			, { field: 'HQtyMust', title: 'æ åç¨é', width: 200 }
			, { field: 'HQty', title: 'å®éç¨é', width: 200, totalRow: true}
			, { field: 'HQtyMust', title: 'æ åç¨é', width: 200, totalRow: true }
			, { field: 'HRemark', title: 'å¤æ³¨', width: 200 }
			]]
			};
			@@ -485,7 +488,7 @@
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
			}
			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			col.push({ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡è¡' });
			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å
			@@ -496,6 +499,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 });
			}
			@@ -510,6 +520,7 @@
			, data: data1.data
			, height: 550
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]