MES-WEB-LayUI.git

			@@ -49,9 +49,10 @@
			<form class="layui-form" lay-filter="component-form-group" action="">
			<div class="layui-card-header">
			<div class="layui-btn-group">
			<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">æ°å¢</button>
			<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">ä¿å</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">éæ´å</button>
			<!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SelectMainBill">éæ´å</button>-->
			<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius layui-btn-disabled" lay-submit="" lay-filter="get_PrintReport" disabled>æå°</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">éåº</button>
			</div>
			@@ -60,7 +61,7 @@
			<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>
			<li lay-id="2" style="padding:1px;display:none;">å¶ä»ä¿¡æ¯</li>
			<li lay-id="3" style="padding:1px;">å¶åä¿¡æ¯</li>
			</ul>
			<div class="layui-tab-content">
			@@ -71,33 +72,64 @@
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">åæ®å·<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HInterID" id="HInterID" value="0">
			<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value=0>
			<input type="hidden" name="HBillSubType" id="HBillSubType" value="">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">æ¥æ<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
			<input type="date" class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¸å¡å<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;" readonly>
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;display:none;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>

			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">é¨é¨<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;" readonly>
			<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value=0 style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;display:none;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¾åºå<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;" readonly>
			<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value=0 style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;display:none;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">åç¥¨ç¼å·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HInvoiceBillNo" id="HInvoiceBillNo" autocomplete="off">
			</div>
			</div>

			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä»åº<label style="color:red"> * </label></label>
			<label class="layui-form-label">ä»åº</label>
			<div class="layui-input-inline">
			<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;" readonly>
			<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -105,74 +137,32 @@
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">éªæ¶å</label>
			<label class="layui-form-label">éªæ¶å<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;" readonly>
			<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¿ç®¡å</label>
			<div class="layui-input-inline">
			<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">

			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¸å¡å</label>
			<div class="layui-input-inline">
			<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">æºåç±»å</label>
			<div class="layui-input-inline">
			<select name="HSourceBillType" id="HSourceBillType" lay-verify="HSourceBillType">
			<!--å¨ææ¸²ææºåç±»å-->
			</select>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">éåå·</label>
			<div class="layui-input-inline">
			<input type="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">

			<button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			<!--<label class="layui-form-label">éåå·</label>
			<!--<label class="layui-form-label">éåå·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="Box2" id="Box2" autocomplete="off">
			</div>-->
			</div>
			</div>
			<div class="layui-row">

			<div class="layui-col-xs4 layui-inline">
			<div class="layui-row" style="display:none;">
			<div class="layui-col-xs4 layui-inline" style="display:none;">
			<label class="layui-form-label">è´è´£äºº</label>
			<div class="layui-input-inline">
			<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;" readonly>
			<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<div class="layui-col-xs4 layui-inline" style="display:none;">
			<label class="layui-form-label">é¡¹ç®ç¼ç </label>
			<div class="layui-input-inline">
			<input type="text" name="HProjectNumber" id="HProjectNumber" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
			@@ -182,44 +172,68 @@
			</button>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<div class="layui-col-xs4 layui-inline" style="display:none;">
			<label class="layui-form-label">é¡¹ç®åç§°</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HProjectName" id="HProjectName" style="background-color:#efefef4d;" readonly autocomplete="off">
			</div>
			</div>

			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">é¨é¨<label style="color:red"> * </label></label>
			<div class="layui-row" style="display:none;">
			<div class="layui-col-xs4 layui-inline" style="display:none;">
			<label class="layui-form-label">ä¿ç®¡å</label>
			<div class="layui-input-inline">
			<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value=0 style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
			<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;" readonly>
			<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>

			</div>
			<!--<div class="layui-row">
			<div class="layui-col-xs4 layui-inline" style="display:none;">
			<label class="layui-form-label">æºåç±»å</label>
			<div class="layui-input-inline">
			<select name="HSourceBillType" id="HSourceBillType" lay-verify="HSourceBillType">
			<!--å¨ææ¸²ææºåç±»å-->
			</select>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline" style="display:none;">
			<label class="layui-form-label">éåå·</label>
			<div class="layui-input-inline">
			<input type="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float:left;width:150px;" readonly>

			<div class="layui-col-xs7 layui-inline">
			<label class="layui-form-label">æè¦</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
			</div>
			</div>
			</div>-->
			<button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<!--<div class="layui-row">
			<div class="layui-col-xs7 layui-inline">
			<label class="layui-form-label">æè¦</label>
			<div class="layui-input-block">
			<input class="layui-input" name="hexplanation" id="hexplanation" autocomplete="off">
			</div>
			</div>
			</div>-->
			</div>
			<div class="layui-row">
			<div class="layui-col-xs7 layui-inline">
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
			<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style="width:800px;">
			</div>
			</div>

			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 120px; width: 800px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -234,21 +248,9 @@
			<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline" style="margin-left: 135px;">
			<label class="layui-form-label">åç¥¨ç¼å·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HInvoiceBillNo" id="HInvoiceBillNo" autocomplete="off">
			</div>
			</div>

			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>

			</div>
			</div>

			@@ -331,11 +333,11 @@
			<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>å¢å ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>å¤å¶ä¸è¡</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>å¢å ä¸è¡</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>å¤å¶ä¸è¡</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>åºåæ¥è¯¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>åºå¥åºè®°å½æ¥è¯¢</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>åºå¥åºè®°å½æ¥è¯¢</button>-->
			</div>
			</script>
			<script type="text/html" id="xuhao">
			@@ -376,7 +378,7 @@
			var month = date.getMonth() + 1;
			var year = date.getFullYear();
			var shijian = year + "-" + month + "-" + day;

			var topScroll = 0;//è®°å½æ»å¨æ¡çä½ç½®
			var allVal;
			//#endregion
			var HModName = "Add_Edit_Kf_POStockInBillList"
			@@ -388,7 +390,7 @@
			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "1201";
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HModuleType) == "" ? $("h1").html() : get_PageTitle(HModuleType);
			var HPageTitle = get_PageTitle(HModuleType) \|\| $("h1").html();
			$("h1").html('<b>' + HPageTitle + '</b>');
			//#endregion

			@@ -406,7 +408,8 @@
			var linterid = params[params[1]];//æºåid
			var HSouceBillType = params[params[2]];//æºåç±»å
			}

			var HBillSubType = getParams("HBillSubType") == "" ? "1201" : getParams("HBillSubType");//åæ®åç±»å
			$("#HBillSubType").val(HBillSubType);


			//#region è·åæå¤§åæ®å·
			@@ -460,11 +463,11 @@
			//#endregion

			var rowdata = [{
			"HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "HQtyMust": "0", "HQty": "", "HRemark": "",
			"HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "HQtyMust": "0", "HQty": "0", "HRemark": "",
			"HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "æ¶æä»åº": "",
			"HSPID": 0, "ä»ä½åç§°": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
			"HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
			"HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
			"HSourceBillNo": "", "HSourceBillType": "", "HSourceInterID": 0, "HSourceEntryID": 0,
			"HTaxRate": 0, "HTaxPrice": 0, "HlineTotal": 0
			}];

			@@ -478,7 +481,7 @@
			"HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "æ¶æä»åº": "",
			"HSPID": 0, "ä»ä½åç§°": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
			"HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
			"HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
			"HSourceBillNo": "", "HSourceBillType": "", "HSourceInterID": 0, "HSourceEntryID": 0,
			"HTaxRate": 0, "HTaxPrice": 0, "HlineTotal": 0
			};
			switch (obj.event) {
			@@ -528,6 +531,15 @@
			form.on('submit(Cancel)', function () {
			Pub_Close(1);
			})

			//#region æ°å¢
			form.on('submit(set_AddNew)', function (data) {
			const url = new URL(location.href);
			url.searchParams.set('OperationType', '1'); // ä¿®æ¹ææ·»å åæ°
			url.searchParams.set('linterid', '0'); // ä¿®æ¹ææ·»å åæ°
			location.href = url.toString();
			});
			//#endregion

			//#region æé®
			form.on('submit(set_CheckBill)', function (data) {
			@@ -793,11 +805,13 @@
			table.on('edit(mainTable)', function (obj) {
			//æ°å¼æ ¼å¼æ ¡éªå·¥å·
			var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			var ref1 = /^-?\d+(\.\d+)?$/; //å¤æåç¬¦ä¸²æ¯å¦ä¸ºæ°å(åå«æ´æ°ãæµ®ç¹æ°)ï¼æ£åè¡¨è¾¾å¼
			var temp = "";
			var Dec = getDecByMaterID(obj.data.HMaterID) //è·åç²¾åº¦
			var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			var HPriceDec = (Dec["HPriceDec"] == null \|\| Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //åä»·ç²¾åº¦
			var HMoneyDec = (Dec["HMoneyDec"] == null \|\| Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //éé¢ç²¾åº¦
			topScroll = $('#mainTable').next('.layui-table-view').find('.layui-table-body').scrollTop();//è·åæ»å¨æ¡ä½ç½®
			// ååæ ¼ç¼è¾ä¹åçå¼
			var oldText = $(this).prev().text();
			var value = obj.value //å¾å°ä¿®æ¹åçå¼
			@@ -808,14 +822,23 @@
			case "HQty": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			if (!ref.test(temp) \|\| temp == 0) {
			if (!ref1.test(temp)) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HQty: oldText
			});
			table.render(option);

			layer.msg("æ°éè¯·è¾å¥å¤§äº0çæ°å!");
			layer.msg("æ°éè¯·è¾å¥ä¸ä¸º0çæ°å!");
			return;
			} else if (temp * 1 == 0) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HQty: oldText
			});
			table.render(option);

			layer.msg("æ°éè¯·è¾å¥ä¸ä¸º0çæ°å!");
			return;
			}

			@@ -845,7 +868,7 @@
			, HTaxPrice: HTaxPrice
			, HlineTotal: HlineTotal
			});
			//table.render(option);
			table.render(option);
			break;
			case "HPrice": //åä»·
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -887,7 +910,7 @@
			, HTaxPrice: HTaxPrice
			, HlineTotal: HlineTotal
			});
			//table.render(option)
			table.render(option)
			break;
			case "HMoney": //éé¢
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -929,7 +952,7 @@
			, HMoney: HMoney
			, HlineTotal: HlineTotal
			});
			//table.render(option);
			table.render(option);
			break;
			case "HTaxRate": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -975,7 +998,7 @@
			, HMoney: HMoney
			, HlineTotal: HlineTotal
			});
			//table.render(option);
			table.render(option);
			break;
			case "HTaxPrice": //åä»·
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -1014,7 +1037,7 @@
			, HlineTotal: HlineTotal //æ´æ°HlineTotalåæ®µï¼HlineTotal
			, HTaxPrice, HTaxPrice //æ´æ°HTaxPriceåæ®µï¼HTaxPrice
			});
			//table.render(option)
			table.render(option)
			break;
			default:
			}
			@@ -1028,6 +1051,11 @@

			//#region æå°
			function get_PrintReport() {
			var temp = $("#HInterID").val();
			if (typeof (temp) != "undefined" && temp != null && temp != "") {
			linterid = temp;
			}

			layer.open({
			type: 2
			, area: ['50%', '50%']
			@@ -1112,23 +1140,26 @@
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150, style: 'background-color:#efefef4d;' }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100, style: 'background-color:#efefef4d;'}
			, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100, edit: 'text', event: "HUnitID" }//f7
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150, edit: 'text', totalRow: true}
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100, event: "HUnitID" }//f7
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150, totalRow: true}
			, { field: 'HQty', title: 'å®æ¶æ°é', width: 150, edit: 'text', totalRow: true}
			, { field: 'HPrice', title: 'åä»·', width: 100, edit: 'text' }
			, { field: 'HMoney', title: 'éé¢', width: 100, edit: 'text', totalRow: true }
			, { field: 'HOrderPrice', title: 'éè´éé¢', width: 100, edit: 'text', totalRow: true}
			, { field: 'HPrice', title: 'åä»·', width: 100 }
			, { field: 'HMoney', title: 'éé¢', width: 100, totalRow: true }
			, { field: 'HOrderPrice', title: 'éè´éé¢', width: 100, totalRow: true}
			, { field: 'HWHID', title: 'HWHID', width: 100, hide: true }
			, { field: 'æ¶æä»åº', title: 'æ¶æä»åº', width: 100, edit: 'text', event: "HWHID" }//f7
			, { field: 'HSPID', title: 'HSPID', width: 100, hide: true }
			, { field: 'ä»ä½åç§°', title: 'ä»ä½åç§°', width: 100, edit: 'text', event: "HSPID" }//f7
			, { field: 'HTaxRate', title: 'ç¨ç', width: 100, edit: 'text' }
			, { field: 'HTaxPrice', title: 'å«ç¨åä»·', width: 100, edit: 'text' }
			, { field: 'HTaxRate', title: 'ç¨ç', width: 100}
			, { field: 'HTaxPrice', title: 'å«ç¨åä»·', width: 100}
			, { field: 'HlineTotal', title: 'å«ç¨éé¢', width: 100, style: 'background-color:#efefef4d;' }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150, edit: 'text' }
			, { field: 'HRemark', title: 'å¤æ³¨', width: 100, edit: 'text' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			, done: function (res, curr, count) {
			$(".layui-table-main").scrollTop(topScroll);
			}
			}

			option.data = [];
			@@ -1142,15 +1173,17 @@
			//æ¥è¯¢æ£éªæ¹æ¡åæ¯å¦åå¨
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + "Kf_POStockInBill/cx",
			url: GetWEBURL() + "/Kf_POStockInBill/cx",
			type: "GET",
			data: {
			"HInterID": linterid
			},
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼

			var data = result.data[0];
			allVal = result.data[0];
			HBillSubType = data.HBillSubType;
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HBillNo": data.åæ®å·
			, "HDate": formatDate(data.æ¥æ)
			@@ -1181,6 +1214,8 @@
			, "HMaker": data.å¶åäºº
			, "HChecker": data.å®¡æ ¸äºº
			, "HCloseMan": data.å³éäºº
			, "HUpDater": data.ä¿®æ¹äºº
			, "HDeleteMan": data.ä½åºäºº
			, "HMakeDate": data.å¶åæ¥æ == null ? "" : Pub_Format(data.å¶åæ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HCheckDate": data.å®¡æ ¸æ¥æ == null ? "" : Pub_Format(data.å®¡æ ¸æ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HCloseDate": data.å³éæ¥æ == null ? "" : Pub_Format(data.å³éæ¥æ, "yyyy-MM-dd hh:mm:ss")
			@@ -1683,7 +1718,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'é¡¹ç®åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../é¡¹ç®ç®¡ç/å·¥ç¨é¡¹ç®/PM_ProjectBillList.html?Type=2&HOrgID=' + HOrgID, 'yes']
			, content: ['../../é¡¹ç®ç®¡ç/å·¥ç¨é¡¹ç®/PM_ProjectBillList.html?Type=2&HOrgID=' + HOrgID + "&HBillSubType=" + HBillSubType, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -3037,7 +3072,18 @@
			function AllowLoadData(data) {

			var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			var ref1 = /^-?\d+(\.\d+)?$/; //å¤æåç¬¦ä¸²æ¯å¦ä¸ºæ°å(åå«æ´æ°ãæµ®ç¹æ°)ï¼æ£åè¡¨è¾¾å¼
			var temp = "";

			if ($("#HBillNo").val() == "") {
			layer.msg("åæ®å·æªè®¾ç½®ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}

			if ($("#HDate").val() == "") {
			layer.msg("æ¥ææªè®¾ç½®ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}

			//if ($("#HWHID").val() == 0) {
			// layer.msg("è¯·éæ©ä»åºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			@@ -3047,23 +3093,23 @@
			// layer.msg("è¯·éæ©è´è´£äººï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			//if ($("#HEmpID").val() == 0) {
			// layer.msg("è¯·éæ©ä¸å¡åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			if ($("#HEmpID").val() == 0 \|\| $("#HEmpID").val() == "" ) {
			layer.msg("è¯·éæ©ä¸å¡åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			//if ($("#HKeeperID").val() == 0) {
			// layer.msg("è¯·éæ©ä¿ç®¡åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			//if ($("#HSecManagerID").val() == 0) {
			// layer.msg("è¯·éæ©éªæ¶åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			//if ($("#HDeptID").val() == 0) {
			// layer.msg("è¯·éæ©é¨é¨ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return;
			//}
			if ($("#HSupID").val() == 0) {
			if ($("#HSecManagerID").val() == 0 \|\| $("#HSecManagerID").val()=="") {
			layer.msg("è¯·éæ©éªæ¶åï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HDeptID").val() == 0 \|\| $("#HDeptID").val() == "") {
			layer.msg("è¯·éæ©é¨é¨ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			if ($("#HSupID").val() == 0 \|\| $("#HSupID").val()=="") {
			layer.msg("è¯·éæ©ä¾åºåï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			@@ -3094,11 +3140,11 @@

			//å®åæ°éæ ¼å¼æ ¡éª
			temp = option.data[i]["HQty"] + "";
			if (temp == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼æ°éä¸è½ä¸º0ï¼");
			if (!ref1.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼å®åæ°éè¯·è¾å¥ä¸ä¸º0çæ°åï¼");
			return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼æ°éè¯·è¾å¥å¤§äº0çæ°åï¼");
			} else if (temp * 1 == 0) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼å®åæ°éè¯·è¾å¥ä¸ä¸º0çæ°åï¼");
			return false;
			}

			@@ -3129,15 +3175,15 @@
			return false;
			}

			//éé¢æ ¼å¼æ ¡éª
			temp = option.data[i]["HMoney"] + "";
			if (temp == "0") {
			//layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢ä¸è½ä¸º0ï¼");
			//return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢è¯·è¾å¥å¤§äº0çæ°åï¼");
			return false;
			}
			////éé¢æ ¼å¼æ ¡éª
			//temp = option.data[i]["HMoney"] + "";
			//if (temp == "0") {
			// //layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢ä¸è½ä¸º0ï¼");
			// //return false;
			//} else if (!ref.test(temp)) {
			// layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢è¯·è¾å¥å¤§äº0çæ°åï¼");
			// return false;
			//}
			//æ¶æä»åºéç©ºéªè¯
			if (option.data[i]["HWHID"] == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼æ¶æä»åºæªéæ©ï¼");
			@@ -3152,6 +3198,17 @@

			//#endregion

			//å°urlåæ°ä¸çä¸æä¹±ç éæ°è½¬æ¢æä¸æ
			function getParams(key) {
			var reg = new RegExp("(^\|&)" + key + "=([^&]*)(&\|$)");
			//å¦æå°åæ ä¸åºç°ä¸æåè¿è¡ç¼ç
			var r = encodeURI(window.location.search).substr(1).match(reg);
			if (r != null) {
			//å°ä¸æç¼ç çåç¬¦éæ°åæä¸æ
			return decodeURI(unescape(r[2]));
			}
			return "";
			};

			//ä»¥ä¸æ¯layuiæ¨¡å
			});