MES-WEB-LayUI.git

			@@ -65,7 +65,6 @@
			<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">
			<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0">
			</div>
			</div>
			<div class="layui-inline">
			@@ -75,36 +74,107 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">éå®é¨é¨</label>
			<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;">
			<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
			<option style="color:blue;" selected="selected" value="1401">éå®è®¢å</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æºåå·</label>
			<div class="layui-input-inline">
			<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSource" 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-inline">
			<label class="layui-form-label">éå®é¨é¨</label>
			<div class="layui-input-inline">
			<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="background-color:#efefef4d;" 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;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			</div>
			</div>
			<div class="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="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="background-color:#efefef4d;" 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;">
			<!--<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>
			</button>-->
			</div>
			</div>

			<div class="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="background-color:#efefef4d;" 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-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="background-color:#efefef4d;" 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;">
			<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-inline">
			<label class="layui-form-label">å¸å«</label>
			<div class="layui-input-inline">
			<input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ±ç<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">èç³»äºº</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HLinkMan" id="HLinkMan" autocomplete="off" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">èç³»çµè¯</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HLinkPhone" id="HLinkPhone" autocomplete="off" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">éå®æ¹å¼</label>
			<div class="layui-input-inline">
			<input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HSellSName" id="HSellSName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HSellSID" id="HSellSID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSellSList" style="width:40px;">
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSellSList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</button>-->
			</div>
			</div>
			<div class="layui-inline">
			@@ -117,18 +187,6 @@
			</button>
			</div>
			</div>
			<div class="layui-inline" style="width:900px;">
			<label class="layui-form-label">å®¢æ·</label>
			<div class="layui-input-inline" style="width:700px;">
			<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:465px;">
			<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>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">ä»ç®¡</label>
			<div class="layui-input-inline">
			@@ -149,60 +207,6 @@
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æºåç±»å</label>
			<div class="layui-input-inline">
			<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
			<option style="color:blue;" selected="selected" value="1401">éå®è®¢å</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æºåå·</label>
			<div class="layui-input-inline">
			<input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HMainSourceBillNo" id="HMainSourceBillNo" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HMainSource" 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-inline" style="display:none;">
			<label class="layui-form-label">è¿è¾å¬å¸</label>
			<div class="layui-input-inline">
			<input type="text" name="HConveyCompName" id="HConveyCompName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HConveyCompID" id="HConveyCompID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HConveyCompList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline" style="display:none;">
			<label class="layui-form-label">è¿è¾æ¹å¼</label>
			<div class="layui-input-inline">
			<input type="text" name="HConveyTypeName" id="HConveyTypeName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HConveyTypeID" id="HConveyTypeID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HConveyTypeList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">èç³»çµè¯</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HLinkPhone" id="HLinkPhone" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">èç³»äºº</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HLinkMan" id="HLinkMan" autocomplete="off">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			@@ -216,19 +220,19 @@
			<div class="layui-inline">
			<label class="layui-form-label">å®¢æ·ä½é¢</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HCusBalance" id="HCusBalance" autocomplete="off" readonly>
			<input class="layui-input" name="HCusBalance" id="HCusBalance" autocomplete="off" style="background-color: #efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¿¡ç¨é¢åº¦</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HCreditRating_Now" id="HCreditRating_Now" autocomplete="off" readonly>
			<input class="layui-input" name="HCreditRating_Now" id="HCreditRating_Now" autocomplete="off" style="background-color: #efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¯ç¨é¢åº¦</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HAvailableBalance" id="HAvailableBalance" autocomplete="off" readonly>
			<input class="layui-input" name="HAvailableBalance" id="HAvailableBalance" autocomplete="off" style="background-color: #efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -242,12 +246,63 @@
			</div>
			</div>
			</div>

			<!--éèåæ®µ-->
			<div class="layui-row" style="display:none;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿è¾å¬å¸</label>
			<div class="layui-input-inline">
			<input type="text" name="HConveyCompName" id="HConveyCompName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HConveyCompID" id="HConveyCompID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HConveyCompList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è¿è¾æ¹å¼</label>
			<div class="layui-input-inline">
			<input type="text" name="HConveyTypeName" id="HConveyTypeName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HConveyTypeID" id="HConveyTypeID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HConveyTypeList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label"></label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HConveyMoney" id="HConveyMoney" autocomplete="off" value="0" >
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è¿è´¹</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HCarriage" id="HCarriage" autocomplete="off" value="0" onfocus="this.select();">
			<input class="layui-input" name="HCarriage" id="HCarriage" autocomplete="off" value="0">
			</div>
			</div>
			</div>
			<div class="layui-row" style="display:none;">
			<div class="layui-inline">
			<div class="layui-input-inline">
			<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0">
			<input type="hidden" name="HOWNERID" id="HOWNERID" lay-verify="HOWNERID" value="0">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">è°åºä»åº</label>
			<div class="layui-input-inline">
			<input type="text" name="HSCWHName" id="HSCWHName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HSCWHID" id="HSCWHID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSCWHList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ ¸éäºº</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HCheckStatusMan" id="HCheckStatusMan" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">
			@@ -257,35 +312,9 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¸å«</label>
			<div class="layui-input-inline">
			<input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">éå®è®¢åå·</label>
			<label class="layui-form-label">åé¨åæ®å·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
			</div>
			</div>
			<div class="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 class="layui-inline">
			<label class="layui-form-label">æ ¸éäºº</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HCheckStatusMan" id="HCheckStatusMan" autocomplete="off">
			</div>
			</div>
			</div>
			@@ -439,13 +468,16 @@

			//#region å¤ææä½ç±»åå¹¶åå§åçé¢
			if (OperationType == 1) { //æ æºåæ°å¢
			$("#HItemID").val(0);
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));

			/* $("#HItemID").val(0);*/

			//çæåæ®å·ååç
			get_MAXNum();

			//æ ¹æ®ç¨æ·è·åå¯¹åºèåãé¨é¨ãéå®ä¸»ç®¡
			getCzyglByUser();
			//åå§åæ¥æãåå»ºäººãåå»ºæ¶é´
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HMaker").val(sessionStorage["HUserName"]);
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
			}
			else if (OperationType == 3) { //ç¼è¾
			//ä¿®æ¹æ¶ä¸»è¡¨ID
			@@ -454,21 +486,14 @@
			//ç¼è¾ç¶ææ¶ï¼æ ¹æ®åç ï¼è·åä¿¡æ¯å¹¶åå¥çé¢
			RoadBillMain(linterid);
			}
			else if (OperationType == 4) { //æµè§
			$("#HItemID").val(linterid);

			//ç¼è¾ç¶ææ¶ï¼æ ¹æ®åç ï¼è·åä¿¡æ¯å¹¶åå¥çé¢
			RoadBillMain(linterid);
			$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//ä¿ååå è½½æ°æ®æ¶ä¿åæé®ç¦ç¨
			else if (OperationType == 4) { //ä¸æ¨
			setInit_PushBill();
			}
			else {
			layer.alert("æªç¥æä½ç±»åï¼", { icon: 5 });
			}
			//#endregion


			//è®¾ç½®ç»ç»
			$("#HUSEORGID").val(sessionStorage["OrganizationID"]);

			DisPlay_HideColumn();

			@@ -501,6 +526,27 @@

			//#region ä¿åæé®
			form.on('submit(Saver)', function (data) {
			if (OperationType == 4) {
			//#region å¤ææºåç¶æ
			for (var i = 0; i < option.data.length; i++) {
			var HSourceBillData = "";
			var HSourceBillData = getPushSourceBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //è·åæºåæ°æ®
			if (HSourceBillData != "none") {
			if (HSourceBillData == null) {
			layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i+1) + "è¡ï¼æªæ¥è¯¢å°æºååæ®!", { icon: 5 });
			return;
			} else if (HSourceBillData.ç¶æ != "å·²å®¡æ ¸") {
			layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i+1) + "è¡ï¼æºååæ®ç¶ææªä¸º'å·²å®¡æ ¸'ç¶æ!", { icon: 5 });
			return;
			}
			} else {
			return;
			}
			}
			//#endregion
			}


			//if (AllowLoadData(data)) {
			set_SaveBill(data);
			//}
			@@ -598,9 +644,64 @@
			, data = checkStatus.data;
			//æ°å¢è¡è¡¨æ ¼æ°æ®
			var NewRow = {
			"HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "HWHID": $("#HWHID").val(), "åè´§ä»åº": $("#HWHName").val(), "HQtyMust": "0",
			"HQty": "0", "HQty_Full": "0", "HQty_Empty": "0", "HQty_Back": "0", "HPrice": "0", "HMoney": "0", "HCostPrice": "0", "HCostMoney": "0",
			"HSalePrice": "0", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HRemark": ""
			"HMaterID": "0"
			, "ç©æä»£ç ": ""
			, "ç©æåç§°": ""
			, "è§æ ¼åå·": ""
			, "HUnitID": "0"
			, "è®¡éåä½": ""
			, "HQtyMust": "0"
			, "HQty": "0"
			, "HPrice": "0"
			, "HTaxPrice": "0"
			, "HTaxRate": "0"
			, "HMoney": "0"
			, "HTaxMoney": "0"
			, "HWHID": $("#HWHID").val()
			, "åè´§ä»åº": $("#HWHName").val()
			, "HRemark": ""

			, "HQty_Full": "0"
			, "HQty_Empty": "0"
			, "HQty_Back": "0"
			, "HCostPrice": "0"
			, "HCostMoney": "0"
			, "HSalePrice": "0"

			, "HSeOrderInterID": 0
			, "HSeOrderEntryID": 0
			, "HSeOrderBillNo": ""

			, "HSourceInterID": "0"
			, "HSourceEntryID": "0"
			, "HSourceBillNo": ""
			, "HSourceBillType": ""
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

			, 'HSPID': "0"
			, 'HSPName': ""
			, 'HSPGroupID': "0"
			, "HSPGroupName": ""
			, 'HSCWHID': "0"
			, 'HSCWHName': ""
			, 'HSCSPID': "0"
			, 'HSCSPName': ""
			, 'HBatchNo': ""
			, 'HPOOrderInterID': "0"
			, 'HPOOrderEntryID': "0"
			, 'HPOOrderBillNo': ""

			, 'HPropertyID': "0"
			, 'HPropertyName': ""
			, 'HSecUnitID': "0"
			, 'HSecUnitName': ""
			, 'HSecUnitRate': "0"


			, 'HEngineNum': ""
			, 'HUnderPanNum': ""
			, 'HLeaveFactCard': ""
			};

			switch (obj.event) {
			@@ -672,7 +773,7 @@
			//layer.msg('[ID: ' + data.id + '] ' + field + ' åæ®µæ´æ¹ä¸ºï¼' + value);

			switch (field) {
			case "HQty": //å®åæ°é
			case "HQty": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			if (!ref.test(temp) \|\| temp == 0) {
			@@ -682,23 +783,40 @@
			});
			table.render(option);

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


			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = value * 1; //å®åæ°é
			var HQty = value * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HMoney = HQty * HPrice; //éé¢=å®åæ°é*åä»·
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			/var HDiscountRate = obj.data.HDiscountRate 1; //ææ£ç*/
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			/var HRelTaxPrice = HTaxPrice HDiscountRate; //å®éå«ç¨åä»·=å«ç¨åä»·ææ£ç/
			//ææ£é¢ = å«ç¨åä»· * (1 - ææ£ç) * æ°é
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = HMoney * (1 + HTaxRate); //ä»·ç¨åè®¡=éé¢ * (1 + ç¨ç)

			//è®¾ç½®æ°æ®å°æ°ä½æ°
			HQty = dealDoubleToFixed(HQty, 1);
			HPrice = dealDoubleToFixed(HPrice, 3);
			HTaxRate = HTaxRate;
			HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
			HMoney = dealDoubleToFixed(HMoney, 2);
			HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty
			, HPrice: HPrice
			, HTaxRate: HTaxRate * 100
			, HTaxPrice: HTaxPrice
			, HMoney: HMoney
			, HTaxMoney: HTaxMoney
			});
			table.render(option);
			//table.render(option);
			break;
			case "HPrice": //åä»·
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -714,18 +832,126 @@
			return;
			}


			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //å®åæ°é
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = value * 1; //åä»·
			var HMoney = HQty * HPrice; //éé¢=å®åæ°é*åä»·
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			/var HDiscountRate = obj.data.HDiscountRate 1; //ææ£ç*/
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			/var HRelTaxPrice = HTaxPrice HDiscountRate; //å®éå«ç¨åä»·=å«ç¨åä»·ææ£ç/
			//ææ£é¢ = å«ç¨åä»· * (1 - ææ£ç) * æ°é
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = HMoney * (1 + HTaxRate); //ä»·ç¨åè®¡=éé¢ * (1 + ç¨ç)

			//è®¾ç½®æ°æ®å°æ°ä½æ°
			HQty = dealDoubleToFixed(HQty, 1);
			HPrice = dealDoubleToFixed(HPrice, 3);
			HTaxRate = HTaxRate;
			HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
			HMoney = dealDoubleToFixed(HMoney, 2);
			HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty
			, HPrice: HPrice
			, HTaxRate: HTaxRate * 100
			, HTaxPrice: HTaxPrice
			, HMoney: HMoney
			, HTaxMoney: HTaxMoney
			});
			table.render(option);
			//table.render(option);
			break;
			case "HTaxRate": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			if (!ref.test(temp)) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HTaxRate: oldText
			});
			table.render(option);

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


			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HTaxRate = value * 0.01; //ç¨ç
			/var HDiscountRate = obj.data.HDiscountRate 1; //ææ£ç*/
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			/var HRelTaxPrice = HTaxPrice HDiscountRate; //å®éå«ç¨åä»·=å«ç¨åä»·ææ£ç/
			//ææ£é¢ = å«ç¨åä»· * (1 - ææ£ç) * æ°é
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = HMoney * (1 + HTaxRate); //ä»·ç¨åè®¡=éé¢ * (1 + ç¨ç)

			//è®¾ç½®æ°æ®å°æ°ä½æ°
			HQty = dealDoubleToFixed(HQty, 1);
			HPrice = dealDoubleToFixed(HPrice, 3);
			HTaxRate = HTaxRate;
			HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
			HMoney = dealDoubleToFixed(HMoney, 2);
			HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty
			, HPrice: HPrice
			, HTaxRate: HTaxRate * 100
			, HTaxPrice: HTaxPrice
			, HMoney: HMoney
			, HTaxMoney: HTaxMoney
			});
			//table.render(option);
			break;
			case "HTaxPrice": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			if (!ref.test(temp)) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HTaxPrice: oldText
			});
			table.render(option);

			layer.msg("å«ç¨åæ®è¯·è¾å¥ä¸å°äº0çæ°å!");
			return;
			}
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //æ°é
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			var HTaxPrice = value * 1; //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HPrice = HTaxPrice / (1 + HTaxRate); //åä»·=å«ç¨åæ®/(1+ç¨ç)

			/var HDiscountRate = obj.data.HDiscountRate 1; //ææ£ç*/

			/var HRelTaxPrice = HTaxPrice HDiscountRate; //å®éå«ç¨åä»·=å«ç¨åä»·ææ£ç/
			//ææ£é¢ = å«ç¨åä»· * (1 - ææ£ç) * æ°é
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = HMoney * (1 + HTaxRate); //ä»·ç¨åè®¡=éé¢ * (1 + ç¨ç)

			//è®¾ç½®æ°æ®å°æ°ä½æ°
			HQty = dealDoubleToFixed(HQty, 1);
			HPrice = dealDoubleToFixed(HPrice, 3);
			HTaxRate = HTaxRate;
			HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
			HMoney = dealDoubleToFixed(HMoney, 2);
			HTaxMoney = dealDoubleToFixed(HTaxMoney, 2);

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty
			, HPrice: HPrice
			, HTaxRate: HTaxRate * 100
			, HTaxPrice: HTaxPrice
			, HMoney: HMoney
			, HTaxMoney: HTaxMoney
			});
			//table.render(option);
			break;
			default:
			}
			@@ -761,6 +987,16 @@
			$("#HInterID").val(d.data[0].HInterID);
			}
			});
			}
			//#endregion

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

			@@ -973,7 +1209,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'åºåºä»åºåè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=HWHID', 'yes']
			, content: ['../../Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=HSCWHID', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1104,45 +1340,137 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, totalRow: true
			, limit: 500
			, height: 500
			, loading: false
			, cols: [[ //åè¡¨
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', width: 100, totalRow: true }
			, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
			, { type: 'numbers', title: 'åºå·', width: 100 }
			, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 150, edit: 'text', event: "HMaterID" }//f7
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150, }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100, }
			, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100, edit: 'text', event: "HUnitID" }//f7
			, { field: 'HQty', title: 'å®åæ°é', width: 100, edit: 'text', event: "HQty" }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150, style: 'background-color:#efefef4d;' }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100, style: 'background-color:#efefef4d;' }
			, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100, edit: 'text', event: "HUnitID"}//f7
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 100, totalRow: true, style: 'background-color:#efefef4d;'}
			, { field: 'HQty', title: 'å®åæ°é', width: 100, totalRow: true, edit: 'text', event: "HQty" }
			, { field: 'HPrice', title: 'åä»·', width: 100, edit: 'text', event: "HPrice" }
			, { field: 'HMoney', title: 'éé¢', width: 100 }
			, { field: 'HWHID', title: 'HWHID', width: 100, edit: 'text', hide: true }
			, { field: 'HTaxPrice', title: 'å«ç¨åä»·', width: 100, edit: 'text', event: "HTaxPrice" }
			, { field: 'HTaxRate', title: 'ç¨ç', width: 100, edit: 'text' }
			, { field: 'HMoney', title: 'éé¢', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			, { field: 'HTaxMoney', title: 'ä»·ç¨åè®¡', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			, { field: 'HWHID', title: 'HWHID', width: 100, edit: 'text', hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'åè´§ä»åº', title: 'åè´§ä»åº', width: 100, edit: 'text', event: "HWHID" }
			, { field: 'HRemark', title: 'å¤æ³¨', width: 100, edit: 'text' }


			, { field: 'HQtyMust', title: 'åºåæ°é', width: 100, edit: 'text', event: "HQtyMust", hide: true }
			, { field: 'HQty_Full', title: 'æ»¡è½¦éé', width: 100, edit: 'text', event: "HQty_Full", hide: true }
			, { field: 'HQty_Empty', title: 'ç©ºè½¦éé', width: 100, edit: 'text', event: "HQty_Empty", hide: true }
			, { field: 'HQty_Back', title: 'åè½¦éé', width: 100, edit: 'text', event: "HQty_Back", hide: true }
			, { field: 'HCostPrice', title: 'ææ¬åä»·', width: 100, edit: 'text', event: "HCostPrice", hide: true }
			, { field: 'HCostMoney', title: 'ææ¬éé¢', width: 100, edit: 'text', event: "HCostMoney", hide: true }
			, { field: 'HSalePrice', title: 'éå®åä»·', width: 100, edit: 'text', event: "HSalePrice", hide: true }
			, { field: 'HSeOrderInterID', title: 'HSeOrderInterID', width: 100, edit: 'text', hide: true }
			, { field: 'HSeOrderEntryID', title: 'HSeOrderEntryID', width: 100, edit: 'text', hide: true }
			, { field: 'HSeOrderBillNo', title: 'éå®è®¢åå·', width: 100, edit: 'text', event: "HSeOrderBillNo", hide: true }

			, { field: 'HSeOrderInterID', title: 'éå®è®¢ååç ', width: 100, edit: 'text', hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HSeOrderEntryID', title: 'éå®è®¢åååç ', width: 100, edit: 'text', hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HSeOrderBillNo', title: 'éå®è®¢åå·', width: 100, hide: true, style: 'background-color:#efefef4d;' }

			, { field: 'HSourceInterID', title: 'æºååç ', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HSourceBillNo', title: 'æºåå·', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HSourceBillType', title: 'æºåç±»å', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HRelationQty', title: 'å³èæ°é', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HRelationMoney', title: 'å³èéé¢', width: 100, hide: true, style: 'background-color:#efefef4d;' }

			, { field: 'HSPID', title: 'HSPID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HSPName', title: 'ä»ä½', width: 100, hide: true }
			, { field: 'HSPGroupID', title: 'HSPGroupID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HSPGroupName', title: 'ä»ä½ç»', width: 100, hide: true }
			, { field: 'HSCWHID', title: 'HSCWHID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HSCWHName', title: 'è°åºä»åº', width: 100, hide: true }
			, { field: 'HSCSPID', title: 'HSCSPID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HSCSPName', title: 'è°åºä»ä½', width: 100, hide: true }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 100, hide: true }
			, { field: 'HPOOrderInterID', title: 'éè´è®¢ååç ', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HPOOrderEntryID', title: 'éè´è®¢åååç ', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HPOOrderBillNo', title: 'éè´è®¢åå·', width: 100, hide: true, style: 'background-color:#efefef4d;' }

			, { field: 'HPropertyID', title: 'HPropertyID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HPropertyName', title: 'è¾å©å±æ§', width: 100, hide: true }
			, { field: 'HSecUnitID', title: 'HSecUnitID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HSecUnitName', title: 'è¾å©è®¡éåä½', width: 100, hide: true }
			, { field: 'HSecUnitRate', title: 'æ¢ç®ç', width: 100, hide: true }


			, { field: 'HEngineNum', title: 'åå¨æºå·', width: 100, hide: true }
			, { field: 'HUnderPanNum', title: 'å°çå·', width: 100, hide: true }
			, { field: 'HLeaveFactCard', title: 'åºåè¯', width: 100, hide: true }

			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			}

			var rowdata = [{
			"HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "HWHID": $("#HWHID").val(), "åè´§ä»åº": $("#HWHName").val(), "HQtyMust": "0",
			"HQty": "0", "HQty_Full": "0", "HQty_Empty": "0", "HQty_Back": "0", "HPrice": "0", "HMoney": "0", "HCostPrice": "0", "HCostMoney": "0",
			"HSalePrice": "0", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "", "HRemark": ""
			"HMaterID": "0"
			, "ç©æä»£ç ": ""
			, "ç©æåç§°": ""
			, "è§æ ¼åå·": ""
			, "HUnitID": "0"
			, "è®¡éåä½": ""
			, "HQtyMust": "0"
			, "HQty": "0"
			, "HPrice": "0"
			, "HTaxPrice": "0"
			, "HTaxRate": "0"
			, "HMoney": "0"
			, "HTaxMoney": "0"
			, "HWHID": $("#HWHID").val()
			, "åè´§ä»åº": $("#HWHName").val()
			, "HRemark": ""

			, "HQty_Full": "0"
			, "HQty_Empty": "0"
			, "HQty_Back": "0"
			, "HCostPrice": "0"
			, "HCostMoney": "0"
			, "HSalePrice": "0"

			, "HSeOrderInterID": "0"
			, "HSeOrderEntryID": "0"
			, "HSeOrderBillNo": ""

			, "HSourceInterID": "0"
			, "HSourceEntryID": "0"
			, "HSourceBillNo": ""
			, "HSourceBillType": ""
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

			, 'HSPID': "0"
			, 'HSPName': ""
			, 'HSPGroupID': "0"
			, "HSPGroupName": ""
			, 'HSCWHID': "0"
			, 'HSCWHName': ""
			, 'HSCSPID': "0"
			, 'HSCSPName': ""
			, 'HBatchNo': ""
			, 'HPOOrderInterID': "0"
			, 'HPOOrderEntryID': "0"
			, 'HPOOrderBillNo': ""

			, 'HPropertyID': "0"
			, 'HPropertyName': ""
			, 'HSecUnitID': "0"
			, 'HSecUnitName': ""
			, 'HSecUnitRate': "0"


			, 'HEngineNum': ""
			, 'HUnderPanNum': ""
			, 'HLeaveFactCard': ""


			}];

			option.data = rowdata;
			@@ -1172,37 +1500,50 @@
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HBillNo": data.åæ®å·
			, "HDate": formatDate(data.æ¥æ)
			, "HInnerBillNo": data.éå®è®¢åå·
			, "HEmpID": data.HEmpID
			, "HEmpName": data.ä¸å¡å
			, "HSupID": data.hsupid
			, "HSupName": data.å®¢æ·
			, "HWHID": data.HWHID_Main
			, "HWHName": data.ä»åº
			, "HSellSID": data.HSellSID
			, "HSellSName": data.éå®æ¹å¼
			, "HDeptID": data.HDeptID
			, "HDeptName": data.é¨é¨
			, "HEmpID": data.HEmpID
			, "HEmpName": data.ä¸å¡å
			, "HManagerID": data.hmanagerid
			, "HManagerName": data.ä¸»ç®¡
			, "BillType": data.HSourceBillType
			, "HMainSourceInterID": data.HMainSourceInterID
			, "HMainSourceEntryID": data.HMainSourceEntryID
			, "HMainSourceBillNo": data.HMainSourceBillNo
			, "HMainSourceBillType": data.HMainSourceBillType
			, "HSupID": data.hsupid
			, "HSupName": data.å®¢æ·
			, "HLinkMan": data.èç³»äºº
			, "HLinkPhone": data.èç³»çµè¯
			, "HSellSID": data.HSellSID
			, "HSellSName": data.éå®æ¹å¼
			, "HSecManagerID": data.hsecmanagerid
			, "HSecManagerName": data.åè´§äºº
			, "HKeeperID": data.hkeeperid
			, "HKeeperName": data.ä¿ç®¡å
			, "HManagerID": data.hmanagerid
			, "HManagerName": data.ä¸»ç®¡
			, "HCheckStatusMan": data.æ ¸éäºº
			, "HWHID": data.HWHID_Main
			, "HWHName": data.ä¸»è¡¨ä»åº
			, "HRemark": data.è¡¨å¤´å¤æ³¨


			, "HConveyCompID": data.HConveyCompID
			, "HConveyCompName": data.è¿è¾å¬å¸
			, "HConveyTypeID": data.HConveyTypeID
			, "HConveyTypeName": data.è¿è¾æ¹å¼
			, "HConveyMoney": data.HConveyMoney
			, "HCarriage": data.è¿è´¹
			, "HRemark": data.è¡¨å¤´å¤æ³¨
			, "HExplanation": data.æè¦

			, "HSTOCKORGID": data.HSTOCKORGID
			, "HOWNERID": data.HOWNERID
			, "HCurID": data.HCurID
			, "HCurName": data.å¸å«
			, "HSourceBillType": data.æºåç±»å
			, "HLinkMan": data.èç³»äºº
			, "HLinkPhone": data.èç³»çµè¯
			, "HExRate": data.æ±ç
			, "HSCWHID": data.HSCWHID_Main
			, "HSCWHName": data.ä¸»è¡¨è°åºä»åº
			, "HCheckStatusMan": data.æ ¸éäºº
			, "HExplanation": data.æè¦
			, "HInnerBillNo": data.åé¨åæ®å·


			, "HMaker": data.å¶åäºº
			, "HMakeDate": data.å¶åæ¥æ == null ? "" : Format(new Date(data.å¶åæ¥æ), "yyyy-MM-dd")
			, "HUpDater": data.ä¿®æ¹äºº
			@@ -1213,12 +1554,6 @@
			, "HCloseDate": data.å³éæ¥æ == null ? "" : Format(new Date(data.å³éæ¥æ), "yyyy-MM-dd")
			, "HDeleteMan": data.ä½åºäºº
			, "HDeleteDate": data.ä½åºæ¥æ == null ? "" : Format(new Date(data.ä½åºæ¥æ), "yyyy-MM-dd")

			, "HMainSourceInterID": data.HSourceInterID
			, "HMainSourceEntryID": "0"
			, "HMainSourceBillNo": data.æºååå·
			, "HMainSourceBillType": data.HSourceBillType
			, "BillType": data.HSourceBillType
			});

			HOrgIDBar = data.HOrgID == null ? 0 : data.HOrgID;
			@@ -1234,20 +1569,24 @@
			, "è§æ ¼åå·": result.data[i].è§æ ¼åå·
			, "HUnitID": result.data[i].hunitid
			, "è®¡éåä½": result.data[i].è®¡éåä½
			, "HQty": result.data[i].æ°é
			, "HPrice": result.data[i].åä»·
			, "HMoney": result.data[i].éé¢
			, "HQtyMust": dealDoubleToFixed(result.data[i].åºåæ°é, 1)
			, "HQty": dealDoubleToFixed(result.data[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(result.data[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(result.data[i].å«ç¨åä»·, 3)
			, "HTaxRate": result.data[i].ç¨ç
			, "HMoney": dealDoubleToFixed(result.data[i].æ°é * result.data[i].åä»·, 2)
			, "HTaxMoney": dealDoubleToFixed(result.data[i].æ°é * result.data[i].å«ç¨åä»·, 2)
			, "HWHID": result.data[i].hwhid
			, "åè´§ä»åº": result.data[i].åè´§ä»åº
			, "HRemark": result.data[i].è¡¨ä½å¤æ³¨

			, "HQtyMust": result.data[i].åºåæ°é
			, "HQty_Full": result.data[i].æ»¡è½¦éé
			, "HQty_Empty": result.data[i].ç©ºè½¦éé
			, "HQty_Back": result.data[i].åè½¦éé
			, "HCostPrice": result.data[i].ææ¬åä»·
			, "HCostMoney": result.data[i].ææ¬éé¢
			, "HSalePrice": result.data[i].éå®åä»·

			, "HSeOrderInterID": result.data[i].HSeOrderInterID
			, "HSeOrderEntryID": result.data[i].HSeOrderEntryID
			, "HSeOrderBillNo": result.data[i].éå®è®¢åå·
			@@ -1256,6 +1595,32 @@
			, "HSourceEntryID": result.data[i].HSourceEntryID
			, "HSourceBillNo": result.data[i].æºååå·
			, "HSourceBillType": result.data[i].HSourceBillType
			, "HRelationQty": result.data[i].å³èæ°é
			, "HRelationMoney": result.data[i].å³èéé¢

			, 'HSPID': result.data[i].HSPID
			, 'HSPName': result.data[i].ä»ä½
			, 'HSPGroupID': result.data[i].HSPGroupID
			, "HSPGroupName": result.data[i].ä»ä½ç»
			, 'HSCWHID': result.data[i].HSCWHID
			, 'HSCWHName': result.data[i].è°åºä»åº
			, 'HSCSPID': result.data[i].HSCSPID
			, 'HSCSPName': result.data[i].è°åºä»ä½
			, 'HBatchNo': result.data[i].æ¹æ¬¡
			, 'HPOOrderInterID': result.data[i].éè´è®¢ååç
			, 'HPOOrderEntryID': result.data[i].éè´è®¢åååç
			, 'HPOOrderBillNo': result.data[i].éè´è®¢åå·

			, 'HPropertyID': result.data[i].HPropertyID
			, 'HPropertyName': result.data[i].è¾å©å±æ§
			, 'HSecUnitID': result.data[i].HSecUnitID
			, 'HSecUnitName': result.data[i].è¾å©è®¡éåä½
			, 'HSecUnitRate': result.data[i].æ¢ç®ç


			, 'HEngineNum': result.data[i].åå¨æºå·
			, 'HUnderPanNum': result.data[i].å°çå·
			, 'HLeaveFactCard': result.data[i].åºåè¯
			}
			)
			}
			@@ -1271,6 +1636,127 @@
			layer.alert("åçéè¯¯!", { icon: 5 });
			}
			});
			}
			//#endregion

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

			//åå§åæ¥æãå¶åäººãå¶åæ¥æ
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HMaker").val(sessionStorage["HUserName"]);
			$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));

			//è®¾ç½®æºåç±»å
			$("#BillType").val(HSouceBillType);

			//ç¦ç¨ç»ç»éé¡¹
			$("#HOrgID").attr("disabled", true);

			//è·å
			var data = getUrlVars_JSON().data;
			var dataArray = [];
			for (var i = 0; i < data.length; i++) {
			var temp = getPushSourceBillInit(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="" å¯¹åºçå¼
			"HDeptID": dataArray[0].HDeptID
			, "HDeptName": dataArray[0].é¨é¨
			, "HEmpID": dataArray[0].HEmpID
			, "HEmpName": dataArray[0].ä¸å¡å
			, "HManagerID": dataArray[0].HManagerID
			, "HManagerName": dataArray[0].ä¸»ç®¡
			, "HMainSourceInterID": "0"
			, "HMainSourceEntryID": "0"
			, "HMainSourceBillNo": ""
			, "HMainSourceBillType": $("#BillType").val()
			, "HSupID": dataArray[0].HCusID
			, "HSupName": dataArray[0].å®¢æ·
			, "HLinkMan": dataArray[0].èç³»äºº
			, "HLinkPhone": dataArray[0].èç³»çµè¯
			, "HSellSID": dataArray[0].HSellSID
			, "HSellSName": dataArray[0].éå®æ¹å¼
			, "HCurID": dataArray[0].HCurID
			, "HCurName": dataArray[0].å¸å«
			, "HExRate": dataArray[0].æ±ç
			});

			//åè¡¨ èµå¼
			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].è®¡éåä½
			, "HQtyMust": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, "HMoney": dealDoubleToFixed(dataArray[i].éé¢, 2)
			, "HTaxMoney": dealDoubleToFixed(dataArray[i].ä»·ç¨åè®¡, 2)
			, "HWHID": $("#HWHID").val()
			, "åè´§ä»åº": $("#HWHName").val()
			, "HRemark": ""

			, "HQty_Full": "0"
			, "HQty_Empty": "0"
			, "HQty_Back": "0"
			, "HCostPrice": "0"
			, "HCostMoney": "0"
			, "HSalePrice": "0"

			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·

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

			, 'HSPID': "0"
			, 'HSPName': ""
			, 'HSPGroupID': "0"
			, "HSPGroupName": ""
			, 'HSCWHID': "0"
			, 'HSCWHName': ""
			, 'HSCSPID': "0"
			, 'HSCSPName': ""
			, 'HBatchNo': ""
			, 'HPOOrderInterID': "0"
			, 'HPOOrderEntryID': "0"
			, 'HPOOrderBillNo': ""

			, 'HPropertyID': "0"
			, 'HPropertyName': ""
			, 'HSecUnitID': "0"
			, 'HSecUnitName': ""
			, 'HSecUnitRate': "0"


			, 'HEngineNum': ""
			, 'HUnderPanNum': ""
			, 'HLeaveFactCard': ""
			}
			);
			}
			option.data = rowdata;
			table.render(option);
			}
			//#endregion

			@@ -1641,36 +2127,36 @@
			}
			})
			}
			//éå®è®¢å
			if (obj.event == "HSeOrderBillNo") {
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éå®è®¢ååè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../éå®ç®¡ç/éå®è®¢å/Xs_SeOrderBillList.html', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®
			////éå®è®¢å
			//if (obj.event == "HSeOrderBillNo") {
			// layer.open({
			// type: 2
			// , skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			// , title: "éå®è®¢ååè¡¨" //æ é¢
			// , closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			// , shift: 2 //å¼¹åºå¨ç»
			// , area: ["90%", "90%"] //çªä½å¤§å°
			// , maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			// , content: ['../../éå®ç®¡ç/éå®è®¢å/Xs_SeOrderBillList.html', '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("è¯·éæ©ä¸æ¡æ°æ®");
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HSeOrderInterID": checkStatus.data[0].hmainid
			, "HSeOrderEntryID": checkStatus.data[0].hsubid
			, "HSeOrderBillNo": checkStatus.data[0].åæ®å·
			})
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			// if (checkStatus.data.length != 1) {
			// return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			// }
			// //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			// obj.update({
			// "HSeOrderInterID": checkStatus.data[0].hmainid
			// , "HSeOrderEntryID": checkStatus.data[0].hsubid
			// , "HSeOrderBillNo": checkStatus.data[0].åæ®å·
			// })
			// layer.close(index);//å³éå¼¹çª
			// }
			// })
			//}
			obj.event = "";
			return false;
			}
			@@ -1857,7 +2343,7 @@
			success: function (data1) {
			if (data1.data.length != 0) {
			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["HMaterID", "HUnitID", "HWHID", "HSeOrderInterID", "HSeOrderEntryID", "åºåæ°é", "æ»¡è½¦éé", "ç©ºè½¦éé", "åè½¦éé", "ææ¬åä»·", "ææ¬éé¢", "éå®åä»·", "éå®è®¢åå·"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HMaterID", "HUnitID", "HWHID", "æ»¡è½¦éé", "ç©ºè½¦éé", "åè½¦éé", "ææ¬åä»·", "ææ¬éé¢", "éå®åä»·", "éå®è®¢ååç ", "éå®è®¢åååç ", "éå®è®¢åå·","æºååç ","æºåååç ","æºåå·","æºåç±»å","å³èæ°é","å³èéé¢","HSPID","ä»ä½","HSPGroupID","ä»ä½ç»","HSCWHID","è°åºä»åº","HSCSPID","è°åºä»ä½","æ¹æ¬¡","éè´è®¢ååç ","éè´è®¢åååç ","éè´è®¢åå·","HPropertyID","è¾å©å±æ§","HSecUnitID","è¾å©è®¡éåä½","æ¢ç®ç","åå¨æºå·","å°çå·","åºåè¯"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//titleData = [];

			dataCol = data1.data[0].HGridString.split(',');
			@@ -1950,21 +2436,21 @@
			, "HDeptName": data.é¨é¨
			, "HEmpID": data.HEmpID
			, "HEmpName": data.ä¸å¡å
			, "HSellSID": data.HSellSID
			, "HSellSName": data.éå®æ¹å¼
			, "HSupID": data.HCusID
			, "HSupName": data.å®¢æ·
			, "HLinkMan": data.èç³»äºº
			, "HLinkPhone": data.èç³»çµè¯
			, "HCreditRating_Now": data.HCreditRating_Now

			, "HManagerID": data.HManagerID
			, "HManagerName": data.ä¸»ç®¡
			, "HMainSourceInterID": HMainSourceInterID
			, "HMainSourceEntryID": "0"
			, "HMainSourceBillNo": data.åæ®å·
			, "HMainSourceBillType": $("#BillType").val()

			//, "HCurID": data.HCurID
			//, "HCurName": data.å¸å«
			, "HSupID": data.HCusID
			, "HSupName": data.å®¢æ·
			, "HLinkMan": data.èç³»äºº
			, "HLinkPhone": data.èç³»çµè¯
			, "HSellSID": data.HSellSID
			, "HSellSName": data.éå®æ¹å¼
			, "HCurID": data.HCurID
			, "HCurName": data.å¸å«
			, "HExRate": data.æ±ç
			});

			//åè¡¨ èµå¼
			@@ -1978,20 +2464,24 @@
			, "è§æ ¼åå·": result.data[i].è§æ ¼åå·
			, "HUnitID": result.data[i].HUnitID
			, "è®¡éåä½": result.data[i].è®¡éåä½
			, "HQty": result.data[i].æ°é
			, "HPrice": result.data[i].åä»·
			, "HMoney": result.data[i].éé¢
			, "HWHID": $("#").val()
			, "åè´§ä»åº": $("#").val()
			, "HQtyMust": dealDoubleToFixed(result.data[i].æ°é, 1)
			, "HQty": dealDoubleToFixed(result.data[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(result.data[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(result.data[i].å«ç¨åä»·, 3)
			, "HTaxRate": result.data[i].ç¨ç
			, "HMoney": dealDoubleToFixed(result.data[i].éé¢, 2)
			, "HTaxMoney": dealDoubleToFixed(result.data[i].ä»·ç¨åè®¡, 2)
			, "HWHID": $("#HWHID").val()
			, "åè´§ä»åº": $("#HWHName").val()
			, "HRemark": ""

			, "HQtyMust": result.data[i].æ°é
			, "HQty_Full": "0"
			, "HQty_Empty": "0"
			, "HQty_Back": "0"
			, "HCostPrice": "0"
			, "HCostMoney": "0"
			, "HSalePrice": "0"

			, "HSeOrderInterID": result.data[i].hmainid
			, "HSeOrderEntryID": result.data[i].hsubid
			, "HSeOrderBillNo": result.data[i].åæ®å·
			@@ -2000,6 +2490,32 @@
			, "HSourceEntryID": result.data[i].hsubid
			, "HSourceBillNo": result.data[i].åæ®å·
			, "HSourceBillType": result.data[i].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

			, 'HSPID': "0"
			, 'HSPName': ""
			, 'HSPGroupID': "0"
			, "HSPGroupName": ""
			, 'HSCWHID': "0"
			, 'HSCWHName': ""
			, 'HSCSPID': "0"
			, 'HSCSPName': ""
			, 'HBatchNo': ""
			, 'HPOOrderInterID': "0"
			, 'HPOOrderEntryID': "0"
			, 'HPOOrderBillNo': ""

			, 'HPropertyID': "0"
			, 'HPropertyName': ""
			, 'HSecUnitID': "0"
			, 'HSecUnitName': ""
			, 'HSecUnitRate': "0"


			, 'HEngineNum': ""
			, 'HUnderPanNum': ""
			, 'HLeaveFactCard': ""
			}
			);
			}
			@@ -2014,7 +2530,6 @@
			});
			}
			//#endregion


			//#region åå®¡æ ¸/å®¡æ ¸æ°æ®
			function set_CheckBill(num) {
			@@ -2040,6 +2555,33 @@
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//#region æ ¹æ®ä¸»åç ä¸ååç è·åæºåéå®è®¢åæ°æ®
			function getPushSourceBillInit(HSourceInterID, HSourceEntryID) {
			var res = "none";
			$.ajax({
			url: GetWEBURL() + "/Xs_SeOrderBill/loadXs_SeOrderBill_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
			@@ -2112,6 +2654,11 @@
			$("#HConveyCompID").val(obj[0].HItemID);
			}

			function GetHSCWHNAMEValue(obj) { //è¿ååºåºä»åº
			$("#HWHName").val(obj[0].HName);
			$("#HWHID").val(obj[0].HItemID);
			}

			//#region æ ¹æ®å®¢æ·è·åå¸å«ãæ±çãç»ç®æ¹å¼ãå®¢æ·ä¿¡ç¨é¢åº¦ãèç³»äººãèç³»çµè¯
			function getCustomerByCusID(HCusID) {
			$.ajax({
			@@ -2165,6 +2712,42 @@
			});
			}
			//#endregion

			//#region å¤çå°æ°æ¾ç¤ºä½æ°ï¼dataï¼éè¦å¤ççæ°æ®ï¼numï¼æ°æ®çç±»å(å¦1:æ°éï¼2:éé¢ï¼3:åä»·)ï¼
			function dealDoubleToFixed(data, num) {
			//ç¨äºè®¾ç½®å°æ°ä½æ°
			var dotLength = 0;

			if (num == 1) { //å½æ°æ®ä¸ºæ°éæ¶ï¼æå¤ä¿ç6ä½å°æ°
			//è®¾ç½®æå¤ä¿ç6ä½å°æ°
			dotLength = 6;
			} else if (num == 2) { //å½æ°æ®ä¸ºéé¢æ¶ï¼æå¤ä¿ç2ä½å°æ°
			//è®¾ç½®æå¤ä¿ç2ä½å°æ°
			dotLength = 2;
			} else if (num == 3) { //å½æ°æ®ä¸ºåä»·æ¶ï¼æå¤ä¿ç4ä½å°æ°
			//è®¾ç½®æå¤ä¿ç4ä½å°æ°
			dotLength = 4;
			}

			//å¤ææ¯å¦åå¨å°æ°ç¹åå¶ç´¢å¼ä½ç½®
			data = data + "";
			var index = data.indexOf(".");

			//å¤çæ°æ®å¹¶è¿å
			if (index < 0) {
			return data * 1;
			} else {
			//è·åå°æ°ä½æ°
			var length = data.length - index - 1;
			if (length <= dotLength) {
			return data * 1;
			} else {
			data = data * 1;
			return data.toFixed(dotLength);
			}
			}
			}
			//#endregion
			</script>
			</body>
			</html>