MES-WEB-LayUI.git

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

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

			@@ -1631,26 +1631,76 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', '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("è¯·éæ©ä¸æ¡æ°æ®");
			}
			//if (checkStatus.data.length != 1) {
			// return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			//}

			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HMaterID": checkStatus.data[0].HItemID
			, "ç©æä»£ç ": checkStatus.data[0].HNumber
			, "ç©æåç§°": checkStatus.data[0].HName
			, "è§æ ¼åå·": checkStatus.data[0].HModel
			, "HUnitID": checkStatus.data[0].HUnitID
			, "è®¡éåä½": checkStatus.data[0].HUnitName
			})
			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", "è®¡éåä½": "", "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": ""
			}
			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; //æ°é
			var HPrice = option.data[rowIndex + i].HPrice; //åä»·
			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; //ä»·ç¨åè®¡=éé¢+ç¨é¢


			option.data[rowIndex + i].HMaterID = resultData.HMaterID;
			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);

			layer.close(index);//å³éå¼¹çª
			}
			})
			@@ -1828,6 +1878,9 @@

			//ä»¥ä¸æ¯layuiæ¨¡å
			});
			//åè¡¨ç¨çï¼æ ¹æ®å®¢æ·å¸¦åº
			var subHTaxRate = 0;

			// åºç¡èµæè¿åæ°æ®
			function GetHEmpValue(obj) //è¿åä¸å¡å
			{
			@@ -1875,6 +1928,7 @@
			$("#HSSID").val(data.HSSID);
			$("#HSSName").val(data.HSSName);

			subHTaxRate = data.HTaxRate;

			} else {
			layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });