MES-WEB-LayUI.git

			@@ -73,51 +73,49 @@
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">æ¥æ<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
			<input type="date" class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä¸å¡å</label>
			<label class="layui-form-label">ä¸å¡å<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;" readonly>
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;display:none;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>

			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">é¨é¨<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;" readonly>
			<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;display:none;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-col-xs8 layui-inline">
			<label class="layui-form-label">ä¾åºå<label style="color:red"> * </label></label>
			<div class="layui-input-inline" style="width:750px">
			<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:700px;">
			<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 700px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
			<div class="layui-input-inline" style="width:800px">
			<input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:750px;" readonly>
			<input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 750px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;display:none;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä»åº<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>

			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 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="float:left;width:150px;">
			<input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="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;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;display:none;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			@@ -125,33 +123,46 @@
			<div class="layui-col-xs4 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;"readonlys>
			<input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">é¨é¨<label style="color:red"> * </label></label>
			<label class="layui-form-label">åç¥¨ç¼å·</label>
			<div class="layui-input-inline">
			<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
			<input class="layui-input" name="HInvoiceBillNo" id="HInvoiceBillNo" autocomplete="off" style="width:150px;">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">ä»åº<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;" readonly>
			<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HWHList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			</div>

			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">äº¤è´§å°ç¹</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HAddress" id="HAddress" autocomplete="off">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline" style="display:none;">
			<label class="layui-form-label">ä¸»ç®¡</label>
			<div class="layui-input-inline">
			<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;" readonly>
			<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<div class="layui-col-xs4 layui-inline" style="display:none;">
			<label class="layui-form-label">æºåç±»å</label>
			<div class="layui-input-inline">
			<select name="HSourceBillType" id="HSourceBillType" lay-verify="HSourceBillType">
			@@ -159,10 +170,10 @@
			</select>
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<div class="layui-col-xs4 layui-inline" style="display:none;">
			<label class="layui-form-label">éåå·</label>
			<div class="layui-input-inline">
			<input type="text" name="" id="" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HSourceBillNo" id="HSourceBillNo" class="layui-input" value="" style="float:left;width:150px;" readonly>

			<button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			@@ -171,27 +182,15 @@
			</div>

			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">äº¤è´§å°ç¹</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HAddress" id="HAddress" autocomplete="off">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<div class="layui-row" style="display:none;">
			<div class="layui-col-xs4 layui-inline" style="display:none;">
			<label class="layui-form-label">åé¨åæ®å·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">åç¥¨ç¼å·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HInvoiceBillNo" id="HInvoiceBillNo" autocomplete="off">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-row" style="display:none;">
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">é¡¹ç®ç¼ç </label>
			<div class="layui-input-inline">
			@@ -213,13 +212,13 @@
			<div class="layui-col-xs7 layui-inline">
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
			<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style="width:800px;">
			</div>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ç»</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<label class="layui-form-label" style="width: 85px;">ç»ç»<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 120px; width: 800px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			@@ -254,25 +253,11 @@
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹äºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºäºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteMan " id="HDeleteMan " style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¶åæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å®¡æ ¸æ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			@@ -285,33 +270,48 @@
			<input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹äºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºäºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹æ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			</div>
			</div>

			</div>
			</div>

			<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>å¢å ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>å¤å¶ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>åºåæ¥è¯¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>åºå¥åºè®°å½æ¥è¯¢</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>å¢å ä¸è¡</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>å¤å¶ä¸è¡</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Inventory" id="get_Inventory"><i class="layui-icon layui-icon-form"></i>åºåæ¥è¯¢</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="get_InOutSum" id="get_InOutSum"><i class="layui-icon layui-icon-form"></i>åºå¥åºè®°å½æ¥è¯¢</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			@@ -326,6 +326,12 @@
			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>
			</script>
			<script>
			//#region ææ¬æ¡è¾å¥æç´¢ç¸å³æ°æ®-åé
			var childPage = null; //è·ååçªå£å¯¹è±¡ï¼ç¨äºæä½åçªå£çåéåæ¹æ³
			var currRowIndex = 0; //ç¨äºå®ä½åçªå£å½åéä¸çè¡
			var childData = null; //ç¨äºè·ååçªå£è¿åçæ°æ®
			//#endregion

			//#region æå æ³¨é
			//#endregion
			layui.config({
			@@ -348,6 +354,7 @@
			var year = date.getFullYear();
			var shijian = year + "-" + month + "-" + day;

			var topScroll = 0;//è®°å½æ»å¨æ¡çä½ç½®
			var allVal;
			window.OptionData = [];
			//#endregion
			@@ -591,6 +598,7 @@
			table.on('edit(mainTable)', function (obj) {
			//æ°å¼æ ¼å¼æ ¡éªå·¥å·
			var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			var ref1 = /^-?\d+(\.\d+)?$/; //å¤æåç¬¦ä¸²æ¯å¦ä¸ºæ°å(åå«æ´æ°ãæµ®ç¹æ°)ï¼æ£åè¡¨è¾¾å¼
			var temp = "";
			var Dec = getDecByMaterID(obj.data.HMaterID) //è·åç²¾åº¦
			var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			@@ -601,20 +609,29 @@
			var value = obj.value //å¾å°ä¿®æ¹åçå¼
			, data = obj.data //å¾å°æå¨è¡ææé®å¼
			, field = obj.field; //å¾å°åæ®µ

			topScroll = $('#mainTable').next('.layui-table-view').find('.layui-table-body').scrollTop();//è·åæ»å¨æ¡ä½ç½®

			switch (field) {
			case "HQty": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			if (!ref.test(temp) \|\| temp == 0) {
			if (!ref1.test(temp)) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HQty: oldText
			});
			table.render(option);

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

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

			@@ -839,6 +856,76 @@
			}
			});
			//#endregion

			//#region åè½¦éæ©æºå
			$('#HSourceBillNo').on('keydown', function (event) {
			var HSourceBillNo = $('#HSourceBillNo').val();//ï¼æºååæ®å·ï¼
			if (event.keyCode == 13) {
			var ajaxLoad = layer.load();
			//å¤æææ¬æ¡æ¯å¦ææ°æ® new
			if (HSourceBillNo == "") {
			return;
			}
			$.ajax({
			url: GetWEBURL() + '/Cg_POOrderBill/PushList',
			type: "GET",
			data: { "HBillNo": HSourceBillNo, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var checkStatus = result;
			if ($("#HSourceBillType").val() == "1102") {
			option.data = [];//æ¸ç©ºåè¡¨
			$("#HProjectName").val(checkStatus.data[0].é¡¹ç®åç§°);
			$("#HProjectNumber").val(checkStatus.data[0].é¡¹ç®ä»£ç );
			$("#HProjectID").val(checkStatus.data[0].HProjectID);
			$("#HDeptID").val(checkStatus.data[0].HDeptID);
			$("#HDeptName").val(checkStatus.data[0].é¨é¨);
			$("#HManagerID").val(checkStatus.data[0].HManagerID);
			$("#HManagerName").val(checkStatus.data[0].ä¸»ç®¡);
			$("#HWHID").val(checkStatus.data[0].HWHID);
			$("#HWHName").val(checkStatus.data[0].ä»åº);
			$("#HEmpID").val(checkStatus.data[0].HEmpID);
			$("#HEmpName").val(checkStatus.data[0].ä¸å¡å);
			$("#HSupID").val(checkStatus.data[0].HSupID);
			$("#HSupName").val(checkStatus.data[0].ä¾åºå);
			$("#HCurID").val(checkStatus.data[0].HCurID);
			$("#HCurName").val(checkStatus.data[0].å¸å«);
			$("#HExRate").val(checkStatus.data[0].æ±ç);
			$("#HAddress").val(checkStatus.data[0].äº¤è´§å°ç¹);
			$("HInvoiceBillNo").val(checkStatus.data[0].åç¥¨ç¼å·)

			var j = 0;
			for (var i = 0; i < result.data.length; i++) {
			var HNewQty = checkStatus.data[j].æ°é - checkStatus.data[j].å³èæ°é//æ°é
			var HNewMoney = checkStatus.data[j].éé¢ - checkStatus.data[j].å³èæ°é * checkStatus.data[j].åä»·//åå°å³èæ°éçéé¢
			var HNewTaxMoney = HNewMoney * checkStatus.data[j].ç¨ç * 0.01
			option.data.push({
			"HMaterID": checkStatus.data[j].HMaterID, "ç©æä»£ç ": checkStatus.data[j].ç©æä»£ç , "ç©æåç§°": checkStatus.data[j].ç©æåç§°, "è§æ ¼åå·": checkStatus.data[j].è§æ ¼åå·,
			"HUnitID": checkStatus.data[j].HUnitID, "è®¡éåä½": checkStatus.data[j].è®¡éåä½,
			"HQty": HNewQty, "HPrice": checkStatus.data[j].åä»·,
			"HMoney": HNewMoney, "HTaxPrice": checkStatus.data[j].å«ç¨åä»·, "HTaxRate": checkStatus.data[j].ç¨ç, "HTaxMoney": HNewTaxMoney, "HDiscountRate": checkStatus.data[j].ææ£ç,
			"HWHID": checkStatus.data[j].HWHIDSub, "æ¶æä»åº": checkStatus.data[j].ä»åºåç§°, "HSPID": checkStatus.data[j].HSPID, "ä»ä½åç§°": checkStatus.data[j].ä»ä½åç§°, "HSecUnitID": checkStatus.data[j].HSecUnitID, "è¾å©åä½": checkStatus.data[j].è¾å©åä½,
			"HSourceBillNo": checkStatus.data[j].åæ®å·, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
			})
			j++;
			}
			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
			//#endregion

			@@ -883,15 +970,18 @@
			, { field: 'HSecUnitID', title: 'HSecUnitID', width: 100, hide: true }
			, { field: 'è¾å©åä½', title: 'è¾å©åä½', width: 100, edit: 'text', event: "HSecUnitID" }//f7
			, { field: 'HQty', title: 'æ°é', width: 100, edit: 'text', totalRow: true }
			, { field: 'HPrice', title: 'åä»·', width: 100, edit: 'text' }
			, { field: 'HTaxPrice', title: 'å«ç¨åä»·', width: 100, edit: 'text' }
			, { field: 'HMoney', title: 'éé¢', width: 100, edit: 'text', totalRow: true }
			, { field: 'HDiscountRate', title: 'ææ£ç', width: 100, edit: 'text' }
			, { field: 'HTaxRate', title: 'ç¨ç', width: 100, edit: 'text' }
			, { field: 'HPrice', title: 'åä»·', width: 100}
			, { field: 'HTaxPrice', title: 'å«ç¨åä»·', width: 100}
			, { field: 'HMoney', title: 'éé¢', width: 100, totalRow: true }
			, { field: 'HDiscountRate', title: 'ææ£ç', width: 100}
			, { field: 'HTaxRate', title: 'ç¨ç', width: 100}
			, { field: 'HTaxMoney', title: 'ç¨é¢', width: 100, style: 'background-color:#efefef4d;'}
			, { field: 'HRemark', title: 'å¤æ³¨', width: 100, edit: 'text' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			, done: function (res, curr, count) {
			$(".layui-table-main").scrollTop(topScroll);
			}
			}

			option.data = [];
			@@ -942,11 +1032,13 @@
			, "HMaker": data[0].å¶åäºº
			, "HChecker": data[0].å®¡æ ¸äºº
			, "HCloseMan": data[0].å³éäºº
			, "HMakeDate": data[0].å¶åæ¥æ
			, "HCheckDate": data[0].å®¡æ ¸æ¥æ
			, "HCloseDate": data[0].å³éæ¥æ
			, "HUpDateDate": data[0].ä¿®æ¹æ¥æ
			, "HDeleteDate": data[0].ä½åºæ¥æ
			, "HUpDater": data[0].ä¿®æ¹äºº
			, "HDeleteMan": data[0].ä½åºäºº
			, "HMakeDate": data[0].å¶åæ¥æ == null ? "" : Pub_Format(data[0].å¶åæ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HCheckDate": data[0].å®¡æ ¸æ¥æ == null ? "" : Pub_Format(data[0].å®¡æ ¸æ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HCloseDate": data[0].å³éæ¥æ == null ? "" : Pub_Format(data[0].å³éæ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HUpDateDate": data[0].ä¿®æ¹æ¥æ == null ? "" : Pub_Format(data[0].ä¿®æ¹æ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HDeleteDate": data[0].ä½åºæ¥æ == null ? "" : Pub_Format(data[0].ä½åºæ¥æ, "yyyy-MM-dd hh:mm:ss")
			});

			//åè¡¨ èµå¼
			@@ -1006,9 +1098,27 @@

			//#region æå°
			function get_PrintReport() {
			if (linterid == null \|\| linterid == "") {
			linterid = $("#HInterID").val();
			//#region å¤ææºåç¶æ
			var HSourceBillData = "";
			var HSourceBillData = getSourceBillStatus_POInStockBill();
			if (HSourceBillData != "none") {
			if (HSourceBillData.length == 0) {
			layer.alert("æå°å¤±è´¥!æªæ¥è¯¢å°åæ®ä¿¡æ¯!", { icon: 5 });
			return;
			} else if (HSourceBillData[0]["ç¶æ"] != "å·²å®¡æ ¸") {
			layer.alert("æå°å¤±è´¥!åæ®ç¶ææªä¸º'å·²å®¡æ ¸'ç¶æ!", { icon: 5 });
			return;
			}
			} else {
			return;
			}
			//#endregion


			//if (linterid == null \|\| linterid == "") {
			// linterid = $("#HInterID").val();
			//}
			var HInterID = $("#HInterID").val();
			layer.open({
			type: 2
			, area: ['50%', '50%']
			@@ -1016,7 +1126,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=HPOInStockBillByID', 'yes']
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + HInterID.toString() + '&MyMsg=' + linterid.toString() + '&Type=HPOInStockBillByID', 'yes']
			, resize: false
			})
			}
			@@ -1226,6 +1336,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);
			}
			$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
			$('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');//æå°æ ¼å¼
			//ä¿ååæµè§
			@@ -1249,6 +1364,7 @@
			function AllowLoadData(data) {
			//æ°å¼æ ¼å¼æ ¡éªå·¥å·
			var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			var ref1 = /^-?\d+(\.\d+)?$/; //å¤æåç¬¦ä¸²æ¯å¦ä¸ºæ°å(åå«æ´æ°ãæµ®ç¹æ°)ï¼æ£åè¡¨è¾¾å¼
			var temp = "";

			//#region è¡¨å¤´æ°æ®æ£éª
			@@ -1262,12 +1378,12 @@
			return false;
			}

			if ($("#HDeptID").val() == "0") {
			if ($("#HDeptID").val() == "0" \|\| $("#HDeptID").val() == "" ) {
			layer.msg("é¨é¨æªéæ©!");
			return false;
			}

			if ($("#HEmpID").val() == "0") {
			if ($("#HEmpID").val() == "0" \|\| $("#HEmpID").val() == "") {
			layer.msg("ä¸å¡åæªéæ©!");
			return false;
			}
			@@ -1319,13 +1435,13 @@
			return false;
			}

			//å®åæ°éæ ¼å¼æ ¡éª
			//æ°éæ ¼å¼æ ¡éª
			temp = option.data[i]["HQty"] + "";
			if (temp == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼æ°éä¸è½ä¸º0ï¼");
			if (!ref1.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼æ°éè¯·è¾å¥ä¸ä¸º0çæ°åï¼");
			return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼æ°éè¯·è¾å¥å¤§äº0çæ°åï¼");
			} else if (temp * 1 == 0) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼æ°éè¯·è¾å¥ä¸ä¸º0çæ°åï¼");
			return false;
			}

			@@ -1356,15 +1472,15 @@
			return false;
			}

			//éé¢æ ¼å¼æ ¡éª
			temp = option.data[i]["HMoney"] + "";
			if (temp == "0") {
			//layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢ä¸è½ä¸º0ï¼");
			//return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢è¯·è¾å¥å¤§äº0çæ°åï¼");
			return false;
			}
			////éé¢æ ¼å¼æ ¡éª
			//temp = option.data[i]["HMoney"] + "";
			//if (temp == "0") {
			// //layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢ä¸è½ä¸º0ï¼");
			// //return false;
			//} else if (!ref.test(temp)) {
			// layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢è¯·è¾å¥å¤§äº0çæ°åï¼");
			// return false;
			//}



			@@ -1640,6 +1756,204 @@
			//è¡åå¿«æ·é®çé
			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) {
			OptionData = childData;

			//éè¿ä¾åºåidè·åç¨ç
			var HSupID = $("#HSupID").val();
			if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
			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"]; //éé¢ç²¾åº¦
			$.ajax({
			url: GetWEBURL() + "/Gy_Supplier/xg",
			//url: "http://localhost:12761/Gy_Supplier/xg",
			type: "GET",
			data: {
			"HInterID": HSupID
			},
			success: function (d) {
			var HTaxRate = parseInt(d.data[0].å¢å¼ç¨ç) * 0.01;
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			, "HTaxRate": HTaxRate * 100
			, "HQty": HQty //æ´æ°HQtyåæ®µï¼HQty
			, "HPrice": HPrice //æ´æ°HPriceåæ®µï¼HPrice
			, "HMoney": HMoney //æ´æ°HMoneyåæ®µï¼HMoney
			, "HTaxMoney": HTaxMoney //æ´æ°HTaxMoneyåæ®µï¼HTaxMoney
			, "HTaxPrice": HTaxPrice //æ´æ°HTaxPriceåæ®µï¼HTaxPrice
			})
			}
			});
			} else if (typeof (OptionData.HItemID) != "undefined") {
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			})
			}

			OptionData = {};
			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);


			if (childData != null) {
			OptionData = childData;

			//éè¿ä¾åºåidè·åç¨ç
			var HSupID = $("#HSupID").val();
			if (HSupID != 0 && typeof (OptionData.HItemID) != "undefined") {
			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"]; //éé¢ç²¾åº¦
			$.ajax({
			url: GetWEBURL() + "/Gy_Supplier/xg",
			//url: "http://localhost:12761/Gy_Supplier/xg",
			type: "GET",
			data: {
			"HInterID": HSupID
			},
			success: function (d) {
			var HTaxRate = parseInt(d.data[0].å¢å¼ç¨ç) * 0.01;
			//æ°æ®æ ¡éªåæ ¼ï¼éç®è®°å½
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = Number((HMoney * HTaxRate)); //ç¨é¢=éé¢*ç¨ç
			var HTaxPrice = Number((HPrice * (1 + HTaxRate))); //å«ç¨åä»·=åä»·*(1+ç¨ç)
			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			HTaxPrice = Number(HTaxPrice.toFixed(HPriceDec));
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			, "HTaxRate": HTaxRate * 100
			, "HQty": HQty //æ´æ°HQtyåæ®µï¼HQty
			, "HPrice": HPrice //æ´æ°HPriceåæ®µï¼HPrice
			, "HMoney": HMoney //æ´æ°HMoneyåæ®µï¼HMoney
			, "HTaxMoney": HTaxMoney //æ´æ°HTaxMoneyåæ®µï¼HTaxMoney
			, "HTaxPrice": HTaxPrice //æ´æ°HTaxPriceåæ®µï¼HTaxPrice
			})
			}
			});
			} else if (typeof (OptionData.HItemID) != "undefined") {
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			})
			}

			OptionData = {};
			childData = null;
			}

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

			}
			//#endregion


			if (event.key == "F7") {
			//ç©æ
			if (obj.event == "HMaterID") {
			@@ -1915,6 +2229,10 @@
			})

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

			var HOrgID = $("#HOrgID").val(); //è·åid="HOrgID"çåç´ ä¸è·åå¶å¼ï¼å¹¶å°è¯¥å¼åå¨å¨åéHOrgIDä¸
			layer.open({ //æå¼å±
			type: 2 // //è¡¨ç¤ºå¼¹åºå±çåå®¹æ¯ä¸ä¸ª iframe ç±»åä¸º2
			@@ -2035,6 +2353,8 @@

			}
			});

			obj.event = "";
			});
			}

			@@ -2088,10 +2408,19 @@
			if (checkStatus.data.length == 0) {
			return layer.msg("è¯·è³å°éæ©ä¸æ¡æ°æ®!");
			}
			var HSupID = $("#HSupID").val();//å¤æä¾åºå
			if (HSupID == 0 \|\| HSupID == '') {
			HSupID = checkStatus.data[0]["HSupID"];
			}
			//layer.alert("ä½ å·²éæ©" + checkStatus.data.length + "æ¡æ°æ®");
			//è·åæ¶æéç¥åä»£ç
			var ProcessNumber = [];
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (checkStatus.data[i]["HSupID"] != HSupID) {
			layer.msg("ä¸æ¨å¤±è´¥!å·²ç»éä¸çè®°å½ä¸åå¨ä¸åä¾åºå!");
			layer.close(index);//å³éå¼¹çª
			return;
			}
			ProcessNumber.push(checkStatus.data[i]);
			}

			@@ -2219,12 +2548,14 @@
			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();
			obj.del();//æºç å é¤è¡æ¯èµå¼={}

			table.cache["mainTable"].splice(rowIndex, 1); //ä»ç¼åéå é¤è¡æ°æ®
			option.data = table.cache["mainTable"];//å°æ°æ®ç»å®å°dataä¸
			table.reload(option);
			table.render(option);
			layer.close(index);
			}
			});
			@@ -2427,6 +2758,30 @@
			return res;
			}
			//#endregion


			//#region è·åæ¬ååæ®ç¶æ
			function getSourceBillStatus_POInStockBill() {
			var HSourceBillData = "none";
			var sWhere = " and hmainid = " + $("#HInterID").val();
			$.ajax({
			url: GetWEBURL() + '/Cg_POInStockBill/list',
			async: false,
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			HSourceBillData = data1.data;
			} else {
			layer.alert(data1.code + "åæ®ç¶æå¤æå¤±è´¥ï¼", { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			return HSourceBillData;
			}
			//#endregion
			//#endregion