MES-WEB-LayUI.git

			@@ -66,7 +66,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">åæ®ç¼å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" >
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
			<input type="hidden" name="HInterID" id="HInterID" value="0">
			</div>
			</div>
			@@ -83,9 +83,9 @@
			<!--å¨ææ¸²ææºåç±»å-->
			</select>
			<!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
			<option style="color:blue;" selected="selected" value="1401">éå®è®¢å</option>
			<option style="color:blue;" value="1205">éå®åºåºå</option>
			</select>-->
			<option style="color:blue;" selected="selected" value="1401">éå®è®¢å</option>
			<option style="color:blue;" value="1205">éå®åºåºå</option>
			</select>-->
			</div>
			</div>
			<div class="layui-inline">
			@@ -102,7 +102,6 @@
			</div>
			</div>
			<div class="layui-row">

			<div class="layui-inline">
			<label class="layui-form-label">éå®é¨é¨</label>
			<div class="layui-input-inline">
			@@ -129,18 +128,27 @@
			<input type="text" name="HCusName" id="HCusName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HCusID" id="HCusID" class="layui-input" value="0" style="float:left;width:150px;">
			<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HCusList" 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">
			<label class="layui-form-label">åä»·ç±»å</label>
			<div class="layui-input-inline">
			<select name="HPriceType" id="HPriceType" lay-filter="HPriceType" style="width: 190px; ">
			<option value="å»ç¨ä»·" selected="selected">å»ç¨ä»·</option>
			<option value="ç»ç®ä»·">ç»ç®ä»·</option>
			<option value="å»ç¨ä»·">å»ç¨ä»·</option>
			<option value="ç»ç®ä»·" selected="selected">ç»ç®ä»·</option>
			<option value="å«ç¨ä»·">å«ç¨ä»·</option>
			</select>
			</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="HProjectName" id="HProjectName" class="layui-input" lay-filter="HProjectName" value="" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HProjectID" id="HProjectID" class="layui-input" value="0" style="float:left;width:150px;">
			</div>
			</div>
			</div>
			@@ -152,7 +160,7 @@
			</div>
			</div>
			</div>



			<!--éèåæ®µ-->
			<div class="layui-row" style="display:none;">
			@@ -178,7 +186,7 @@
			</div>
			</div>

			<!--åºæ¬ä¿¡æ¯-->
			<!--å¶å®ä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item" style="padding-top: 10px;">

			@@ -647,113 +655,61 @@
			, "HSSName": dataArray[0].ç»ç®æ¹å¼
			, "HSellSID": dataArray[0].HSellSID
			, "HSellSName": dataArray[0].éå®æ¹å¼
			, "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
			, "HProjectName": (dataArray[0].é¡¹ç®åç§°)
			});

			if ($("#HPriceType").val() == "å»ç¨ä»·") {
			//åè¡¨ææ¬ä»·Entry èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é; //æ°é
			var HPrice = dataArray[i].HNoTaxCost; //ææ¬ä»·
			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].HNoTaxCost, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
			, "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].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

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

			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}
			} else {
			//åè¡¨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].HTaxPrice, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
			, "HMoney": dealDoubleToFixed(HMoney, 2)
			, 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
			, 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
			, "HRemark": ""
			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].HTaxPrice, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
			, "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].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"
			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

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

			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}
			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}

			optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
			table.render(optionEntry);
			//åè¡¨æ±æ»
			@@ -792,106 +748,60 @@
			, "HEmpName": dataArray[0].ä¸å¡å
			, "HCusID": dataArray[0].HSupID
			, "HCusName": dataArray[0].å®¢æ·
			, "HCurID": dataArray[0].ä¸»è¡¨å¸å«id
			, "HCurName": dataArray[0].ä¸»è¡¨å¸å«
			, "HExRate": dataArray[0].ä¸»è¡¨æ±ç
			, "HCurID": dataArray[0].HCurID
			, "HCurName": dataArray[0].å¸å«
			, "HExRate": dataArray[0].æ±ç
			, "HSSID": "0"
			, "HSSName": ""
			, "HSellSID": dataArray[0].HSellSID
			, "HSellSName": dataArray[0].éå®æ¹å¼
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
			});
			if ($("#HPriceType").val() == "å»ç¨ä»·") {
			//åè¡¨ èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é - dataArray[i].å·²å³èæ°é; //æ°é

			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': dealDoubleToFixed(HQty * dataArray[i].ææ¬åä»· * dataArray[0].ç¨ç, 2) //
			, "HMoney": dealDoubleToFixed(HQty * dataArray[i].ææ¬åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].ææ¬åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""
			//åè¡¨ èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é; //æ°é
			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': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].ç¨ç, 2) //
			, "HMoney": dealDoubleToFixed(HQty * dataArray[i].åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""

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

			, 'HPOOrderInterID': "0"
			, 'HPOOrderEntryID': "0"
			, 'HPOOrderBillNo': ""
			, '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].æºååå· : ""
			}
			);
			}
			, '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].æºååå· : ""
			}
			);
			}
			else {
			//åè¡¨ èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é; //æ°é
			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': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].ç¨ç, 2) //
			, "HMoney": dealDoubleToFixed(HQty * dataArray[i].åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""

			, "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].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
			, "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
			, "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].æºååå· : ""
			}
			);
			}
			}


			optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
			table.render(optionEntry);
			//åè¡¨æ±æ»
			@@ -917,6 +827,7 @@

			}
			table.render(option);
			changeHPrice();
			layer.close(ajaxLoad);
			layer.msg("æ¥è¯¢æå", { time: 1 * 1000, icon: 1 });
			} else {
			@@ -1354,7 +1265,10 @@
			// çå¬ä¸ææ¡éæ©
			form.on('select(HPriceType)', function (data) {
			console.log(data.value); // å¾å°è¢«éä¸çå¼
			// æ§è¡ç¸å³æä½
			changeHPrice();
			});
			//æ ¹æ®ä¸ææ¡çå¼è®¾ç½®ç©æåä»·çä¿¡æ¯
			function changeHPrice() {
			//#region åè¡¨ æ°æ®æ£éª
			for (var i = 0; i < option.data.length; i++) {
			if (option.data[i]["HMaterID"] == "0") {
			@@ -1363,7 +1277,7 @@
			} else {
			var HPrice = option.data[i]["HPrice"];
			var HMaterID = option.data[i]["HMaterID"];
			var HType = data.value.toString();
			var HType = $("#HPriceType").val();
			//è·åç©æå¯¹åºåä»·ç±»åçåä»·
			$.ajax({
			url: GetWEBURL() + "/Xs_ReceivableBill/getPriceByType",
			@@ -1404,14 +1318,14 @@
			option.data[i]["HRelTaxPrice"] = Number(HRelTaxPrice.toFixed(HPriceDec));
			option.data[i]["HlineTotalBB"] = Number(HlineTotalBB.toFixed(HMoneyDec));
			}


			}
			table.render(option);
			//#endregion
			});
			}

			//#endregion


			//#endregion

			//#endregion
			@@ -1746,7 +1660,7 @@
			{
			setInitBySellOutBill(checkStatus);
			}

			changeHPrice();
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			@@ -1808,6 +1722,7 @@
			}
			}
			getSeletMainInfo(sMainWhere);
			changeHPrice();
			layer.close(index);//å³éå¼¹çª
			}
			});
			@@ -1847,113 +1762,62 @@
			, "HSSName": dataArray[0].ç»ç®æ¹å¼
			, "HSellSID": dataArray[0].HSellSID
			, "HSellSName": dataArray[0].éå®æ¹å¼

			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
			});
			//åè¡¨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].HTaxPrice, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
			, "HMoney": dealDoubleToFixed(HMoney, 2)
			, 'HMoneyBB': dealDoubleToFixed(HMoneyBB, 2)
			, 'HlineTotal': dealDoubleToFixed(HlineTotal, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HlineTotalBB, 2)
			, "HRemark": ""

			if ($("#HPriceType").val() == "å»ç¨ä»·") {
			//åè¡¨ææ¬ä»·Entry èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é; //æ°é
			var HPrice = dataArray[i].HNoTaxCost; //ææ¬ä»·
			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].HNoTaxCost, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
			, "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].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

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

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

			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}
			} else {
			//åè¡¨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].HTaxPrice, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': dealDoubleToFixed(HTaxMoney, 2) //
			, "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].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

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

			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}
			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}

			optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
			table.render(optionEntry);
			//åè¡¨æ±æ»
			@@ -1990,11 +1854,11 @@
			return;
			}
			});

			} else if ($("#BillType").val() == "1205") {
			$.ajax({
			url: GetWEBURL() + '/Kf_SellOutBill/GetSellOutBillList',
			type: "GET",
			async: false,
			data: { "sWhere": sMainWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			@@ -2020,98 +1884,53 @@
			, "HSSName": ""
			, "HSellSID": dataArray[0].HSellSID
			, "HSellSName": dataArray[0].éå®æ¹å¼
			, "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			});
			if ($("#HPriceType").val() == "å»ç¨ä»·") {
			//åè¡¨ èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é * 1 - dataArray[i].å·²å³èæ°é * 1; //æ°é
			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': dealDoubleToFixed(HQty * dataArray[i].ææ¬åä»· * dataArray[0].ç¨ç, 2) //
			, "HMoney": dealDoubleToFixed(HQty * dataArray[i].ææ¬åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].ææ¬åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é*1 - dataArray[i].å·²å³èæ°é; //æ°é
			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': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].ç¨ç, 2) //
			, "HMoney": dealDoubleToFixed(HQty * dataArray[i].åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""

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

			, 'HPOOrderInterID': "0"
			, 'HPOOrderEntryID': "0"
			, 'HPOOrderBillNo': ""
			, '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].æºååå· : ""
			}
			);
			}
			, '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].æºååå· : ""
			}
			);
			}
			else {
			//åè¡¨ èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é; //æ°é
			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': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].ç¨ç, 2) //
			, "HMoney": dealDoubleToFixed(HQty * dataArray[i].åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""

			, "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].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
			, "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
			, "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].æºååå· : ""
			}
			);
			}
			}


			optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
			table.render(optionEntry);
			//åè¡¨æ±æ»
			@@ -2134,7 +1953,7 @@
			set_InitGridHaveSource();
			option.data = rowdataEntry;
			haveSource = true;
			table.render(option);
			table.render(option)
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			@@ -2343,6 +2162,8 @@
			, "HRemark": data.è¡¨å¤´å¤æ³¨
			, "HExplanation": data.æè¦
			, "HInnerBillNo": data.åé¨åæ®å·
			, "HProjectID": (data.HProjectID == null ? 0 : data.HProjectID)
			, "HProjectName": data.é¡¹ç®åç§°

			, "HMaker": data.å¶åäºº
			, "HMakeDate": data.å¶åæ¥æ == null ? "" : Format(new Date(data.å¶åæ¥æ), "yyyy-MM-dd")
			@@ -3444,96 +3265,54 @@
			, "HSSName": dataArray[0].ç»ç®æ¹å¼
			, "HSellSID": dataArray[0].HSellSID
			, "HSellSName": dataArray[0].éå®æ¹å¼
			, "HProjectID": (dataArray[0].HProjectID == null ? 0 : dataArray[0].HProjectID)
			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			});

			if ($("#HPriceType").val() == "ææ¬ä»·") {
			//åè¡¨ææ¬ä»·Entry èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			//åè¡¨Entry èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é;
			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].HTaxPrice, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 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)
			, "HRemark": ""

			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].HMaterID
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].HNoTaxCost, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxCost, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxCost, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': "0" //
			, "HMoney": dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].HNoTaxCost, 2)
			, 'HMoneyBB': dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].HNoTaxCost, 2)
			, 'HlineTotal': dealDoubleToFixed(dataArray[i].ä»·ç¨åè®¡, 2)
			, 'HlineTotalBB': dealDoubleToFixed(dataArray[i].ä»·ç¨åè®¡ * dataArray[0].æ±ç, 2)
			, "HRemark": ""
			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

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

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

			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}
			} else {
			//åè¡¨Entry èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].HMaterID
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 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)
			, "HRemark": ""

			, "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].HTaxPrice, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}
			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].HTaxPrice, 3)
			, "HSeOrderInterID": dataArray[i].hmainid
			, "HSeOrderEntryID": dataArray[i].hsubid
			, "HSeOrderBillNo": dataArray[i].åæ®å·
			}
			);
			}

			optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
			table.render(optionEntry);
			//åè¡¨æ±æ»
			@@ -3592,7 +3371,6 @@
			return;
			}
			}

			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HMainSourceInterID": "0"
			, "HMainSourceEntryID": "0"
			@@ -3607,103 +3385,62 @@
			, "HEmpName": dataArray[0].ä¸å¡å
			, "HCusID": dataArray[0].hsupid
			, "HCusName": dataArray[0].å®¢æ·
			, "HCurID": dataArray[0].ä¸»è¡¨å¸å«id
			, "HCurName": dataArray[0].ä¸»è¡¨å¸å«
			, "HExRate": dataArray[0].ä¸»è¡¨æ±ç
			, "HCurID": dataArray[0].HCurID
			, "HCurName": dataArray[0].å¸å«
			, "HExRate": dataArray[0].æ±ç
			, "HSSID": "0"
			, "HSSName": ""
			, "HSellSID": dataArray[0].HSellSID
			, "HSellSName": dataArray[0].éå®æ¹å¼

			, "HProjectName": dataArray[0].é¡¹ç®åç§°
			, "HProjectID": dataArray[0].HProjectID == null ? "0" : dataArray[0].HProjectID
			});
			if ($("#HPriceType").val() == "å»ç¨ä»·") {
			//åè¡¨ èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].hmaterid
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].hunitid
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].ææ¬åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': "0" //
			, "HMoney": dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].ææ¬åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].ææ¬åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""

			, "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].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
			, "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
			, "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].æºååå· : ""
			}
			);
			}
			}
			else {
			//åè¡¨ èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].hmaterid
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].hunitid
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': "0" //
			, "HMoney": dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""

			, "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].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
			, "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
			, "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].æºååå· : ""
			}
			);
			}
			}

			//åè¡¨ èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é * 1 - dataArray[i].å³èæ°é;
			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': "0" //
			, "HMoney": dealDoubleToFixed(HQty * dataArray[i].åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""

			, "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].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
			, "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
			, "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].æºååå· : ""
			}
			);
			}

			optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
			table.render(optionEntry);
			//åè¡¨æ±æ»

	WebTM/views/计划管理/工艺路线/Gy_RoutingBillCheckQuery.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/销售管理/应收单/Xs_ReceivableBill.html	887 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -537,7 +537,7 @@
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " =='' ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
			break;
			case 'long':
			case 'Int32':