MES-WEB-LayUI.git

			@@ -19,7 +19,7 @@
			padding-right: 0;
			}
			</style>
			</head>
			</head>
			<body>
			<div class="layui-fluid">
			<div class="layui-col-md12">
			@@ -147,6 +147,34 @@
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>

			<div class="layui-row" style="margin:10px 0px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<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>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			@@ -333,9 +361,9 @@
			$("#ColName1").append(Organization);
			form.render('select');

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

			//å è½½ç½æ ¼
			@@ -534,6 +562,9 @@
			var ColName1 = $("#ColName1").val();//å¤éæ¡
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();
			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();

			var com = "";
			if (ColName != 0 && Comparator != 0) {
			@@ -577,6 +608,27 @@
			break;
			}
			sWhere += " 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;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}
			//æ ¹æ®ç¨æ·è¿æ»¤ç¨æ·å³èå®¢æ·çè®°å½
			var HOtherSearch = getSWhereByHUser();
			@@ -648,6 +700,9 @@
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			ColFilter();
			sWhere = "";
			}