MES-WEB-LayUI.git

			@@ -8,6 +8,7 @@
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/tableFilter.css" media="all">
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			@@ -17,6 +18,7 @@
			<script src="../../../layuiadmin/HideButton.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<script src="../../../layuiadmin/modules//tableFilter2.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -148,6 +150,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>
			@@ -241,7 +271,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
			}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable','tableFilter'], function () {
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			@@ -252,11 +282,10 @@
			, laydate = layui.laydate
			, util = layui.util
			, soulTable = layui.soulTable
			, tableFilter = layui.tableFilter

			var Organization = sessionStorage["Organization"];
			//å¬ç¨åé
			var page = 1;//åé¡µæ°æ®
			var size = 50;
			var sWhere = "";
			var option = [];
			var option1 = [];
			@@ -297,6 +326,16 @@
			var lookDownBar = 0; //(0:ä¸æ¥æä½ï¼1ï¼ç´æ¥æ¥ç)
			var params = get_UrlVars(); //è·ååæ°

			//var tableFilterIns = tableFilter.render({
			// 'elem': '#mainTable',//tableçéæ©å¨
			// 'mode': 'local',//è¿æ»¤æ¨¡å¼
			// 'filters': [
			// { field: 'è½¦é´', type: 'checkbox' },
			// ],//è¿æ»¤é¡¹éç½®
			// 'done': function (filters) {
			// //ç»æåè°
			// }
			//})

			//åå§åè¡¨æ ¼
			set_InitGrid();
			@@ -1761,6 +1800,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 +1832,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 +1860,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 +1945,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) {
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			@@ -2102,9 +2097,22 @@
			//, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);

			tableFilter.render({
			'elem': '#mainTable',
			'mode': 'local',
			'filters': [
			{ field: 'è½¦é´', type: 'input' },
			{ field: 'æ¥æ', type: 'date' },
			{ field: 'å®¡æ ¸äºº', type: 'checkbox' },
			{ field: 'ä»»å¡å', type: 'radio' },
			],
			'done': function (filters) { }
			}).reload();
			}
			}

			option.cols = [col];
			option.data = data1.data
			//å¤ææ¯å¦ææ¥çå·¥ä»·æé
			$.ajax({
			type: "get",
			@@ -2129,6 +2137,10 @@
			ins = table.render(option);

			laypage.render(optionPage);

			tableFilterIns = table.render(optionPage);
			tableFilter.render(tableFilterIns);

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			@@ -2136,7 +2148,7 @@
			Display_HideButton(btns, "3791", HModName, sessionStorage["HUserName"]);

			layer.close(ajaxLoad);
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			} else {
			@@ -2422,27 +2434,20 @@
			if (result.count == 1) {
			var data = option.data
			data.forEach((item) => {

			for (let itemobj in item) {
			if (item[itemobj] == null) {
			item[itemobj] = "";
			}
			if (item[itemobj].length > 0) { // åè®¾åæ®µåä¸ºfield
			item[itemobj] = item[itemobj].toString().replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			if (itemobj === 'è§æ ¼åå·') {
			item[itemobj] = item[itemobj].replace(/,/g, 'ï¼'); // æ¿æ¢è±æéå·ä¸ºä¸æéå·
			}
			}


			//// å¦ææä¸ªåæ®µçå¼å¤ªé¿ï¼éè¦å»é¤æ¢è¡ç¬¦
			//if (item.è§æ ¼åå·.length > 0) { // åè®¾åæ®µåä¸ºfield
			// item.è§æ ¼åå· = item.è§æ ¼åå·.replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			//}
			//if (item.äº§ååç§°.length > 0) { // åè®¾åæ®µåä¸ºfield
			// item.äº§ååç§° = item.äº§ååç§°.replace(/[\r\n]+/g, ''); // å°æ¢è¡ç¬¦æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			//}
			});

			table.exportFile(ins.config.id, option.data, "xls");
			table.exportFile(ins.config.id, data, "xls");
			} else {
			layer.alert("å½åæ¨¡åæ²¡æå¯¼åºæé!", { icon: 5 });
			}
			@@ -2463,6 +2468,8 @@
			}
			$("#ColName").empty()
			$("#ColName").append(Organization);
			$("#ColName1").empty()
			$("#ColName1").append(Organization);
			form.render('select');
			}