MES-WEB-LayUI.git

			@@ -148,6 +148,34 @@
			<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-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" lay-filter="Comparator1" class="ForFilteringSchemes" 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>
			</div>
			</div>
			@@ -255,8 +283,6 @@

			var Organization = sessionStorage["Organization"];
			//å¬ç¨åé
			var page = 1;//åé¡µæ°æ®
			var size = 50;
			var sWhere = "";
			var option = [];
			var option1 = [];
			@@ -1761,6 +1787,9 @@
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#HNumber").val("");
			$("#HName").val("");
			$("#HEmpNumber").val("");
			@@ -1790,6 +1819,9 @@
			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 HNumber = $("#HNumber").val(); //äº§åä»£ç å³ç©æç¼ç
			var HName = $("#HName").val(); //å½åå·¥åº
			var HEmpNumber = $("#HEmpNumber").val(); //æä½åä»£ç
			@@ -1815,6 +1847,28 @@
			break;
			}
			sWhere += " and " + ColName+ " "+ com;
			}

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

			if (HBeginDate) {
			@@ -1878,78 +1932,6 @@
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}

			//#region åé¡µæ¥è¯¢
			function get_DisplayPage(sWhere) {
			var wait = layer.load();//é®ç½©
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Cj_StationOutBill/page',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
			success: function (data1) {
			option.limit = size;//æ¹åè¡¨æ ¼é¡µå¤§å°
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°

			if (data1.code == 1) {
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			for (var key in data1.list) {
			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 (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
			}
			}
			}


			option.cols = [col];
			option.data = data1.data;
			ins = table.render(option);
			laypage.render(optionPage);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			option.data = [[]]
			ins = table.render(option);
			laypage.render(optionPage);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			/layer.alert(data1.code + data1.Message, { icon: 5 });/
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			//#endregion
			//å è½½ç½æ ¼
			function get_Display(sWhere) {
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			@@ -2088,23 +2070,8 @@
			}
			}
			}
			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 700
			//, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			//, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			}

			option.cols = [col];
			option.data = data1.data
			//å¤ææ¯å¦ææ¥çå·¥ä»·æé
			$.ajax({
			type: "get",
			@@ -2136,7 +2103,7 @@
			Display_HideButton(btns, "3791", HModName, sessionStorage["HUserName"]);

			layer.close(ajaxLoad);
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			} else {
			@@ -2463,6 +2430,8 @@
			}
			$("#ColName").empty()
			$("#ColName").append(Organization);
			$("#ColName1").empty()
			$("#ColName1").append(Organization);
			form.render('select');
			}