MES-WEB-LayUI.git

			@@ -43,7 +43,25 @@
			</select>
			</div>
			</div>-->
			<div class="layui-inline">
			<div class="layui-form layui-inline" style="position:relative;top:10px;">
			<label class="layui-form-label">æ¥æ</label>
			<div class="layui-form-item layui-inline">
			<div class="layui-inline">
			<div class="layui-input-inline">
			<input type="text" class="layui-input" id="HBeginDate" placeholder="yyyy-MM-dd HH:mm:ss">
			</div>
			</div>
			</div>
			<div class="layui-form-item layui-inline">
			<div class="layui-inline">
			<label class="layui-form-label">-</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" id="HEndDate" placeholder="yyyy-MM-dd HH:mm:ss">
			</div>
			</div>
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
			@@ -54,7 +72,7 @@
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
			</div>
			</div>
			</div>-->
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			@@ -162,6 +180,8 @@
			var sWhere = "";
			var option = [];
			var HModName = "MaterOutEntryReport_Cloth";

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

			//#region è¿å¥é¡µé¢æ¢å è½½
			@@ -193,6 +213,24 @@
			get_FastQuery();
			});

			//è¡çå¬äºä»¶-åå»
			table.on('row(mainTable)', function (obj) {
			var flag = !obj.tr.find(':checkbox:first').prop('checked');
			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èæ¯é¢è²ååä½é¢è²
			} else {
			obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//åæ¶å¤éæ¡éä¸æ ·å¼
			$(obj.tr.selector).attr({ "style": "background:" });//åæ¶å½åtré¢è²
			}
			//mainTable ä¸ºè¡¨æ ¼ID æ³¨ææ¤å¤å¦æIDä¸æ£ç¡®å°å¯¼è´ä½ å¨çå¬å¤éæ¡æ¶è·åä¸å°ä½ éæ©çæ°æ®ï¼åé¢çåªæ¯æ·»å æå é¤éä¸æªéä¸æ ·å¼ä»¥åè®¾ç½®èæ¯è²ï¼åä½é¢è²
			layui.each(table.cache.mainTable, function (i, l) {
			if (obj.tr.index() == l.LAY_TABLE_INDEX) {
			l.LAY_CHECKED = flag;
			}
			});
			});
			//#endregion

			//#region æ¤é¡µé¢ææçæ¹æ³
			@@ -200,10 +238,29 @@
			//åå§åçé¢
			function set_ClearBill() {
			//åå§åæ¶é´
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			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',
			fullPanel: true
			, format: 'yyyy-MM-dd HH'
			, value: HBeginDate
			});
			laydate.render({
			elem: '#HEndDate',
			type: 'datetime',
			fullPanel: true
			, format: 'yyyy-MM-dd HH'
			, value: HEndDate
			});


			////åå§åæ¶é´
			//$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//å¼å§æ¥æ
			//$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			//åå§åè¡¨æ ¼
			//set_InitGrid();
			set_InitGrid();
			//å è½½æ°æ®å°ç½æ ¼
			get_FastQuery();
			DisPlay_HideColumn();
			@@ -211,7 +268,57 @@
			}

			//åå§åè¡¨æ ¼
			function set_InitGrid(sWhere) {
			function set_InitGrid() {
			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";//ç»ææ¥æ
			var HMaterNumber = $("#HMaterNumber").val();//ç©æä»£ç
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HProductName = $("#HProductName").val();//äº§ååç§°
			var HProductModel = $("#HProductModel").val();//äº§åè§æ ¼

			//ä»»æåæ®µæ¡ä»¶è¿æ»¤ æ¡ä»¶æå
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();

			//æ¼æ¥ä»»ä¸åæ®µè¿æ»¤æ¥è¯¢æ¡ä»¶
			var com = "";
			if (ColName != 0 && Comparator != 0) {
			switch (Comparator) {
			case "7":
			com = "like ''%" + ColContent + "%''";
			break;
			case "8":
			com = "like ''%" + ColContent + "''";
			break;
			case "9":
			com = "like ''" + ColContent + "%''";
			break;
			case "10":
			com = "not like ''%" + ColContent + "%''";
			break;
			default:
			com = "" + Comparator + " ''" + ColContent + "''";
			break;
			}
			com = " and (" + ColName + " " + com + ")";
			}

			sWhere = {
			HBeginDate: HBeginDate
			, HEndDate: HEndDate
			, HMaterNumber: HMaterNumber
			, HBillNo: HBillNo
			, HProductName: HProductName
			, HProductModel: HProductModel
			, RandomSearch: com
			}
			sWhere = JSON.stringify(sWhere);


			//å¨æå-ç¼ååè¡¨
			$.ajax({
			url: GetWEBURL() + "/MaterOutEntryReport/MaterOutEntryReport_Cloth",
			@@ -233,21 +340,26 @@
			} else if (width > 300) {
			width = 300;
			}
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType, "width": width });
			data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType});
			}


			//å¨åè¡¨å·¦è¾¹æ·»å å¾éæ¡
			col.push({ type: 'checkbox', fixed: 'left' });
			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 (data[i].ColName == 'ç½å¯åå¸') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow:true });
			}
			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 HH:mm:ss')}}</div>", width: data[i].width });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: data[i].width });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
			}
			}
			}
			@@ -339,6 +451,14 @@
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			//è°æ´æ¥ææ ¼å¼ï¼æ¾ç¤º å¹´ææ¥ å æ¶ å
			for (var i = 0; i < data1.data.length; i++) {
			if (data1.data[i].æ¥æ != null) {
			data1.data[i].æ¥æ = data1.data[i]["æ¥æ"].split(":")[0] + ":" + data1.data[i]["æ¥æ"].split(":")[1];
			data1.data[i].æ¥æ = data1.data[i]["æ¥æ"].replace("T", " ");
			}
			}

			option.data = data1.data;
			//var num = 0;
			//for (let i = 0; i < data1.data.length; i++) {
			@@ -379,6 +499,20 @@
			function get_FastQuery() {
			var HBeginDate = $("#HBeginDate").val();//ä¸è¾¾æ¥æ å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ

			if (HBeginDate == '') {
			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(7, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//ç»ææ¥æ
			} else {
			HEndDate = $("#HEndDate").val() + ":00:00";//ç»ææ¥æ
			}

			//var HBeginDate = $("#HBeginDate").val()+":00:00";//ä¸è¾¾æ¥æ å¼å§æ¥æ
			//var HEndDate = $("#HEndDate").val()+":00:00";//ç»ææ¥æ
			var HMaterNumber = $("#HMaterNumber").val();//ç©æä»£ç
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HProductName = $("#HProductName").val();//äº§ååç§°
			@@ -412,6 +546,22 @@
			com = " and (" + ColName + " " + com + ")";
			}

			var params = get_UrlVars();
			if (params[params[0]] != null && detailBar == 0) {
			//æ±æ»æ¥è¡¨ççäº§è®¢åå·
			HBillNo = params[params[0]];
			//è®¾ç½®çäº§è®¢åå·æ ç¾
			$("#HBillNo").val(HBillNo);

			//è®¾ç½®æ¶é´ä¸ºä¸ä¸ªå¾å¤§çå¼ï¼é»è®¤æç´¢æææ¶é´çæç»
			HBeginDate = "1900-01-01 00:00:00";
			HEndDate = "2200-01-01 00:00:00";

			detailBar = 1;
			} else {
			HBillNo = $("#HBillNo").val(); //åæ®å·
			}

			sWhere = {
			HBeginDate: HBeginDate
			, HEndDate: HEndDate
			@@ -422,7 +572,7 @@
			, RandomSearch: com
			}

			set_InitGrid(JSON.stringify(sWhere));
			//set_InitGrid(JSON.stringify(sWhere));
			get_Display(JSON.stringify(sWhere));
			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			sWhere = "";
			@@ -430,8 +580,26 @@

			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			//åå§åæ¶é´
			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',
			fullPanel: true
			, format: 'yyyy-MM-dd HH'
			, value: HBeginDate
			});
			laydate.render({
			elem: '#HEndDate',
			type: 'datetime',
			fullPanel: true
			, format: 'yyyy-MM-dd HH'
			, value: HEndDate
			});

			//$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//å¼å§æ¥æ
			//$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			$("#HMaterNumber").val("");
			$("#HBillNo").val("");
			$("#HProductName").val("");
			@@ -448,7 +616,7 @@
			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}

			@@ -487,7 +655,7 @@

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

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