MES-WEB-LayUI.git

			@@ -825,9 +825,11 @@
			for (var i = 0; i < option.data.length; i++) {
			var HMaterRuleType = option.data[i].HMaterRuleType;
			if (HMaterRuleType == "ææ") {
			option.data[i].HQty = option.data[i].HRate * HWeight;
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
			} else if (HMaterRuleType == "å©å") {
			option.data[i].HQty = option.data[i].HRate * HWaterQty;
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
			} else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") {
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
			}
			}
			table.render(option);
			@@ -844,9 +846,11 @@
			for (var i = 0; i < option.data.length; i++) {
			var HMaterRuleType = option.data[i].HMaterRuleType;
			if (HMaterRuleType == "ææ") {
			option.data[i].HQty = option.data[i].HRate * HWeight;
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
			} else if (HMaterRuleType == "å©å") {
			option.data[i].HQty = option.data[i].HRate * HWaterQty;
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
			} else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") {
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
			}
			}
			table.render(option);
			@@ -1049,9 +1053,11 @@
			var HQty = 0;
			var HMaterRuleType = obj.data.HMaterRuleType;
			if (HMaterRuleType == "ææ") {
			HQty = HRate * HWeight;
			HQty = dealDoubleToFixed(HRate * HWeight);
			} else if (HMaterRuleType == "å©å") {
			HQty = HRate * HWaterQty;
			HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
			} else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") {
			HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
			}
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			@@ -1067,9 +1073,11 @@
			var HQty = 0;
			var HMaterRuleType = value;
			if (HMaterRuleType == "ææ") {
			HQty = HRate * HWeight;
			HQty = dealDoubleToFixed(HRate * HWeight);
			} else if (HMaterRuleType == "å©å") {
			HQty = HRate * HWaterQty;
			HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
			} else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") {
			HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
			}
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			@@ -1429,7 +1437,7 @@
			url: GetWEBURL() + 'Kf_MateOutBill/Kf_MateOutBillListProjectDetai',
			async:false,
			type: "GET",
			data: { "sqlWhere": "and hmainid=" + linterid },
			data: { "sqlWhere": " and hmainid=" + linterid },
			success: function (result) {
			if (result.count == 1) {
			option.data = result.list[0];
			@@ -1604,7 +1612,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -1644,9 +1652,11 @@
			var HWeight = $("#HWeight").val();
			var HWaterQty = $("#HWaterQty").val();
			if (option.data[rowIndex + i].HMaterRuleType == "ææ") {
			option.data[rowIndex + i].HQty = option.data[rowIndex + i].HRate * HWeight;
			option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight);
			} else if (option.data[rowIndex + i].HMaterRuleType == "å©å") {
			option.data[rowIndex + i].HQty = option.data[rowIndex + i].HRate * HWaterQty;
			option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001);
			} else if (option.data[rowIndex + i].HMaterRuleType == "å©åï¼æå¸ç®ï¼") {
			option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
			}
			}
			table.render(option);
			@@ -1659,7 +1669,7 @@
			},
			end: function () {
			obj.update({
			"HMaterID" :OptionData.HMaterID
			"HMaterID": OptionData.HItemID
			,"HMaterCode" : OptionData.ç©æä»£ç
			, "HMaterName" :OptionData.ç©æåç§°
			,"HMaterSpec" : OptionData.è§æ ¼åå·
			@@ -2032,10 +2042,10 @@
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,è®¡éåä½ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			//if (sSubStr[i].HMaterRuleType == null \|\| sSubStr[i].HMaterRuleType == "") {
			// layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,ç©æå¬å¼ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return Result = false;
			//}
			if (sSubStr[i].HMaterRuleType == null \|\| sSubStr[i].HMaterRuleType == "") {
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,ç©æå¬å¼ä¸ºç©º!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			temp = sSubStr[i].HRate + "";
			if (temp == "" \|\| temp *1 == "0") {
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,ç¨éä¸ºç©ºæä¸º0!", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			@@ -2194,7 +2204,33 @@
			//åå»è¿åè®¡éåä½
			function GetGyUnit(data) {
			OptionData = data
			}
			}


			//#region å¤çå°æ°æ¾ç¤ºä½æ°ï¼dataï¼éè¦å¤ççæ°æ®ï¼numï¼æ°æ®çç±»å(å¦1:æ°éï¼2:éé¢ï¼3:åä»·)ï¼
			function dealDoubleToFixed(data) {
			//ç¨äºè®¾ç½®å°æ°ä½æ°
			var dotLength = 6;

			//å¤ææ¯å¦åå¨å°æ°ç¹åå¶ç´¢å¼ä½ç½®
			data = data + "";
			var index = data.indexOf(".");

			//å¤çæ°æ®å¹¶è¿å
			if (index < 0) {
			return data * 1;
			} else {
			//è·åå°æ°ä½æ°
			var length = data.length - index - 1;
			if (length <= dotLength) {
			return data * 1;
			} else {
			data = data * 1;
			return data.toFixed(dotLength) * 1;
			}
			}
			}
			//#endregion
			</script>
			</body>
			</html>