MES-WEB-LayUI.git

			@@ -21,6 +21,7 @@
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<script src="../../../layuiadmin/SetColumn.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -39,6 +40,12 @@
			<label class="layui-form-label" style="width: 85px;">åæ®å·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" id="HBillNo">
			</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>
			<div class="layui-inline">
			@@ -207,9 +214,7 @@
			var Organization = sessionStorage["Organization"];

			var option = [];
			var page = 1;//åé¡µæ°æ®
			var size = 50;

			var optionPage = [];
			var sWhere = "";
			var HModName = "Xs_ReceivableBillList";

			@@ -344,6 +349,31 @@
			})
			//#endregion

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

			//#region åå»è¿å¥ç¼è¾
			table.on('rowDouble(mainTable)', function (obj) {
			//éä¸é«äº® åå»è¡
			@@ -376,22 +406,17 @@
			//#region éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			set_ClearQuery();

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

			});
			//#endregion

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

			});
			//#endregion

			@@ -437,6 +462,8 @@
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//åå§åé¡µå¤§å°
			DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
			//æ¥è¯¢
			get_FastQuery(1);
			//Organ();
			@@ -452,7 +479,7 @@
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			//, page: true
			, page: false
			, totalRow: true
			//, cellMinWidth: 90
			, limit: 50
			@@ -619,10 +646,10 @@
			url: GetWEBURL() + '/Xs_ReceivableBill/list_byPage',
			type: "GET",
			async: false,
			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 totalArray = ["", ""];
			var data = [];
			@@ -665,22 +692,9 @@
			}
			}
			} //å¨ææ¾ç¤ºåå
			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;
			ins = table.render(option);
			@@ -695,13 +709,8 @@
			ColFilter();
			}
			} else {
			optionPage.count = data1.count;//æ¹ååè¡¨æ°æ®æ»æ°
			laypage.render(optionPage);

			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);
			@@ -715,6 +724,7 @@
			//#region å¿«éè¿æ»¤
			function get_FastQuery(number) {
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HProjectNumber = $("#HProjectNumber").val(); //é¡¹ç®ç¼å·
			var HDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HEndDate").val();//ç»ææ¥æ
			//ä»»æåæ®µè¿æ»¤
			@@ -800,7 +810,9 @@
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}

			if (HProjectNumber) {
			sWhere += " and é¡¹ç®ä»£ç like '%" + HProjectNumber + "%'";
			}
			//æ ¹æ®ç¨æ·è¿æ»¤ç¨æ·å³èå®¢æ·çè®°å½
			sWhere += getSWhereByHUser();
			sWhere += addSWhereByOpenType();
			@@ -817,6 +829,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("");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			@@ -1213,8 +1226,10 @@
			, content: [contentUrl, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//åå§åé¡µå¤§å°
			DisPlay_HideColumn_GetPageSize(HModName, sessionStorage["HUserName"], optionPage);
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			@@ -1302,6 +1317,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);
			//å·æ°æé®æ¾ç¤º
			var btns = document.getElementsByTagName("button"); //è·åæ¬é¡µæææé®å¯¹è±¡
			@@ -1321,8 +1345,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++) {