MES-WEB-LayUI.git

			@@ -58,7 +58,7 @@
			<li lay-id="1" style="padding:1px;" class="layui-this">åºæ¬ä¿¡æ¯</li>
			<!--<li lay-id="2" style="padding:1px;">å¶ä»ä¿¡æ¯</li>-->
			</ul>
			<h1 style="text-align:center;"><b>çäº§é¢æå</b></h1>
			<h1 style="text-align:center;"><b>çäº§é¢æå-ç¾æ¯æè²</b></h1>
			<div class="layui-tab-content">
			<!--åºæ¬ä¿¡æ¯-->
			<div class="layui-tab-item layui-show">
			@@ -71,6 +71,7 @@
			id="HBillNo" readonly="readonly" autocomplete="off">
			<input id="HInterID" name="HInterID" type="hidden" />
			<input id="HMaker" name="HMaker" type="hidden" /><!--å¶åäºº-->
			<input id="HBillSubType" name="HBillSubType" type="hidden" value="ç¾æ¯æè²"/>
			</div>
			</div>
			<div class="layui-inline">
			@@ -139,8 +140,22 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å®¢æ·<label style="color:red"> *
			<label class="layui-form-label">ä»åº<label style="color:red"> *
			</label></label>
			<div class="layui-input-inline">
			<input type="text" name="HWHName" id="HWHName" readonly
			class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HWHID" id="HWHID" class="layui-input"
			value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn"
			lay-filter="WareHouse" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"
			style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å®¢æ·</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HCusName" lay-verify="HCusName"
			id="HCusName" readonly="readonly" autocomplete="off">
			@@ -178,7 +193,7 @@
			<input type="text" name="HWeight" id="HWeight" class="layui-input"
			value=""style="float: left; width: 150px;">
			<button type="button" lay-submit="" class="layui-btn"
			lay-filter="btnSearchWeight" style="width:40px;">
			lay-filter="btnSearchWeight" id="btnSearchWeight" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"
			style="margin-left:-9px;"></i>
			</button>
			@@ -294,7 +309,7 @@
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<!-- <div class="layui-inline">
			<label class="layui-form-label">ä»åº<label style="color:red"> *
			</label></label>
			<div class="layui-input-inline">
			@@ -308,7 +323,7 @@
			style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			</div> -->
			<div class="layui-inline">
			<label class="layui-form-label">æºåç±»å</label>
			<div class="layui-input-inline">
			@@ -663,7 +678,7 @@
			if (checkStatus.data.length !== 1) {
			return layer.msg('è¯·éæ©ä¸æ¡æ°æ®');
			}
			$("#HWeight").val(checkStatus.data[0]['åé'])
			$("#HWeight").val(checkStatus.data[0]['åé']).trigger('change');


			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			@@ -744,7 +759,6 @@
			if (checkStatus.data.length !== 1) {
			return layer.msg('è¯·éæ©ä¸æ¡æ°æ®');
			}
			debugger
			$("#HMaterID").val(checkStatus.data[0]['HItemID'])
			$("#HMaterName").val(checkStatus.data[0]['ç©æåç§°'])
			$("#HModel").val(checkStatus.data[0]['è§æ ¼åå·'])
			@@ -994,15 +1008,16 @@
			for (var i = 0; i < option.data.length; i++) {
			var HMaterRuleType = option.data[i].HMaterRuleType;
			var HMaterRuleExternType = option.data[i].HMaterRuleExternType;
			if (HMaterRuleType == "ææ") {
			if (HMaterRuleExternType == "ææ") {
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight);
			} else if (HMaterRuleType == "å©å") {
			} else if (HMaterRuleExternType == "å©å") {
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWaterQty * 0.001);
			} else if (HMaterRuleType == "å©åï¼æå¸ç®ï¼") {
			} else if (HMaterRuleExternType == "å©åï¼æå¸ç®ï¼") {
			option.data[i].HQty = dealDoubleToFixed(option.data[i].HRate * HWeight * 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,15 +1033,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 == 'ç¾æ¯') {
			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);
			});
			@@ -1228,15 +1244,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 == 'ç¾æ¯') {
			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,
			@@ -1425,8 +1442,8 @@
			, { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
			, { field: 'HMaterCode', title: 'ç©æä»£ç ', edit: 'text', event: 'HMaterCode', width: 100 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 100 }
			, { field: 'HMaterRuleType', title: 'ç©æå¬å¼', width: 100 }
			, { field: 'HMaterRuleExternType', title: 'ç©æå¬å¼2', width: 100 }
			// , { field: 'HMaterRuleType', title: 'ç©æå¬å¼', width: 100 }
			, { field: 'HMaterRuleExternType', title: 'ç©æå¬å¼', width: 100 }
			, { field: 'HMaterSpec', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'HUnitID', title: 'HUnitID', width: 100, hide: true }
			, { field: 'HUnitCode', title: 'è®¡éåä½ä»£ç ', edit: 'text', event: 'HUnitCode', width: 100, hide: true }
			@@ -1555,8 +1572,8 @@
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼

			//, "HInnerBillNo": data.åé¨åæ®å·
			//"HWHID": data.HWHIDMain //ä»åºID
			//, "HWHName": data.ä»åº //ä»åºåç§°
			"HWHID": data.HWHIDMain //ä»åºID
			, "HWHName": data.ä»åº //ä»åºåç§°
			//, "HSecManagerID": data.HSecManagerID //éªæ¶åID
			//, "HSecManagerName": data.é¢æå //éªæ¶ååç§°
			//, "HKeeperID": data.HKeeperID //ä¿ç®¡åID
			@@ -1566,7 +1583,7 @@
			//, "HSourceBillType": data.æºåç±»å //æºåç±»å
			//, "XDH": "" //éåå·

			"HBillNo": data.åæ®å·
			, "HBillNo": data.åæ®å·
			, "HDate": formatDate(data.æ¥æ)
			, "HDeptID": data.HDeptID //é¨é¨ID
			, "HDeptName": data.é¨é¨ //é¨é¨åç§°
			@@ -1792,7 +1809,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) {

			@@ -1832,15 +1849,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 == "ç¾æ¯") {
			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();