MES-WEB-LayUI.git

			@@ -19,7 +19,7 @@
			<script src="../../../layuiadmin/HideButton.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.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;
			@@ -70,6 +70,12 @@
			<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">
			@@ -252,8 +258,7 @@
			var sWhere = "";
			var option = [];
			var HModName = "Kf_POStockInBillList";
			var page = 1;//åé¡µæ°æ®
			var size = 50;

			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "1201";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			@@ -285,21 +290,17 @@
			form.on('submit(btnReSearch)', function (data) {
			//æ¸ç©ºè¿æ»¤æ¡ä»¶
			set_ClearQuery();
			if (page != 1) {
			$("#page a:eq(1)").get(0).click();//ç¹å»åé¡µæ ç¬¬ä¸é¡µ
			} else {
			get_FastQuery();
			}
			optionPage.curr = 1;
			get_FastQuery();

			});
			//#endregion

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

			});
			//#endregion

			@@ -321,6 +322,33 @@
			$('#HEndDate').prop('disabled', false);
			}
			});


			//#endregion è¾å¥æ¡åè½¦çå¬
			$('input[type="text"]').on('keydown', function (event) {
			if (event.keyCode == 13) {
			$("#btnSearch").click();
			}
			});
			//#endregion

			//#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"); //è·åæ¬é¡µæææé®å¯¹è±¡
			var HBillType = "1201";
			Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
			});
			//#endregion

			//è·åç»ç»
			Organ();
			@@ -344,6 +372,8 @@
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//åå§åé¡µå¤§å°
			DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery(table, option,2);

			@@ -442,8 +472,6 @@
			//é¦æ¬¡ä¸æ§è¡
			if (!first) {
			//do something
			page = obj.curr;
			size = obj.limit;
			get_FastQuery();
			}
			}
			@@ -567,9 +595,9 @@
			url: GetWEBURL() + '/Kf_POStockInBill/page',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": page, "size": size },
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "page": optionPage.curr, "size": optionPage.limit },
			success: function (data1) {
			option.limit = size;//æ¹åè¡¨æ ¼é¡µå¤§å°
			option.limit = optionPage.limit;//æ¹åè¡¨æ ¼é¡µå¤§å°
			if (data1.code == 1) {
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			var data = [];//ååæ®µæ°æ®
			@@ -802,6 +830,7 @@
			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HProjectNumber = $("#HProjectNumber").val(); //é¡¹ç®ç¼å·
			var HSupID = $("#HSupID").val();
			var HDeptID = $("#HDeptID").val();
			var HMangerID = $("#HMangerID").val();
			@@ -896,6 +925,9 @@
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			if (HProjectNumber) {
			sWhere += " and é¡¹ç®ä»£ç like '%" + HProjectNumber + "%'";
			}
			if (HSupID) {
			sWhere += " and ä¾åºå like '%" + HSupID + "%'";
			}
			@@ -921,6 +953,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("");
			$("#HSupID").val("");
			$("#HDeptID").val("");
			$("#HMangerID").val("");
			@@ -1447,7 +1480,7 @@
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["field"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			@@ -1470,8 +1503,10 @@
			, content: [contentUrl, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//åå§åé¡µå¤§å°
			DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery(table, option, 2);
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			@@ -1493,8 +1528,10 @@
			var titleData = ["hmainid", "hsupid", "hsecmanagerid", "hkeeperid", "HDeptID", "hsubid", "hmaterid", "hunitid","hwhid"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			if (dataCol.length <= i) {
			break;
			}
			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {
			@@ -1556,6 +1593,15 @@
			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);
			} else {
			table.render(option);