MES-WEB-LayUI.git

			@@ -25,16 +25,13 @@
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-form-item" style="margin-bottom: 20px;">
			<button type="button" lay-submit="" lay-filter="HAddBT" class="layui-btn layui-btn-radius">æ°å¢</button>
			<!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">æ¸ç©º</button>-->
			<button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">ä¿å</button>
			<button type="button" lay-submit="" lay-filter="Close" class="layui-btn layui-btn-radius layui-btn-danger">éåº</button>
			<button type="button" lay-submit="" lay-filter="HAddPrint" class="layui-btn layui-btn-radius">æ°å¢æå°æ¨¡æ¿</button>
			<div class="layui-inline">
			<div class="layui-input-block">
			<select name="city" lay-verify="required" id="dymb">
			<!--<option value="æªéæ©">è¯·éæ©æå°æ¨¡æ¿</option>-->
			<option value="HBarCodePrint">ç©ææ¡ç æ¨¡æ¿</option>
			<!--<option value="HPOInStockBill">éè´§å</option>-->
			<!--<option value="HPOInStockBill">éè´§å(æ ç¾çº¸)</option>-->
			<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
			<select name="dymb" id="dymb" lay-verify="dymb" class="ForFilteringSchemes">
			<!--å¨ææ¸²ææ¨¡æ¿-->
			</select>
			</div>
			</div>
			@@ -68,6 +65,7 @@
			<option value="1941600-00-B">1941600-00-B</option>
			<option value="1941600-00-C">1941600-00-C</option>
			<option value="1943600-00-C">1943600-00-C</option>
			<option value="1998800-00-C">1998800-00-C</option>
			<option value="å¶ä»" selected>å¶ä»</option>
			</select>
			</div>
			@@ -178,6 +176,7 @@
			<td>
			<input type="text" name="æµè½¬å¡å·" id="HProcExchBillNo" lay-verify="" autocomplete="off" placeholder="æµè½¬å¡å·" class="layui-input" style="background-color:#efefef4d" readonly>
			<input type="hidden" name="æµè½¬å¡ID" id="HFbarcodeID">
			<input type="hidden" name="HOrgID" id="HOrgID">
			</td>
			<th style="width:80px;padding:10px" id="BT_HDateNow">ç»è£æ¶é´</th>
			<td>
			@@ -397,7 +396,7 @@
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
			<script src="../../../layuiadmin/Scripts/webConfig2.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../CreateControl.js"></script>
			<script src="../../../layuiadmin/MESLanguage.js"></script>
			<script>
			@@ -439,6 +438,7 @@
			}
			var option = [];
			set_InitGrid();

			//åå§åæç»è¡¨æ ¼
			function set_InitGrid() {
			columns = [
			@@ -474,6 +474,7 @@
			}
			};
			}

			//å¨å±åé
			var ZJTMFlag = false;//åä»¶æ¡ç è¾å¥æ è®°
			//è·åå½åæ¶é´å¤ç
			@@ -498,6 +499,7 @@
			getBillno();
			$("#HDateNow").val(time);//å è½½å½åæ¶é´
			$("#HFbarcode").focus();
			$("#HOrgID").val(sessionStorage["OrganizationID"]);
			$("#HFbarcode").css("box-shadow", "0 0 0 1px #00ff00");
			$("#SubBarcode").attr("readonly", "readonly");//åä»¶æ¡ç åªè¯»
			$("#SubBarcode").css("background-color", "#efefef4d");
			@@ -509,6 +511,10 @@
			var HModName = "MES_ProductionLinePackaging";
			initFunction(1, HModName, sessionStorage["HTranSlate"]);
			form.render('select');


			//è·åæå°æ¨¡æ¿
			GetHBarCodePrint();

			//æ«æ¡å½¢ç æ¹æ³
			$('#HFbarcode').on('keydown', function (event) { //æ«æ¡å½¢ç
			@@ -804,6 +810,7 @@
			, "HNumber": $("#HNumber").val()
			, "HName": $("#HMaterName").val()
			, "HModel": $("#HModel").val()
			, "HOrgID": $("#HOrgID").val()
			},
			success: function (result) {
			var data = result.data;
			@@ -815,7 +822,7 @@
			$('#SubBarcode').val("");
			$("#SubBarcode").focus();
			table.reload('smjl-table', {
			url: GetWEBURL1() + '/LEMS/Update_HBillNo_SubBarcodeList_Json'
			url: GetWEBURL() + '/LEMS/Update_HBillNo_SubBarcodeList_Json'
			, where: {
			HBillNo: HBillNo2
			, HBarCode: HBillNo
			@@ -884,6 +891,7 @@
			});
			}
			});

			//ä¿åæé®
			form.on('submit(Saver)', function (data) {//æäº¤
			//debugger;
			@@ -950,6 +958,7 @@
			, "BBM": BBM
			, "LDM": LDM
			, "HMaterNumber": $("#HNumber").val()
			, "HOrgID": $("#HOrgID").val()
			},
			success: function (result) {
			var data = result.data;
			@@ -1112,15 +1121,24 @@
			});
			});

			//æ°å¢æå°æ¨¡æ¿æé®
			form.on('submit(HAddPrint)', function (data) {//éåº
			layer.open({
			type: 2
			, area: ['80%', '80%']
			, title: 'æå°æ¨¡çéæ©'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=&MyMsg=&Type=' + HModName, 'yes']
			, resize: false
			})
			});

			//æå°æé®
			form.on('submit(Print2)', function (data) {//éåº
			//æå¼æå°æ¨¡æ¿
			var linterid = $("#HInterID").val();
			//var linterid = "28973";
			//var Type = "HBarCodePrint";
			//var OpenTmp = "åè£åç©ææ è¯å¡(ç½é¡µç)";
			//var ReportViewer = document.getElementById("ReportViewer");
			//window.open("../../views/BaseSet/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());

			var sWhere = "select * from h_v_SRM_BarCodeBillList where HItemID in(" + linterid + ") order by ç©æä»£ç ";
			$.ajax({
			@@ -1142,12 +1160,13 @@

			var report1 = "";
			var parintName = $("#PrintName").val();
			if (parintName == "æ¯è«å°") {
			if (parintName == "æ¯è«å°" && LDM != "AAA") {
			report1 = urlAddRandomNo("../../grf/åè£åç©ææ è¯å¡(ç½é¡µç).grf");
			} else if (LDM == "AAA") {
			report1 = urlAddRandomNo("../../grf/åè£åç©ææ è¯å¡(ç½é¡µç)_MXG.grf");
			} else {
			report1 = urlAddRandomNo("../../grf/åè£åç©ææ è¯å¡(ç½é¡µç)2.grf");
			}

			var args = {
			type: "print",
			showOptionDlg: false, //å¦æä¸æ¾ç¤ºæå°å¯¹è¯æ¡èç´æ¥æå°ï¼å°æ¤è¡æ³¨éå»æå³å¯
			@@ -1180,10 +1199,10 @@
			var BBM = $("#BBM").val();
			var LDM = $("#LDM").val();
			var linterid = $("#HInterID").val();
			var HOrgID = $("#HOrgID").val();
			var Type = "HBarCodePrint";
			var OpenTmp = "ç½æ æå°1";
			//var ReportViewer = document.getElementById("ReportViewer");
			window.open("../../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + linterid.toString() + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());
			var OpenTmp = $("#dymb").val();
			window.open("../../åºç¡èµæ/å¬ç¨åºç¡èµæ/HBarPlanPrint.html?linterid=" + linterid.toString() + "\|" + HOrgID + "&Type=" + Type.toString() + "&OpenTmp=" + OpenTmp.toString());

			$("#Print2").click();
			});
			@@ -1306,6 +1325,11 @@
			, "æµè½¬å¡ID": data[0].hmainid
			});
			icmoQty = data[0].æµè½¬å¡æ°é;
			if (data[0].é»è®¤æå°æ¨¡ç !="") {
			$("#dymb").val(data[0].é»è®¤æå°æ¨¡ç);
			form.render('select');
			}

			//
			$.ajax({//çæå¯ä¸ç
			url: GetWEBURL() + "/LEMS/SaveBarCode_json",
			@@ -1315,7 +1339,8 @@
			"sHBarcodeNo": $("#HSourceBillNo").val(),
			"sHMaterID": $("#HMaterID").val(),
			"sHUnitID": $("#HUnitID").val(),
			"sHMaterName": $("#HMaterName").val()
			"sHMaterName": $("#HMaterName").val(),
			"HOrgID": $("#HOrgID").val()
			},
			success: function (result) {
			var data = result.data;
			@@ -1341,8 +1366,7 @@
			});
			} else {
			playSound();
			// $("#verifycode").click();
			//layer.msg(result.Message, { icon: 5 });

			layer.alert(get_MessageError("[0000-2-063]æå¥ä¸»è¡¨å¤±è´¥", sessionStorage["HTranSlate"]), { icon: 5, btn: [get_MessageError('[0000-2-035]éåº', sessionStorage["HTranSlate"])], time: 100000, offset: 't' });
			}
			}, error: function () {
			@@ -1438,19 +1462,32 @@
			}
			});
			}

			//è·åæå°æ¨¡æ¿
			function GetHBarCodePrint() {
			//è·åç»å½é¡µç»ç»å
			$.ajax({
			type: "get",
			async: false,
			url: GetWEBURL() + "/Open_PrintTem/GetOpenTmpList_Json",
			data: { "HNumber": HModName },
			success: function (result) {
			var HBarCodePrint = "";
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			HBarCodePrint += '<option style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';
			}
			$("#dymb").append(HBarCodePrint);
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}

			//ä»¥ä¸ä¸ºlayuiæ¨¡å
			});

			//function window_onload() {
			// Report.LoadFromURL("../grf/åè£åç©ææ è¯å¡(ç½é¡µç).grf");

			//}
			//function btnPrint_onclick() {
			// var linterid = "28973";
			// //Report.LoadDataFromURL("../../views/Baseset/xmlSRM_Web_BarCodeBillList.aspx?linterid=" + linterid, true, "");

			// Report.Print(true);
			//}

			function GetHWorkerValue(obj) { //è¿åæ¥æ¶äºº
			$("#Operator").val(obj[0].HName);
			@@ -1490,16 +1527,16 @@
			$("#HOrganizationID").val(obj[0].HNumber);
			}

			//function GetHEmpValue(obj) //è¿åèå
			//{
			// $("#HEmpName").val(obj[0].HName);
			// $("#HEmpID").val(obj[0].HItemID);
			//}
			//function GetHDeptNameValue(obj) //è¿åé¨é¨
			//{
			// $("#HDeptName").val(obj[0].HName);
			// $("#HDeptID").val(obj[0].HItemID);
			//}
			//function GetHEmpValue(obj) //è¿åèå
			//{
			// $("#HEmpName").val(obj[0].HName);
			// $("#HEmpID").val(obj[0].HItemID);
			//}
			//function GetHDeptNameValue(obj) //è¿åé¨é¨
			//{
			// $("#HDeptName").val(obj[0].HName);
			// $("#HDeptID").val(obj[0].HItemID);
			//}


			</script>