MES-WEB-LayUI.git

			@@ -758,7 +758,13 @@
			console.log(obj)
			page = obj.curr;
			size = obj.limit;
			get_FastQuery();

			if (get_needClose_Bar == 0) {
			get_FastQuery();
			} else if (get_needClose_Bar == 1) {
			get_needClose();
			}

			}
			}
			}
			@@ -1745,14 +1751,17 @@
			function get_needClose() {
			//è®°å½è¿æ»¤æ¡ä»¶
			var temp = sWhere_Bak;

			if (get_needClose_Bar == 0) {
			//è®¾ç½®é¡µæ°ä¸º1
			page = 1;
			}

			//æ è®°å½åæ°æ®ä¸º å¾å³éé¡¹
			get_needClose_Bar = 1;

			//ä¸ºè¿æ»¤æ¡ä»¶å¢å æåº
			//sWhere_Bak += " and å©ä½è®¢é>0 and å©ä½è®¢é<=1000 and å³éäºº='' and è¡å³éäºº='' and ç¶æ = 'å·²å®¡æ ¸' and HCusID <> 166351 order by åæ®å· desc";

			//è®¾ç½®é¡µæ°ä¸º1
			page = 1;

			//è·åæåºåçæ°æ®å¹¶éæ°æ¸²æ
			var ajaxLoad = layer.load();
			@@ -1762,13 +1771,63 @@
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size},
			success: function (data1) {
			if (data1.count == 1) {

			option.limit = size;//æ¹åè¡¨æ ¼é¡µå¤§å°
			if (data1.count != 0) {
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			var data = [];//ååæ®µæ°æ®
			var col = [];
			var totalArray = [];
			//ç»ç©ºçæ°ç»èµå¼
			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', totalRowText: 'åè®¡' });
			//è®¾ç½®åè¡¨åä¸ä¸ªåæ®åªæç¬¬ä¸æ¡æ°æ®æ¾ç¤ºä¸»è¡¨ä¿¡æ¯ï¼å¶å®è®°å½åªæ¾ç¤ºåè¡¨ä¿¡æ¯
			//è·ååè¡¨åæ°æ®
			var colList = [];
			for (var i = 0; i < option.cols[0].length; i++) {
			colList.push(option.cols[0][i].field);
			}
			for (var i = 0; i < data.length; i++) {//éådataæ°ç»éçæ°æ®
			// if (data[i].name == 'HInterID' \|\| data[i].name == 'HBillType' \|\| data[i].name == 'hmainid') {
			if ($.inArray(data[i].name, titleData) > -1) {//æ£æ¥dataãiã.nameæ¯å¦å¨æ°ç»ä¸ //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if ($.inArray(data[i].name, totalArray) > -1 \|\| (data[i].Type == "Decimal" \|\| data[i].Type == "int")) { //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			} else if (data[i].name == 'åæ®å·') {
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·'
			, event: 'åæ®å·', templet: function (d) {
			return '<span style="color: blue;">' + d.åæ®å· + '</span>'
			}, style: 'cursor: pointer;'
			});
			} else {
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "è¡å³éæ¥æ" ? "è¡å³éäºº" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			}
			}
			}
			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 800
			//, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			}
			//è®¾ç½®æ°æ®
			var result = data1.data;
			@@ -1788,17 +1847,21 @@


			option.data = result;
			table.render(option);
			ins = table.render(option);
			laypage.render(optionPage);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();

			layer.close(ajaxLoad);

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			option.data = [];
			table.render(option);
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			/layer.alert(data1.code + data1.Message, { icon: 5 });/
			}
			}, error: function () {
			layer.close(ajaxLoad);
			@@ -2352,6 +2415,7 @@
			$.ajax({
			url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
			type: "GET",
			async:false,
			data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
			success: function (data1) {
			if (data1.count == 1) {
			@@ -2696,6 +2760,7 @@
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			res = res.replace(/'/g, "''");
			return res;
			}
			//#endregion