MES-WEB-LayUI.git

			@@ -149,6 +149,7 @@
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<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="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>éèåè®¾ç½®</button>
			</div>
			@@ -181,6 +182,8 @@
			var option = [];
			var HModName = "MaterOutEntryReport_Cloth";

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

			var detailBar = 0; //ç¨äºæ±æ»æ¥è¡¨æ¥çæç»æ¥è¡¨ï¼å½ä¸º0æ¶æ¾ç¤ºæç»æ±æ»æ¥è¡¨å¯¹åºæç»æ¥è¡¨ã
			//#endregion

			@@ -195,6 +198,10 @@
			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			//éåº
			case 'btn-exit': Pub_Close(2);
			break;
			@@ -238,8 +245,8 @@
			//åå§åçé¢
			function set_ClearBill() {
			//åå§åæ¶é´
			var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
			var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
			var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh");
			var HEndDate = Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh");
			laydate.render({
			elem: '#HBeginDate',
			type: 'datetime',
			@@ -269,8 +276,8 @@

			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//ä¸è¾¾æ¥æ å¼å§æ¥æ
			var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//ç»ææ¥æ
			var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//ä¸è¾¾æ¥æ å¼å§æ¥æ
			var HEndDate = Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//ç»ææ¥æ

			//var HBeginDate = $("#HBeginDate").val() + ":00:00" ;//ä¸è¾¾æ¥æ å¼å§æ¥æ
			//var HEndDate = $("#HEndDate").val()+":00:00";//ç»ææ¥æ
			@@ -324,12 +331,12 @@
			url: GetWEBURL() + "/MaterOutEntryReport/MaterOutEntryReport_Cloth",
			type: "GET",
			async: false,
			data: { "sWhere": sWhere },
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			//async: false,
			success: function (data1) {

			if (data1.count == 1) {

			var totalArray = ["ä»»å¡æ°é","ç½å¯åå¸", "æµè½¬å¡æ°é"];
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			@@ -348,6 +355,9 @@
			for (var i = 0; i < data.length; i++) {
			if ($.inArray(data[i].name, "") > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if ($.inArray(data[i].name, totalArray) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			}
			else if (data[i].ColName == 'ç½å¯åå¸') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow:true });
			@@ -373,7 +383,7 @@
			, cols: [col]
			, data: data1.data
			};
			table.render(option);
			ins = table.render(option);
			} else {
			option = {
			elem: '#mainTable'
			@@ -390,7 +400,7 @@
			, { field: 'äº§ååç§°', title: 'äº§ååç§°', width: 160 }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 160 }
			, { field: 'å½åå·¥åº', title: 'å½åå·¥åº', width: 160 }
			, { field: 'ä»»å¡æ°é', title: 'ä»»å¡æ°é', width: 160 }
			, { field: 'ä»»å¡æ°é', title: 'ä»»å¡æ°é', totalRow: true,width: 160 }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 200 }
			, { field: 'æµè½¬å¡æ°é', title: 'æµè½¬å¡æ°é', width: 160, totalRow: true }
			]]
			@@ -414,7 +424,7 @@
			//});
			}
			};
			table.render(option);
			ins = table.render(option);
			}
			},
			error: function (err) {
			@@ -448,7 +458,7 @@
			$.ajax({
			url: GetWEBURL() + '/MaterOutEntryReport/MaterOutEntryReport_Cloth',
			type: "GET",
			data: { "sWhere": sWhere },
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			//è°æ´æ¥ææ ¼å¼ï¼æ¾ç¤º å¹´ææ¥ å æ¶ å
			@@ -472,7 +482,7 @@
			// }
			// }
			//}
			table.render(option);
			ins = table.render(option);

			//è®¡ç®åè®¡å¬æ¤æ°
			var sumHMaterOutQty = 0;
			@@ -501,12 +511,12 @@
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ

			if (HBeginDate == '') {
			HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//ä¸è¾¾æ¥æ å¼å§æ¥æ
			HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//ä¸è¾¾æ¥æ å¼å§æ¥æ
			} else {
			HBeginDate = $("#HBeginDate").val() + ":00:00";//ä¸è¾¾æ¥æ å¼å§æ¥æ
			}
			if (HEndDate == '') {
			HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//ç»ææ¥æ
			HEndDate = Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//ç»ææ¥æ
			} else {
			HEndDate = $("#HEndDate").val() + ":00:00";//ç»ææ¥æ
			}
			@@ -581,8 +591,8 @@
			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			//åå§åæ¶é´
			var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
			var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh");
			var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh");
			var HEndDate = Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh");
			laydate.render({
			elem: '#HBeginDate',
			type: 'datetime',
			@@ -613,6 +623,28 @@
			}


			//#region å¯¼åºExecel
			function get_Export() {
			var ModRightNameCheck = "Kf_MaterOutEntryReport_Cloth_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_HideColumn() {
			var colName = "";