MES-WEB-LayUI.git

			@@ -66,7 +66,7 @@
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-row">
			<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" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HInterID" id="HInterID" value="0">
			@@ -74,43 +74,53 @@
			</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 class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" style="background-color:#efefef4d;">
			<input type="date" class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd" style="background-color:#efefef4d;" readonly>
			</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="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
			<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete=" off" style="background-color:#efefef4d;" readonly>
			</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="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
			<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;">
			<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>
			<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;">
			<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;">
			<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 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="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;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="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;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="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
			@@ -119,11 +129,8 @@
			</button>
			</div>
			</div>

			</div>
			<div class="layui-row">
			<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="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value=0 style="float:left;width:150px;">
			@@ -132,28 +139,30 @@
			</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 class="layui-col-xs4 layui-inline">
			<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;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			</div>
			<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="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 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="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
			<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" style="display:none;">
			<label class="layui-form-label">æºåç±»å</label>
			<div class="layui-input-inline">
			<select name="HSourceBillType" id="HSourceBillType" lay-verify="HSourceBillType">
			@@ -161,7 +170,7 @@
			</select>
			</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="" id="" class="layui-input" value="" style="float:left;width:150px;">
			@@ -171,50 +180,32 @@
			</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="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
			<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>
			<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 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 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">
			</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">
			</div>
			</div>
			<div class="layui-row">
			<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 class="layui-row">
			<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>


			<!--å¶åä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item">
			@@ -240,20 +231,6 @@
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹äºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºäºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¶åæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
			@@ -271,18 +248,32 @@
			<input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹äºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºäºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹æ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -290,14 +281,18 @@
			</div>
			</div>



			</div>

			<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">
			@@ -335,14 +330,14 @@

			var allVal;
			//#endregion

			var HModName = "Kf_POStockInBackBill_Add_Up"

			//#region è¿å¥é¡µé¢å³å è½½

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			get_LoginIs();
			//è·åç»ç»
			Organ() ;
			Organ();

			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "1239";
			@@ -353,8 +348,8 @@

			//è·åæºåç±»å
			HSourceBillType();

			//è·åé¡µé¢è·³è½¬åæ°

			//è·åé¡µé¢è·³è½¬åæ°
			var params = get_UrlVars();
			if (typeof (params[params[0]]) == "undefined") {
			OperationType = 1;//æä½ç±»å
			@@ -364,17 +359,17 @@
			var HSouceBillType = params[params[2]];//æºåç±»å
			}

			// åå§åç
			// åå§åç
			set_InitGrid();

			//#region è·åæå¤§åæ®å·
			//#region è·åæå¤§åæ®å·
			function get_MAXNum() {
			$("#HInterID").val("0");
			$("#HBillNo").val("");
			$.ajax({
			url: GetWEBURL() + "/WEBSController/GetMaxBillNoAndID_Json",
			type: "GET",
			data: { "HBillType": '1103' },
			data: { "HBillType": '1239' },
			success: function (d) {
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HInterID").val(d.data[0].HInterID);
			@@ -383,9 +378,9 @@
			}
			//#endregion

			//#region å¤ææä½ç±»åå¹¶åå§åçé¢
			//#region å¤ææä½ç±»åå¹¶åå§åçé¢
			if (OperationType == 1) { //æ æºåæ°å¢
			/* $("#HItemID").val(0);*/
			/* $("#HItemID").val(0);*/

			//çæåæ®å·ååç
			get_MAXNum();
			@@ -413,31 +408,31 @@



			//å¤ææ¯å¦æ°å¢
			if (linterid == null \|\| linterid == 0) {
			//è·åæå¤§åæ®å· new
			$("#HMaker").val(sessionStorage["HUserName"]);
			$("#HInterID").val("0");
			$("#HBillNo").val("");
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '1239' },
			success: function (d) {
			//console.log(d.data);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HInterID").val(d.data[0].HInterID);
			$("#HSSDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ç®æ¹å¼
			}
			});
			} else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			$("#HInterID").val(linterid);
			RoadBillMain(linterid);
			}
			////å¤ææ¯å¦æ°å¢
			//if (linterid == null \|\| linterid == 0) {
			// //è·åæå¤§åæ®å· new
			// $("#HMaker").val(sessionStorage["HUserName"]);
			// $("#HInterID").val("0");
			// $("#HBillNo").val("");
			// $.ajax({
			// url: GetWEBURL() + "/Web/GetMAXNum",
			// type: "GET",
			// data: { "HBillType": '1239' },
			// success: function (d) {
			// //console.log(d.data);
			// $("#HBillNo").val(d.data[0].HBillNo);
			// $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			// $("#HInterID").val(d.data[0].HInterID);
			// $("#HSSDate").val(Format(new Date(), "yyyy-MM-dd")); //ç»ç®æ¹å¼
			// }
			// });
			//} else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			// $("#HInterID").val(linterid);
			// RoadBillMain(linterid);
			//}
			//#endregion
			//#endregion
			//è·åç»ç»
			//è·åç»ç»
			function Organ() {
			//è·åç»å½é¡µç»ç»å
			$.ajax({
			@@ -459,8 +454,8 @@
			})
			}
			var rowdata = [{
			"HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "HQty": "", "HRemark": "",
			"HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "æ¶æä»åº": "",
			"HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "HQty": "", "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,
			@@ -476,7 +471,7 @@
			//æ°å¢è¡è¡¨æ ¼æ°æ®
			var NewRow = {
			"HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "HQty": "", "HRemark": "",
			"HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "æ¶æä»åº": "",
			"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,
			@@ -514,10 +509,10 @@
			//checkRefresh();
			}
			break;
			////åè®¾ç½®
			//case 'set_HideColumn':
			// get_HideColumn();
			// break;
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			break;
			}
			});

			@@ -597,7 +592,11 @@
			//æ°å¼æ ¼å¼æ ¡éªå·¥å·
			var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			var temp = "";

			console.log(obj)
			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"]; //éé¢ç²¾åº¦
			// ååæ ¼ç¼è¾ä¹åçå¼
			var oldText = $(this).prev().text();
			var value = obj.value //å¾å°ä¿®æ¹åçå¼
			@@ -617,6 +616,15 @@

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

			layer.msg("å®éæ°éä¸è½å¤§äºåºéæ°é!");
			return;
			}


			@@ -624,7 +632,9 @@
			var HQty = value * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·

			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));


			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			@@ -633,7 +643,7 @@
			, HPrice: HPrice
			, HMoney: HMoney
			});
			/* table.render(option);*/
			table.render(option);
			break;
			case "HPrice": //åä»·
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -653,7 +663,9 @@
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = value * 1;
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·

			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			@@ -661,6 +673,7 @@
			, HPrice: HPrice
			, HMoney: HMoney
			});
			table.render(option)
			break;
			case "HMoney": //éé¢
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -670,7 +683,7 @@
			obj.update({
			HMoney: oldText
			});
			/* table.render(option);*/
			table.render(option);

			layer.msg("éé¢è¯·è¾å¥å¤§äº0çæ°å!");
			return;
			@@ -679,8 +692,10 @@
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //æ°é
			var HMoney = value * 1;
			var HPrice = (HMoney / HQty).toFixed(2); //åä»·=éé¢/æ°é

			var HPrice = Number((HMoney / HQty).toFixed(2)); //åä»·=éé¢/æ°é
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			@@ -688,8 +703,9 @@
			, HPrice: HPrice
			, HMoney: HMoney
			});
			break;
			table.render(option);
			break;

			default:
			}
			});
			@@ -759,7 +775,7 @@
			//#endregion




			//æ¥ææ ¼å¼å
			function formatDate(date) {
			var d = new Date(date),
			@@ -786,24 +802,24 @@
			, totalRow: true
			, cols: [[ //åè¡¨
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', width: 100}
			, { type: 'HSourceBillNo', title: 'æºåå·', width: 100, hide: true }//æºåå·
			, { type: 'numbers', field: 'åºå·', title: 'åºå·', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºåå·', width: 100, hide: true }//æºåå·
			, { field: 'HSourceBillType', title: 'æºåç±»å', width: 100, hide: true }//æºåç±»å
			, { type: 'HSourceInterID', title: 'æºåä¸»åç ', width: 100, hide: true }//æºåä¸»åç
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 100, hide: true }//æºåä¸»åç
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 100, hide: true }//æºåååç
			, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 150, edit: 'text', event: "HMaterID" }//f7
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 150, event: "HMaterID" }//f7
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150, style: 'background-color:#efefef4d;' }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100, 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: 'HQty', title: 'å®æ¶æ°é', width: 150, edit: 'text', totalRow: true}
			, { field: 'HQtyMust', 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: 'è®¡éåä½', title: 'è®¡éåä½', width: 100, event: "HUnitID" }//f7
			, { field: 'HQty', title: 'å®éæ°é', width: 150, edit: 'text', totalRow: true }
			, { field: 'HQtyMust', title: 'åºéæ°é', width: 150, 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: 'åæä»åº', 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: 'HBatchNo', title: 'æ¹æ¬¡', width: 150, edit: 'text' }
			@@ -814,6 +830,7 @@

			option.data = [];
			table.render(option);
			DisPlay_HideColumn();
			}

			//#region å è½½è¡¨å¤´
			@@ -856,11 +873,13 @@
			, "HMaker": data.å¶åäºº
			, "HChecker": data.å®¡æ ¸äºº
			, "HCloseMan": data.å³éäºº
			, "HMakeDate": data.å¶åæ¥æ
			, "HCheckDate": data.å®¡æ ¸æ¥æ
			, "HCloseDate": data.å³éæ¥æ
			, "HUpDateDate": data.ä¿®æ¹æ¥æ
			, "HDeleteDate": data.ä½åºæ¥æ
			, "HUpDater": data.ä¿®æ¹äºº
			, "HDeleteDate": 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")
			, "HUpDateDate": data.ä¿®æ¹æ¥æ == null ? "" : Pub_Format(data.ä¿®æ¹æ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HDeleteDate": data.ä½åºæ¥æ == null ? "" : Pub_Format(data.ä½åºæ¥æ, "yyyy-MM-dd hh:mm:ss")

			});
			//åè¡¨ èµå¼
			@@ -870,7 +889,7 @@
			rowdata.push(
			{
			"HMaterID": subdata[i].HMaterID, "ç©æä»£ç ": subdata[i].ç©æä»£ç , "ç©æåç§°": subdata[i].ç©æåç§°, "è§æ ¼åå·": subdata[i].è§æ ¼åå·, "HUnitID": subdata[i].HUnitID, "è®¡éåä½": subdata[i].è®¡éåä½,
			"HQty": subdata[i].å®æ¶æ°é, "HQtyMust": subdata[i].åºæ¶æ°é,"HRemark": subdata[i].è¡¨ä½å¤æ³¨, "HPrice": subdata[i].åä»·, "HMoney": subdata[i].éé¢, "HOrderPrice": subdata[i].éè´éé¢, "HWHID": subdata[i].HWHID, "æ¶æä»åº": subdata[i].æ¶æä»åº, "HSPID": subdata[i].HSPID, "ä»ä½åç§°": subdata[i].ä»ä½åç§°,
			"HQty": subdata[i].å®æ¶æ°é, "HQtyMust": subdata[i].åºæ¶æ°é, "HRemark": subdata[i].è¡¨ä½å¤æ³¨, "HPrice": subdata[i].åä»·, "HMoney": subdata[i].éé¢, "HOrderPrice": subdata[i].éè´éé¢, "HWHID": subdata[i].HWHID, "åæä»åº": subdata[i].æ¶æä»åº, "HSPID": subdata[i].HSPID, "ä»ä½åç§°": subdata[i].ä»ä½åç§°,
			"HBatchNo": subdata[i].æ¹æ¬¡,
			"HSourceBillNo": subdata[i].æºååå·, //æºåå·
			"HSourceBillType": subdata[i].æºåç±»å, //æºåç±»å
			@@ -908,11 +927,11 @@
			}
			});

			//#region ä¿åæé®
			//#region ä¿åæé®
			form.on('submit(Saver)', function (data) {
			//#region å¤ææºåç¶æ
			if (OperationType == 1 \|\| OperationType == 4) {


			if ($("#HSourceBillType").val() == "1105") {
			for (var i = 0; i < option.data.length; i++) {
			var HSourceBillData = "";
			@@ -933,6 +952,27 @@
			return;
			}
			}
			} else if ($("#HSourceBillType").val() == "1201") {
			for (var i = 0; i < option.data.length; i++) {
			var HSourceBillData = "";
			var HSourceBillData = getPushSource_POStockInBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //è·åæºåæ°æ®
			if (HSourceBillData != "none") {
			if (HSourceBillData == null) {
			layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i + 1) + "è¡ï¼æªæ¥è¯¢å°æºååæ®!", { icon: 5 });
			return;
			}
			//else if (HSourceBillData.ç¶æ != "å·²å®¡æ ¸") {
			// var err = "ä¿åå¤±è´¥!åå ï¼ç¬¬" + (i + 1) + "è¡-æºååæ®ç¶æä¸ºâ" + HSourceBillData.ç¶æ + "âï¼ä¸åè®¸ä¿åï¼";
			// layer.alert(err, { icon: 5 });
			// return;
			//} else if (HSourceBillData.è¡ç¶æ == "å·²å³é") {
			// layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i + 1) + "è¡ï¼è¯¥è¡è®°å½è¡ç¶æä¸º'å·²å³é'ç¶æ!", { icon: 5 });
			// return;
			//}
			} else {
			return;
			}
			}
			}
			else {
			return layer.msg('å½åä¸æ¯æè¯¥æºåï¼ï¼');
			@@ -941,25 +981,25 @@
			//#endregion

			//if (AllowLoadData(data)) {
			set_SaveBill(data);
			set_SaveBill(data);
			//}
			});
			//#endregion

			//#region è·ååæ°_ä¼ éçJSONæ ¼å¼åæ°

			//#region è·ååæ°_ä¼ éçJSONæ ¼å¼åæ°
			function getUrlVars_JSON() {
			var datajson;
			var str = window.location.search; //è·åé¾æ¥ä¸ä¼ éçåæ°
			var arr = str.substring(str.lastIndexOf("=")+1);
			var arr = str.substring(str.lastIndexOf("=") + 1);
			datajson = $.parseJSON(decodeURI(arr));
			return datajson;
			}
			//#endregion


			//#region ä¸æ¨é¡µé¢åå§å
			//#region ä¸æ¨é¡µé¢åå§å
			function setInit_PushBill() {
			//çæåæ®å·ååç
			//çæåæ®å·ååç
			get_MAXNum();

			//åå§åæ¥æãå¶åäººãå¶åæ¥æ
			@@ -974,95 +1014,13 @@
			//ç¦ç¨ç»ç»éé¡¹
			$("#HOrgID").attr("disabled", true);

			//è·å
			var data = getUrlVars_JSON().data;
			var dataArray = [];
			for (var i = 0; i < data.length; i++) {
			var temp = getPushSource_POInStockBackInit(data[i].hmainid, data[i].hsubid);
			if (temp != "none") {
			dataArray.push(temp);
			} else {
			return;
			}
			if (HSouceBillType == "1105") {
			setInit_PushBill_ByPOInStockBackBill();
			} else if (HSouceBillType == "1201") {
			setInit_PushBill_ByPOStockInBillInit();
			}
			}


			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HMainSourceInterID": "0"
			, "HMainSourceEntryID": "0"
			, "HMainSourceBillNo": ""
			, "HMainSourceBillType": $("#BillType").val()

			, "HDeptID": dataArray[0].HDeptID
			, "HDeptName": dataArray[0].é¨é¨
			, "HManagerID": dataArray[0].HManagerID
			, "HManagerName": dataArray[0].ä¸»ç®¡
			, "HWHID": dataArray[0].HWHID
			, "HWHName": dataArray[0].ä»åº
			, "HEmpID": dataArray[0].HEmpID
			, "HEmpName": dataArray[0].ä¸å¡å
			, "HSupID": dataArray[0].HSupID
			, "HSupName": dataArray[0].ä¾åºå
			, "HSecManagerID": dataArray[0].HSecManagerID
			, "HSecManagerName": dataArray[0].éªæ¶å
			, "HKeeperID": dataArray[0].HKeeperID
			, "HKeeperName": dataArray[0].ä¿ç®¡å
			, "HCurID": dataArray[0].HCurID
			, "HCurName": dataArray[0].å¸å«
			, "HExRate": dataArray[0].æ±ç
			, "HAddress": data.äº¤è´§å°ç¹
			, "HRemark": data.è¡¨å¤´å¤æ³¨
			, "HInnerBillNo": data.åé¨åæ®å·
			});

			//åè¡¨ èµå¼
			var rowdata = [];
			for (var i = 0; i < dataArray.length; i++) {
			rowdata.push(
			{
			"HMaterID": dataArray[i].HMaterID
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HWHID": dataArray[i].HWHID
			, "æ¶æä»åº": dataArray[i].æ¶æä»åº
			, "HSPID": dataArray[i].HSPID
			, "ä»ä½åç§°": dataArray[i].ä»ä½åç§°
			, "HSecUnitID": dataArray[i].HSecUnitID
			, "è¾å©åä½": dataArray[i].è¾å©åä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, 'HDiscountRate': dataArray[i].ææ£ç //
			, 'HRelTaxPrice': "0"
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': dataArray[i].ç¨é¢ //
			, "HMoney": dealDoubleToFixed(dataArray[i].éé¢, 2)
			, "HRemark": dataArray[i].è¡¨ä½å¤æ³¨

			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

			, 'HPOOrderInterID': "0"
			, 'HPOOrderEntryID': "0"
			, 'HPOOrderBillNo': ""

			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}
			option.data = rowdata;
			table.render(option);
			}

			//#endregion

			//#region ä¿åæ¹æ³
			@@ -1084,12 +1042,12 @@
			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 ($("#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: "æ¸©é¦¨æç¤º" });
			layer.msg("è¯·éæ©éæåï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}

			@@ -1311,9 +1269,33 @@
			, btn2: function (index, layero) { }
			})
			}
			//#region æ ¹æ®ç©æIDè·åç²¾åº¦
			function getDecByMaterID(HMaterID) {
			var resultData = {};
			$.ajax({ // å¼æ¥è¯·æ±
			url: GetWEBURL() + "Gy_Material/getDecByID", //è¯·æ±å°å
			async: false, //æ¯å¦å¼å¯å¼æ¥
			type: "GET", //è¯·æ±ç±»å
			data: { //å®ä¹åéå°æå¡å¨çæ°æ®
			"HMaterID": HMaterID // å°hmateridä½ä¸ºè¯·æ±åæ°åé
			},
			success: function (result) { // å½è¯·æ±æåæ¶ï¼æ§è¡è¿ä¸ªå½æ°
			if (result.code == 1) { // å¦ææå¡å¨è¿åçæ°æ®ä¸ç`codeåæ®µçäº1ï¼è¿å¯è½è¡¨ç¤ºå®¡æ ¸æä½æåæ§è¡
			var data = result.data; //å£°ædataåéï¼å¹¶å°å¶èµå¼ä¸ºresultå¯¹è±¡ä¸çdataå±æ§
			resultData = data[0]; //å°dataæ°ç»ï¼æç±»æ°ç»å¯¹è±¡ï¼çç¬¬ä¸ä¸ªåç´ èµå¼ç»åéresultData
			}
			//else {
			// layer.alert(result.Message, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' }); //result.msgå¯¹è±¡ï¼æç¤ºå¼¹çª ç±»åä¸º5ï¼ æé®ï¼åæé®çåç§°ä¸ºéåº æ¶é´ ä¸º100ç§ï¼ä»¥ååç§»éï¼`offset: 't'
			//}
			}, error: function () {
			layer.alert("åçéè¯¯!", { icon: 5 }); //æç¤ºå¼¹çª åçéè¯¯ ï¼è¦ç¤ºæ å¿ä¸º5ç
			}
			});
			return resultData;
			}
			//#endregion


			//#region åå®¡æ ¸/å®¡æ ¸æ°æ®
			//#region åå®¡æ ¸/å®¡æ ¸æ°æ®
			function set_CheckBill(num) {
			var InterID = $("#HInterID").val();
			//é»è¾å®¡æ ¸æ¹æ³
			@@ -1365,47 +1347,46 @@
			//if (checkStatus.data.length != 1) {
			// return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			//}
			OptionData = checkStatus.data[0]; //æéä¸æ°æ®çç¬¬ä¸æ¡èµå¼ç»OptionDataåé
			if (checkStatus.data.length > 1) {
			var rowIndex = $(obj.tr).attr("data-index") * 1;
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (rowIndex + i >= option.data.length) {
			var NewRow = {
			"HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "HQty": "", "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,
			};

			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];

			var rowIndex = $(obj.tr).attr("data-index") * 1;
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (rowIndex + i >= option.data.length) {
			var NewRow = {
			"HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "HQty": "", "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,
			};
			table.render(option);
			}

			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];

			table.render(option);
			var HMaterID = checkStatus.data[i].HItemID;
			var resultData = getMaterialByMaterID(HMaterID);
			option.data[rowIndex + i].HMaterID = resultData.HMaterID;
			option.data[rowIndex + i].ç©æä»£ç = resultData.HMaterNumber;
			option.data[rowIndex + i].ç©æåç§° = resultData.HMaterName;
			option.data[rowIndex + i].è§æ ¼åå· = resultData.HMaterModel;
			option.data[rowIndex + i].HUnitID = resultData.HUnitID;
			option.data[rowIndex + i].è®¡éåä½ = resultData.HUnitName;
			////æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			//obj.update({
			// "HMaterID": checkStatus.data[0].HItemID
			// , "ç©æä»£ç ": checkStatus.data[0].HNumber
			// , "ç©æåç§°": checkStatus.data[0].HName
			// , "è§æ ¼åå·": checkStatus.data[0].HModel
			// , "HUnitID": checkStatus.data[0].HUnitID
			// , "è®¡éåä½": checkStatus.data[0].HUnitName
			//})
			//layer.close(index);//å³éå¼¹çª
			}



			var HMaterID = checkStatus.data[i].HItemID;
			var resultData = getMaterialByMaterID(HMaterID);
			option.data[rowIndex + i].HMaterID = resultData.HMaterID;
			option.data[rowIndex + i].ç©æä»£ç = resultData.HMaterNumber;
			option.data[rowIndex + i].ç©æåç§° = resultData.HMaterName;
			option.data[rowIndex + i].è§æ ¼åå· = resultData.HMaterModel;
			option.data[rowIndex + i].HUnitID = resultData.HUnitID;
			option.data[rowIndex + i].è®¡éåä½ = resultData.HUnitName;
			////æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			//obj.update({
			// "HMaterID": checkStatus.data[0].HItemID
			// , "ç©æä»£ç ": checkStatus.data[0].HNumber
			// , "ç©æåç§°": checkStatus.data[0].HName
			// , "è§æ ¼åå·": checkStatus.data[0].HModel
			// , "HUnitID": checkStatus.data[0].HUnitID
			// , "è®¡éåä½": checkStatus.data[0].HUnitName
			//})
			//layer.close(index);//å³éå¼¹çª
			table.render(option);
			}
			table.render(option);
			layer.closeAll();
			//layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -1414,14 +1395,14 @@
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			obj.update({
			"HMaterID" :OptionData.HMaterID
			,"ç©æä»£ç " : OptionData.ç©æä»£ç
			, "ç©æåç§°" :OptionData.ç©æåç§°
			,"è§æ ¼åå·" : OptionData.è§æ ¼åå·
			,"HUnitID" :OptionData.HUnitID
			,"è®¡éåä½" : OptionData.è®¡éåä½åç§°
			})
			obj.update({
			"HMaterID": OptionData.HItemID
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			})
			}
			});
			}
			@@ -1452,12 +1433,12 @@
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			obj.update({
			"HUnitID": OptionData.HItemID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			})
			}
			, end: function () {
			obj.update({
			"HUnitID": OptionData.HItemID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			})
			}
			})
			}
			//æ¶æä»åº
			@@ -1482,17 +1463,17 @@
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"æ¶æä»åº": checkStatus.data[0].ä»åºåç§°
			"åæä»åº": checkStatus.data[0].ä»åºåç§°
			, "HWHID": checkStatus.data[0].HItemID
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			obj.update({
			"HWHID": OptionData.HItemID
			, "æ¶æä»åº": OptionData.ä»åºåç§°
			})
			}
			, end: function () {
			obj.update({
			"HWHID": OptionData.HItemID
			, "åæä»åº": OptionData.ä»åºåç§°
			})
			}
			})
			}
			//ä»ä½
			@@ -1522,18 +1503,99 @@
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			obj.update({
			"HSPID": OptionData.HMainID
			, "ä»ä½åç§°": OptionData.ä»ä½åç§°
			})
			}
			, end: function () {
			obj.update({
			"HSPID": OptionData.HMainID
			, "ä»ä½åç§°": OptionData.ä»ä½åç§°
			})
			}
			})
			}
			obj.event = "";
			return false;
			}
			})

			//åå»
			$('.layui-table-box tbody td[data-field="ç©æä»£ç "]').off('dblclick').on('dblclick', function () {
			var HOrgID = $("#HOrgID").val();
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "ç©æåè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			//if (checkStatus.data.length != 1) {
			// return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			//}
			OptionData = checkStatus.data[0]; //æéä¸æ°æ®çç¬¬ä¸æ¡èµå¼ç»OptionDataåé
			if (checkStatus.data.length > 1) {
			var rowIndex = $(obj.tr).attr("data-index") * 1;
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (rowIndex + i >= option.data.length) {
			var NewRow = {
			"HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "HQty": "", "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,
			};

			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];

			table.render(option);
			}

			var HMaterID = checkStatus.data[i].HItemID;
			var resultData = getMaterialByMaterID(HMaterID);
			option.data[rowIndex + i].HMaterID = resultData.HMaterID;
			option.data[rowIndex + i].ç©æä»£ç = resultData.HMaterNumber;
			option.data[rowIndex + i].ç©æåç§° = resultData.HMaterName;
			option.data[rowIndex + i].è§æ ¼åå· = resultData.HMaterModel;
			option.data[rowIndex + i].HUnitID = resultData.HUnitID;
			option.data[rowIndex + i].è®¡éåä½ = resultData.HUnitName;
			////æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			//obj.update({
			// "HMaterID": checkStatus.data[0].HItemID
			// , "ç©æä»£ç ": checkStatus.data[0].HNumber
			// , "ç©æåç§°": checkStatus.data[0].HName
			// , "è§æ ¼åå·": checkStatus.data[0].HModel
			// , "HUnitID": checkStatus.data[0].HUnitID
			// , "è®¡éåä½": checkStatus.data[0].HUnitName
			//})
			//layer.close(index);//å³éå¼¹çª
			}
			table.render(option);
			}
			layer.closeAll();
			//layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			obj.update({
			"HMaterID": OptionData.HItemID
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			})
			}
			});
			});
			}

			//è¡åäºä»¶
			@@ -1593,6 +1655,35 @@
			if (checkStatus.data.length == 0) {
			return layer.msg("è¯·è³å°éæ©ä¸æ¡æ°æ®!");
			}

			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HMainSourceInterID": "0"
			, "HMainSourceEntryID": "0"
			, "HMainSourceBillNo": ""
			, "HMainSourceBillType": $("#BillType").val()

			, "HDeptID": checkStatus.data[0].HDeptID
			, "HDeptName": checkStatus.data[0].é¨é¨
			, "HManagerID": checkStatus.data[0].HManagerID
			, "HManagerName": checkStatus.data[0].ä¸»ç®¡
			, "HWHID": checkStatus.data[0].ä¸»è¡¨ä»åºID == null ? 0 : checkStatus.data[0].ä¸»è¡¨ä»åºID
			, "HWHName": checkStatus.data[0].ä¸»è¡¨ä»åº
			, "HEmpID": checkStatus.data[0].HEmpID
			, "HEmpName": checkStatus.data[0].ä¸å¡å
			, "HSupID": checkStatus.data[0].HSupID
			, "HSupName": checkStatus.data[0].ä¾åºå
			//, "HSecManagerID": checkStatus.data[0].HSecManagerID
			//, "HSecManagerName": checkStatus.data[0].éªæ¶å
			//, "HKeeperID": checkStatus.data[0].HKeeperID
			//, "HKeeperName": checkStatus.data[0].ä¿ç®¡å
			, "HCurID": checkStatus.data[0].HCurID
			, "HCurName": checkStatus.data[0].å¸å«
			, "HExRate": checkStatus.data[0].æ±ç
			/, "HAddress": data.äº¤è´§å°ç¹/
			, "HRemark": checkStatus.data[0].è¡¨å¤´å¤æ³¨
			, "HInnerBillNo": checkStatus.data[0].åé¨åæ®å·
			});

			//layer.alert("ä½ å·²éæ©" + checkStatus.data.length + "æ¡æ°æ®");
			//è·åæ¶æéç¥åä»£ç
			var ProcessNumber = [];
			@@ -1609,10 +1700,10 @@
			for (var i = 0; i < ProcessNumber.length; i++) {
			option.data.push({
			"HMaterID": checkStatus.data[j].HMaterID, "ç©æä»£ç ": checkStatus.data[j].ç©æä»£ç , "ç©æåç§°": checkStatus.data[j].ç©æåç§°, "è§æ ¼åå·": checkStatus.data[j].è§æ ¼åå·,
			"HUnitID": checkStatus.data[j].HUnitID, "è®¡éåä½": checkStatus.data[j].è®¡éåä½,
			"HQty": checkStatus.data[j].æ°é-checkStatus.data[j].å³èæ°é,"HQtyMust": checkStatus.data[j].åºæ¶æ°é, "HPrice": checkStatus.data[j].åä»·,
			"HMoney": checkStatus.data[j].éé¢, "HTaxRate": checkStatus.data[j].ç¨ç, "HTaxMoney": checkStatus.data[j].ç¨é¢,"HWHID": checkStatus.data[j].HWHID,
			"æ¶æä»åº": checkStatus.data[j].æ¶æä»åº,"HSPID": checkStatus.data[j].HSPID,"ä»ä½åç§°": checkStatus.data[j].ä»ä½åç§°,"HSecUnitID": checkStatus.data[j].HSecUnitID,"è¾å©åä½": checkStatus.data[j].è¾å©åä½,
			"HUnitID": checkStatus.data[j].HUnitID, "è®¡éåä½": checkStatus.data[j].è®¡éåä½,
			"HQty": checkStatus.data[j].æ°é - checkStatus.data[j].å³èæ°é, "HQtyMust": checkStatus.data[j].æ°é - checkStatus.data[j].å³èæ°é, "HPrice": checkStatus.data[j].åä»·,
			"HMoney": (checkStatus.data[j].æ°é - checkStatus.data[j].å³èæ°é) * Number(checkStatus.data[j].åä»·), "HTaxRate": checkStatus.data[j].ç¨ç, "HTaxMoney": checkStatus.data[j].ç¨é¢, "HWHID": checkStatus.data[j].HWHID,
			"åæä»åº": checkStatus.data[j].æ¶æä»åº, "HSPID": checkStatus.data[j].HSPID, "ä»ä½åç§°": checkStatus.data[j].ä»ä½åç§°, "HSecUnitID": checkStatus.data[j].HSecUnitID, "è¾å©åä½": checkStatus.data[j].è¾å©åä½,
			"HSourceBillNo": checkStatus.data[j].åæ®å·, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid
			})
			j++;
			@@ -1625,7 +1716,7 @@
			});
			});

			//å¤ææéçä¸è¡¨æ ¼æ¯å¦æéå¤æ°æ®
			//å¤ææéçä¸è¡¨æ ¼æ¯å¦æéå¤æ°æ®
			function checkDuplicateData(data) {
			const duplicates = [];

			@@ -1698,8 +1789,8 @@
			}
			//#endregion


			//#region è·åæºåç±»å

			//#region è·åæºåç±»å
			function HSourceBillType() {
			var HName = 'éè´éæå';
			//è·åç»å½é¡µç»ç»å
			@@ -1723,7 +1814,100 @@
			}
			//#endregion

			//#region æ ¹æ®ä¸»åç ä¸ååç è·åæºåéæéç¥åæ°æ®
			//#region ä¸æ¨é¡µé¢åå§å-éæéç¥å
			function setInit_PushBill_ByPOInStockBackBill() {
			//è·å
			var data = getUrlVars_JSON().data;
			var dataArray = [];
			for (var i = 0; i < data.length; i++) {
			var temp = getPushSource_POInStockBackInit(data[i].hmainid, data[i].hsubid);
			if (temp != "none") {
			dataArray.push(temp);
			} else {
			return;
			}
			}


			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HMainSourceInterID": "0"
			, "HMainSourceEntryID": "0"
			, "HMainSourceBillNo": ""
			, "HMainSourceBillType": $("#BillType").val()

			, "HDeptID": dataArray[0].HDeptID
			, "HDeptName": dataArray[0].é¨é¨
			, "HManagerID": dataArray[0].HManagerID
			, "HManagerName": dataArray[0].ä¸»ç®¡
			, "HWHID": dataArray[0].ä¸»è¡¨ä»åºID == null ? 0 : dataArray[0].ä¸»è¡¨ä»åºID
			, "HWHName": dataArray[0].ä¸»è¡¨ä»åº
			, "HEmpID": dataArray[0].HEmpID
			, "HEmpName": dataArray[0].ä¸å¡å
			, "HSupID": dataArray[0].HSupID
			, "HSupName": dataArray[0].ä¾åºå
			//, "HSecManagerID": dataArray[0].HSecManagerID
			//, "HSecManagerName": dataArray[0].éªæ¶å
			//, "HKeeperID": dataArray[0].HKeeperID
			//, "HKeeperName": dataArray[0].ä¿ç®¡å
			, "HCurID": dataArray[0].HCurID
			, "HCurName": dataArray[0].å¸å«
			, "HExRate": dataArray[0].æ±ç
			, "HAddress": data.äº¤è´§å°ç¹
			, "HRemark": data.è¡¨å¤´å¤æ³¨
			, "HInnerBillNo": data.åé¨åæ®å·
			});

			//åè¡¨ èµå¼
			var rowdata = [];
			for (var i = 0; i < dataArray.length; i++) {
			rowdata.push(
			{
			"HMaterID": dataArray[i].HMaterID
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HWHID": dataArray[i].HWHID
			, "åæä»åº": dataArray[i].æ¶æä»åº
			, "HSPID": dataArray[i].HSPID
			, "ä»ä½åç§°": dataArray[i].ä»ä½åç§°
			, "HSecUnitID": dataArray[i].HSecUnitID
			, "è¾å©åä½": dataArray[i].è¾å©åä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HQtyMust": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, 'HDiscountRate': dataArray[i].ææ£ç //
			, 'HRelTaxPrice': "0"
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': dataArray[i].ç¨é¢ //
			, "HMoney": dealDoubleToFixed(dataArray[i].éé¢, 2)
			, "HRemark": dataArray[i].è¡¨ä½å¤æ³¨

			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

			, 'HPOOrderInterID': "0"
			, 'HPOOrderEntryID': "0"
			, 'HPOOrderBillNo': ""

			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}
			option.data = rowdata;
			table.render(option);
			}
			//#endregion

			//#region æ ¹æ®ä¸»åç ä¸ååç è·åæºåéæéç¥åæ°æ®
			function getPushSource_POInStockBackInit(HSourceInterID, HSourceEntryID) {
			var res = "none";
			$.ajax({
			@@ -1749,8 +1933,231 @@
			return res;
			}
			//#endregion

			//#region ä¸æ¨é¡µé¢åå§å-éè´å¥åºå
			function setInit_PushBill_ByPOStockInBillInit() {
			//è·å
			var data = getUrlVars_JSON().data;
			var dataArray = [];
			for (var i = 0; i < data.length; i++) {
			var temp = getPushSource_POStockInBillInit(data[i].hmainid, data[i].hsubid);
			if (temp != "none") {
			dataArray.push(temp);
			} else {
			return;
			}
			}


			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HInnerBillNo": dataArray[0].åé¨åæ®å·
			, "HSupID": dataArray[0].HSupID
			, "HSupName": dataArray[0].ä¾åºå
			, "HEmpID": dataArray[0].HEmpID
			, "HEmpName": dataArray[0].ä¸å¡å
			, "HWHID": dataArray[0].ä¸»è¡¨ä»åºID
			, "HWHName": dataArray[0].ä¸»è¡¨ä»åº
			//, "HSecManagerID": data.HSecManagerID
			//, "HSecManagerName": data.éªæ¶å
			, "HKeeperID": dataArray[0].HKeeperID
			, "HKeeperName": dataArray[0].ä¿ç®¡å
			, "HDeptName": dataArray[0].é¨é¨
			, "HDeptID": dataArray[0].HDeptID
			//, "HSourceBillType": data.æºåç±»å
			, "HManagerID": dataArray[0].HManagerID
			, "HManagerName": dataArray[0].è´è´£äºº
			, "HExRate": dataArray[0].æ±ç
			//, "Box2": ""
			//, "HExplanation": data.æè¦
			//, "HRemark": data.è¡¨å¤´å¤æ³¨

			, "HSourceBillType": HSouceBillType
			});

			//åè¡¨ èµå¼
			var rowdata = [];
			for (var i = 0; i < dataArray.length; i++) {
			rowdata.push(
			{
			"HMaterID": dataArray[i].HMaterID
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½


			, "HWHID": dataArray[i].HWHID
			, "åæä»åº": dataArray[i].æ¶æä»åº
			, "HSPID": dataArray[i].HSPID
			, "ä»ä½åç§°": dataArray[i].ä»ä½åç§°
			//, "HSecUnitID": dataArray[i].HSecUnitID
			//, "è¾å©åä½": dataArray[i].è¾å©åä½


			, "HQty": dealDoubleToFixed(dataArray[i].å®æ¶æ°é, 1) - dealDoubleToFixed(dataArray[i].å³èæ°é, 1)
			, "HQtyMust": dealDoubleToFixed(dataArray[i].å®æ¶æ°é, 1) - dealDoubleToFixed(dataArray[i].å³èæ°é, 1)


			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HMoney": dealDoubleToFixed(dataArray[i].éé¢, 2)
			, "HOrderPrice": dataArray[i].éè´éé¢
			, "HRemark": dataArray[i].è¡¨ä½å¤æ³¨
			, "HBatchNo": dataArray[i].æ¹æ¬¡

			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"
			}
			);
			}
			option.data = rowdata;
			table.render(option);
			}
			//#endregion

			//#region æ ¹æ®ä¸»åç ä¸ååç è·åæºåéè´å¥åºåæ°æ®
			function getPushSource_POStockInBillInit(HSourceInterID, HSourceEntryID) {
			var res = "none";
			$.ajax({
			url: GetWEBURL() + "/Kf_POStockInBill/loadKf_POStockInBillEdit_Push",
			async: false,
			type: "GET",
			data: {
			"HInterID": HSourceInterID
			, "HSubID": HSourceEntryID
			},
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			res = result.data[0];
			} else {
			res = result.data;
			//layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			}
			}, error: function () {
			res = "none";
			layer.alert("åçéè¯¯!", { icon: 5 });
			}
			});
			return res;
			}
			//#endregion
			//#endregion
			//#region åè®¾ç½®
			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["field"] + ",";
			}

			var colTitleName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colTitleName += option.cols[0][i]["title"] + ",";
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

			//æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			async: false,
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {

			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

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

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			}
			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			table.render(option);
			} else {
			table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//#endregion

			//ä»¥ä¸æ¯layuiæ¨¡å
			});
			@@ -1798,27 +2205,27 @@
			}


			//åå»è¿åç©æ
			function GetGyMaterial(data) {
			OptionData = data
			}
			//åå»è¿åè®¡éåä½
			function GetGyUnit(data) {
			OptionData = data
			}
			//åå»è¿åç©æ
			function GetGyMaterial(data) {
			OptionData = data
			}
			//åå»è¿åè®¡éåä½
			function GetGyUnit(data) {
			OptionData = data
			}

			//åå»è¿åæ¶æä»åº
			function GetGyWarehouse(data) {
			OptionData = data
			}
			//åå»è¿åæ¶æä»åº
			function GetGyWarehouse(data) {
			OptionData = data
			}


			//åå»è¿åæ¶æä»ä½
			function GetGyStockPlace(data) {
			OptionData = data
			}
			function GetGyStockPlace(data) {
			OptionData = data
			}

			//#region å¤çå°æ°æ¾ç¤ºä½æ°ï¼dataï¼éè¦å¤ççæ°æ®ï¼numï¼æ°æ®çç±»å(å¦1:æ°éï¼2:éé¢ï¼3:åä»·)ï¼
			//#region å¤çå°æ°æ¾ç¤ºä½æ°ï¼dataï¼éè¦å¤ççæ°æ®ï¼numï¼æ°æ®çç±»å(å¦1:æ°éï¼2:éé¢ï¼3:åä»·)ï¼
			function dealDoubleToFixed(data, num) {
			//ç¨äºè®¾ç½®å°æ°ä½æ°
			var dotLength = 0;
			@@ -1852,7 +2259,7 @@
			}
			}
			}
			//#endregion
			//#endregion
			</script>
			</body>
			</html>