MES-WEB-LayUI.git

			@@ -175,6 +175,7 @@
			<div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			</div>
			<div id="page"></div>
			</div>
			</div>
			</div>
			@@ -206,11 +207,12 @@
			var Organization = sessionStorage["Organization"];
			var HModName = "Gy_Material";
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HItemID", "HUnitID", "HParentID", "HUSEORGID", "HMinPickQty", "HEndFlag", "HStopFlag"];
			var titleData = ["HItemID", "HUnitID", "HParentID", "HUSEORGID", "HMinPickQty", "HEndFlag", "HStopFlag","éæ©"];

			var ins; //ç¨äºå¯¼åºexcel
			var HMaterTypeID = 0; //ç©æåç±»èç¹id

			var page = 1;//åé¡µæ°æ®
			var size = 50;
			//è·ååæ°
			var params = getUrlVars();
			var openType = params[params[0]]; //ä»åæ°ä¸è·å æå¼æ¹å¼ 1ç´æ¥æå¼ 2å¶å®é¡µé¢éè¿éæ©æé®æå¼
			@@ -328,12 +330,7 @@

			//#region æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {
			if ($("#HProject").val() == "0") {
			get_FastQuery();
			}
			else {
			get_FastQuery(2);
			}
			});
			//#endregion

			@@ -445,28 +442,9 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 500
			, page: true
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			//, cols: [[
			// { type: 'checkbox', fixed: 'left' }
			// , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
			// , { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ' }
			// , { field: 'ç©æåç§°', title: 'ç©æåç§°' }
			// , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·' }
			// , { field: 'HUnitID', title: 'HUnitID', hide: true }
			// , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ' }
			// , { field: 'è®¡éåä½åç§°', title: 'è®¡éåä½åç§°' }
			// , { field: 'HMinPickQty', title: 'HMinPickQty', hide: true }
			// , { field: 'æç»æ è®°', title: 'æç»æ è®°' }
			// , { field: 'ç¦ç¨æ è®°', title: 'ç¦ç¨æ è®°' }
			// , { field: 'ç»ç»åç§°', title: 'ç»ç»åç§°' }
			// , { field: 'HEndFlag', title: 'HEndFlag', hide: true }
			// , { field: 'HStopFlag', title: 'HStopFlag', hide: true }
			// , { field: 'HParentID', title: 'HParentID', hide: true }
			// , { field: 'HUSEORGID', title: 'HUSEORGID', hide: true }
			//]]
			, height: 'full-80'
			, page: false
			, limit: 50
			, done: function (res, curr, count) {
			var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
			var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
			@@ -484,6 +462,29 @@
			}
			}
			};
			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); //å¾å°æ¯é¡µæ¾ç¤ºçæ¡æ°

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

			@@ -512,7 +513,7 @@
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization},
			success: function (data1) {
			if (data1.count == 1) {
			if (data1.count != 0) {
			var data = [];
			var col = [];
			//ç»ç©ºçæ°ç»èµå¼
			@@ -538,18 +539,9 @@
			}
			}

			//å¨ææ¾ç¤ºåå
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, cols: [col]
			, data: data1.data
			, height: 'full-80'
			, page: true
			, limits: [50, 500, 5000, 50000]
			, limit: 50
			, cellMinWidth: 90
			}

			option.cols = [col];
			option.data = data1.data;
			ins = table.render(option);

			//å·æ°è¡¨æ ¼æ°æ®
			@@ -572,7 +564,69 @@
			}
			//#endregion

			//#region æ¥è¯¢
			function get_DisplayPage(sWhere) {
			var wait = layer.load();//é®ç½©
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Gy_Material/page',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
			success: function (data1) {
			option.limit = size;//æ¹åè¡¨æ ¼é¡µå¤§å°
			if (data1.count != 0) {
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			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: true, 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: true, 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 = [[]]
			table.render(option);
			layer.close(ajaxLoad);
			/layer.alert(data1.code + data1.Message, { icon: 5 });/
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion


			//#region å¿«éè¿æ»¤
			@@ -590,40 +644,39 @@
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like'%" + ColContent + "%'";
			com = "like''%" + ColContent + "%''";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			com = "like''%" + ColContent + "''";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			com = "like''" + ColContent + "%''";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			com = "not like''%" + ColContent + "%''";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			com = "" + Comparator + "''" + ColContent + "''";
			break;
			}
			sWhere += " and " + ColName + " " + com;
			}
			if (HNumber) {
			sWhere += " and ç©æä»£ç like '%" + HNumber + "%'";
			sWhere += " and ç©æä»£ç like ''%" + HNumber + "%''";
			}
			if (HName) {
			sWhere += " and ç©æåç§° like '%" + HName + "%'";
			sWhere += " and ç©æåç§° like ''%" + HName + "%''";
			}
			if (HModel) {
			sWhere += " and è§æ ¼åå· like '%" + HModel + "%'";
			sWhere += " and è§æ ¼åå· like ''%" + HModel + "%''";
			}
			if (HOrgName) {
			sWhere += " and ç»ç»åç§° like '%" + HOrgName + "%'";
			sWhere += " and ç»ç»åç§° like ''%" + HOrgName + "%''";
			}
			if (number==2) {
			if (HProject) {
			sWhere += " and é¡¹ç®å· like '%" + HProject + "%'";
			}
			if (HProject) {
			sWhere += " and é¡¹ç®å· like ''%" + HProject + "%''";
			}

			if (GetDataCols != "") {
			sWhere += GetDataCols;
			}
			@@ -631,7 +684,7 @@
			sWhere += sql;
			}
			addSWhereByOpenType();
			get_Display(sWhere);
			get_DisplayPage(sWhere);
			sWhere = "";//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å
			GetDataCols = "";
			}
			@@ -1015,10 +1068,10 @@
			sql = "";
			HMaterTypeID = 0;
			} else {
			sql = " and HMaterTypeID='" + data.id + "' ";
			sql = " and HMaterTypeID=''" + data.id + "'' ";
			HMaterTypeID = data.id;
			}
			get_Display(sql);
			get_FastQuery()
			}
			});
			}
			@@ -1334,7 +1387,7 @@
			var openType = params[params[0]]; //ä»åæ°ä¸è·å æå¼æ¹å¼ 1ç´æ¥æå¼ 2å¶å®é¡µé¢éè¿éæ©æé®æå¼
			var HOrgID = params[params[1]];
			if (openType == 2) {
			sWhere += " and ç¦ç¨æ è®° = '' ";
			sWhere += " and ç¦ç¨æ è®° = '''' ";
			Organ(HOrgID);
			}
			}
			@@ -1369,7 +1422,7 @@
			$("#" + data[i].è¿æ»¤åæ®µID).find("option[value='" + data[i].è¿æ»¤å¼ + "']").attr("selected", true);
			}
			}
			get_FastQuery(2);
			get_FastQuery();
			form.render("select");
			} else {
			//å½åç¨æ·æ²¡æè®¾ç½®é»è®¤çè¿æ»¤æ¹æ¡
			@@ -1377,7 +1430,7 @@
			document.getElementById("HFilterScheme_Now").style.display = "none";
			//æ§è¡æ¥è¯¢æ¹æ³
			//æ¥è¯¢
			get_FastQuery(2);
			get_FastQuery();
			form.render("select");
			}
			}, error: function () {