MES-WEB-LayUI.git

			@@ -56,6 +56,7 @@
			<form class="layui-form" lay-filter="component-form-group" action="">
			<div class="layui-card-header">
			<div class="layui-btn-group">
			<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="set_AddNew" id="set_AddNew">æ°å¢</button>
			<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_SaveBill">ä¿å</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck">åå®¡æ ¸</button>
			@@ -77,7 +78,7 @@
			<div class="layui-inline">
			<label class="layui-form-label">åæ®ç¼å·<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;">
			<input type="hidden" name="HInterID" id="HInterID" value="0">
			<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
			</div>
			@@ -91,7 +92,7 @@
			<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; background-color: #efefef4d;" readonly>
			<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float: left; width: 150px;">
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -153,6 +154,15 @@
			<select name="HBillSubType" id="HBillSubType" lay-filter="HBillSubType" style="width: 180px; ">
			<option style="color:blue;" selected="selected" value="0">æ®éåæ®</option>
			<option style="color:blue;" value="1">è¿ä¿®åæ®</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">äº§åç±»å</label>
			<div class="layui-input-inline">
			<select name="HProductType" id="HProductType" lay-filter="HProductType" style="width: 180px; ">
			<option style="color:blue;" selected="selected" value="éæ ·å">éæ ·å</option>
			<option style="color:blue;" value="æ ·å">æ ·å</option>
			</select>
			</div>
			</div>
			@@ -437,6 +447,15 @@
			</select>
			</script>
			<script>
			//#region ææ¬æ¡è¾å¥æç´¢ç¸å³æ°æ®-åé
			var childPage = null; //è·ååçªå£å¯¹è±¡ï¼ç¨äºæä½åçªå£çåéåæ¹æ³
			var currRowIndex = 0; //ç¨äºå®ä½åçªå£å½åéä¸çè¡
			var childData = null; //ç¨äºè·ååçªå£è¿åçæ°æ®
			//#endregion




			//#region æå æ³¨é
			var HDataEmp = {};
			//#endregion
			@@ -444,7 +463,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index' //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'laydate', 'table', 'element'], function () {
			}).use(['index', 'form', 'laydate', 'table', 'element', 'tableSelect'], function () {

			//#region å¬ç¨åé
			var $ = layui.$
			@@ -453,10 +472,13 @@
			, table = layui.table
			, form = layui.form
			, laydate = layui.laydate
			, element = layui.element;
			, element = layui.element
			, tableSelect = layui.tableSelect;

			//åè¡¨æ¸²æåæ°
			window.option = {};
			var topScroll = 0;//è®°å½æ»å¨æ¡çä½ç½®
			var titleData = ["HMaterID", "HUnitID", "ææ£ç", "å®éå«ç¨åä»·", "ç¨é¢", "æ¬ä½å¸ä»·ç¨åè®¡", "åºåºæ°é", "å¼ç¥¨æ°é", "HOrderLevID", "è®¢åççº§ä»£ç ", "éå®åºåºæ°é", "éå®åºåºå®¡æ ¸æ°é", "éå®åºåºå®¡æ ¸éé¢", "çäº§æ°é", "éå®éåºæ°é", "éå®éåºå®¡æ ¸æ°é"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			//è®°å½ç»ç»çå¼
			var HOrgIDBar = 0;
			@@ -478,7 +500,8 @@


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

			//æ£æµæ¯å¦å·å¤æ¥çéé¢æéï¼è®¾ç½®éèå
			checkRight_Money();
			//#region å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			get_LoginIs();

			@@ -596,12 +619,115 @@
			//#endregion
			//#endregion

			//#region è¡¨å¤´åºç¡èµæéæ©å¼¹çª
			//#region ææ¬æ¡çå¬
			$(document).ready(function () {
			//#region éå®ååºç¡èµæçéå¼¹çª
			$("#HEmpName").on('keydown', function (data) {
			var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
			if ($.inArray(event.key, errKeys) == -1) { //å¦ææä¸çé®ä½ä¸æ¯ æ¹åé®ï¼åå·æ°å¼¹çªä¸çæ°æ®
			if (childPage == null) { //å¤æå½ååçªå£æ¯å¦å·²ç»æå¼ï¼è¥æªæå¡ï¼åæå¼é¡µé¢ï¼å¹¶è·ååçªå£çå¯¹è±¡
			var offset = $(this).offset(); //è·åè§¦åäºä»¶çåç´ çä½ç½®ï¼ç¨äºå®ä½åçªå£æå¼çä½ç½®
			var innerHeight = window.innerHeight;
			var top = offset.top + 0.05 * innerHeight;
			var left = offset.left;
			if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
			top = top - 0.3 * innerHeight - 0.05 * innerHeight;
			}
			layer.open({
			type: 2 //å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['25%', '30%'] //å¤§å°
			, shadeClose: true //ç¹å»é®ç½©æ¶å³éå¼¹çª
			, offset: [top, left]
			, title: false //ä¸æ¾ç¤ºæ é¢æ
			//, title: 'é¡¹ç®è´¹ç¨åè¡¨' //æ é¢
			, shift: 2 //å¼¹åºå¨ç»
			, closeBtn: 0 //ç¦ç¨å³éæé®
			, content: ["../../åºç¡èµæ/éç¨åºç¡èµæ/Gy_CommonBaseData.html?OperationType=2", "yes"]
			, success: function (layero, index) {
			setTimeout(function () {
			var value = $("#HEmpName").val().replace(/'/g, ""); //è·åææ¬æ¡ææ°å¼
			currRowIndex = 0;
			var tableView = "h_v_IF_EmployeeList";
			var childSWhere = "select top(10) HItemID,èååç§° from " + tableView + " where 1=1 and ç»ç»åç§° = '" + sessionStorage["Organization"] + "' and (èåä»£ç like '%" + value + "%' or èååç§° like '%" + value + "%') order by èåä»£ç ";
			childPage.getData(childSWhere, tableView);
			}, 200);
			}
			, end: function () {
			childPage = null;
			currRowIndex = 0;
			if (childData != null) {
			$("#HEmpName").val(childData.èååç§°);
			$("#HEmpID").val(childData.HItemID);

			getEmpInfoByHEmpID(childData.HItemID);

			childData = null;
			}
			}
			});
			} else {
			setTimeout(function () {
			var value = $("#HEmpName").val().replace(/'/g,""); //è·åææ¬æ¡ææ°å¼
			currRowIndex = 0;
			var tableView = "h_v_IF_EmployeeList";
			var childSWhere = "select top(10) HItemID,èååç§° from " + tableView + " where 1=1 and ç»ç»åç§° = '" + sessionStorage["Organization"] + "' and (èåä»£ç like '%" + value + "%' or èååç§° like '%" + value + "%') order by èåä»£ç ";
			childPage.getData(childSWhere, tableView);
			}, 200);
			}
			} else { //å¦ææä¸çé®ä½æ¯ æ¹åé®ï¼åè°æ´çªå£ä¸ éä¸è¡ çä½ç½®
			if (event.key == "ArrowUp") {
			currRowIndex--;
			childPage.setSelectedRow(currRowIndex);
			} else if (event.key == "ArrowDown") {
			currRowIndex++;
			childPage.setSelectedRow(currRowIndex);
			} else if (event.key == "Enter") {
			//æå¨å¤±ç¦
			var element = document.getElementById("HBillNo");
			element.focus();

			childPage.getSelectedData(currRowIndex);

			if ($("#HEmpName").val() == "") {
			$("#HEmpName").val("");
			$("#HEmpID").val("0");

			$("#HDeptID").val("0");
			$("#HDeptName").val("");
			} else {
			$("#HEmpName").val(childData.èååç§°);
			$("#HEmpID").val(childData.HItemID);

			getEmpInfoByHEmpID(childData.HItemID);
			}


			childPage = null;
			currRowIndex = 0;
			childData = null;
			}
			}
			});
			//#endregion
			});
			//#endregion
			//#endregion

			//#region è¡¨å¤´æé®è§¦åäºä»¶
			//#region ä¿åæé®
			form.on('submit(set_SaveBill)', function (data) {
			if (AllowLoadData(data)) {
			set_SaveBill(data);
			}
			});
			//#endregion

			//#region æ°å¢
			form.on('submit(set_AddNew)', function (data) {
			const url = new URL(location.href);
			location.href = url.origin + url.pathname;
			});
			//#endregion

			@@ -748,6 +874,7 @@
			var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			var HPriceDec = (Dec["HPriceDec"] == null \|\| Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //åä»·ç²¾åº¦
			var HMoneyDec = (Dec["HMoneyDec"] == null \|\| Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //éé¢ç²¾åº¦
			topScroll = $('#mainTable').next('.layui-table-view').find('.layui-table-body').scrollTop();//è·åæ»å¨æ¡ä½ç½®
			// ååæ ¼ç¼è¾ä¹åçå¼
			var oldText = $(this).prev().text();
			var value = obj.value //å¾å°ä¿®æ¹åçå¼
			@@ -775,23 +902,21 @@


			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = value * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			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 * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢

			//æ°åç²¾åº¦
			var HQty = value * 1; //æ°é
			HQty = Number(HQty.toFixed(HQtyDec));
			var HPrice = obj.data.HPrice * 1; //åä»·
			HPrice = Number(HPrice.toFixed(HPriceDec));
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			/var HDiscountRate = obj.data.HDiscountRate 1; //ææ£ç*/
			var HTaxPrice = obj.data.HTaxPrice * 1; //å«ç¨åä»·=åä»·*(1+ç¨ç)
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			/var HRelTaxPrice = HTaxPrice HDiscountRate; //å®éå«ç¨åä»·=å«ç¨åä»·ææ£ç/
			//ææ£é¢ = å«ç¨åä»· * (1 - ææ£ç) * æ°é
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HQty * HTaxPrice; //ä»·ç¨åè®¡=æ°é*å«ç¨åä»·
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			HTaxPrice = Number(HPrice.toFixed(HPriceDec));

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			@@ -858,24 +983,23 @@
			}

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

			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			HTaxPrice = Number(HPrice.toFixed(HPriceDec));

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty
			@@ -910,25 +1034,19 @@
			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 * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢

			//æ°åç²¾åº¦
			var HQty = obj.data.HQty * 1; //æ°é
			HQty = Number(HQty.toFixed(HQtyDec));
			var HTaxRate = value * 0.01; //ç¨ç
			var HPrice = obj.data.HPrice * 1; //åä»·
			HPrice = Number(HPrice.toFixed(HPriceDec));
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HQty * HTaxPrice; //ä»·ç¨åè®¡=æ°é*å«ç¨åä»·
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			HTaxPrice = Number(HPrice.toFixed(HPriceDec));

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			@@ -994,26 +1112,21 @@
			}
			}
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			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 * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HQty = obj.data.HQty * 1; //æ°é
			HQty = Number(HQty.toFixed(HQtyDec));
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			var HTaxPrice = value * 1; //å«ç¨åä»·
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			var HPrice = HTaxPrice / (1 + HTaxRate); //åä»·
			HPrice = Number(HPrice.toFixed(HPriceDec));

			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HQty * HTaxPrice; //ä»·ç¨åè®¡=æ°é*å«ç¨åä»·
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));

			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			HTaxPrice = Number(HPrice.toFixed(HPriceDec));

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty
			@@ -1280,6 +1393,7 @@
			}
			});
			});
			$(".layui-table-main").scrollTop(topScroll);
			}
			}

			@@ -1353,7 +1467,7 @@

			//åå§åå¹¶åè®¾ç½®ï¼åè¡¨1
			set_InitGrid();
			DisPlay_HideColumn();
			// DisPlay_HideColumn();

			//æ ¹æ®æ¯å¦ååºåè·åå®éæ¯ä¾
			setHEarnestRateByHisStockGoods();
			@@ -1408,6 +1522,7 @@
			, "HProjectName": data.é¡¹ç®åç§°
			, "HWHID": data.ä¸»ä»åºid
			, "HWHName": data.ä¸»ä»åº
			, "HProductType": data.äº§åç±»å
			, "HCreditRating_Now": data.HCreditRating_Now
			, "HRemark": data.è¡¨å¤´å¤æ³¨
			, "HMaker": data.å¶åäºº
			@@ -1432,6 +1547,11 @@
			//åè¡¨ èµå¼
			var rowdata = [];
			for (var i = 0; i < result.data.length; i++) {
			var HTaxPrice_Temp = result.data[i]["å«ç¨åä»·"];
			if (typeof (HTaxPrice_Temp) == "undefined") {
			HTaxPrice_Temp = result.data[i]["HTaxPrice"];
			}

			rowdata.push(
			{
			"HMaterID": result.data[i]["HMaterID"],
			@@ -1447,7 +1567,7 @@
			"ä»åº": result.data[i]["åä»åº"],
			"HQty": dealDoubleToFixed(result.data[i]["æ°é"], 1),
			"HPrice": dealDoubleToFixed(result.data[i]["åä»·"], 3),
			"HTaxPrice": dealDoubleToFixed(result.data[i]["HTaxPrice"], 3),
			"HTaxPrice": dealDoubleToFixed(HTaxPrice_Temp, 3),
			"HMoney": dealDoubleToFixed(result.data[i]["éé¢"],2),
			"HDiscountRate": result.data[i]["ææ£ç"],
			"HRelTaxPrice": result.data[i]["å®éå«ç¨åä»·"],
			@@ -2014,6 +2134,11 @@
			return false;
			}

			if (temp != "0" && option.data[i]["HTaxPrice"] == option.data[i]["HPrice"]) {
			layer.msg("ç¬¬" + i + "è¡ï¼å½åç¨çä¸ä¸º0ï¼åä»·ä¸å«ç¨åä»·ä¸è´ï¼è¯·æ£æ¥æ°æ®æ¯å¦æ£ç¡®ï¼");
			return false;
			}

			//å«ç¨åä»·æ ¼å¼æ ¡éª
			temp = option.data[i]["HTaxPrice"] + "";
			if ($("#HBillSubType").val() == "0") {
			@@ -2502,7 +2627,7 @@
			if (obj.event === 'del') {
			layer.confirm('ççå é¤è¡ä¹', function (index) {
			console.log("ç´¢å¼ä¸º:" + rowIndex);
			if (rowIndex === '0') {
			if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
			layer.msg('é¦è¡æ æ³å é¤ï¼ï¼ï¼');
			} else {
			//obj.del();
			@@ -2558,6 +2683,203 @@
			//#region è¡åå¿«æ·é®çé
			function set_GridCellCheck(obj) {
			$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
			//#region åè¡¨ææ¬æ¡è¾å¥åæ£ç´¢æ°æ®
			//if (event.key != "F7") {
			// var errKeys = ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "Enter"];
			// if (obj.event == "HMaterID") { //å®ä½å½åæ£å¨è¾å¥çææ¬æ¡çåå
			// if ($.inArray(event.key, errKeys) == -1) { //å¦ææä¸çé®ä½ä¸æ¯ æ¹åé®ï¼åå·æ°å¼¹çªä¸çæ°æ®
			// if (childPage == null) { //å¤æå½ååçªå£æ¯å¦å·²ç»æå¼ï¼è¥æªæå¡ï¼åæå¼é¡µé¢ï¼å¹¶è·ååçªå£çå¯¹è±¡
			// var offset = $(this).offset(); //è·åè§¦åäºä»¶çåç´ çä½ç½®ï¼ç¨äºå®ä½åçªå£æå¼çä½ç½®
			// var innerHeight = window.innerHeight;
			// var top = offset.top + 0.05 * innerHeight;
			// var left = offset.left;
			// if (top + 0.05 * innerHeight + 0.3 * innerHeight > innerHeight) {
			// top = top - 0.3 * innerHeight - 0.05 * innerHeight;
			// }
			// layer.open({
			// type: 2 //å¼¹çªç±»å
			// , skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			// , area: ['25%', '30%'] //å¤§å°
			// , shadeClose: true //ç¹å»é®ç½©æ¶å³éå¼¹çª
			// , offset: [top, left]
			// , title: false //ä¸æ¾ç¤ºæ é¢æ
			// //, title: 'é¡¹ç®è´¹ç¨åè¡¨' //æ é¢
			// , shift: 2 //å¼¹åºå¨ç»
			// , closeBtn: 0 //ç¦ç¨å³éæé®
			// , content: ["../../åºç¡èµæ/éç¨åºç¡èµæ/Gy_CommonBaseData.html?OperationType=2", "yes"]
			// , success: function (layero, index) {
			// setTimeout(function () {
			// var value = $(e.currentTarget).val().replace("'", ""); //è·åææ¬æ¡ææ°å¼
			// currRowIndex = 0;
			// var tableView = "h_v_Gy_MaterialList";
			// var childSWhere = "select top(10) HItemID,ç©æä»£ç ,ç©æåç§°,è§æ ¼åå·,HUnitID,è®¡éåä½åç§° from " + tableView + " where 1=1 and ç»ç»åç§° = '" + sessionStorage["Organization"] + "' and (ç©æä»£ç like '%" + value + "%' or ç©æåç§° like '%" + value + "%') order by ç©æä»£ç desc";
			// childPage.getData(childSWhere, tableView);
			// }, 200);
			// }
			// , end: function () {
			// obj.event = "";
			// childPage = null;
			// currRowIndex = 0;
			// if (childData != null) {
			// var rowIndex = $(obj.tr).attr("data-index") * 1;
			// var Dec = getDecByMaterID(childData.HItemID) //è·åç²¾åº¦
			// var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			// var HPriceDec = (Dec["HPriceDec"] == null \|\| Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //åä»·ç²¾åº¦
			// var HMoneyDec = (Dec["HMoneyDec"] == null \|\| Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //éé¢ç²¾åº¦
			// //æ°å¼æ ¼å¼æ ¡éªå·¥å·
			// var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			// var temp = "";
			// //è·åéæ©ç©æååçç¨ç
			// var value_TaxRate = subHTaxRate; //éæ©ç©æåæ ¹æ®å®¢æ·å¾å°çç¨ç
			// var oldText = option.data[rowIndex].HTaxRate; //è¯¥è®°å½ä¸åæçç¨ç

			// //ç¨çæ°æ®æ ¼å¼æ ¡éªï¼è¥æ ¹æ®å®¢æ·è·åçç¨çä¸åæ³ï¼åä½¿ç¨è®°å½ä¸åæçç¨çï¼å¹¶æç¤º
			// temp = value_TaxRate + "";
			// if (!ref.test(temp)) {
			// value_TaxRate = oldText;
			// layer.msg("è·åå°çç¨çä¸åæ³ï¼å·²èªå¨åæ´ä¸ºåæç¨ç!");
			// }

			// //æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			// var HQty = option.data[rowIndex].HQty * 1; //æ°é
			// var HPrice = option.data[rowIndex].HPrice * 1; //åä»·
			// var HTaxRate = value_TaxRate * 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 * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			// var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			// //æ°åç²¾åº¦
			// HQty = Number(HQty.toFixed(HQtyDec));
			// HPrice = Number(HPrice.toFixed(HPriceDec));
			// HMoney = Number(HMoney.toFixed(HMoneyDec));
			// HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			// HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			// HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));

			// option.data[rowIndex].HMaterID = childData.HItemID;
			// option.data[rowIndex].ç©æä»£ç = childData.ç©æä»£ç ;
			// option.data[rowIndex].ç©æåç§° = childData.ç©æåç§°;
			// option.data[rowIndex].è§æ ¼åå· = childData.è§æ ¼åå·;
			// option.data[rowIndex].HUnitID = childData.HUnitID;
			// option.data[rowIndex].è®¡éåä½ = childData.è®¡éåä½åç§°;

			// option.data[rowIndex].HQty = HQty;
			// option.data[rowIndex].HPrice = HPrice;
			// option.data[rowIndex].HTaxRate = HTaxRate * 100;
			// option.data[rowIndex].HTaxPrice = HTaxPrice;
			// option.data[rowIndex].HMoney = HMoney;
			// option.data[rowIndex].HlineTotal = HlineTotal;

			// table.render(option);

			// //å·æ°è¡¨æ ¼åæ¶æ ¹æ®optionä¸HisStockGoodså¼è®¾ç½®ä¸æåè¡¨
			// setSelectHisStockGoodsByTableRender();

			// //è®¾ç½®è¡¨å¤´æééé¢
			// set_HBillMoney($("#HEarnestRate").val() * 1);

			// childData = null;
			// }
			// }
			// });
			// } else {
			// setTimeout(function () {
			// var value = $(e.currentTarget).val().replace("'", ""); //è·åææ¬æ¡ææ°å¼
			// currRowIndex = 0;
			// var tableView = "h_v_Gy_MaterialList";
			// var childSWhere = "select top(10) HItemID,ç©æä»£ç ,ç©æåç§°,è§æ ¼åå·,HUnitID,è®¡éåä½åç§° from " + tableView + " where 1=1 and ç»ç»åç§° = '" + sessionStorage["Organization"] + "' and (ç©æä»£ç like '%" + value + "%' or ç©æåç§° like '%" + value + "%') order by ç©æä»£ç desc";
			// childPage.getData(childSWhere, tableView);
			// }, 200);
			// }
			// } else { //å¦ææä¸çé®ä½æ¯ æ¹åé®ï¼åè°æ´çªå£ä¸ éä¸è¡ çä½ç½®
			// if (event.key == "ArrowUp") {
			// currRowIndex--;
			// childPage.setSelectedRow(currRowIndex);
			// } else if (event.key == "ArrowDown") {
			// currRowIndex++;
			// childPage.setSelectedRow(currRowIndex);
			// } else if (event.key == "Enter") {
			// //æå¨å¤±ç¦
			// var element = document.getElementById("HBillNo");
			// element.focus();

			// childPage.getSelectedData(currRowIndex);


			// var Dec = getDecByMaterID(childData.HItemID) //è·åç²¾åº¦
			// var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			// var HPriceDec = (Dec["HPriceDec"] == null \|\| Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //åä»·ç²¾åº¦
			// var HMoneyDec = (Dec["HMoneyDec"] == null \|\| Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //éé¢ç²¾åº¦
			// //æ°å¼æ ¼å¼æ ¡éªå·¥å·
			// var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			// var temp = "";
			// //è·åéæ©ç©æååçç¨ç
			// var value_TaxRate = subHTaxRate; //éæ©ç©æåæ ¹æ®å®¢æ·å¾å°çç¨ç
			// var oldText = option.data[rowIndex].HTaxRate; //è¯¥è®°å½ä¸åæçç¨ç

			// //ç¨çæ°æ®æ ¼å¼æ ¡éªï¼è¥æ ¹æ®å®¢æ·è·åçç¨çä¸åæ³ï¼åä½¿ç¨è®°å½ä¸åæçç¨çï¼å¹¶æç¤º
			// temp = value_TaxRate + "";
			// if (!ref.test(temp)) {
			// value_TaxRate = oldText;
			// layer.msg("è·åå°çç¨çä¸åæ³ï¼å·²èªå¨åæ´ä¸ºåæç¨ç!");
			// }

			// //æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			// var HQty = option.data[rowIndex].HQty * 1; //æ°é
			// var HPrice = option.data[rowIndex].HPrice * 1; //åä»·
			// var HTaxRate = value_TaxRate * 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 * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			// var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			// //æ°åç²¾åº¦
			// HQty = Number(HQty.toFixed(HQtyDec));
			// HPrice = Number(HPrice.toFixed(HPriceDec));
			// HMoney = Number(HMoney.toFixed(HMoneyDec));
			// HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			// HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			// HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));

			// option.data[rowIndex].HMaterID = childData.HItemID;
			// option.data[rowIndex].ç©æä»£ç = childData.ç©æä»£ç ;
			// option.data[rowIndex].ç©æåç§° = childData.ç©æåç§°;
			// option.data[rowIndex].è§æ ¼åå· = childData.è§æ ¼åå·;
			// option.data[rowIndex].HUnitID = childData.HUnitID;
			// option.data[rowIndex].è®¡éåä½ = childData.è®¡éåä½åç§°;

			// option.data[rowIndex].HQty = HQty;
			// option.data[rowIndex].HPrice = HPrice;
			// option.data[rowIndex].HTaxRate = HTaxRate * 100;
			// option.data[rowIndex].HTaxPrice = HTaxPrice;
			// option.data[rowIndex].HMoney = HMoney;
			// option.data[rowIndex].HlineTotal = HlineTotal;

			// table.render(option);

			// //å·æ°è¡¨æ ¼åæ¶æ ¹æ®optionä¸HisStockGoodså¼è®¾ç½®ä¸æåè¡¨
			// setSelectHisStockGoodsByTableRender();

			// //è®¾ç½®è¡¨å¤´æééé¢
			// set_HBillMoney($("#HEarnestRate").val() * 1);

			// childPage = null;
			// currRowIndex = 0;
			// childData = null;
			// obj.event = "";
			// }
			// }
			// }

			//}
			//#endregion


			if (event.key == "F7") {
			//ç©æ
			if (obj.event == "HMaterID") {
			@@ -2571,7 +2893,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2&HOrgID=' + HOrgID + '&openType2=SeOrder', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -2612,24 +2934,21 @@
			}

			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = option.data[rowIndex + i].HQty * 1; //æ°é
			var HPrice = option.data[rowIndex + i].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 * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			//æ°åç²¾åº¦
			var HQty = option.data[rowIndex + i].HQty * 1; //æ°é
			HQty = Number(HQty.toFixed(HQtyDec));
			var HTaxRate = value * 0.01; //ç¨ç
			var HPrice = option.data[rowIndex + i].HPrice * 1; //åä»·
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));

			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			var HlineTotal = HQty * HTaxPrice; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			//æ°åç²¾åº¦

			option.data[rowIndex + i].HMaterID = resultData.HItemID;
			option.data[rowIndex + i].ç©æä»£ç = resultData.ç©æä»£ç ;
			option.data[rowIndex + i].ç©æåç§° = resultData.ç©æåç§°;
			@@ -2670,20 +2989,19 @@
			var HMoneyDec = (Dec["HMoneyDec"] == null \|\| Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //éé¢ç²¾åº¦
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HTaxRate = value * 0.01; //ç¨ç
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			HQty = Number(HQty.toFixed(HQtyDec));
			var HTaxRate = value * 0.01; //ç¨ç
			var HPrice = obj.data.HPrice * 1; //åä»·
			HPrice = Number(HPrice.toFixed(HPriceDec));
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HlineTotal = HQty * HTaxPrice; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));

			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			HTaxPrice = Number(HPrice.toFixed(HPriceDec));

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty
			@@ -2864,25 +3182,22 @@

			for (var i = rowIndex * 1; i < option.data.length; i++) {
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = value * 1; //æ°é
			var HPrice = option.data[i].HPrice * 1; //åä»·
			var HTaxRate = option.data[i].HTaxRate * 0.01; //ç¨ç
			/var HDiscountRate = option.data[i].HDiscountRate 1; //ææ£ç*/
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			/var HRelTaxPrice = HTaxPrice HDiscountRate; //å®éå«ç¨åä»·=å«ç¨åä»·ææ£ç/
			//ææ£é¢ = å«ç¨åä»· * (1 - ææ£ç) * æ°é
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢

			//è®¾ç½®æ°æ®å°æ°ä½æ°
			var HQty = value * 1; //æ°é
			HQty = dealDoubleToFixed(HQty, 1);
			HPrice = dealDoubleToFixed(HPrice, 3);
			var HTaxRate = option.data[i].HTaxRate * 0.01; //ç¨ç
			HTaxRate = HTaxRate;
			var HPrice = option.data[i].HPrice * 1; //åä»·
			HPrice = dealDoubleToFixed(HPrice, 3);
			var HTaxPrice = HPrice * (1 + HTaxRate) //å«ç¨åä»·=åä»·*(1+ç¨ç)
			HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			HMoney = dealDoubleToFixed(HMoney, 2);
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HQty * HTaxPrice; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			HlineTotal = dealDoubleToFixed(HlineTotal, 2);

			//è®¾ç½®æ°æ®å°æ°ä½æ°

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			option.data[i].HQty = HQty;
			option.data[i].HPrice = HPrice;
			@@ -2950,24 +3265,23 @@
			for (var i = rowIndex * 1; i < option.data.length; i++) {
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = option.data[i].HQty * 1; //æ°é
			HQty = dealDoubleToFixed(HQty, 1);
			var HPrice = value * 1; //åä»·
			HPrice = dealDoubleToFixed(HPrice, 3);
			var HTaxRate = option.data[i].HTaxRate * 0.01; //ç¨ç
			HTaxRate = HTaxRate;
			/var HDiscountRate = option.data[i].HDiscountRate 1; //ææ£ç*/
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
			/var HRelTaxPrice = HTaxPrice HDiscountRate; //å®éå«ç¨åä»·=å«ç¨åä»·ææ£ç/
			//ææ£é¢ = å«ç¨åä»· * (1 - ææ£ç) * æ°é
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢

			//è®¾ç½®æ°æ®å°æ°ä½æ°
			HQty = dealDoubleToFixed(HQty, 1);
			HPrice = dealDoubleToFixed(HPrice, 3);
			HTaxRate = HTaxRate;
			HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
			HMoney = dealDoubleToFixed(HMoney, 2);
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HQty * HTaxPrice; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			HlineTotal = dealDoubleToFixed(HlineTotal, 2);

			//è®¾ç½®æ°æ®å°æ°ä½æ°
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			option.data[i].HQty = HQty;
			option.data[i].HPrice = HPrice;
			@@ -3008,25 +3322,22 @@

			for (var i = rowIndex * 1; i < option.data.length; i++) {
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = option.data[i].HQty * 1; //æ°é
			var HPrice = option.data[i].HPrice * 1; //åä»·
			var HTaxRate = value * 1 * 0.01; //ç¨ç
			/var HDiscountRate = option.data[i].HDiscountRate 1; //ææ£ç*/
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			/var HRelTaxPrice = HTaxPrice HDiscountRate; //å®éå«ç¨åä»·=å«ç¨åä»·ææ£ç/
			//ææ£é¢ = å«ç¨åä»· * (1 - ææ£ç) * æ°é
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢

			//è®¾ç½®æ°æ®å°æ°ä½æ°
			var HQty = option.data[i].HQty * 1;
			HQty = dealDoubleToFixed(HQty, 1);
			HPrice = dealDoubleToFixed(HPrice, 3);
			var HTaxRate = value * 1 * 0.01; //ç¨ç
			HTaxRate = HTaxRate;
			var HPrice = option.data[i].HPrice * 1; //åä»·
			HPrice = dealDoubleToFixed(HPrice, 3);
			var HTaxPrice = HPrice * (1 + HTaxRate) //å«ç¨åä»·=åä»·*(1+ç¨ç)
			HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			HMoney = dealDoubleToFixed(HMoney, 2);
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HQty * HTaxPrice; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			HlineTotal = dealDoubleToFixed(HlineTotal, 2);

			//è®¾ç½®æ°æ®å°æ°ä½æ°

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			option.data[i].HQty = HQty;
			option.data[i].HPrice = HPrice;
			@@ -3093,26 +3404,21 @@
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			for (var i = rowIndex * 1; i < option.data.length; i++) {
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = option.data[i].HQty * 1; //æ°é
			var HTaxRate = option.data[i].HTaxRate * 0.01; //ç¨ç
			/var HDiscountRate = option.data[i].HDiscountRate 1; //ææ£ç*/
			var HTaxPrice = value * 1;; //å«ç¨åä»·=åä»·*(1+ç¨ç)
			var HPrice = HTaxPrice / (1 + HTaxRate); //åä»·=å«ç¨åæ®/(1+ç¨ç)

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

			//è®¾ç½®æ°æ®å°æ°ä½æ°
			var HQty = option.data[i].HQty * 1;
			HQty = dealDoubleToFixed(HQty, 1);
			HPrice = dealDoubleToFixed(HPrice, 3);
			var HTaxRate = option.data[i].HTaxRate * 0.01; //ç¨ç
			HTaxRate = HTaxRate;
			var HTaxPrice = value * 1;; //å«ç¨åä»·=åä»·*(1+ç¨ç)
			HTaxPrice = dealDoubleToFixed(HTaxPrice, 3);
			var HPrice = HTaxPrice / (1 + HTaxRate); //åä»·
			HPrice = dealDoubleToFixed(HPrice, 3);
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			HMoney = dealDoubleToFixed(HMoney, 2);
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HQty * HTaxPrice; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			HlineTotal = dealDoubleToFixed(HlineTotal, 2);


			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			option.data[i].HQty = HQty;
			option.data[i].HPrice = HPrice;
			@@ -3198,6 +3504,10 @@

			//åå»
			$('.layui-table-box tbody td[data-field="ç©æä»£ç "]').off('dblclick').on('dblclick', function () {
			//æå¨å¤±ç¦
			var element = document.getElementById("HBillNo");
			element.focus();

			var HOrgID = $("#HOrgID").val();

			layer.open({
			@@ -3208,7 +3518,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2&HOrgID=' + HOrgID + '&openType2=SeOrder', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -3250,23 +3560,20 @@

			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = option.data[rowIndex + i].HQty * 1; //æ°é
			var HPrice = option.data[rowIndex + i].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 * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			var HTaxRate = value * 0.01;
			var HPrice = option.data[rowIndex + i].HPrice * 1; //åä»·
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));

			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			var HlineTotal = HQty * HTaxPrice; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			//æ°åç²¾åº¦

			option.data[rowIndex + i].HMaterID = resultData.HItemID;
			option.data[rowIndex + i].ç©æä»£ç = resultData.ç©æä»£ç ;
			option.data[rowIndex + i].ç©æåç§° = resultData.ç©æåç§°;
			@@ -3305,22 +3612,22 @@
			var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			var HPriceDec = (Dec["HPriceDec"] == null \|\| Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //åä»·ç²¾åº¦
			var HMoneyDec = (Dec["HMoneyDec"] == null \|\| Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //éé¢ç²¾åº¦

			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HTaxRate = value * 0.01; //ç¨ç
			var HTaxPrice = HPrice * (1 + HTaxRate); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			HQty = Number(HQty.toFixed(HQtyDec));
			var HTaxRate = value * 0.01; //ç¨ç
			var HPrice = obj.data.HPrice * 1; //åä»·
			HPrice = Number(HPrice.toFixed(HPriceDec));
			var HTaxPrice = HPrice * (1 + HTaxRate) //å«ç¨åä»·=åä»·*(1+ç¨ç)
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			var HlineTotal = HMoney + HTaxMoney; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			var HlineTotal = HQty * HTaxPrice; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));

			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			HTaxPrice = Number(HPrice.toFixed(HPriceDec));

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty
			@@ -3344,7 +3651,108 @@
			}
			}
			})

			obj.event = "";
			});

			//ç©æè¡¨æ ¼ä¸ææç´¢æ¡
			tableSelect.render({
			elem: 'td[data-field="ç©æä»£ç "] .layui-table-edit',
			checkedKey: 'HItemID',
			searchKey: 'ç©æä»£ç ,ç©æåç§°',
			sWhere: " and ç©æå±æ§='èªå¶'",//tableæç´¢sWhereæ¡ä»¶
			table: {
			url: GetWEBURL() + 'Gy_Material/page',
			where: { user: sessionStorage["HUserName"], Organization: sessionStorage["Organization"] },
			cols: [[
			{ type: 'checkbox', fixed: 'left' },
			{ field: 'HItemID', title: 'HItemID' },
			{ field: 'ç©æä»£ç ', title: 'ç©æä»£ç ' },
			{ field: 'ç©æåç§°', title: 'ç©æåç§°' },
			]],
			page: true,
			limit: 5,
			limits: [5]
			},
			done: function (elem, data) {
			if (data != []) {
			checkStatus = data;
			var rowIndex = $(obj.tr).attr("data-index") * 1;
			var Dec = getDecByMaterID(obj.data.HMaterID) //è·åç²¾åº¦
			var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			var HPriceDec = (Dec["HPriceDec"] == null \|\| Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //åä»·ç²¾åº¦
			var HMoneyDec = (Dec["HMoneyDec"] == null \|\| Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //éé¢ç²¾åº¦
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (rowIndex + i >= option.data.length) {
			var NewRow = {
			"HMaterID": "0", "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": "0", "è®¡éåä½": "", "HQty": "0", "HPrice": "0", "HTaxPrice": "0"
			, "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0"
			, "HDate": Format(new Date(), 'yyyy-MM-dd'), "HOutStockQty": "0", "HInvoiceQty": "0", "HRemark": "", "HCusMaterNumber": "",
			"HCusModel": "", "HCusMaterName": ""
			}
			btnAddLine(NewRow);
			}

			//è·åéä¸çç©æä¿¡æ¯
			var resultData = checkStatus.data[i];

			//æ°å¼æ ¼å¼æ ¡éªå·¥å·
			var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			var temp = "";
			//è·åéæ©ç©æååçç¨ç
			var value = subHTaxRate; //éæ©ç©æåæ ¹æ®å®¢æ·å¾å°çç¨ç
			var oldText = option.data[rowIndex + i].HTaxRate; //è¯¥è®°å½ä¸åæçç¨ç

			//ç¨çæ°æ®æ ¼å¼æ ¡éªï¼è¥æ ¹æ®å®¢æ·è·åçç¨çä¸åæ³ï¼åä½¿ç¨è®°å½ä¸åæçç¨çï¼å¹¶æç¤º
			temp = value + "";
			if (!ref.test(temp)) {
			value = oldText;
			layer.msg("è·åå°çç¨çä¸åæ³ï¼å·²èªå¨åæ´ä¸ºåæç¨ç!");
			}

			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = option.data[rowIndex + i].HQty * 1; //æ°é
			HQty = Number(HQty.toFixed(HQtyDec));
			var HTaxRate = value * 0.01; //ç¨ç
			var HPrice = option.data[rowIndex + i].HPrice * 1; //åä»·
			HPrice = Number(HPrice.toFixed(HPriceDec));
			var HTaxPrice = HPrice * (1 + HTaxRate) //å«ç¨åä»·=åä»·*(1+ç¨ç)
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			var HTaxMoney = HMoney * HTaxRate; //ç¨é¢=éé¢*ç¨ç
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			var HlineTotal = HQty * HTaxPrice; //ä»·ç¨åè®¡=éé¢+ç¨é¢
			HlineTotal = Number(HlineTotal.toFixed(HMoneyDec));
			//æ°åç²¾åº¦

			option.data[rowIndex + i].HMaterID = resultData.HItemID;
			option.data[rowIndex + i].ç©æä»£ç = resultData.ç©æä»£ç ;
			option.data[rowIndex + i].ç©æåç§° = resultData.ç©æåç§°;
			option.data[rowIndex + i].è§æ ¼åå· = resultData.è§æ ¼åå·;
			option.data[rowIndex + i].HUnitID = resultData.HUnitID;
			option.data[rowIndex + i].è®¡éåä½ = resultData.è®¡éåä½åç§°;

			option.data[rowIndex + i].HQty = HQty;
			option.data[rowIndex + i].HPrice = HPrice;
			option.data[rowIndex + i].HTaxRate = HTaxRate * 100;
			option.data[rowIndex + i].HTaxPrice = HTaxPrice;
			option.data[rowIndex + i].HMoney = HMoney;
			option.data[rowIndex + i].HlineTotal = HlineTotal;


			}
			table.render(option);

			//å·æ°è¡¨æ ¼åæ¶æ ¹æ®optionä¸HisStockGoodså¼è®¾ç½®ä¸æåè¡¨
			setSelectHisStockGoodsByTableRender();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney($("#HEarnestRate").val() * 1);
			}

			}
			})
			}
			//#endregion

			@@ -3445,7 +3853,7 @@
			success: function (data1) {
			if (data1.data.length != 0) {
			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["HMaterID", "HUnitID", "ææ£ç", "å®éå«ç¨åä»·", "ç¨é¢", "æ¬ä½å¸ä»·ç¨åè®¡", "åºåºæ°é", "å¼ç¥¨æ°é", "HOrderLevID","è®¢åççº§ä»£ç ","éå®åºåºæ°é","éå®åºåºå®¡æ ¸æ°é","éå®åºåºå®¡æ ¸éé¢","çäº§æ°é","éå®éåºæ°é","éå®éåºå®¡æ ¸æ°é"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			/var titleData = ["HMaterID", "HUnitID", "ææ£ç", "å®éå«ç¨åä»·", "ç¨é¢", "æ¬ä½å¸ä»·ç¨åè®¡", "åºåºæ°é", "å¼ç¥¨æ°é", "HOrderLevID","è®¢åççº§ä»£ç ","éå®åºåºæ°é","éå®åºåºå®¡æ ¸æ°é","éå®åºåºå®¡æ ¸éé¢","çäº§æ°é","éå®éåºæ°é","éå®éåºå®¡æ ¸æ°é"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±/
			//titleData = [];

			dataCol = data1.data[0].HGridString.split(',');
			@@ -3476,6 +3884,10 @@
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) > -1) {
			option.cols[0][i + 1]["hide"] = true;
			}

			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			@@ -3786,6 +4198,30 @@
			form.render('select');
			}
			//#endregion

			//#region æ¥çæ¯å¦å·å¤æ¥çéé¢æéï¼è®¾ç½®éé¢çåæ®µæ¯å¦éè¦éè
			function checkRight_Money() {
			$.ajax({
			type: "GET",
			async: false,
			url: GetWEBURL() + "/Xs_SeOrderBill/CheckRight_Money", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {

			} else {
			var HideColumnList = ["å©ä½è®¢é", "åä»·", "ç¨ç%", "å«ç¨åä»·", "éé¢", "ä»·ç¨åè®¡"];
			for (var i = 0; i < HideColumnList.length; i++) {
			titleData.push(HideColumnList[i]);
			}
			}
			}, error: function (err) {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			//#endregion

			//#endregion