MES-WEB-LayUI.git

			@@ -18,7 +18,7 @@
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			<script src="../../../layuiadmin/HideButton.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>

			<script src="../../../layuiadmin/SetColumn.js"></script>
			<style type="text/css">
			input.layui-input.layui-unselect {
			padding-right: 0;
			@@ -61,6 +61,13 @@
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo" style="width:190px;">
			</div>
			</div>

			<div class="layui-inline">
			<label class="layui-form-label">é¡¹ç®ç¼å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input ForFilteringSchemes" name="HProjectNumber" id="HProjectNumber" style="width:190px;">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			@@ -262,8 +269,6 @@
			var Organization = sessionStorage["Organization"];
			var sWhere = "";
			var option = [];
			var page = 1;//åé¡µæ°æ®
			var size = 50;

			var HModName = "Xs_SeOrderBillList";
			var HBillType = "1401";
			@@ -310,10 +315,16 @@
			form.on('submit(btnSearch)', function (data) {
			//æ è®°å½åæ°æ®ä¸º æ¥è¯¢æ°æ®
			get_needClose_Bar = 0;
			if (page != 1) {
			$("#page a:eq(1)").get(0).click();//ç¹å»åé¡µæ ç¬¬ä¸é¡µ
			} else {
			get_FastQuery(table, option);
			optionPage.curr = 1;
			get_FastQuery(table, option);

			});
			//#endregion

			//#endregion è¾å¥æ¡åè½¦çå¬
			$('input[type="text"]').on('keydown', function (event) {
			if (event.keyCode == 13) {
			$("#btnSearch").click();
			}
			});
			//#endregion
			@@ -323,11 +334,9 @@
			//æ¸ç©ºè¿æ»¤æ¡ä»¶
			set_ClearQuery();

			if (page != 1) {
			$("#page a:eq(1)").get(0).click();//ç¹å»åé¡µæ ç¬¬ä¸é¡µ
			} else {
			get_FastQuery(table, option);
			}
			optionPage.curr = 1;
			get_FastQuery(table, option);

			});
			//#endregion

			@@ -467,45 +476,20 @@
			});
			//#endregion

			//#region çå¬æåºäºä»¶
			table.on('sort(mainTable)', function (obj) {
			//// è·åæåºåæ®µåç±»å
			//var field = obj.field;
			//var type = obj.type;
			////è®°å½è¿æ»¤æ¡ä»¶
			//var temp = sWhere_Bak;

			////ä¸ºè¿æ»¤æ¡ä»¶å¢å æåº
			//sWhere_Bak += " order by " + field + " " + (type == "null" ? "" : type) + " ";

			////è·åæåºåçæ°æ®å¹¶éæ°æ¸²æ
			//var ajaxLoad = layer.load();
			//$.ajax({
			// url: GetWEBURL() + '/Xs_SeOrderBill/sortList',
			// async: false,
			// type: "GET",
			// data: { "sWhere": sWhere_Bak, "user": sessionStorage["HUserName"] },
			// success: function (data1) {
			// if (data1.count == 1) {

			// option.data = data1.data;
			// table.render(option);
			// layer.close(ajaxLoad);

			// if ($("#Comparator").val() == 0 && $("#ColContent").val() == "" && $("#Comparator1").val() == 0 && $("#ColContent1").val() == "" && $("#Comparator2").val() == 0 && $("#ColContent2").val() == "") {
			// ColFilter();
			// }
			// } else {
			// layer.close(ajaxLoad);
			// layer.alert(data1.code + data1.Message, { icon: 5 });
			// }
			// }, error: function () {
			// layer.close(ajaxLoad);
			// layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			// }
			//});

			//sWhere_Bak = temp;
			//#region æåºåéæ©
			table.on('sort(mainTable)', function (obj) { //æ³¨ï¼sort æ¯å·¥å·æ¡äºä»¶åï¼test æ¯ table åå§å®¹å¨çå±æ§ lay-filter="å¯¹åºçå¼"
			table.reload('mainTable', {
			initSort: obj //è®°å½åå§æåºï¼å¦æä¸è®¾çè¯ï¼å°æ æ³æ è®°è¡¨å¤´çæåºç¶æã layui 2.1.1 æ°å¢åæ°
			, where: { //è¯·æ±åæ°ï¼æ³¨æï¼è¿éé¢çåæ°å¯ä»»æå®ä¹ï¼å¹¶éä¸é¢åºå®çæ ¼å¼ï¼
			field: obj.field //æåºåæ®µ å¨æ¥å£ä½ä¸ºåæ°åæ®µ field order
			, order: obj.type //æåºæ¹å¼ å¨æ¥å£ä½ä¸ºåæ°åæ®µ field order
			}
			});
			option.data = layui.table.cache["mainTable"];
			table.render(option);
			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			});
			//#endregion

			@@ -615,7 +599,8 @@
			//æ¥è¯¢
			//get_FastQuery();
			//get_Display(" and 1=0 ");

			//åå§åé¡µå¤§å°
			DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
			get_DisplayPage(" and 1=0 ");

			//æ¥è¯¢å½åç»å½ç¨æ·ææ²¡æå¨å½åæ¨¡åè®¾ç½®é»è®¤è¿æ»¤æ¹æ¡
			@@ -756,8 +741,6 @@
			if (!first) {
			//do something
			console.log(obj)
			page = obj.curr;
			size = obj.limit;

			if (get_needClose_Bar == 0) {
			get_FastQuery();
			@@ -960,10 +943,10 @@
			$.ajax({
			url: GetWEBURL() + '/Xs_SeOrderBill/list_ByPage',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size },
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
			success: function (data1) {
			option.limit = size;//æ¹åè¡¨æ ¼é¡µå¤§å°
			if (data1.count != 0) {
			option.limit = optionPage.limit;//æ¹åè¡¨æ ¼é¡µå¤§å°
			if (data1.code == 1) {
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			var data = [];//ååæ®µæ°æ®
			var col = [];
			@@ -1004,22 +987,8 @@
			}
			}
			}
			//å¨ææ¾ç¤ºåå
			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);
			}
			}
			option.cols = [col];
			option.data = data1.data;
			//è®¾ç½®æ°æ®
			var result = data1.data;
			var temp = "";
			@@ -1049,10 +1018,8 @@
			}
			//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);
			@@ -1067,6 +1034,7 @@
			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HProjectNumber = $("#HProjectNumber").val(); //é¡¹ç®ç¼å·
			var HCusID = $("#HCusID").val();
			var HMaterNumber = $("#HMaterNumber").val();
			var HMaterName = $("#HMaterName").val();
			@@ -1158,6 +1126,9 @@
			if (HBillNo) {
			sWhere += " and åæ®å· like ''%" + HBillNo + "%''";
			}
			if (HProjectNumber) {
			sWhere += " and é¡¹ç®ç¼ç like ''%" + HProjectNumber + "%''";
			}
			if (HCusID) {
			sWhere += " and å®¢æ· like ''%" + HCusID + "%''";
			}
			@@ -1195,6 +1166,7 @@
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ææ¥æ
			$("#HBillNo").val("");//
			$("#HProjectNumber").val("");
			$("#HCusID").val("");
			$("#HMaterNumber").val("");
			$("#HMaterName").val("");
			@@ -1754,7 +1726,7 @@

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

			//æ è®°å½åæ°æ®ä¸º å¾å³éé¡¹
			@@ -1769,9 +1741,9 @@
			url: GetWEBURL() + '/Xs_SeOrderBill/sortList__ByPage',
			async: false,
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": page, "size": size},
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "Organization": Organization, "page": optionPage.curr, "size": optionPage.limit },
			success: function (data1) {
			option.limit = size;//æ¹åè¡¨æ ¼é¡µå¤§å°
			option.limit = optionPage.limit;//æ¹åè¡¨æ ¼é¡µå¤§å°
			if (data1.count != 0) {
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			var data = [];//ååæ®µæ°æ®
			@@ -2287,8 +2259,10 @@
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//åå§åé¡µå¤§å°
			DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery()
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			@@ -2369,6 +2343,15 @@
			data1.data[0].HFixCols += 1;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			//è®¾ç½®åæåº
			for (var i = 1; i < option.cols[0].length; i++) {
			if (data1.data[0].HSortFlag == "æ¯") {
			option.cols[0][i]["sort"] = true;
			}
			else {
			option.cols[0][i]["sort"] = false;
			}
			}
			table.render(option);
			@@ -2724,8 +2707,8 @@

			//#region åå§æ¥æé´é ä¸æåè¡¨
			function setSelect_HInitTimeCycle() {
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29];
			var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©"];
			var valueList = [0, 1, 2, 3, 4, 5, 6, 29, 180, 365];
			var titleList = ["ä»å¤©", "è¿ä¸¤å¤©", "è¿ä¸å¤©", "è¿åå¤©", "è¿äºå¤©", "è¿åå¤©", "è¿ä¸å¤©", "è¿30å¤©", "è¿åå¹´", "è¿ä¸å¹´"];

			var HInitTimeCycle_ArrayList = '<option value="-1" selected="selected" >ä»»æé´é</option>';
			for (var i = 0; i < valueList.length; i++) {