MES-WEB-LayUI.git

			@@ -71,7 +71,7 @@
			id="HBillNo" readonly="readonly" autocomplete="off">
			<input id="HInterID" name="HInterID" type="hidden" />
			<input id="HMaker" name="HMaker" type="hidden" /><!--å¶åäºº-->
			<input id="HMainSourceBillType" name="HMainSourceBillType" type="hidden" value="ç¾æ¯æè²"/>
			<input id="HBillSubType" name="HBillSubType" type="hidden" value="ç¾æ¯æè²"/>
			</div>
			</div>
			<div class="layui-inline">
			@@ -993,16 +993,16 @@
			for (var i = 0; i < option.data.length; i++) {
			var HMaterRuleType = option.data[i].HMaterRuleType;
			var HMaterRuleExternType = option.data[i].HMaterRuleExternType;
			// if (HMaterRuleType == "ææ") {
			// option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
			// } else if (HMaterRuleType == "å©å") {
			// 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);
			// } else if (HMaterRuleExternType == 'ç¾æ¯') {
			if (HMaterRuleExternType == 'ç¾æ¯') {
			if (HMaterRuleExternType == "ææ") {
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
			} else if (HMaterRuleExternType == "å©å") {
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
			} else if (HMaterRuleExternType == "å©åï¼æå¸ç®ï¼") {
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
			}
			}
			//if (HMaterRuleExternType == 'ç¾æ¯') {
			// option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
			// }
			}
			table.render(option);
			});
			@@ -1018,16 +1018,16 @@
			for (var i = 0; i < option.data.length; i++) {
			var HMaterRuleType = option.data[i].HMaterRuleType;
			var HMaterRuleExternType = option.data[i].HMaterRuleExternType;
			// if (HMaterRuleType == "ææ") {
			// option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
			// } else if (HMaterRuleType == "å©å") {
			// 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);
			// } else if (HMaterRuleExternType == 'ç¾æ¯') {
			if (HMaterRuleExternType == 'ç¾æ¯') {
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
			}
			if (HMaterRuleExternType == "ææ") {
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
			} else if (HMaterRuleExternType == "å©å") {
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
			} else if (HMaterRuleExternType == "å©åï¼æå¸ç®ï¼") {
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
			}
			//if (HMaterRuleExternType == 'ç¾æ¯') {
			// option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 0.001);
			//}
			}
			table.render(option);
			});
			@@ -1229,16 +1229,16 @@
			var HQty = 0;
			var HMaterRuleType = obj.data.HMaterRuleType;
			var HMaterRuleExternType = obj.data.HMaterRuleExternType;
			// if (HMaterRuleType == "ææ") {
			// HQty = dealDoubleToFixed(HRate * HWeight);
			// } else if (HMaterRuleType == "å©å") {
			// HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
			// } else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") {
			// HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
			// } else if (HMaterRuleExternType == 'ç¾æ¯') {
			if (HMaterRuleExternType == 'ç¾æ¯') {
			HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
			}
			if (HMaterRuleExternType == "ææ") {
			HQty = dealDoubleToFixed(HRate * HWeight);
			} else if (HMaterRuleExternType == "å©å") {
			HQty = dealDoubleToFixed(HRate * HWaterQty * 0.001);
			} else if (HMaterRuleExternType == "å©åï¼æå¸ç®ï¼") {
			HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
			}
			//if (HMaterRuleExternType == 'ç¾æ¯') {
			// HQty = dealDoubleToFixed(HRate * HWeight * 0.001);
			//}
			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HRate: value,
			@@ -1794,7 +1794,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -1834,16 +1834,16 @@
			//æ ¹æ®ç©æç ç©æå¬å¼ è®¡ç® éé
			var HWeight = $("#HWeight").val();
			var HWaterQty = $("#HWaterQty").val();
			// if (option.data[rowIndex + i].HMaterRuleType == "ææ") {
			// option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight);
			// } else if (option.data[rowIndex + i].HMaterRuleType == "å©å") {
			// 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);
			// } else if (option.data[rowIndex + i].HMaterRuleExternType == "ç¾æ¯") {
			if (option.data[rowIndex + i].HMaterRuleExternType == "ç¾æ¯") {
			option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
			}
			if (option.data[rowIndex + i].HMaterRuleExternType == "ææ") {
			option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight);
			} else if (option.data[rowIndex + i].HMaterRuleExternType == "å©å") {
			option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWaterQty * 0.001);
			} else if (option.data[rowIndex + i].HMaterRuleExternType == "å©åï¼æå¸ç®ï¼") {
			option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
			}
			//if (option.data[rowIndex + i].HMaterRuleExternType == "ç¾æ¯") {
			// option.data[rowIndex + i].HQty = dealDoubleToFixed(option.data[rowIndex + i].HRate * HWeight * 0.001);
			//}
			}
			table.render(option);
			layer.closeAll();