MES-WEB-LayUI.git

			@@ -90,21 +90,21 @@
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æè²è¦æ±</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HColorRemark" id="HColorRemark" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="HColorRemark" id="HColorRemark" >
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è®¢åè·è¸ªå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<label class="layui-form-label">è®¢åè·è¸ªå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">å¾å·çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<label class="layui-form-label">å¾å·çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HPicNumVer" id="HPicNumVer" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3 layui-inline">
			@@ -113,8 +113,8 @@
			<input type="text" class="layui-input" name="HMaterName2" id="HMaterName2" onmouseover="this.title=this.value" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="hidden" name="HMaterID2" id="HMaterID2" value="0">
			<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchMater2" id="btnSearchMater2" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			@@ -126,15 +126,15 @@
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">äº§åè§æ ¼</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="HMaterModel2" id="HMaterModel2" onmouseover="this.title=this.value" style="">
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ»è£å¾å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<label class="layui-form-label">æ»è£å¾å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HPicNumAssemble" id="HPicNumAssemble" onmouseover="this.title=this.value" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			</div>
			<div class="layui-row">
			<div class="layui-col-xs3 layui-inline">
			@@ -158,33 +158,33 @@
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æè´¨</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
			</div>
			</div>-->
			<label class="layui-form-label">æè´¨</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HMaterTexture" id="HMaterTexture">
			</div>
			</div>-->
			</div>
			<div class="layui-row">
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è®¡åå¼å·¥æ¥æ</label>
			<div class="layui-input-inline">
			<input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è®¡åå®å·¥æ¥æ</label>
			<div class="layui-input-inline">
			<input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
			</div>
			</div>-->
			<label class="layui-form-label">è®¡åå¼å·¥æ¥æ</label>
			<div class="layui-input-inline">
			<input type="date" class="layui-input" name="HPlanBeginDate" id="HPlanBeginDate" style="padding-left: 32px;">
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è®¡åå®å·¥æ¥æ</label>
			<div class="layui-input-inline">
			<input type="date" class="layui-input" name="HPlanEndDate" id="HPlanEndDate" style="padding-left: 32px;">
			</div>
			</div>-->

			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">éåå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="textBox2" id="textBox2" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
			<!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchICMOBill" id="btnSearchICMOBill" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>-->
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			@@ -200,34 +200,34 @@
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">å¹å®½</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWidth" id="HWidth" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="text" class="layui-input" name="HWidth" id="HWidth" style="float: left;" >
			</div>
			</div>

			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æåç¼å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
			</div>
			</div>-->
			<label class="layui-form-label">æåç¼å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HProductNum" id="HProductNum" onmouseover="this.title=this.value">
			</div>
			</div>-->
			</div>

			<div class="layui-row">
			<!--<div class="layui-col-xs6 layui-inline">
			<label class="layui-form-label" style="width:12.5%">å¤æ³¨</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style="width:610px;">
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ¥è®¡åå·¥åéåå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>-->
			<label class="layui-form-label" style="width:12.5%">å¤æ³¨</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HRemark" id="HRemark" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style="width:610px;">
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ¥è®¡åå·¥åéåå·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWorkBillSortNo" id="HWorkBillSortNo" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchWorkBillSort" id="btnSearchWorkBillSort" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>-->
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è¾æ°é</label>
			<div class="layui-input-inline">
			@@ -241,6 +241,21 @@
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">åç¼¸å·</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HSplitColorQty" id="HSplitColorQty" style="float: left;" value="0">
			</div>
			</div>

			</div>
			<div class="layui-row">
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æåæ»é</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HSplitSumQty" id="HSplitSumQty" style="float: left;" value="0">
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è¾å©åä½</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HAuxUnitName" id="HAuxUnitName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			@@ -250,26 +265,27 @@
			</button>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è¡¥æåå </label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>-->
			<label class="layui-form-label">è¡¥æåå </label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HExplanation" id="HExplanation" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value">
			</div>
			</div>-->
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è¡¥ææ è®°</label>
			<div class="layui-input-block">
			<input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
			</div>
			</div>-->
			<label class="layui-form-label">è¡¥ææ è®°</label>
			<div class="layui-input-block">
			<input type="checkbox" name="HBLFlag" id="HBLFlag" lay-skin="primary" title="" checked="">
			</div>
			</div>-->
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">åé</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWeight" id="HWeight" style="float: left; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="text" class="layui-input" name="HWeight" id="HWeight" style="float: left;">
			</div>
			</div>

			</div>
			<div class="layui-row">
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">ä¸å¡å</label>
			<div class="layui-input-inline">
			@@ -295,7 +311,7 @@
			</div>
			<div class="layui-row">
			<div class="layui-col-xs6 layui-inline">
			<label class="layui-form-label" style="width:12.5%">å¤æ³¨2</label>
			<label class="layui-form-label" style="width:12.5%">ç½å¯è¦æ±</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HRemark2" id="HRemark2" placeholder="è¯·è¾å¥åå®¹" onmouseover="this.title=this.value" style="width: 610px;">
			</div>
			@@ -509,17 +525,17 @@
			</div>
			</div>
			<!--<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<label class="layui-form-label">çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">çæ¬</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
			</div>
			</div>-->
			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">è¯ä½ç©æä»£ç </label>
			<div class="layui-input-inline">
			@@ -571,7 +587,7 @@
			<input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="float: left;">
			</div>
			</div>


			<div class="layui-col-xs3 layui-inline">
			<label class="layui-form-label">æ¥è®¡åå·¥åéåå·</label>
			<div class="layui-input-inline">
			@@ -1010,6 +1026,7 @@
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			async: false,
			data: { "HBillType": '3772' },
			success: function (d) {
			//console.log(d.data);
			@@ -1069,7 +1086,7 @@
			, elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: false
			, cellMinWidth: 120
			//, cellMinWidth: 120
			, height: 400
			, cols: [columns]
			, limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
			@@ -1432,9 +1449,9 @@
			success: function (res) {
			if (res.count == 1) {
			if (res.data.length != 0) {
			hinterid += ",1";
			hinterid += "\|1";
			} else {
			hinterid += ",0";
			hinterid += "\|0";
			}

			layer.open({
			@@ -1773,14 +1790,62 @@
			}
			}

			var HWidth = $('#HWidth').val();
			if (HWidth.substring(HWidth.length - 1, HWidth.length) == ".") {
			layer.msg("å¹å®½çç»å°¾ä¸è½æ¯.ï¼");
			return;
			} else {
			var ref = /^[0-9]+$/;
			if (!ref.test(HWidth)) {
			layer.msg("å¹å®½è¯·è¾æ£ç¡®å¥æ°åï¼");
			return;
			}
			}

			var HWeight = $('#HWeight').val();
			if (HWeight.substring(HWeight.length - 1, HWeight.length) == ".") {
			layer.msg("åéçç»å°¾ä¸è½æ¯.ï¼");
			return;
			} else {
			var ref = /^[0-9]+$/;
			if (!ref.test(HWeight)) {
			layer.msg("åéè¯·è¾æ£ç¡®å¥æ°åï¼");
			return;
			}
			}

			var HSplitNo = $('#HSplitNo').val();
			if (HSplitNo.substring(HSplitNo.length - 1, HSplitNo.length) == ".") {
			layer.msg("æåå·çç»å°¾ä¸è½æ¯.ï¼");
			return;
			} else {
			var ref = /^[0-9]+\.?[0-9]*$/;
			var ref = /^[0-9]+$/;
			if (!ref.test(HSplitNo)) {
			layer.msg("æåå·è¯·è¾æ£ç¡®å¥æ°åï¼");
			return;
			}
			}

			var HSplitSumQty = $('#HSplitSumQty').val();
			if (HSplitSumQty.substring(HSplitSumQty.length - 1, HSplitSumQty.length) == ".") {
			layer.msg("æåæ»éçç»å°¾ä¸è½æ¯.ï¼");
			return;
			} else {
			var ref = /^[0-9]+$/;
			if (!ref.test(HSplitSumQty)) {
			layer.msg("æåæ»éè¯·è¾æ£ç¡®å¥æ°åï¼");
			return;
			}
			}

			var HSplitColorQty = $('#HSplitColorQty').val();
			if (HSplitColorQty.substring(HSplitColorQty.length - 1, HSplitColorQty.length) == ".") {
			layer.msg("åç¼¸å·çç»å°¾ä¸è½æ¯.ï¼");
			return;
			} else {
			var ref = /^[0-9]+$/;
			if (!ref.test(HSplitColorQty)) {
			layer.msg("åç¼¸å·è¯·è¾æ£ç¡®å¥æ°åï¼");
			return;
			}
			}
			@@ -2001,6 +2066,7 @@
			$.ajax({
			url: GetWEBURL() + "Sc_ProcessExchangeBill/GetProcessExchangeBillMain",
			type: "GET",
			async: false,
			data: {
			"HInterID": linterid
			},
			@@ -2038,13 +2104,15 @@
			, "HAuxUnit": data.HAuxUnit
			, "HAuxUnitName": data.è¾å©åä½
			, "HSplitNo": data.æåå·
			, "HRemark2": data.å¤æ³¨2
			, "HRemark2": data.ç½å¯è¦æ±
			, "HRemark3": data.åºé¨å¤æ³¨
			, "HEmpID": data.HEmpID
			, "HEmpName": data.ä¸å¡å
			, "HCusID": data.HCusID
			, "HCusNames": data.å®¢æ·
			, "HColorRemark": data.æè²è¦æ±
			, "HSplitSumQty": data.æåæ»é
			, "HSplitColorQty": data.åç¼¸å·

			, "HProjectNum": data.é¡¹ç®ç¼å·
			, "HVerNum": data.çæ¬
			@@ -2380,6 +2448,7 @@
			$("#HCusID").val(data.HCusID);
			$("#HCusNames").val(data.å®¢æ·);
			$("#HColorRemark").val(data.æè²è¦æ±);
			//$("#HRemark3").val(data.åºé¨å¤æ³¨);
			$("#HBLFlag").val(result.data[0].HBLFlag == 0 ? false : true);
			$("input[name='isHBLFlag']").prop("checked", result.data[0].HBLFlag);//true:éä¸ false:ä¸éä¸
			form.render("checkbox");