MES-WEB-LayUI.git

			@@ -34,7 +34,7 @@
			</div>
			</div>
			<div class="layui-form layui-inline" style="position:relative;top:10px;">
			<label class="layui-form-label " style="width:30px">æ¥æ</label>
			<label class="layui-form-label" style="width:30px">æ¥æ</label>
			<div class="layui-form-item layui-inline">

			<div class="layui-input-inline">
			@@ -84,7 +84,7 @@
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æä»£ç </label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
			<input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
			</div>
			</div>
			<div class="layui-inline">
			@@ -93,9 +93,6 @@
			<input type="text" class="layui-input ForFilteringSchemes" name="HProductName" id="HProductName">
			</div>
			</div>
			</div>
			<div class="layui-inline" style="margin-left:5px;">
			<div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
			</div>
			<div class="layui-row" style="margin-top:10px;margin-bottom:10px;">
			<!--å¶ä»æ¡ä»¶-->
			@@ -110,12 +107,12 @@
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" class="ForFilteringSchemes" style="width:190px;">
			<select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" class="ForFilteringSchemes" style="width:190px;">
			<select name="Comparator" id="Comparator" class=" ForFilteringSchemes " lay-filter="Comparator" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			@@ -133,7 +130,7 @@
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
			<div class="layui-row" style="margin:10px 0px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			@@ -142,7 +139,7 @@
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
			<select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			@@ -160,8 +157,7 @@
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>

			<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
			<!--<div class="layui-row" style="margin:10px 0px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			@@ -170,7 +166,7 @@
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
			<select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			@@ -187,10 +183,10 @@
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>-->
			</div>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<table class="" id="mainTable1" lay-filter="mainTable1"></table>
			<script type="text/html" id="toolbarDemo">
			@@ -206,7 +202,7 @@
			<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>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>éèåè®¾ç½®</button>-->
			</div>
			</script>
			</form>
			@@ -242,9 +238,6 @@
			window.HDefaultFilter = "";
			//éæ©çè¿æ»¤æ¹æ¡åç ï¼å¨å±åéï¼
			window.HInterID_Choose = 0;

			//#endregion

			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = [];
			@@ -267,7 +260,7 @@
			//#region åå§åçé¢

			set_ClearBill();


			//#endregion

			//#region ç¹å»äºä»¶åæ¬on formäºä»¶ç
			@@ -355,7 +348,7 @@
			get_FastQuery();

			ColFilter();
			// DisPlay_HideColumn();
			// DisPlay_HideColumn();
			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			get_DefaultModule();
			}
			@@ -368,7 +361,7 @@
			async: false,
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "num": 1, "user": sessionStorage["HUserName"]},
			data: { "sWhere": sWhere, "num": 1, "user": sessionStorage["HUserName"] },
			success: function (data1) {

			if (data1.count == 1) {
			@@ -444,7 +437,7 @@
			async: false,
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "num": 2, "user": sessionStorage["HUserName"]},
			data: { "sWhere": sWhere, "num": 2, "user": sessionStorage["HUserName"] },
			success: function (data1) {

			if (data1.count == 1) {
			@@ -537,9 +530,9 @@
			$("#ColName1").append(Organization);
			form.render('select');

			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			//$("#ColName2").empty();
			//$("#ColName2").append(Organization);
			//form.render('select');
			}

			//å¿«éè¿æ»¤
			@@ -559,15 +552,17 @@
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();

			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();

			//var ColName2 = $("#ColName2").val();//å¤éæ¡
			//var Comparator2 = $("#Comparator2").val()
			//var ColContent2 = $("#ColContent2").val();



			//æ¼æ¥ä»»ä¸åæ®µè¿æ»¤æ¥è¯¢æ¡ä»¶
			var com = "";
			var coms = "";
			if (ColName != 0 && Comparator != 0) {
			ColName = "[" + ColName + "]";
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like ''%" + ColContent + "%''";
			@@ -585,58 +580,58 @@
			com = "" + Comparator + " ''" + ColContent + "''";
			break;
			}
			com = " and (" + ColName + " " + com + ")";
			coms += " and (" + ColName + " " + com + ")";
			}

			if (ColName1 != 0 && Comparator1 != 0) {
			ColName1 = "[" + ColName1 + "]";
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			com1 = "like ''%" + ColContent1 + "%''";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			com1 = "like ''%" + ColContent1 + "''";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			com1 = "like ''" + ColContent1 + "%''";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			com1 = "not like ''%" + ColContent1 + "%''";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			com1 = "" + Comparator1 + " ''" + ColContent1 + "''";
			break;
			}
			// sWhere += " and " + ColName1 + " " + com1;
			com1 = " and (" + ColName1 + " " + com1 + ")";
			coms += " and (" + ColName1 + " " + com1 + ")";
			}

			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator2 + "'" + ColContent2 + "'";
			break;
			}
			com2 = " and (" + ColName2 + " " + com2 + ")";
			// sWhere += " and " + ColName2 + " " + com2;
			}

			com = com + com1 + com2;

			//if (ColName2 != 0 && Comparator2 != 0) {
			// ColName2 = "[" + ColName2 + "]";
			// var com2 = "";
			// switch (Comparator2) {
			// case "7":
			// com2 = "like ''%" + ColContent2 + "%''";
			// break;
			// case "8":
			// com2 = "like ''%" + ColContent2 + "''";
			// break;
			// case "9":
			// com2 = "like ''" + ColContent2 + "%''";
			// break;
			// case "10":
			// com2 = "not like ''%" + ColContent2 + "%''";
			// break;
			// default:
			// com2 = "" + Comparator2 + " ''" + ColContent2 + "''";
			// break;
			// }
			// coms += " and (" + ColName2 + " " + com2 + ")";
			//}


			if (HBeginDate != "" && HEndDate != "") {


			} else {
			HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm");
			HEndDate = Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm");
			@@ -652,7 +647,7 @@
			HProductName: HProductName,
			HEndDate: HEndDate,
			HEmpName: HEmpName,
			sWheres: com,
			sWheres: coms,
			HOtherSearch: (HOtherSearch == null \|\| HOtherSearch == "undefine") ? " and 1=1 " : HOtherSearch
			};

			@@ -715,9 +710,9 @@
			$("#ColName1").val("0");
			$("#Comparator1").val("0");

			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			//$("#ColContent2").val("");
			//$("#ColName2").val("0");
			//$("#Comparator2").val("0");
			ColFilter();
			sWhere = "";
			}
			@@ -896,7 +891,6 @@
			}
			//#endregion

			//#endregion
			//#region ãè¿æ»¤æ¹æ¡ã

			//è·åå½åç¨æ·çé»è®¤è¿æ»¤æ¹æ¡
			@@ -1107,6 +1101,7 @@
			}

			//#endregion
			//#endregion
			});
			//#region ãè¿æ»¤æ¹æ¡è¿åæ°æ®ã
			function HFilterScheme(obj) //è¿åè¿æ»¤æ¹æ¡