MES-WEB-LayUI.git

			@@ -77,19 +77,19 @@
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<div class="layui-inline">
			<div class="layui-inline" style="display:none;">
			<label class="layui-form-label">ç½å¯åå¸åè®¡å¬æ¤æ°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="SumHMaterOutQty" id="SumHMaterOutQty" disabled="disabled">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-inline" style="display:none;">
			<label class="layui-form-label">æååºç«åè®¡å¬æ¤æ°</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="SumDyeColorOut" id="SumDyeColorOut" disabled="disabled">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-inline" style="display:none;">
			<label class="layui-form-label">å·®é¢</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="SumCompare" id="SumCompare" disabled="disabled">
			@@ -231,6 +231,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 æ¤é¡µé¢ææçæ¹æ³
			@@ -238,20 +256,20 @@
			//åå§åçé¢
			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(8, 0, 0, 0), "yyyy-MM-dd");
			var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd");
			laydate.render({
			elem: '#HBeginDate',
			type: 'datetime',
			type: 'date',
			fullPanel: true
			, format: 'yyyy-MM-dd HH'
			, format: 'yyyy-MM-dd'
			, value: HBeginDate
			});
			laydate.render({
			elem: '#HEndDate',
			type: 'datetime',
			type: 'date',
			fullPanel: true
			, format: 'yyyy-MM-dd HH'
			, format: 'yyyy-MM-dd'
			, value: HEndDate
			});

			@@ -268,8 +286,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(8, 0, 0, 0), "yyyy-MM-dd") + " 00:00:00";//ä¸è¾¾æ¥æ å¼å§æ¥æ
			var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd") + " 00:00:00";//ç»ææ¥æ
			var HMaterNumber = $("#HMaterNumber").val();//ç©æä»£ç
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HProductName = $("#HProductName").val();//äº§ååç§°
			@@ -334,7 +352,8 @@
			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å
			@@ -405,7 +424,7 @@
			//åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 0; i < option.cols[0].length; i++) {
			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			}
			@@ -435,6 +454,9 @@
			data1.data[i].ç½å¯åå¸æ¥æ = data1.data[i]["ç½å¯åå¸æ¥æ"].split(":")[0] + ':' + data1.data[i]["ç½å¯åå¸æ¥æ"].split(":")[1];
			data1.data[i].ç½å¯åå¸æ¥æ = data1.data[i]["ç½å¯åå¸æ¥æ"].replace("T", " ");
			}
			if (data1.data[i].çäº§è®¢åæ¥æ != null) {
			data1.data[i].çäº§è®¢åæ¥æ = data1.data[i]["çäº§è®¢åæ¥æ"].split("T")[0];
			}
			}

			option.data = data1.data;
			@@ -462,7 +484,7 @@
			//è®¡ç®æååºç«åè®¡å¬æ¤æ°
			var sumDyeColorOut = 0;
			for (var i = 0; i < data1.data.length; i++) {
			sumDyeColorOut += data1.data[i]["æå"];
			sumDyeColorOut += data1.data[i]["æååºç«"];
			}
			$("#SumDyeColorOut").val(sumDyeColorOut);

			@@ -490,14 +512,14 @@
			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(8, 0, 0, 0), "yyyy-MM-dd") + " 00:00:00";//ä¸è¾¾æ¥æ å¼å§æ¥æ
			} else {
			HBeginDate = $("#HBeginDate").val() + ":00:00";//ä¸è¾¾æ¥æ å¼å§æ¥æ
			HBeginDate = $("#HBeginDate").val() + " 00: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(8, 0, 0, 0), "yyyy-MM-dd") + " 00:00:00";//ç»ææ¥æ
			} else {
			HEndDate = $("#HEndDate").val() + ":00:00";//ç»ææ¥æ
			HEndDate = $("#HEndDate").val() + " 00:00:00";//ç»ææ¥æ
			}

			var HMaterNumber = $("#HMaterNumber").val();//ç©æä»£ç
			@@ -536,8 +558,17 @@
			}

			var params = get_UrlVars();
			if (params[params[0]] != null && detailBar==0) {
			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(); //åæ®å·
			@@ -561,22 +592,39 @@
			//éç½®è¿æ»¤æ¡ä»¶
			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(8, 0, 0, 0), "yyyy-MM-dd");
			var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd");
			laydate.render({
			elem: '#HBeginDate',
			type: 'datetime',
			type: 'date',
			fullPanel: true
			, format: 'yyyy-MM-dd HH'
			, format: 'yyyy-MM-dd'
			, value: HBeginDate
			});
			laydate.render({
			elem: '#HEndDate',
			type: 'datetime',
			type: 'date',
			fullPanel: true
			, format: 'yyyy-MM-dd HH'
			, format: 'yyyy-MM-dd'
			, value: HEndDate
			});
			////åå§åæ¶é´
			//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");
			//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"));//ç»ææ¥æ
			@@ -596,7 +644,7 @@
			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 0; i < option.cols[0].length; i++) {
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["title"] + ",";
			}

			@@ -635,38 +683,38 @@

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

			for (var i = 0; i < option.cols[0].length; i++) {
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i]["hide"] = true;
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i]["style"] = "font-size:100%";
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i]["width"] = dataCols[3];
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i]["title"], titleData) == -1) {
			option.cols[0][i]["hide"] = false;
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i]["align"] = "left";
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i]["align"] = "center";
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i]["align"] = "right";
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			}