MES-WEB-LayUI.git

			@@ -65,6 +65,14 @@

			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">PNLæ¡ç å·:</label>
			<div class="layui-input-inline">
			<input class="layui-input ForFilteringSchemes" name="HBarCode_PNL"
			lay-verify="HBarCode_PNL" id="HBarCode_PNL" autocomplete="off">

			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
			lay-filter="btnSearch" id="btnSearch">
			æ¥è¯¢
			@@ -96,9 +104,11 @@
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<=">
			<= </option>
			<=
			</option>
			<option value="<">
			< </option>
			<
			</option>
			<option value="<>">
			<>
			</option>
			@@ -130,9 +140,11 @@
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<=">
			<= </option>
			<=
			</option>
			<option value="<">
			< </option>
			<
			</option>
			<option value="<>">
			<>
			</option>
			@@ -164,9 +176,11 @@
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<=">
			<= </option>
			<=
			</option>
			<option value="<">
			< </option>
			<
			</option>
			<option value="<>">
			<>
			</option>
			@@ -188,9 +202,9 @@
			<div id="page" style="position: relative; bottom: 0;"></div>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>æ°å¢</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_AddNew" lay-event="set_AddNew"><i class="layui-icon layui-icon-form"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_ShowBill" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-transfer"></i>å¤å¶</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Copy" id="btn-Copy"><i class="layui-icon layui-icon-transfer"></i>å¤å¶</button>-->
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_DeleteBill" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-form"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-Export" id="btn-Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="set_HideColumn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			@@ -484,16 +498,16 @@
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
			break;
			default:
			if (data[i].name === 'æ¡ç ç¼å·') {
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
			templet: function (d) {
			return '<span style="color: blue;" lay-unrow >' + d.æ¡ç ç¼å· + '</span>'
			}, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
			});
			} else {
			//if (data[i].name === 'æ¡ç ç¼å·') {
			// col.push({
			// field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
			// templet: function (d) {
			// return '<span style="color: blue;" lay-unrow >' + d.æ¡ç ç¼å· + '</span>'
			// }, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
			// });
			//} else {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
			}
			//}
			}
			}
			}
			@@ -537,6 +551,7 @@
			var HBeginDate = $("#HBeginDate").val();//èµ·å§æ¥æ
			var HEndDate = $("#HEndDate").val();//æªæ¢æ¥æ
			var HBarCode = $("#HBarCode").val();//åæ®å·
			var HBarCode_PNL = $("#HBarCode_PNL").val()
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			@@ -616,10 +631,14 @@
			sWhere += " and æ¡ç ç¼å· like '%" + HBarCode + "%'";
			}
			if (HBeginDate != "" && HEndDate != "") {
			sWhere += "and åå»ºæ¶é´ between '" + HBeginDate + "' and '" + HEndDate + "'";
			sWhere += " and åå»ºæ¶é´ between '" + HBeginDate + " 00:00:00' and '" + HEndDate + " 23:59:59'";
			}
			if (GetDataCols != "") {
			sWhere += GetDataCols;
			}

			if (HBarCode_PNL != "") {
			sWhere += " and PNLæ¡ç å· like '%" + HBarCode_PNL +"%'"
			}

			//get_Display(sWhere);
			@@ -825,6 +844,7 @@
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#HBarCode_PNL").val("");
			form.render('select');
			sWhere = "";
			get_FastQuery();