MES-WEB-LayUI.git

			@@ -14,6 +14,7 @@
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/PageTitle.js"></script>
			<!--<style>
			.main-btn { /å¤´é¨ä¸»æé®/
			padding: 0 2px; /è°æ´æé®å·¦å³ç©ºéå¤§å°/
			@@ -65,6 +66,7 @@
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">åå³é</button>-->
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			<h1 style="text-align: center; padding: 10px 0;"><b>å çç³è¯·å</b></h1>
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;" class="layui-this">åºæ¬ä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">å¶ä»ä¿¡æ¯</li>
			@@ -284,6 +286,14 @@

			//æ¨¡åå
			var HModName = "Pay_OverApplyBill";

			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "2209";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
			$("h1").html('<b>' + HPageTitle + '</b>');
			//#endregion

			//è¡¨æ ¼æ¸²æåæ°
			var option = {}; //åè¡¨æ¸²æåæ°
			//è·ååæ°
			@@ -300,10 +310,6 @@
			icon: 4, skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º", closeBtn: 0, btn: ['éæ°ç»å½']
			}, function () { window.location.href = "../../user/login.html"; });
			}
			//#endregion

			//#region åå§åè¡¨æ ¼
			//DisPlay_HideColumn();
			//#endregion

			//#region å¤æå¹¶è®¾ç½®æä½ç±»åãé¡µé¢åå§å
			@@ -346,7 +352,7 @@
			//#endregion

			//#region åå§åè¡¨æ ¼
			//DisPlay_HideColumn();
			DisPlay_HideColumn();
			//#endregion

			//#endregion
			@@ -503,7 +509,7 @@
			var HTimes = (hours * 1 + minutes / 60).toFixed(2); //å çæ¶é´
			//è®¾ç½®è¡æ°æ®
			data["HTimes"] = HTimes;
			if (data["HRelTimes"] == true) {
			if (data["HRestFlag"] == true) {
			data["HRelTimes"] = HTimes - data["HRestTimes"];
			} else {
			data["HRelTimes"] = HTimes;
			@@ -539,7 +545,7 @@
			var HRelPay = (HTimes * HPayMoney).toFixed(2); //åºä»å·¥èµ = å®éå®é*å°æ¶å·¥èµ
			//è®¾ç½®è¡æ°æ®
			data["HTimes"] = HTimes;
			if (data["HRelTimes"] == true) {
			if (data["HRestFlag"] == true) {
			data["HRelTimes"] = HTimes - data["HRestTimes"];
			} else {
			data["HRelTimes"] = HTimes;
			@@ -665,18 +671,18 @@
			, cellMinWidth: 120
			, height: 400
			, cols: [[
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			{ type: 'checkbox', totalRowText: 'åè®¡' }
			, { type: 'numbers', title: 'åºå·' }
			, { field: 'RowID', title: 'è¡å·' } //è¡æ è¯ï¼ç¨äºä¸ä¸è¡ãä¸ä¸è¡è¯å«æå¨è¡
			, { field: 'HEmpID', title: 'èåID' }
			, { field: 'RowID', title: 'è¡å·', hide: true } //è¡æ è¯ï¼ç¨äºä¸ä¸è¡ãä¸ä¸è¡è¯å«æå¨è¡
			, { field: 'HEmpID', title: 'èåID', hide:true, style: 'background-color: #f9f9f9;' }
			, { field: 'HEmpNumber', title: 'èåä»£ç ', edit: 'text', event: "HEmpNumber" } //f7
			, { field: 'HEmpName', title: 'èååç§°', style: 'background-color: #CDCDCD;' }
			, { field: 'HEmpName', title: 'èååç§°', style: 'background-color: #f9f9f9;' }
			, { field: 'HBTimes', title: 'å¼å§æ¶é´', event: "HBTimes" }
			, { field: 'HETimes', title: 'ç»ææ¶é´', event: "HETimes" }
			, { field: 'HRestFlag', title: 'åä¼æ è®°', templet: "#HRestFlag" }
			, { field: 'HRestTimes', title: 'åä¼æ¶é´', edit: 'text'} //f7
			, { field: 'HTimes', title: 'å çæ¶é´', style: 'background-color: #CDCDCD;'} //f7
			, { field: 'HRelTimes', title: 'å®éæ¶é´', style: 'background-color: #CDCDCD;' } //f7
			, { field: 'HRestTimes', title: 'åä¼æ¶é´', edit: 'text', totalRow: true} //f7
			, { field: 'HTimes', title: 'å çæ¶é´', style: 'background-color: #f9f9f9;', totalRow: true} //f7
			, { field: 'HRelTimes', title: 'å®éæ¶é´', style: 'background-color: #f9f9f9;', totalRow: true } //f7
			, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text' } //f7
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			]]
			@@ -899,6 +905,8 @@
			option.data = tableSub;
			for (var i = 0; i < option.data.length; i++) {
			option.data[i]["RowID"] = (i + 1) * 10;
			option.data[i]["HBTimes"] = option.data[i]["HBTimes"].split("T")[0] + " " + option.data[i]["HBTimes"].split("T")[1];
			option.data[i]["HETimes"] = option.data[i]["HETimes"].split("T")[0] + " " + option.data[i]["HETimes"].split("T")[1];
			}
			table.render(option);
			CheckedSet_tableSub();
			@@ -1192,9 +1200,9 @@
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			option.cols[0][i + 1]["style"] += "font-size:100%";
			}
			//è®¾ç½®åå®½
			//if (data1.data[0].HColumnWidth != 0) {