MES-WEB-LayUI.git

			@@ -781,12 +781,16 @@
			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: Number(HQty.toFixed(HQtyDec))
			, HPrice: Number(HPrice.toFixed(HPriceDec))
			, HMoney: Number(HMoney.toFixed(HMoneyDec))
			HQty: HQty
			, HPrice: HPrice
			, HMoney:HMoney
			, HTaxMoney: HTaxMoney
			});
			table.render(option)
			@@ -810,12 +814,16 @@
			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: Number(HQty.toFixed(HQtyDec))
			, HPrice: Number(HPrice.toFixed(HPriceDec))
			, HMoney: Number(HMoney.toFixed(HMoneyDec))
			HQty: HQty
			, HPrice: HPrice
			, HMoney: HMoney
			, HTaxMoney: HTaxMoney
			});
			table.render(option)
			@@ -840,13 +848,17 @@
			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
			, HQty: Number(HQty.toFixed(HQtyDec))
			, HPrice: Number(HPrice.toFixed(HPriceDec))
			, HMoney: Number(HMoney.toFixed(HMoneyDec))
			, HQty: HQty
			, HPrice: HPrice
			, HMoney: HMoney
			, HTaxMoney: HTaxMoney
			});
			break;
			@@ -1345,26 +1357,25 @@
			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 = 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++) {
			@@ -1391,62 +1402,71 @@
			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.closeAll(); //å³éææéè¿layer
			//layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			, btn2: function (index, layero) { //å½ç¹å»âåæ¶âæé®æ¶ä¼è¢«è°ç¨
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			//éè¿ä¾åºåidè·åç¨ç
			var HSupID = $("#HSupID").val();
			if (HSupID != 0) {
			$.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).toFixed(4)); //ç¨é¢=éé¢*ç¨ç
			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 {
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": 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.è®¡éåä½åç§°
			})
			}

			}
			});
			}
			@@ -1614,6 +1634,7 @@
			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;
			@@ -1641,7 +1662,7 @@
			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);
			@@ -1656,7 +1677,11 @@
			end: function () {
			//éè¿ä¾åºåidè·åç¨ç
			var HSupID = $("#HSupID").val();
			if (HSupID != 0) {
			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",
			@@ -1670,7 +1695,12 @@
			var HQty = obj.data.HQty * 1; //æ°é
			var HPrice = obj.data.HPrice * 1; //åä»·
			var HMoney = HQty * HPrice; //éé¢=æ°é*åä»·
			var HTaxMoney = Number((HMoney * HTaxRate).toFixed(4)); //ç¨é¢=éé¢*ç¨ç
			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.ç©æä»£ç
			@@ -1686,7 +1716,7 @@
			})
			}
			});
			} else {
			} else if (typeof (OptionData.HItemID) != "undefined"){
			obj.update({ //æ´æ°è¡¨æ ¼æ°æ®
			"HMaterID": OptionData.HItemID //è®¾ç½®HItemIDçå¼ä¸ºâHBillNoâåæ®µçå¼HItemID`çå¼
			, "ç©æä»£ç ": OptionData.ç©æä»£ç
			@@ -1881,6 +1911,31 @@
			})
			}
			//#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 getPushSource_POOrderBillInit(HSourceInterID, HSourceEntryID) {
			var res = "none";