MES-WEB-LayUI.git

			@@ -29,9 +29,9 @@
			<div class="layui-card-body" style="padding: 1px;">
			<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
			<div style="padding: 2px; ">
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAdd" id="btnSave">æå°</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAdd" id="btnSave">æ°å¢</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCancel" id="btnEdit">éåº</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnPrint" id="btnPrint">æå°</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnAdd" id="btnAdd">æ°å¢</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCancel" id="btnCancel">éåº</button>
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill" style="width: 49.5%; float: left; background-color: white;height:430px;">
			<ul class="layui-tab-title" lay-filter="tab-all">
			@@ -165,7 +165,7 @@
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">æ¡å½¢ç </label>
			<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
			<input type="text" class="layui-input" lay-verify="HBarCode" name="HBarCode" id="HBarCode">
			<input type="text" class="layui-input" lay-verify="HBarCodeSN" name="HBarCodeSN" id="HBarCodeSN">
			</div>
			</div>
			</div>
			@@ -239,7 +239,7 @@
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">äº§åSN</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" lay-verify="HMaterSN" name="HMaterSN" id="HMaterSN" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" lay-verify="HBarCode" name="HBarCode" id="HBarCode" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			@@ -255,6 +255,8 @@
			<input type="hidden" name="HCreator" id="HCreator" lay-verify="HCreator">
			<input type="hidden" name="HCreateDate" id="HCreateDate" lay-verify="HCreateDate">

			<input type="hidden" name="HProcExchInterID" id="HProcExchInterID" lay-verify="HProcExchInterID" value="0">
			<input type="hidden" name="HProcExchEntryID" id="HProcExchEntryID" lay-verify="HProcExchEntryID" value="0">
			<input type="hidden" name="HSourceInterID" id="HSourceInterID" lay-verify="HSourceInterID" value="0">
			<input type="hidden" name="HSourceEntryID" id="HSourceEntryID" lay-verify="HSourceEntryID" value="0">
			<input type="hidden" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" value="">
			@@ -329,7 +331,7 @@
			, laydate = layui.laydate
			, tree = layui.tree
			var titleData = ["HInterID", "HEntryID", "HBadReasonID", "HSourceInterID","HSourceEntryID"];//åè¡¨ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			var hpj =0;
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -340,8 +342,8 @@
			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

			//æ¡å½¢ç åè½¦æ¹æ³
			$('#HBarCode').on('keydown', function (event) {
			var HBarCode = $('#HBarCode').val();
			$('#HBarCodeSN').on('keydown', function (event) {
			var HBarCode = $('#HBarCodeSN').val();
			if (event.keyCode == 13) {
			if (!HBarCode) {
			layer.msg("æ¡å½¢ç ä¸è½ä¸ºç©ºï¼")
			@@ -362,18 +364,33 @@
			get_checkSearchChangeMater();
			});

			//åè¡¨è¡åäºä»¶
			table.on('tool(mainTable)', function (obj) {
			set_GridDelete(obj); //è¡åå é¤
			});

			// NGä¿å
			form.on('submit(NGSave)', function (data) {
			get_Save(data,"NG");
			});

			// OKä¿å
			form.on('submit(OKSave)', function (data) {
			get_Save(data,"OK");
			});

			//#endregion

			//#region æ¤é¡µé¢ææçæ¹æ³
			//åå§åçé¢
			function set_ClearBill() {
			$('#btnAdd').addClass("layui-btn-disabled").attr("disabled", true);
			//åå§ååæ®
			createBillNo();
			var mychart1 = echarts.init(document.getElementById('mychart1'));

			get_Display();
			get_Histogram1(mychart1);//æ±ç¶å¾1
			get_UsreList();
			get_Display();
			}

			// çæåæ®å·
			@@ -505,14 +522,9 @@

			//æ¥è¯¢åè¡¨æ°æ®
			function get_Display() {
			var HSourceInterID = $("#HSourceInterID").val();
			var HSourceEntryID = $("#HSourceEntryID").val();
			var HBarCode = $("#HBarCode").val();
			var sWhere = "";
			if (HSourceInterID != 0 && HSourceEntryID != 0) {
			sWhere = " and HSourceInterID=" + HSourceInterID + " and HSourceEntryID=" + HSourceEntryID;
			} else {
			sWhere = " and HSourceInterID=0 and HSourceEntryID=0 ";
			}
			sWhere = " and SNç ='" + HBarCode + "'";
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + "/Cj_SingleStation/ProcessItemRepair",
			@@ -548,15 +560,6 @@
			}
			col.push({ fixed: 'right', title: 'æä½', toolbar: '#barDemo' });

			if (data1.data.length != 0) {
			$("#HBadReasonID").val(data1.data[0]["HBadReasonID"]);
			$("#HBadReasonName").val(data1.data[0]["ä¸è¯åå "]);
			//$("#HBadTypeID").val();
			//$("#HBadTypeName").val();
			//$("#HBadResultID").val();
			//$("#HBadResultName").val();
			}

			var option = {
			elem: '#mainTable'
			//, toolbar: '#toolbarDemo'
			@@ -599,10 +602,12 @@
			$("#HDeptID").val(data1.data[0]["HDeptID"]);
			$("#HDeptName").val(data1.data[0]["è½¦é´"]);
			$("#HProName").val(data1.data[0]["å·¥åº"]);
			$("#HProcess").val(data1.data[0]["HProcID"]);
			$("#HSourceID").val(data1.data[0]["HSourceID"]);
			$("#HSourceName").val(data1.data[0]["çäº§èµæº"]);
			$("#HEmpID").val(data1.data[0]["HEmpID"]);
			$("#HEmpName").val(data1.data[0]["è´¨æ£å"]);
			$("#HCreator").val(data1.data[0]["è´¨æ£å"]);
			//$("#HGroupID").val(data1.data[0]["HGroupID"]);
			//$("#HGroupName").val(data1.data[0]["çäº§çç»"]);
			layer.close(ajaxLoad);
			@@ -626,7 +631,7 @@
			var index = layer.load();
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cj_SingleStation/HBardCodeList",
			url: GetWEBURL() + "/Cj_SingleStation/HFBardCodeList",
			async: false,
			data: { "HBarCode": HBarCode, "user": sessionStorage["HUserName"] },
			dataType: "json",
			@@ -638,6 +643,7 @@
			$("#HICMOEntryID").val(data1.data[0]["HICMOEntryID"]);
			$("#HProcExchBillNo").val(data1.data[0]["å·¥åºæµè½¬å¡"]);
			$("#HProcExchInterID").val(data1.data[0]["HSourceInterID"]);
			$("#HProcExchEntryID").val(data1.data[0]["HProcExchEntryID"]);
			$("#HUnitID").val(data1.data[0]["HUnitID"]);
			$("#HUnitName").val(data1.data[0]["åä½"]);
			$("#HOrgName").val(data1.data[0]["ç»ç»"]);
			@@ -646,21 +652,63 @@
			$("#HMaterID").val(data1.data[0]["HMaterID"]);
			$("#HMaterName").val(data1.data[0]["ç©æåç§°"]);
			$("#HMaterModel").val(data1.data[0]["è§æ ¼åå·"]);
			$("#HMaterSN").val(data1.data[0]["æ¡ç "]);
			$("#HBarCode").val(data1.data[0]["æ¡ç "]);
			$("#HBadReasonID").val(data1.data[0]["HBadReasonID"]);
			$("#HBadReasonName").val(data1.data[0]["ä¸è¯åå "]);
			if (data1.data.length != 0) {

			//$("#HBadTypeID").val();
			//$("#HBadTypeName").val();
			//$("#HBadResultID").val();
			//$("#HBadResultName").val();
			}

			//æ¥è¯¢è¿ä¿®è®°å½
			get_Display();
			}
			else {
			layer.close(index);
			layer.msg(data1.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			$("#HBarCode").val("");
			$("#HBarCodeSN").val("");
			},
			error: function (err) {
			layer.close(index);
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}

			//å é¤æ¹æ³
			function set_GridDelete(obj) {
			if (obj.event === 'del') {
			layer.confirm('ççå é¤è¡åï¼', function (index) {
			var HInterID = obj.data.HInterID;
			var HEntryID = obj.data.HEntryID;

			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + "/Cj_SingleStation/ProcessItemRepairDel",
			type: "GET",
			async: false,
			data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"],"HBill":"ZB" },
			success: function (result) {
			if (result.count == 1) {
			layer.msg("å é¤æåï¼");
			layer.close(ajaxLoad);
			//æ¥è¯¢è¿ä¿®è®°å½
			get_Display();
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			layer.close(ajaxLoad);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.close(ajaxLoad);
			}
			})
			});
			}
			}

			//ä¸è¯åå éæ©é¡µé¢
			@@ -692,36 +740,43 @@
			})
			}


			//æ¢éä»¶é¡µé¢
			function get_checkSearchChangeMater() {
			var HMaterSN = $("#HMaterSN").val();
			if (HMaterSN == "") {
			var HBarCode = $("#HBarCode").val();
			if (HBarCode == "") {
			return layer.msg("è¯·åæ«æ¡ç !");
			}

			if (hpj == 0) {
			return layer.msg("è¯·åä¿åè¿ä¿®è®°å½!");
			}

			var HInterID = $("#HInterID").val();
			var HBillNo = $("#HBillNo").val();
			//var HEmpName = $("#HEmpName").val();
			//var HProdMac = $("#HProdMac").val();
			//var HSourceInterID = $("#HSourceInterID").val();
			//var HSourceEntryID = $("#HSourceEntryID").val();
			//var HSourceBillNo = $("#HSourceBillNo").val();
			//var HSourceBillType = $("#HSourceBillType").val();
			//var HBarCode = $("#HBarCode").val();
			var HEmpName = $("#HEmpName").val();
			var HProdMac = $("#HProdMac").val();
			var HSourceInterID = $("#HSourceInterID").val();
			var HSourceEntryID = $("#HSourceEntryID").val();
			var HSourceBillNo = $("#HSourceBillNo").val();
			var HSourceBillType = $("#HSourceBillType").val();
			var HProcExchBillNo = $("#HProcExchBillNo").val();
			var HProcess = $("#HProcess").val();

			var dataParams = {
			'OperationType': 1
			, 'HMaterSN': HMaterSN
			, 'HInterID': HInterID
			, 'HBillNo': HBillNo
			//, 'HEmpName': HEmpName
			//, 'HProdMac': HProdMac
			//, 'HSourceInterID': HSourceInterID
			//, 'HSourceEntryID': HSourceEntryID
			//, 'HSourceBillNo': HSourceBillNo
			//, 'HSourceBillType': HSourceBillType
			//, 'HBarCode': HBarCode
			//, 'subMaterList_Temp': $("#subMaterList_Temp").val()
			, 'HMaterSN': HBarCode
			, 'HEmpName': HEmpName
			, 'HProdMac': HProdMac
			, 'HSourceInterID': HSourceInterID
			, 'HSourceEntryID': HSourceEntryID
			, 'HSourceBillNo': HSourceBillNo
			, 'HSourceBillType': HSourceBillType
			, 'HBarCode': HBarCode
			, 'HProcExchBillNo': HProcExchBillNo
			, 'HProcess': HProcess
			, 'subMaterList_Temp': $("#subMaterList_Temp").val()
			}
			var datajson = JSON.stringify(dataParams);
			url = encodeURI('../../è½¦é´ç®¡ç/ååè¿ç«/Cj_ProcessItemBGA_PJGH.html?OperationType=1&datajson=' + datajson);
			@@ -743,6 +798,43 @@
			})
			}

			//ä¿å
			function get_Save(data, HResult) {
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache["mainTable"]);
			var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + HResult;

			var index = layer.load();
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/Cj_SingleStation/HFXAddRepairBill",
			async: false,
			data: { "sMainSub": sMainSub },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) {
			$('#NGSave').addClass("layui-btn-disabled").attr("disabled", true);
			$('#OKSave').addClass("layui-btn-disabled").attr("disabled", true);
			$('#btnAdd').removeClass("layui-btn-disabled").attr("disabled", false);
			layer.close(index);
			layer.msg("æäº¤æå");
			hpj = 1;
			get_Display();
			var mychart1 = echarts.init(document.getElementById('mychart1'));
			get_Histogram1(mychart1);//æ±ç¶å¾1
			}
			else {
			layer.close(index);
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.close(index);
			layer.msg("éè¯¯:" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}

			//#endregion

			});