MES-WEB-LayUI.git

			@@ -234,25 +234,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;">
			@@ -265,18 +251,32 @@
			<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>
			@@ -290,6 +290,8 @@
			<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="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			@@ -328,7 +330,7 @@
			var shijian = year + "-" + month + "-" + day;
			var allVal;
			//#endregion

			var HModName = "Add_Edit_Cg_POInStockBackBillList"

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

			@@ -472,10 +474,16 @@
			//checkRefresh();
			}
			break;
			////åè®¾ç½®
			//case 'set_HideColumn':
			// get_HideColumn();
			// break;
			//åºåæ¥è¯¢
			case 'get_Inventory': get_Inventory();
			break;
			//åºå¥åºè®°å½æ¥è¯¢
			case 'get_InOutSum': get_InOutSum();
			break;
			//åè®¾ç½®
			case 'set_HideColumn':
			get_HideColumn();
			break;
			}
			});

			@@ -585,10 +593,10 @@
			, totalRow: true
			, cols: [[ //åè¡¨
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', width: 100, totalRow: true }
			, { type: 'HSourceBillNo', title: 'æºåå·', width: 100, hide: true }//æºåå·
			, { type: 'numbers', field: 'åºå·',title: 'åºå·', width: 100, totalRow: true }
			, { field: 'HSourceBillNo', title: 'æºåå·', width: 100, hide: true }//æºåå·
			, { field: 'HSourceBillType', title: 'æºåç±»å', width: 100, hide: true }//æºåç±»å
			, { type: 'HSourceInterID', title: 'æºåä¸»åç ', width: 100, hide: true }//æºåä¸»åç
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 100, hide: true }//æºåä¸»åç
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 100, hide: true }//æºåååç
			, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 150, edit: 'text', event: "HMaterID" }//f7
			@@ -604,7 +612,7 @@
			, { 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: 'HMoney', title: 'éé¢', width: 100, edit: 'text', totalRow: true }
			, { field: 'HMoney', title: 'éé¢', width: 100, totalRow: true, style: 'background-color:#efefef4d;' }
			, { field: 'HTaxRate', title: 'ç¨ç', width: 100, edit: 'text' }
			, { field: 'HTaxMoney', title: 'ç¨é¢', width: 100, style: 'background-color:#efefef4d;'}
			, { field: 'HBatchNo', title: 'æ¹å·', width: 150, edit: 'text' }
			@@ -615,6 +623,7 @@

			option.data = [];
			table.render(option);
			DisPlay_HideColumn();
			}
			//#endregion
			//#endregion
			@@ -659,11 +668,11 @@
			, "HMaker": data.å¶åäºº
			, "HChecker": data.å®¡æ ¸äºº
			, "HCloseMan": data.å³éäºº
			, "HMakeDate": data.å¶åæ¥æ
			, "HCheckDate": data.å®¡æ ¸æ¥æ
			, "HCloseDate": data.å³éæ¥æ
			, "HUpDateDate": data.ä¿®æ¹æ¥æ
			, "HDeleteDate": data.ä½åºæ¥æ
			, "HMakeDate": data.å¶åæ¥æ == null ? "" : Pub_Format(data.å¶åæ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HCheckDate": data.å®¡æ ¸æ¥æ == null ? "" : Pub_Format(data.å®¡æ ¸æ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HCloseDate": data.å³éæ¥æ == null ? "" : Pub_Format(data.å³éæ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HUpDateDate": data.ä¿®æ¹æ¥æ == null ? "" : Pub_Format(data.ä¿®æ¹æ¥æ, "yyyy-MM-dd hh:mm:ss")
			, "HDeleteDate": data.ä½åºæ¥æ == null ? "" : Pub_Format(data.ä½åºæ¥æ, "yyyy-MM-dd hh:mm:ss")
			});

			//åè¡¨ èµå¼
			@@ -740,7 +749,10 @@
			//æ°å¼æ ¼å¼æ ¡éªå·¥å·
			var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			var temp = "";

			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"]; //éé¢ç²¾åº¦
			// ååæ ¼ç¼è¾ä¹åçå¼
			var oldText = $(this).prev().text();
			var value = obj.value //å¾å°ä¿®æ¹åçå¼
			@@ -770,24 +782,29 @@
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //ç¨é¢=éé¢*ç¨ç

			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty
			, HPrice: HPrice
			, HMoney: HMoney
			, HMoney:HMoney
			, HTaxMoney: HTaxMoney
			});
			table.render(option)
			break;
			case "HPrice": //åä»·
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			if (!ref.test(temp) \|\| temp == 0) {
			if (!ref.test(temp)) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HPrice: oldText
			});

			table.render(option);
			layer.msg("åä»·è¯·è¾å¥å¤§äº0çæ°å!");
			return;
			}
			@@ -798,7 +815,11 @@
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxRate = obj.data.HTaxRate * 0.01; //ç¨ç
			var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //ç¨é¢=éé¢*ç¨ç

			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HQty: HQty
			@@ -806,6 +827,7 @@
			, HMoney: HMoney
			, HTaxMoney: HTaxMoney
			});
			table.render(option)
			break;
			case "HTaxRate": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -815,7 +837,7 @@
			obj.update({
			HTaxRate: oldText
			});

			table.render(option);
			layer.msg("ç¨çè¯·è¾å¥ä¸å°äº0çæ°å!");
			return;
			}
			@@ -827,7 +849,11 @@
			var HPrice = obj.data.HPrice * 1;
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //ç¨é¢=éé¢*ç¨ç

			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HTaxRate: HTaxRate * 100
			@@ -837,6 +863,7 @@
			, HTaxMoney: HTaxMoney
			});
			break;

			table.render(option);
			default:
			}
			@@ -1030,7 +1057,20 @@
			layer.msg("è¯·éæ©ä¸»ç®¡ï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}

			//åè¡¨æ°æ®æ£éªç®åè¡¨åéªè¯
			//åç»å¯ç¨å¤ä¸ªæ°ç»åå¨ååæ©å±
			for (var i = 0; i < option.data.length; i++) {
			if (typeof option.data[i] !== 'object' \|\| option.data[i] === null \|\| Array.isArray(option.data[i])) {
			continue; // è·³è¿éå¯¹è±¡é¡¹ï¼å¦ç©ºæ°ç»ï¼
			}
			var rowData = option.data[i];
			for (var col of Object.keys(rowData)) {
			if (rowData[col] == "0" && col != "LAY_TABLE_INDEX") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼" + col + "ä¸è½ä¸º0ï¼");
			return;
			}
			}
			}
			var num = [];
			for (var i = 0; i < table.cache["mainTable"].length; i++) {
			if (table.cache["mainTable"][i] != "") {
			@@ -1069,6 +1109,82 @@
			console.log("Reason" + sMainStr);
			}
			});
			}
			//#endregion

			//#region æ ¹æ®ç©æIDè·åç²¾åº¦
			function getDecByMaterID(HMaterID) {
			var resultData = {};
			$.ajax({ // å¼æ¥è¯·æ±
			url: GetWEBURL() + "Gy_Material/getDecByID", //è¯·æ±å°å
			async: false, //æ¯å¦å¼å¯å¼æ¥
			type: "GET", //è¯·æ±ç±»å
			data: { //å®ä¹åéå°æå¡å¨çæ°æ®
			"HMaterID": HMaterID // å°hmateridä½ä¸ºè¯·æ±åæ°åé
			},
			success: function (result) { // å½è¯·æ±æåæ¶ï¼æ§è¡è¿ä¸ªå½æ°
			if (result.code == 1) { // å¦ææå¡å¨è¿åçæ°æ®ä¸ç`codeåæ®µçäº1ï¼è¿å¯è½è¡¨ç¤ºå®¡æ ¸æä½æåæ§è¡
			var data = result.data; //å£°ædataåéï¼å¹¶å°å¶èµå¼ä¸ºresultå¯¹è±¡ä¸çdataå±æ§
			resultData = data[0]; //å°dataæ°ç»ï¼æç±»æ°ç»å¯¹è±¡ï¼çç¬¬ä¸ä¸ªåç´ èµå¼ç»åéresultData
			}
			//else {
			// layer.alert(result.Message, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' }); //result.msgå¯¹è±¡ï¼æç¤ºå¼¹çª ç±»åä¸º5ï¼ æé®ï¼åæé®çåç§°ä¸ºéåº æ¶é´ ä¸º100ç§ï¼ä»¥ååç§»éï¼`offset: 't'
			//}
			}, error: function () {
			layer.alert("åçéè¯¯!", { icon: 5 }); //æç¤ºå¼¹çª åçéè¯¯ ï¼è¦ç¤ºæ å¿ä¸º5ç
			}
			});
			return resultData;
			}
			//#endregion

			//#region åºåæ¥è¯¢
			function get_Inventory() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
			var HMaterID = data[0].HMaterID.toString();
			//å¼¹çªæ¹æ³
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'åºåæ¥è¯¢åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../ä»åç®¡ç/æ¡ç æ¥è¡¨/Kf_ICinventoryQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
			, btn: ['åæ¶']
			, btn1: function (index, layero) {
			layer.close(index);
			}
			})
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æç©ææ°æ®æ¥è¯¢ï¼');
			}
			}
			//#endregion
			//#region åºå¥åºè®°å½æ¥è¯¢
			function get_InOutSum() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1 && data[0].HMaterID != 0) {
			var HMaterID = data[0].HMaterID.toString();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'åºå¥åºè®°å½åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../ä»åç®¡ç/æ¡ç æ¥è¡¨/Kf_StockInOutSumQueryReport.html?Type=1&HMaterID=' + HMaterID, 'yes']
			, btn: ['åæ¶']
			, btn1: function (index, layero) {
			layer.close(index);
			}
			})
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æç©ææ°æ®æ¥è¯¢ï¼');
			}
			}
			//#endregion

			@@ -1242,71 +1358,116 @@
			if (event.key == "F7") {
			//ç©æ
			if (obj.event == "HMaterID") {
			var HOrgID = $("#HOrgID").val();
			layer.open({
			type: 2
			var HOrgID = $("#HOrgID").val(); //è·åid="HOrgID"çåç´ ä¸è·åå¶å¼ï¼å¹¶å°è¯¥å¼åå¨å¨åéHOrgIDä¸
			layer.open({ //æå¼å±
			type: 2 // //è¡¨ç¤ºå¼¹åºå±çåå®¹æ¯ä¸ä¸ª iframe ç±»åä¸º2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "ç©æåè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes'] //é¡µé¢å è½½
			, btn: ["ç¡®å®", "åæ¶"] //å±æ§å®ä¹äºå¼¹åºå±ä¸çæé®æ°âç¡®å®âåâåæ¶
			, btn1: function (index, laero) { //å½ç¹å»âç¡®å®âæé®æ¶ä¼è¢«è°ç¨
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			//if (checkStatus.data.length != 1) {
			// return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			//}
			OptionData = checkStatus.data[0]; //æéä¸æ°æ®çç¬¬ä¸æ¡èµå¼ç»OptionDataåé
			var TaxRate = getHTaxRateByHSupID();
			//éä¸å¤è¡æ¶
			if (checkStatus.data.length > 1) {
			var rowIndex = $(obj.tr).attr("data-index") * 1;
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (rowIndex + i >= option.data.length) {
			var NewRow = {
			"HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "HWHID": 0, "éæä»åº": "",
			"HSPID": 0, "ä»ä½åç§°": "", "HSecUnitID": 0, "è¾å©åä½": "", "HQty": "0"
			, "HPrice": "0", "HMoney": "0", "HTaxRate": "0", "HTaxMoney": "0", "HBatChNo": "", "HRemark": ""
			};

			var rowIndex = $(obj.tr).attr("data-index") * 1;
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (rowIndex + i >= option.data.length) {
			var NewRow = {
			"HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "HWHID": 0, "éæä»åº": "",
			"HSPID": 0, "ä»ä½åç§°": "", "HSecUnitID": 0, "è¾å©åä½": "", "HQty": "0"
			, "HPrice": "0", "HMoney": "0", "HTaxRate": "0", "HTaxMoney": "0", "HBatChNo": "", "HRemark": ""
			};
			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];

			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];
			table.render(option);
			}

			table.render(option);


			var HMaterID = checkStatus.data[i].HItemID;
			var resultData = getMaterialByMaterID(HMaterID);
			option.data[rowIndex + i].HMaterID = resultData.HMaterID;
			option.data[rowIndex + i].ç©æä»£ç = resultData.HMaterNumber;
			option.data[rowIndex + i].ç©æåç§° = resultData.HMaterName;
			option.data[rowIndex + i].è§æ ¼åå· = resultData.HMaterModel;
			option.data[rowIndex + i].HUnitID = resultData.HUnitID;
			option.data[rowIndex + i].è®¡éåä½ = resultData.HUnitName;
			option.data[rowIndex + i].HTaxRate = TaxRate;

			}



			var HMaterID = checkStatus.data[i].HItemID;
			var resultData = getMaterialByMaterID(HMaterID);
			option.data[rowIndex + i].HMaterID = resultData.HMaterID;
			option.data[rowIndex + i].ç©æä»£ç = resultData.HMaterNumber;
			option.data[rowIndex + i].ç©æåç§° = resultData.HMaterName;
			option.data[rowIndex + i].è§æ ¼åå· = resultData.HMaterModel;
			option.data[rowIndex + i].HUnitID = resultData.HUnitID;
			option.data[rowIndex + i].è®¡éåä½ = resultData.HUnitName;


			table.render(option);
			}
			table.render(option);
			layer.closeAll();
			layer.closeAll(); //å³éææéè¿layer
			//layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			, btn2: function (index, layero) { //å½ç¹å»âåæ¶âæé®æ¶ä¼è¢«è°ç¨
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			obj.update({
			"HMaterID" :OptionData.HMaterID
			,"ç©æä»£ç " : OptionData.ç©æä»£ç
			, "ç©æåç§°" :OptionData.ç©æåç§°
			,"è§æ ¼åå·" : OptionData.è§æ ¼åå·
			,"HUnitID" :OptionData.HUnitID
			,"è®¡éåä½" : OptionData.è®¡éåä½åç§°
			})
			end: function () {
			//éè¿ä¾åºå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)); //ç¨é¢=éé¢*ç¨ç
			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			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
			})
			}
			});
			} else if (typeof (OptionData.HItemID) != "undefined") {
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			})
			}

			}
			});
			}
			@@ -1454,6 +1615,122 @@
			return false;
			}
			})

			//åå»
			$('.layui-table-box tbody td[data-field="ç©æä»£ç "]').off('dblclick').on('dblclick', function () {
			var HOrgID = $("#HOrgID").val(); //è·åid="HOrgID"çåç´ ä¸è·åå¶å¼ï¼å¹¶å°è¯¥å¼åå¨å¨åéHOrgIDä¸
			layer.open({ //æå¼å±
			type: 2 // //è¡¨ç¤ºå¼¹åºå±çåå®¹æ¯ä¸ä¸ª iframe ç±»åä¸º2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "ç©æåè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes'] //é¡µé¢å è½½
			, btn: ["ç¡®å®", "åæ¶"] //å±æ§å®ä¹äºå¼¹åºå±ä¸çæé®æ°âç¡®å®âåâåæ¶
			, btn1: function (index, laero) { //å½ç¹å»âç¡®å®âæé®æ¶ä¼è¢«è°ç¨
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			OptionData = checkStatus.data[0]; //æéä¸æ°æ®çç¬¬ä¸æ¡èµå¼ç»OptionDataåé
			var TaxRate = getHTaxRateByHSupID();
			//éä¸å¤è¡æ¶
			if (checkStatus.data.length > 1) {
			var rowIndex = $(obj.tr).attr("data-index") * 1;
			for (var i = 0; i < checkStatus.data.length; i++) {
			if (rowIndex + i >= option.data.length) {
			var NewRow = {
			"HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "HWHID": 0, "éæä»åº": "",
			"HSPID": 0, "ä»ä½åç§°": "", "HSecUnitID": 0, "è¾å©åä½": "", "HQty": "0"
			, "HPrice": "0", "HMoney": "0", "HTaxRate": "0", "HTaxMoney": "0", "HBatChNo": "", "HRemark": ""
			};

			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];

			table.render(option);
			}



			var HMaterID = checkStatus.data[i].HItemID;
			var resultData = getMaterialByMaterID(HMaterID);
			option.data[rowIndex + i].HMaterID = resultData.HMaterID;
			option.data[rowIndex + i].ç©æä»£ç = resultData.HMaterNumber;
			option.data[rowIndex + i].ç©æåç§° = resultData.HMaterName;
			option.data[rowIndex + i].è§æ ¼åå· = resultData.HMaterModel;
			option.data[rowIndex + i].HUnitID = resultData.HUnitID;
			option.data[rowIndex + i].è®¡éåä½ = resultData.HUnitName;
			option.data[rowIndex + i].HTaxRate = TaxRate;

			}
			table.render(option);
			}
			layer.closeAll(); //å³éææéè¿layer
			//layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { //å½ç¹å»âåæ¶âæé®æ¶ä¼è¢«è°ç¨
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			//éè¿ä¾åºå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)); //ç¨é¢=éé¢*ç¨ç
			//æ°åç²¾åº¦
			HQty = Number(HQty.toFixed(HQtyDec));
			HPrice = Number(HPrice.toFixed(HPriceDec));
			HMoney = Number(HMoney.toFixed(HMoneyDec));
			HTaxMoney = Number(HTaxMoney.toFixed(HMoneyDec));
			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
			})
			}
			});
			} else if (typeof (OptionData.HItemID) != "undefined"){
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			, "ç©æåç§°": OptionData.ç©æåç§°
			, "è§æ ¼åå·": OptionData.è§æ ¼åå·
			, "HUnitID": OptionData.HUnitID
			, "è®¡éåä½": OptionData.è®¡éåä½åç§°
			})
			}

			}
			});
			});
			}

			//è¡åå é¤
			@@ -1635,6 +1912,142 @@
			})
			}
			//#endregion

			//#region éè¿ä¾åºåidè·åç¨ç
			function getHTaxRateByHSupID() {
			var HTaxRate;
			//éè¿ä¾åºåidè·åç¨ç
			var HSupID = $("#HSupID").val();
			if (HSupID != 0) {
			$.ajax({
			url: GetWEBURL() + "/Gy_Supplier/xg",
			type: "GET",
			async: false,
			data: {
			"HInterID": HSupID
			},
			success: function (d) {
			HTaxRate = parseInt(d.data[0].å¢å¼ç¨ç);
			}
			});
			} else {
			HTaxRate = 0;
			}
			return HTaxRate;
			}
			//#endregion
			//#region åè®¾ç½®
			//éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["field"] + ",";
			}
			var colTitleName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colTitleName += option.cols[0][i]["title"] + ",";
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}

			//æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			async: false,
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {

			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = [];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			}
			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			table.render(option);
			} else {
			table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//#endregion

			//#region æ ¹æ®ä¸»åç ä¸ååç è·åæºåéè´è®¢åæ°æ®
			function getPushSource_POOrderBillInit(HSourceInterID, HSourceEntryID) {
			var res = "none";