MES-WEB-LayUI.git

			@@ -23,8 +23,8 @@
			<div class="layui-card" style="padding: 1px">
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div style="width: 65%; height: calc(95vh); float: left; background-color: rgb(255 255 255) ">
			<div id="top" style="width:100%;height:calc(40vh);">
			<div style="width: 65%; height: calc(135vh); float: left; background-color: rgb(255 255 255) ">
			<div id="top" style="width:100%;height:calc(60vh);">
			<div id="top-left" style="width: 30%; height: calc(40vh); float: left;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 30px;"><span style="font-weight:bolder">è®¾å¤</span></label>
			@@ -230,9 +230,60 @@
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-bottom: 15px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 65px;">æ¥åºæ°é</label>
			<div class="layui-input-block" style="margin-left: 95px;">
			<input type="text" class="layui-input" name="HWasterQty" id="HWasterQty" value="0" style="width: 150px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 65px;">è¿å·¥æ°é</label>
			<div class="layui-input-block" style="margin-left: 95px;">
			<input type="text" class="layui-input" name="HBackWorkQty" id="HBackWorkQty" value="0" style="width: 150px;">
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-bottom: 15px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 65px;">å·¥åºæ°é</label>
			<div class="layui-input-block" style="margin-left: 95px;">
			<input type="text" class="layui-input" name="HWasterQty_Work" id="HWasterQty_Work" value="0" style="width: 150px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 65px;">æåºæ°é</label>
			<div class="layui-input-block" style="margin-left: 95px;">
			<input type="text" class="layui-input" name="HWasterQty_Mater" id="HWasterQty_Mater" value="0" style="width: 150px;">
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-bottom: 15px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 65px;">æ¨¡å·ç¼å·</label>
			<div class="layui-input-block" style="margin-left: 95px;">
			<input type="text" class="layui-input" name="HMouldNo" id="HMouldNo" value="" style="width: 150px;" readonly>
			<input type="hidden" class="layui-input" name="HMouldID" id="HMouldID" value="0">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 65px;">æ¨¡å·åç§°</label>
			<div class="layui-input-block" style="margin-left: 95px;">
			<input type="text" class="layui-input" name="HMouldName" id="HMouldName" value="" style="width: 150px;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-bottom: 15px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 65px;">æ¨¡å·åå·</label>
			<div class="layui-input-block" style="margin-left: 95px;">
			<input type="text" class="layui-input" name="HModel" id="HModel" value="" style="width: 150px;" readonly>
			</div>
			</div>
			</div>
			</div>
			</div>
			<div id="center" style="width: 100%; height: calc(40vh); margin-top: 1%;">
			<div id="center" style="width: 100%; height: calc(55vh); margin-top: 1%;">
			<div id="center-left" style="width: 30%; height: calc(40vh); float: left;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 30px;"><span style="font-weight:bolder">äººå</span></label>
			@@ -252,8 +303,7 @@
			<div id="chart2" style="width: 75%; height: calc(40vh); left: 2%; float: left;"></div>
			</div>
			</div>

			<div id="bottom" style="width: 100%; height: calc(10vh);float:left;">
			<div id="bottom" style="width: 100%; height: calc(10vh);">
			<div id="bottom-left" style="width: 100%; height: calc(10vh);">
			<div style="text-align: left; width: 100%; height: calc(10vh); ">
			<button type="button" lay-submit="" lay-filter="tg" class="layui-btn layui-btn-radius " style="margin-left: 15%;" id="tg">åå·¥æèµ·</button>
			@@ -265,7 +315,7 @@
			</div>
			</div>
			</div>
			<div id="center-right-maintable" style="width: 34%; height: calc(95vh); float: left; margin-left: 0.2%; background-color: rgb(255 255 255) ">
			<div id="center-right-maintable" style="width: 34%; height: calc(135vh); float: left; margin-left: 0.2%; background-color: rgb(255 255 255) ">
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;" class="layui-this">æ«ç è®°å½</li>
			@@ -273,7 +323,7 @@
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<div class="layui-form-item">
			<table class="" id="mainTable" style="width:100%;" lay-filter="mainTable"></table>
			<table class="" id="mainTable" style="width:110%;" lay-filter="mainTable"></table>
			</div>
			</div>
			</div>
			@@ -813,7 +863,7 @@
			, totalRow: true
			//, cellMinWidth: 120
			, data: []
			, height: 700
			, height: 780
			, limit: Number.MAX_VALUE
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			@@ -1046,7 +1096,7 @@
			$("#HICMOQty").val(data1.data[0]["çäº§æ°é"]);
			$("#HPlanQty").val(data1.data[0]["æµè½¬å¡æ°é"]);
			$("#HBarCode").val(HBarCode);

			getHModel(data1.data[0]["hmainid"], data1.data[0]["hsubid"], data1.data[0]["åæ®å·"]);
			}
			else {
			layer.close(indexs);
			@@ -1063,6 +1113,33 @@
			});
			}

			//æ ¹æ®æ¡å½¢ç çæ¥åºçæµè½¬å¡ä¸»åid+æµè½¬å¡ æ¾åºå¯¹åºçæ¨¡å·
			function getHModel(HInterID, HEntryID, HBillNo) {
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cj_StationOutBill_CurrentWork/getHModelList",
			async: false,
			data: { "HInterID": HInterID, "HEntryID": HEntryID, "HBillNo": HBillNo},
			dataType: "json",
			success: function (data1) {
			if (data1.count == 1) {
			$("#HMouldID").val(data1.data[0]["HMouldID"]);
			$("#HMouldNo").val(data1.data[0]["æ¨¡å·ç¼ç "]);
			$("#HMouldName").val(data1.data[0]["æ¨¡å·åç§°"]);
			$("#HModel").val(data1.data[0]["æ¨¡å·åå·"]);
			}
			else {
			layer.close(indexs);
			layer.msg(data1.Message);
			}
			},
			error: function (err) {
			layer.close(indexs);
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}

			//ä¿å
			function Saver(data) {
			if ($("#HProcExchBillNo").val() == "") {