MES-WEB-LayUI.git

			@@ -162,7 +162,7 @@
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<!--<div id="page" style="position: relative; bottom: 0;"></div>-->
			<div id="page" style="position: relative; bottom: 0;"></div>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			@@ -238,6 +238,73 @@

			//#endregion

			//#region åè½¦æ¥è¯¢

			//åæ®å·åè½¦æ¹æ³
			$('#HBillNo').on('keydown', function (event) {
			if (event.keyCode == 13) {
			get_FastQuery();
			}
			});

			//çç»åè½¦æ¹æ³
			$('#HGroupName').on('keydown', function (event) {
			if (event.keyCode == 13) {
			get_FastQuery();
			}
			});

			//èååè½¦æ¹æ³
			$('#HEmpName').on('keydown', function (event) {
			if (event.keyCode == 13) {
			get_FastQuery();
			}
			});

			//èªå®ä¹è¿æ»¤åè½¦æ¹æ³
			$('#ColContent').on('keydown', function (event) {
			if (event.keyCode == 13) {
			get_FastQuery();
			}
			});

			//èªå®ä¹è¿æ»¤åè½¦æ¹æ³
			$('#ColContent1').on('keydown', function (event) {
			if (event.keyCode == 13) {
			get_FastQuery();
			}
			});

			//èªå®ä¹è¿æ»¤åè½¦æ¹æ³
			$('#ColContent2').on('keydown', function (event) {
			if (event.keyCode == 13) {
			get_FastQuery();
			}
			});

			table.on('tool(mainTable)', function (obj) {
			var data = obj.data;
			if (obj.event == 'åæ®å·') {
			var HInterID = data.hmainid.toString();
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: HPageTitle + '- ç¼è¾'
			, shift: 0 //å¼¹åºå¨ç»
			, content: '../../å·¥èµç®¡ç/å·¥èµç»ç®å(ä¸ªäºº)/Pay_SingleBalBillEdit.html?OperationType=2&HInterID=' + HInterID
			, btn: ['ç¡®å®'],
			// æé®1 çåè°
			end: function (index, layero, that) {
			//å·æ°é¡µé¢
			$("#btnSearch").trigger('click');
			}
			})
			}
			});

			//#endregion


			//#region è¿å¥é¡µé¢å³å è½½

			//#region åå§åçé¢
			@@ -260,38 +327,38 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: true
			, page: false
			, totalRow: true
			, height: 'full-50'
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]

			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			};
			//optionPage = {
			// elem: 'page', //æ³¨æï¼è¿éç page æ¯ IDï¼ä¸ç¨å # å·
			// count: 10000, //æ°æ®æ»æ°ï¼ä»æå¡ç«¯å¾å°
			// limit: 50,
			// limits: [50, 500, 5000, 50000],
			// layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
			// jump: function (obj, first) {
			// //console.log(obj)
			// //objåå«äºå½ååé¡µçææåæ°ï¼æ¯å¦ï¼
			// //console.log(obj.curr); //å¾å°å½åé¡µï¼ä»¥ä¾¿åæå¡ç«¯è¯·æ±å¯¹åºé¡µçæ°æ®ã
			// //console.log(obj.limit); //å¾å°æ¯é¡µæ¾ç¤ºçæ¡æ°
			optionPage = {
			elem: 'page', //æ³¨æï¼è¿éç page æ¯ IDï¼ä¸ç¨å # å·
			count: 10000, //æ°æ®æ»æ°ï¼ä»æå¡ç«¯å¾å°
			limit: 50,
			limits: [50, 500, 1000, 2000],
			layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
			jump: function (obj, first) {
			//console.log(obj)
			//objåå«äºå½ååé¡µçææåæ°ï¼æ¯å¦ï¼
			//console.log(obj.curr); //å¾å°å½åé¡µï¼ä»¥ä¾¿åæå¡ç«¯è¯·æ±å¯¹åºé¡µçæ°æ®ã
			//console.log(obj.limit); //å¾å°æ¯é¡µæ¾ç¤ºçæ¡æ°

			// //é¦æ¬¡ä¸æ§è¡
			// if (!first) {
			// //do something
			// page = obj.curr;
			// size = obj.limit;
			// get_FastQuery();
			// }
			// }
			//}
			//laypage.render(optionPage);
			//é¦æ¬¡ä¸æ§è¡
			if (!first) {
			//do something
			page = obj.curr;
			size = obj.limit;
			get_FastQuery();
			}
			}
			}
			laypage.render(optionPage);
			}
			//#endregion

			@@ -577,7 +644,123 @@

			//#region å¯¼åºExecel
			function btn_Export() {
			var data = option.data
			var data;
			//è®¾ç½®sWhere
			var ajaxLoad = layer.load();
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HGroupName = $("#HGroupName").val();//çç»
			var HEmpName = $("#HEmpName").val();//èå
			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;
			}
			if (HBeginDate) {
			sWhere += " and æ¥æ >= '" + HBeginDate + "'";
			}
			if (HEndDate) {
			sWhere += " and æ¥æ <= '" + HEndDate + "'";
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			if (HGroupName) {
			sWhere += " and çç» like '%" + HGroupName + "%'";
			}
			if (HEmpName) {
			sWhere += " and èååç§° like '%" + HEmpName + "%'";
			}
			$.ajax({
			type: "GET",
			url: GetWEBURL() + '/Pay_SingleBalBillController/GetPay_SingleBalBillList_Json',
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "sWhere": sWhere, "HMaker": HMaker },
			success: function (data1) {
			if (data1.count == 1) {
			data = data1.data
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.Message, { icon: 5 });
			}
			},
			error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			sWhere = "";
			data.forEach((item) => {
			for (let itemobj in item) {
			if (item[itemobj] == null) {
			@@ -589,7 +772,7 @@
			}
			});

			table.exportFile(ins.config.id, option.data, "xls");
			table.exportFile(ins.config.id, data, "xls");
			}
			//#endregion

			@@ -966,7 +1149,11 @@
			form.on('submit(btnReSearch)', function (data) {
			//æ¸ç©ºè¿æ»¤æ¡ä»¶
			set_ClearQuery();
			get_FastQuery();
			if (page != 1) {
			$("#page a:eq(1)").get(0).click();//ç¹å»åé¡µæ ç¬¬ä¸é¡µ
			} else {
			get_FastQuery();
			}
			});

			//éç½®è¿æ»¤æ¡ä»¶
			@@ -993,7 +1180,11 @@

			//#region æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			if (page != 1) {
			$("#page a:eq(1)").get(0).click();//ç¹å»åé¡µæ ç¬¬ä¸é¡µ
			} else {
			get_FastQuery();
			}
			});

			//å¿«éæ¥è¯¢
			@@ -1092,7 +1283,7 @@
			if (HEmpName) {
			sWhere += " and èååç§° like '%" + HEmpName + "%'";
			}
			get_Display(sWhere);
			get_DisplayPage(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			}

			@@ -1202,6 +1393,13 @@
			if ($.inArray(data[i].name, titleData) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if (data[i].name == 'åæ®å·') {//æ·»å è¶é¾æ¥
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·', templet: function (d) {
			return '<span style="color: blue;">' + d.åæ®å· + '</span>'
			}, style: 'cursor: pointer;'
			});
			}
			else {
			switch (data[i].Type) {
			//int