MES-WEB-LayUI.git

			@@ -160,9 +160,9 @@
			columns.push({ field: 'FNUMBER', title: 'ç©æç¼ç ', sort: true });
			columns.push({ field: 'HMaterName', title: 'ç©æåç§°', sort: true });
			columns.push({ field: 'HMaterModel', title: 'ç©æè§æ ¼', sort: true });
			columns.push({ field: 'å¨éæ°é', title: 'å¨éæ°é' });
			columns.push({ field: 'å¨éæ°é', title: 'å¨éæ°é', totalRow: true });
			columns.push({ field: 'CountHQty', title: 'åè®¡', sort: true });
			columns.push({ field: 'FBASEQTY', title: 'å³æ¶åºåæ°é', sort: true });
			columns.push({ field: 'FBASEQTY', title: 'å³æ¶åºåæ°é', sort: true, totalRow: true});
			//è·åä¸¤ä¸ªææä¹é´çç¸å·®
			var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//å¼å§æ¶é´
			var time2 = Date.parse(new Date($("#HENDDATE").val()));//ç»ææ¶é´
			@@ -178,7 +178,7 @@

			var k = 0;//æ¶éå¾ªç¯æ¬¡æ°
			for (var j = 0; j <= (Days - k); j++) {
			columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70 })
			columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true })
			//è·¨å¹´çè¯ ä¼ä»ä¸æä¸å·å¼å§
			if (MM == 12 && (HBEGINDATE + j) == 31) {
			yyyy += 1;
			@@ -201,6 +201,7 @@
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			, totalRow: true
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, loading: false