MES-WEB-LayUI.git

			@@ -54,7 +54,9 @@
			<h1 style="text-align: center; padding: 10px 0;"><b>åºä»å</b></h1>
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;" class="layui-this">åºæ¬ä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">å¶åä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">å¶ä»ä¿¡æ¯</li>
			<li lay-id="3" style="padding:1px;">å¶åä¿¡æ¯</li>

			</ul>
			<div class="layui-tab-content">
			<!--åºæ¬ä¿¡æ¯-->
			@@ -81,9 +83,9 @@
			<!--å¨ææ¸²ææºåç±»å-->
			</select>
			<!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
			<option style="color:blue;" selected="selected" value="1102">éè´è®¢å</option>
			<option style="color:blue;" value="1201">éè´å¥åºå</option>
			</select>-->
			<option style="color:blue;" selected="selected" value="1102">éè´è®¢å</option>
			<option style="color:blue;" value="1201">éè´å¥åºå</option>
			</select>-->
			</div>
			</div>
			<div class="layui-inline">
			@@ -92,7 +94,7 @@
			<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>
			<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>
			@@ -100,14 +102,14 @@
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline" style="width:625px">
			<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; width: 505px" readonly>
			<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 505px;">
			<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="background-color: #efefef4d; width: 150px" readonly>
			<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 150px;">
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			</div>
			</div>
			<div class="layui-inline">
			@@ -130,24 +132,6 @@
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">å¸å«<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" 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">
			@@ -158,17 +142,8 @@
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ç®æ¹å¼</label>
			<div class="layui-input-inline">
			<input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
			<input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" 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>
			@@ -180,10 +155,24 @@
			</button>
			</div>
			</div>
			<div class="layui-inline" style="">
			<label class="layui-form-label">åç¥¨ç¼å·</label>
			<div class="layui-input-inline" style="background-color: #efefef4d; float: left; width: 150px;">
			<input class="layui-input" name="HInvoiceBillNo" id="HInvoiceBillNo" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä»æ¬¾æ¥æ<label style="color:red"> * </label></label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" lay-verify="HReceiveDate" name="HReceiveDate" id="HReceiveDate" style="width:190px;">
			<label class="layui-form-label">é¡¹ç®åç§°</label>
			<div class="layui-input-inline">
			<input type="text" name="HProjectName" id="HProjectName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
			<input type="hidden" name="HProjectID" id="HProjectID" class="layui-input" value="0" style="float: left; width: 150px; background-color: #efefef4d;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">é¡¹ç®ç¼ç </label>
			<div class="layui-input-inline">
			<input type="text" name="HProjectNumber" id="HProjectNumber" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>

			</div>
			</div>
			</div>
			@@ -192,16 +181,6 @@
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style="width: 1135px;">
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			</div>
			@@ -227,6 +206,59 @@
			</div>
			</div>
			</div>
			</div>
			</div>

			<!--å¶ä»ä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">ç»ç®æ¹å¼</label>
			<div class="layui-input-inline">
			<input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" readonly>
			<input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSSList" 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-block">
			<input type="date" class="layui-input" lay-verify="HReceiveDate" name="HReceiveDate" id="HReceiveDate" style="width:190px;">
			</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="HCurName" id="HCurName" class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;" 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>
			<div class="layui-row">
			<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>
			<div class="layui-row" style="margin-top:10px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			</div>

			</div>
			</div>
			<!--å¶åä¿¡æ¯-->
			@@ -575,6 +607,250 @@
			});
			//#endregion

			//#region åè½¦éæ©æºå
			$('#HMainSourceBillNo').on('keydown', function (event) {
			var HSourceBillNo = $('#HMainSourceBillNo').val();//ï¼æºååæ®å·ï¼
			if (event.keyCode == 13) {
			var ajaxLoad = layer.load();
			var url;
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			if (HSourceBillNo == "") {
			return;
			}
			if ($("#BillType").val() == "1102") {
			//æºåç±»åæ¯éè´è®¢å
			url = "/Cg_POOrderBill/PushList";
			} else if ($("#BillType").val() == "1201") {
			//æºåç±»åæ¯æ¶æéç¥å
			url = "/Kf_POStockInBill/PushList";
			}
			$.ajax({
			url: GetWEBURL() + url,
			type: "GET",
			data: { "HBillNo": HSourceBillNo, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var dataArray = result.data;
			if ($("#BillType").val() == "1102") {
			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].é¨é¨
			, "HMangerID": dataArray[0].HManagerID
			, "HMangerName": dataArray[0].ä¸»ç®¡
			, "HEmpID": dataArray[0].HEmpID
			, "HEmpName": dataArray[0].ä¸å¡å
			, "HSupID": dataArray[0].HSupID
			, "HSupName": dataArray[0].ä¾åºå
			, "HCurID": dataArray[0].HCurID
			, "HCurName": dataArray[0].å¸å«
			, "HExRate": dataArray[0].æ±ç
			, "HSSID": dataArray[0].HSSID
			, "HSSName": dataArray[0].ç»ç®æ¹å¼
			, "HPSStyleID": dataArray[0].HPSStyleID
			, "HPSStyleName": dataArray[0].éè´æ¹å¼
			, "HProjectID": dataArray[0].HProjectID
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectNumber": dataArray[0].é¡¹ç®ä»£ç
			});

			//åè¡¨Entry èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é; //æ°é
			var HPrice = dataArray[i].åä»·; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxRate = dataArray[i].ç¨ç * 0.01; //ç¨ç
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HMoneyBB = HMoney * HExRate;
			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].HMaterID
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(HQty, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': HTaxMoney //
			, "HMoney": dealDoubleToFixed(HMoney, 2)
			, 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
			, 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
			, "HRemark": ""

			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].åæ®ç±»å
			, "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].åæ®å·
			}
			);
			}
			optionEntry.data = rowdataEntry;
			table.render(optionEntry);
			//åè¡¨æ±æ»
			for (var i = 0; i < rowdataEntry.length; i++) {
			var item = rowdataEntry[i];

			for (var j = i + 1; j < rowdataEntry.length; j++) {
			if (rowdataEntry[j].HMaterID == item.HMaterID) {
			rowdataEntry[i].HQty += rowdataEntry[j].HQty;//æ°é
			rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//éé¢=æ°é*åä»·
			rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//ç¨é¢
			rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //ä»·ç¨åè®¡
			var HExRate = $("#HExRate").val();
			rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //æ¬ä½å¸ä»·ç¨åè®¡
			rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //æ¬ä½å¸éé¢
			rowdataEntry.splice(j, 1);
			j = j - 1;
			}
			}
			}
			set_InitGridHaveSource();
			option.data = rowdataEntry;

			} else if ($("#BillType").val() == "1201") {
			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].é¨é¨
			, "HMangerID": dataArray[0].hmanagerid == null ? "0" : dataArray[0].hmanagerid
			, "HMangerName": dataArray[0].ä¸»ç®¡
			, "HEmpID": dataArray[0].HEmpID
			, "HEmpName": dataArray[0].ä¸å¡å
			, "HSupID": dataArray[0].HSupID
			, "HSupName": dataArray[0].ä¾åºå
			, "HCurID": dataArray[0].HCurID
			, "HCurName": dataArray[0].å¸å«
			, "HExRate": dataArray[0].æ±ç
			, "HSSID": "0"
			, "HSSName": ""
			, "HPSStyleID": dataArray[0].HPSStyleID
			, "HPSStyleName": dataArray[0].éè´æ¹å¼
			, "HProjectID": dataArray[0].HProjectID
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectNumber": dataArray[0].é¡¹ç®ä»£ç
			, "HInvoiceBillNo": dataArray[0].åç¥¨ç¼å·
			});
			//åè¡¨Entry èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].å®æ¶æ°é - dataArray[i].å³èæ°é; //æ°é
			var HPrice = dataArray[i].åä»·; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxRate = dataArray[i].ç¨ç * 0.01; //ç¨ç
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HMoneyBB = HMoney * HExRate;
			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].HMaterID
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(HQty, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': HTaxMoney //
			, "HMoney": dealDoubleToFixed(HMoney, 2)
			, 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
			, 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
			, "HRemark": ""

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

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

			// , 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
			, "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
			, "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].æºååå· : ""
			}
			);
			}
			optionEntry.data = rowdataEntry;
			table.render(optionEntry);
			//åè¡¨æ±æ»
			for (var i = 0; i < rowdataEntry.length; i++) {
			var item = rowdataEntry[i];
			for (var j = i + 1; j < rowdataEntry.length; j++) {
			if (rowdataEntry[j].HMaterID == item.HMaterID) {
			rowdataEntry[i].HQty += rowdataEntry[j].HQty;
			rowdataEntry[i].HMoney = rowdataEntry[i].HQty * rowdataEntry[i].HPrice//éé¢=æ°é*åä»·
			rowdataEntry[i].HTaxMoney = Number((rowdataEntry[i].HMoney * rowdataEntry[i].HTaxRate).toFixed(4))//ç¨é¢
			rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //ä»·ç¨åè®¡
			var HExRate = $("#HExRate").val();
			rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //æ¬ä½å¸ä»·ç¨åè®¡
			rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //æ¬ä½å¸éé¢
			rowdataEntry.splice(j, 1);
			j = j - 1;
			}
			}
			}
			set_InitGridHaveSource();
			option.data = rowdataEntry;

			}
			haveSource = true;
			table.render(option);
			layer.close(ajaxLoad);
			layer.msg("æ¥è¯¢æå", { time: 1 * 1000, icon: 1 });
			} else {
			layer.alert(result.Message, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			layer.close(ajaxLoad);
			}
			}, error: function () {
			layer.alert(result.Message + "åçéè¯¯!", { icon: 5 });
			layer.close(ajaxLoad);
			}
			});
			}
			});
			//#endregion


			//#endregion

			//#region å¤éæ¡ç¶æåæ´
			@@ -596,7 +872,7 @@
			, "HQty": "0"
			, "HPrice": "0"
			, "HTaxPrice": "0"
			, 'HDiscountRate': "0"
			, 'HDiscountRate': "1"
			, 'HRelTaxPrice': "0"
			, "HTaxRate": "0"
			, 'HTaxMoney': "0"
			@@ -1002,7 +1278,17 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}

			var HSupID = $("#HSupID").val();//å¤æä¾åºå
			if (HSupID == 0 \|\| HSupID == '') {
			HSupID = checkStatus.data[0]["HSupID"];
			}
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (checkStatus.data[i]["HSupID"] != HSupID) {
			layer.msg("ä¸æ¨å¤±è´¥!å·²ç»éä¸çè®°å½ä¸åå¨ä¸åä¾åºå!");
			layer.close(index);//å³éå¼¹çª
			return;
			}
			}
			if ($("#BillType").val() == "1102") {
			setInitByPOOrderBill(checkStatus);
			}
			@@ -1123,7 +1409,7 @@
			, "HQty": "0"
			, "HPrice": "0"
			, "HTaxPrice": "0"
			, 'HDiscountRate': "0"
			, 'HDiscountRate': "1"
			, 'HRelTaxPrice': "0"
			, "HTaxRate": "0"
			, 'HTaxMoney': "0"
			@@ -1248,6 +1534,7 @@
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HMoneyBB = HMoney * HExRate;

			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			@@ -1255,6 +1542,7 @@
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
			HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty
			@@ -1263,6 +1551,7 @@
			, HTaxMoney: HTaxMoney
			, HlineTotal: HlineTotal
			, HlineTotalBB: HlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			table.render(option);
			break;
			@@ -1291,7 +1580,7 @@
			var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4)); //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç

			var HMoneyBB = HMoney * HExRate;
			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			@@ -1301,6 +1590,7 @@
			HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
			HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty
			@@ -1311,6 +1601,7 @@
			, HTaxPrice, HTaxPrice
			, HRelTaxPrice: HRelTaxPrice
			, HlineTotalBB: HlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			table.render(option);
			break;
			@@ -1341,6 +1632,7 @@
			var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4)); //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HMoneyBB = HMoney * HExRate;
			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			@@ -1350,6 +1642,7 @@
			HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
			HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HTaxRate: HTaxRate * 100
			@@ -1362,6 +1655,7 @@
			, HTaxPrice, HTaxPrice
			, HRelTaxPrice: HRelTaxPrice
			, HlineTotalBB: HlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			table.render(option);
			break;
			@@ -1409,7 +1703,6 @@
			});
			table.render(option);
			break;

			case "HTaxPrice": //åä»·
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + ""; //ä¿®æ¹åçå¼ è½¬ä¸ºåç¬¦ä¸² èµå¼ç» åétemp
			@@ -1436,6 +1729,7 @@
			var HRelTaxPrice = Number((HTaxPrice * HDiscountRate).toFixed(4)); //å®éå«ç¨åä»·=å«ç¨åä»·*ææ£ç
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate).toFixed(4)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HMoneyBB = HMoney * HExRate;
			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			@@ -1445,6 +1739,7 @@
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			HRelTaxPrice = Number(HRelTaxPrice.toFixed(HPriceDec));
			HlineTotalBB = Number(HlineTotalBB.toFixed(HMoneyDec));
			HMoneyBB = Number(HMoneyBB.toFixed(HMoneyDec));
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ® æ¹æ³æ¯è¯¥å¯¹è±¡æä¾çä¸ä¸ªæ¹æ³ï¼ç¨äºæ´æ°å¶åé¨ç¶ææä¸ä¹å³èçæ°æ®æº
			HQty: HQty //æ´æ°HQtyåæ®µï¼HQty
			@@ -1455,6 +1750,7 @@
			, HTaxPrice, HTaxPrice //æ´æ°HTaxPriceåæ®µï¼HTaxPrice
			, HRelTaxPrice: HRelTaxPrice //æ´æ°HRelTaxPriceåæ®µï¼å¶å¼æ¥èªåéHRelTaxPrice
			, HlineTotalBB: HlineTotalBB //æ´æ°HlineTotalBBåæ®µï¼å¶å¼æ¥èªåéHlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			table.render(option);
			break;
			@@ -1509,6 +1805,11 @@
			, "HRemark": data.è¡¨å¤´å¤æ³¨
			, "HExplanation": data.æè¦
			, "HInnerBillNo": data.åé¨åæ®å·

			, "HProjectID": data.HProjectID == null ? 0 : data.HProjectID
			, "HProjectName": data.é¡¹ç®åç§°
			, "HProjectNumber": data.é¡¹ç®ä»£ç
			, "HInvoiceBillNo": data.åç¥¨ç¼å·

			, "HMaker": data.å¶åäºº
			, "HMakeDate": data.å¶åæ¥æ == null ? "" : Format(new Date(data.å¶åæ¥æ), "yyyy-MM-dd HH:mm:ss")
			@@ -1645,6 +1946,9 @@
			, "HSSName": dataArray[0].ç»ç®æ¹å¼
			, "HPSStyleID": dataArray[0].HPSStyleID
			, "HPSStyleName": dataArray[0].éè´æ¹å¼
			, "HProjectID": dataArray[0].HProjectID
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectNumber": dataArray[0].é¡¹ç®ä»£ç
			});

			//åè¡¨ èµå¼
			@@ -1724,6 +2028,10 @@
			, "HExRate": dataArray[0].æ±ç
			, "HPSStyleID": dataArray[0].HPSStyleID
			, "HPSStyleSName": dataArray[0].éè´æ¹å¼
			, "HProjectID": dataArray[0].HProjectID
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectNumber": dataArray[0].é¡¹ç®ä»£ç
			, "HInvoiceBillNo": dataArray[0].åç¥¨ç¼å·
			});

			//åè¡¨ èµå¼
			@@ -1832,6 +2140,11 @@
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { icon: 1 });
			if (data.Verify == "Y") //èªå¨å®¡æ ¸
			{
			$("#HInterID").val(data.HInterID);//è·åæäº¤æåè¿åçåæ®ä¸»ID
			set_CheckBill(0); //å®¡æ ¸
			}
			$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
			//ä¿ååæµè§
			//ReRoadBillMain();
			@@ -1865,22 +2178,22 @@
			layer.msg("æ¥æä¸è½ä¸ºç©º!");
			return false;
			}
			if ($("#HCurID").val() == 0) {
			layer.msg("è¯·éæ©å¸å«ï¼");
			return;
			}
			if ($("#HExRate").val() == 0) {
			layer.msg("è¯·è¾å¥æ±çï¼");
			return;
			}
			//if ($("#HCurID").val() == 0) {
			// layer.msg("è¯·éæ©å¸å«ï¼");
			// return;
			//}
			//if ($("#HExRate").val() == 0) {
			// layer.msg("è¯·è¾å¥æ±çï¼");
			// return;
			//}
			//if ($("#HEmpID").val() == 0) {
			// layer.msg("è¯·éæ©ä¸å¡ååï¼");
			// return;
			//}
			if ($("#HDeptID").val() == 0) {
			layer.msg("è¯·éæ©éè´é¨é¨ï¼");
			return;
			}
			//if ($("#HDeptID").val() == 0) {
			// layer.msg("è¯·éæ©éè´é¨é¨ï¼");
			// return;
			//}
			if ($("#HSupID").val() == 0) {
			layer.msg("è¯·éæ©ä¾åºåï¼");
			return;
			@@ -1894,14 +2207,14 @@
			// return;
			//}

			temp = $("#HExRate").val() + "";
			if (temp == 0) {
			layer.msg("æ±çä¸è½ä¸º0!");
			return false;
			} else if (!ref.test(temp)) {
			layer.msg("æ±çè¯·è¾å¥å¤§äº0çæ°å!");
			return false;
			}
			//temp = $("#HExRate").val() + "";
			//if (temp == 0) {
			// layer.msg("æ±çä¸è½ä¸º0!");
			// return false;
			//} else if (!ref.test(temp)) {
			// layer.msg("æ±çè¯·è¾å¥å¤§äº0çæ°å!");
			// return false;
			//}
			//#endregion

			//#region åè¡¨ æ°æ®æ£éª
			@@ -2579,11 +2892,23 @@
			, "HSSName": dataArray[0].ç»ç®æ¹å¼
			, "HPSStyleID": dataArray[0].HPSStyleID
			, "HPSStyleName": dataArray[0].éè´æ¹å¼
			, "HProjectID": dataArray[0].HProjectID
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectNumber": dataArray[0].é¡¹ç®ä»£ç
			});

			//åè¡¨Entry èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é; //æ°é
			var HPrice = dataArray[i].åä»·; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxRate = dataArray[i].ç¨ç * 0.01; //ç¨ç
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HMoneyBB = HMoney * HExRate;
			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].HMaterID
			@@ -2592,17 +2917,17 @@
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é - dataArray[i].å³èæ°é, 1)
			, "HQty": dealDoubleToFixed(HQty, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': "0" //
			, "HMoney": dealDoubleToFixed(dataArray[i].éé¢, 2)
			, 'HMoneyBB': dealDoubleToFixed(dataArray[i].éé¢ * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(dataArray[i].ä»·ç¨åè®¡, 2)
			, 'HlineTotalBB': dealDoubleToFixed(dataArray[i].ä»·ç¨åè®¡ * dataArray[0].æ±ç, 2)
			, 'HTaxMoney': HTaxMoney //
			, "HMoney": dealDoubleToFixed(HMoney, 2)
			, 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
			, 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
			, "HRemark": ""

			, "HSourceInterID": dataArray[i].hmainid
			@@ -2637,6 +2962,7 @@
			rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //ä»·ç¨åè®¡
			var HExRate = $("#HExRate").val();
			rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //æ¬ä½å¸ä»·ç¨åè®¡
			rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //æ¬ä½å¸éé¢
			rowdataEntry.splice(j, 1);
			j = j - 1;
			}
			@@ -2671,6 +2997,12 @@
			return;
			}
			}
			if (dataArray[0].æºåç±»å == "1102") {
			getPushSource_POOrderBillCur(dataArray[0].æºåä¸»åç , dataArray[0].æºåååç );
			} else {
			getPushSource_POInStockBillCur(dataArray[0].æºåä¸»åç , dataArray[0].æºåååç );
			}


			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HMainSourceInterID": "0"
			@@ -2686,18 +3018,31 @@
			, "HEmpName": dataArray[0].ä¸å¡å
			, "HSupID": dataArray[0].HSupID
			, "HSupName": dataArray[0].ä¾åºå
			, "HCurID": dataArray[0].HCurID
			, "HCurName": dataArray[0].å¸å«
			, "HExRate": dataArray[0].æ±ç
			//, "HCurID": dataArray[0].HCurID
			//, "HCurName": dataArray[0].å¸å«
			//, "HExRate": dataArray[0].æ±ç
			, "HSSID": "0"
			, "HSSName": ""
			, "HPSStyleID": dataArray[0].HPSStyleID
			, "HPSStyleName": dataArray[0].éè´æ¹å¼
			, "HProjectID": dataArray[0].HProjectID
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectNumber": dataArray[0].é¡¹ç®ä»£ç
			, "HInvoiceBillNo": dataArray[0].åç¥¨ç¼å·
			});

			//åè¡¨Entry èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].å®æ¶æ°é - dataArray[i].å³èæ°é; //æ°é
			var HPrice = dataArray[i].åä»·; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxRate = dataArray[i].ç¨ç * 0.01; //ç¨ç
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HExRate = $("#HExRate").val(); //æ±ç
			var HlineTotalBB = Number(((HMoney + HTaxMoney) * HExRate)); //æ¬ä½å¸ä»·ç¨åè®¡=(ç¨é¢+éé¢)*æ±ç
			var HMoneyBB = HMoney * HExRate;
			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].HMaterID
			@@ -2706,14 +3051,17 @@
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].å®æ¶æ°é - dataArray[i].å³èæ°é, 1)
			, "HQty": dealDoubleToFixed(HQty, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': "0" //
			, "HMoney": dataArray[i].éé¢
			, 'HTaxMoney': HTaxMoney //
			, "HMoney": dealDoubleToFixed(HMoney, 2)
			, 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
			, 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
			, "HRemark": ""

			, "HSourceInterID": dataArray[i].hmainid
			@@ -2747,6 +3095,7 @@
			rowdataEntry[i].HlineTotal = rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney //ä»·ç¨åè®¡
			var HExRate = $("#HExRate").val();
			rowdataEntry[i].HlineTotalBB = Number(((rowdataEntry[i].HMoney + rowdataEntry[i].HTaxMoney) * HExRate).toFixed(4)) //æ¬ä½å¸ä»·ç¨åè®¡
			rowdataEntry[i].HMoneyBB = Number((rowdataEntry[i].HMoney * HExRate).toFixed(4)) //æ¬ä½å¸éé¢
			rowdataEntry.splice(j, 1);
			j = j - 1;
			}
			@@ -2867,7 +3216,69 @@
			}
			//#endregion


			//#region æ ¹æ®ä¸»åç ä¸ååç è·åæºåéè´è®¢åå¸å«æ±ç
			function getPushSource_POOrderBillCur(HSourceInterID, HSourceEntryID) {
			var res = "none";
			$.ajax({
			url: GetWEBURL() + "/Cg_POOrderBill/loadCg_POOrderBill_Push",
			async: false,
			type: "GET",
			data: {
			"HInterID": HSourceInterID
			, "HSubID": HSourceEntryID
			},
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			res = result.data[0];
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HCurID": res.HCurID
			, "HCurName": res.å¸å«
			, "HExRate": res.æ±ç
			});
			} 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

			//#region æ ¹æ®ä¸»åç ä¸ååç è·åæºåæ¶æéç¥åå¸å«æ±ç
			function getPushSource_POInStockBillCur(HSourceInterID, HSourceEntryID) {
			var res = "none";
			$.ajax({
			url: GetWEBURL() + "/Cg_POInStockBill/loadCg_POInStockBill_Push",
			async: false,
			type: "GET",
			data: {
			"HInterID": HSourceInterID
			, "HSubID": HSourceEntryID
			},
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			res = result.data[0];
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HCurID": res.HCurID
			, "HCurName": res.å¸å«
			, "HExRate": res.æ±ç
			});
			} 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