MES-WEB-LayUI.git

			@@ -52,39 +52,128 @@
			<input type="date" class="layui-input ForFilteringSchemes" name="HDate2" id="HDate2" style="width:190px;">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
			<div class="layui-inline">
			<label class="layui-form-label">è®¢åè·è¸ªå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" id="txtHOrderProcNo" style="width:190px;">
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è®¢åè·è¸ªå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" id="txtHOrderProcNo" style="width:190px;">
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç©æä»£ç </label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" lay-verify="txtHMaterNumber" name="txtHMaterNumber" id="txtHMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">é¨é¨åç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" id="txtHDeptName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-block">
			<input type="checkbox" name="chkHShowUnFinish" id="chkHShowUnFinish" lay-skin="primary" lay-filter="chkHShowUnFinish" title="åªæ¾ç¤ºæªå®å·¥">
			</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>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			</div>

			<div class="layui-inline">
			<label class="layui-form-label">ç©æä»£ç </label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" lay-verify="txtHMaterNumber" name="txtHMaterNumber" id="txtHMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;">
			<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">é¨é¨åç§°</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" id="txtHDeptName" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-block">
			<input type="checkbox" name="chkHShowUnFinish" id="chkHShowUnFinish" lay-skin="primary" lay-filter="chkHShowUnFinish" title="åªæ¾ç¤ºæªå®å·¥">
			</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>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">

			</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-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;" class="ForFilteringSchemes">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;" class="ForFilteringSchemes">
			<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="ColContent" id="ColContent">
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<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>
			<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="ColContent1" id="ColContent1">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<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>
			</div>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			@@ -222,7 +311,7 @@

			//å è½½æ°æ®å°ç½æ ¼
			get_FastQuery();


			}

			//åå§åè¡¨æ ¼
			@@ -238,12 +327,12 @@
			}

			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			function get_Display(HDate1,HDate2,txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName, sWhere) {
			var wait = layer.load();//é®ç½©
			$.ajax({
			url: GetWEBURL() + '/Mes_OrderProcFlowAllReport/OrderProcFlowAllReportList_Tk',
			type: "GET",
			data: { "sWhere": sWhere },
			data: { "HDate1": HDate1, "HDate2": HDate2,"txtHOrderProcNo": txtHOrderProcNo, "txtHMaterNumber": txtHMaterNumber, "check": check, "txtHDeptName": txtHDeptName, "sWhere": sWhere },
			success: function (data1) {
			var col = [];
			if (data1.count == 1) {
			@@ -276,6 +365,10 @@
			option.data = data1.data;
			ins = table.render(option);
			DisPlay_HideColumn();
			if ($("#ColName option").length < 1) {
			ColFilter();

			}
			layer.close(wait);
			} else {
			layer.close(wait);
			@@ -292,6 +385,8 @@
			function get_FastQuery() {
			var HDate1 = $("#HDate1").val();
			var HDate2 = $("#HDate2").val();
			sWhere = "";
			//sWhere = "and å·¥åºå®å·¥æ¥æ1 >='" + HDate1 + "' and å·¥åºå®å·¥æ¥æ1<='" + HDate2 + "'";
			var txtHOrderProcNo = $("#txtHOrderProcNo").val();//è®¢åè·è¸ªå·
			var txtHMaterNumber = $("#txtHMaterNumber").val(); //ç©æ
			var txtHDeptName = $("#txtHDeptName").val(); //ç©æ
			@@ -300,9 +395,83 @@
			if (chkHShowUnFinish) {
			check = "Y";
			}

			sWhere = "'" + HDate1 + "','" + HDate2 + "','" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'";
			get_Display(sWhere);
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			var ColName1 = $("#ColName1").val();//å¤éæ¡
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();
			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			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;
			}
			sWhere += " and " + ColName + " " + com;
			}

			if (ColName1 != 0 && Comparator1 != 0) {
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			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 = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName2 + " " + com2;
			}

			get_Display(HDate1,HDate2,txtHOrderProcNo, txtHMaterNumber, check, txtHDeptName, sWhere);
			//sWhere = "'" + HDate1 + "','" + HDate2 + "','" + txtHOrderProcNo + "','" + txtHMaterNumber + "','" + check + "'" + ",'" + txtHDeptName + "'";
			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			sWhere = "";
			}
			@@ -326,7 +495,7 @@
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			form.render('select');


			sWhere = " ";
			get_FastQuery();
			}
			@@ -423,7 +592,23 @@
			});
			})
			//#endregion

			//#region åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			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>';
			}
			}
			$("#ColName").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization);
			$("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}
			//#endregion
			//æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({