MES-WEB-LayUI.git

			@@ -81,7 +81,7 @@
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
			<input type="hidden" name="HEntryID" id="HEntryID" lay-verify="HEntryID" value="0">
			<input type="hidden" name="HEntryID" id="HEntryID" lay-verify="HEntryID" value="1">
			</div>
			</div>
			<div class="layui-inline">
			@@ -187,10 +187,12 @@
			<input type="hidden" name="HSourceBillType" id="HSourceBillType" lay-verify="HSourceBillType" value="">
			<input type="hidden" name="HRelationQty" id="HRelationQty" lay-verify="HRelationQty" value="0">
			<input type="hidden" name="HRelationMoney" id="HRelationMoney" lay-verify="HRelationMoney" value="0">
			<input type="hidden" name="HRelationBillNo" id="HRelationBillNo" lay-verify="HRelationBillNo" value="">

			<input type="hidden" name="HMacAddr" id="HMacAddr" lay-verify="HMacAddr">
			<input type="hidden" name="HIPAddr" id="HIPAddr" lay-verify="HIPAddr">

			<!--è®°å½åé¡µé¢(æ´æ¢éä»¶)åè¡¨çä¸´æ¶æ°æ®-->
			<input type="hidden" name="subMaterList_Temp" id="subMaterList_Temp" lay-verify="subMaterList_Temp">

			</div>
			</div>
			@@ -358,7 +360,8 @@
			var HModName = "Sc_SourceLineRepairBill";
			//è¡¨æ ¼æ¸²æåæ°
			var option = {}; //é¡¹ç®é¶æ®µè¡¨æ¸²æåæ°
			var titleData = ["HInterID", "HMaterID", "HBadReasonID"];//åè¡¨ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HInterID", "HEntryID", "HBadReasonID"];//åè¡¨ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			//è·ååæ°
			var params = getUrlVars();
			var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å 1æ·»å ä¿å 2å¤å¶ 3 ç¼è¾
			@@ -416,12 +419,6 @@
			get_checkSearchHBadResult();
			});
			//#endregion

			//#region éæ©æ¥åºåå æé®
			form.on('submit(btnSearchHWasterReason)', function () {
			get_checkSearchHWasterReason();
			});
			//#endregion
			//#endregion

			//#region æä½æé®è§¦åäºä»¶
			@@ -464,7 +461,7 @@
			//#region æ¢éä»¶
			form.on('submit(ChangeMater)', function (data) {
			//layer.msg("æ¢éä»¶");
			get_checkSearchChangeBill();
			get_checkSearchChangeMater();
			});
			//#endregion

			@@ -656,6 +653,7 @@
			function createBillNo() {
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			async: false,
			type: "GET",
			data: { "HBillType": '3748' },
			success: function (d) {
			@@ -674,13 +672,15 @@
			var Czybm = sessionStorage["Czybm"];

			$.ajax({
			url: GetWEBURL() + "/Sc_ICMOBillQualityStatus_Tmp/getMainInfo",
			url: GetWEBURL() + "/Sc_SourceLineRepairBill/getMainInfo",
			type: "GET",
			async: false,
			data: { "Czybm": Czybm, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			var tableMain = result.data;
			var subMaterList_Temp = [];

			//ä¸»è¡¨ èµå¼
			form.val("formData", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼

			@@ -717,6 +717,8 @@
			, "HSourceEntryID": tableMain[0]["HICMOEntryID"] == null ? 0 : tableMain[0]["HICMOEntryID"]
			, "HSourceBillNo": tableMain[0]["HICMOBillNo"]
			, "HSourceBillType": tableMain[0]["HICMOBillType"]

			, "subMaterList_Temp": JSON.stringify(subMaterList_Temp)

			});
			} else {
			@@ -741,14 +743,15 @@
			, height: 400
			}

			var HInterID = $("#HInterID").val();

			var HSourceInterID = $("#HSourceInterID").val();
			var HSourceEntryID = $("#HSourceEntryID").val();
			var HDate = $("#HDate").val();
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + "/Sc_ICMOBillQualityStatus_Tmp/getSubInfo",
			url: GetWEBURL() + "/Sc_SourceLineRepairBill/getSubInfo",
			type: "GET",
			async: false,
			data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
			data: { "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HDate": HDate, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			var data = [];
			@@ -863,14 +866,14 @@

			//#region ä¸è¯çå æ¯åæå¾æ°æ®è·å
			function getBadReasonRateInfo() {
			var HICMOInterID = $("#HICMOInterID").val();
			var HICMOEntryID = $("#HICMOEntryID").val();
			var HSourceInterID = $("#HSourceInterID").val();
			var HSourceEntryID = $("#HSourceEntryID").val();

			$.ajax({
			url: GetWEBURL() + "/Sc_ICMOBillQualityStatus_Tmp/getBadReasonRateInfo",
			url: GetWEBURL() + "/Sc_SourceLineRepairBill/getBadReasonRateInfo",
			type: "GET",
			async: false,
			data: { "HICMOInterID": HICMOInterID, "HICMOEntryID": HICMOEntryID },
			data: { "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID },
			success: function (result) {
			if (result.count == 1) {
			//æ¸²æä¸è¯çå æ¯åæå¾
			@@ -894,7 +897,7 @@
			getMainInfo();
			//åå§åé¡¹ç®é¶æ®µè¡¨
			get_InitGrid();
			//åå§åä¸è¯çå æ¯åæ
			//ä¸è¯çå æ¯åæå¾æ¸²æ
			getBadReasonRateInfo();
			}
			//#endregion
			@@ -1022,49 +1025,18 @@
			}
			//#endregion

			//#region æ¥åºåå éæ©é¡µé¢
			function get_checkSearchHWasterReason() {
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "æ¥åºåå åè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}

			layer.msg("æ¥åºåå ");
			//$("#HBadResultID").val(checkStatus.data[0].HItemID);//åç
			//$("#HBadResultName").val(checkStatus.data[0].ä¸è¯åå åç§°);//åç§°
			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			})
			}
			//#endregion

			//#region æ¡å½¢ç åè½¦äºä»¶
			function touchedByEnter_HBarCode() {
			var HBarCode = $("#HBarCode").val();

			$.ajax({
			url: GetWEBURL() + "/Sc_ICMOBillQualityStatus_Tmp/getBarCodeInfo",
			url: GetWEBURL() + "/Sc_SourceLineRepairBill/getBarCodeInfo",
			type: "GET",
			async: false,
			data: { "HBarCode": HBarCode},
			success: function (result) {
			if (result.count == 1) {
			$("#HMTONo").val(result.data[0]["HMTONo"]);

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			@@ -1072,7 +1044,6 @@
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})

			}
			//#endregion

			@@ -1100,29 +1071,88 @@
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}

			$("HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("HCreateDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HBadProcID").val(checkStatus.data[0].HProcID);
			$("#HBadProcName").val(checkStatus.data[0].å·¥åº);

			$("#HSplitNO").val(checkStatus.data[0].åæ®å·);
			$("#HICMOInterID").val(checkStatus.data[0].çäº§è®¢ååç );
			$("#HICMOEntryID").val(checkStatus.data[0].çäº§è®¢åæç»åç );
			$("#HICMOBillNo").val(checkStatus.data[0].çäº§è®¢åå·);

			$("#HDeptID").val(checkStatus.data[0].HDeptID);
			$("#HDeptName").val(checkStatus.data[0].é¨é¨);

			$("#HSourceID").val(checkStatus.data[0].HSourceID);
			$("#HSourceName").val(checkStatus.data[0].çäº§èµæº);

			$("#HMaterID").val(checkStatus.data[0].HMaterID);
			$("#HMaterNumber").val(checkStatus.data[0].ç©æä»£ç );
			$("#HMaterName").val(checkStatus.data[0].ç©æåç§°);
			$("#HMaterModel").val(checkStatus.data[0].è§æ ¼åå·);
			$("#HUnitID").val(checkStatus.data[0].HUnitID);
			$("#HUnitName").val(checkStatus.data[0].è®¡éåä½);
			$("#HSourceID").val(checkStatus.data[0].HSourceID);
			$("#HSourceName").val(checkStatus.data[0].çäº§èµæº);
			$("#HDeptID").val(checkStatus.data[0].HDeptID);
			$("#HDeptName").val(checkStatus.data[0].é¨é¨);
			$("#HGroupID").val(checkStatus.data[0].HGroupID);
			$("#HGroupName").val(checkStatus.data[0].çç»);
			$("#HAuxPorpID").val(checkStatus.data[0].HAuxPropID);
			$("#HAuxPropName").val(checkStatus.data[0].è¾å©å±æ§);
			$("#HProcID").val(checkStatus.data[0].HProcID);
			$("#HProcName").val(checkStatus.data[0].å·¥åº);

			$("#HProcess").val(checkStatus.data[0].HProcID);
			$("#HProcessName").val(checkStatus.data[0].å·¥åº);

			$("#HSourceInterID").val(checkStatus.data[0].çäº§è®¢ååç );
			$("#HSourceEntryID").val(checkStatus.data[0].çäº§è®¢åæç»åç );
			$("#HSourceBillNo").val(checkStatus.data[0].çäº§è®¢åå·);
			$("#HSourceBillType").val(checkStatus.data[0].çäº§è®¢åç±»å);

			//layer.msg("æ¢å");
			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			})
			}
			//#endregion

			//#region æ¢éä»¶é¡µé¢
			function get_checkSearchChangeMater() {
			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 url = "../../è®¡åç®¡ç/äº§çº¿è¿ä¿®å¹³å°/Sc_SourceLineRepairBill_ChangeMater.html?OperationType=2&HInterID=" + HInterID + "&HSourceInterID=" + HSourceInterID + "&HSourceEntryID=" + HSourceEntryID + "&HSourceBillNo=" + HSourceBillNo + "&HSourceBillType=" + HSourceBillType + "&HBarCode=" + HBarCode + "&subMaterListLength=" + subMaterListLength + "&HBillNo=" + HBillNo + "&HEmpName=" + HEmpName + "&HProdMac=" + HProdMac;

			var dataParams = {
			'OperationType': 2
			, 'HInterID': HInterID
			, 'HBillNo': HBillNo
			, 'HEmpName': HEmpName
			, 'HProdMac': HProdMac
			, 'HSourceInterID': HSourceInterID
			, 'HSourceEntryID': HSourceEntryID
			, 'HSourceBillNo': HSourceBillNo
			, 'HSourceBillType': HSourceBillType
			, 'HBarCode': HBarCode
			, 'subMaterList_Temp': $("#subMaterList_Temp").val()
			}
			var datajson = JSON.stringify(dataParams);
			url = encodeURI('../../è®¡åç®¡ç/äº§çº¿è¿ä¿®å¹³å°/Sc_SourceLineRepairBill_ChangeMater.html?datajson=' + datajson);

			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "äº§çº¿è¿ä¿®å¹³å°(æ´æ¢éä»¶)" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: [url, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {


			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			@@ -1134,28 +1164,68 @@
			function set_AddNew(data,HSaveType) {
			data.field.HReportType = "3";
			//è·åè¡¨å¤´æ°æ®
			var tableMain = data.field;
			var tableMain = {
			"HInterID": $("#HInterID").val()
			, "HBillNo": $("#HBillNo").val()
			, "HDate": $("#HDate").val()
			, "HEmpID": $("#HEmpID").val()
			, "HDeptID": $("#HDeptID").val()
			, "HSourceID": $("#HSourceID").val()
			, "HProdOrgID": $("#HProdOrgID").val()
			, "HMaterID": $("#HMaterID").val()
			, "HWorkStationID": $("#HWorkStationID").val()
			, "HProcess": $("#HProcess").val()
			, "HIPAddr": $("#HIPAddr").val()
			, "HMacAddr": $("#HMacAddr").val()
			, "HProdMac": $("#HProdMac").val()
			, "HBarCode": $("#HBarCode").val()
			}
			//è·ååè¡¨1æ°æ®
			var tableSub = {
			"HInterID": $("#HInterID").val()
			, "HEntryID": $("#HEntryID").val()
			, "HBillNo_bak": $("#HBillNo").val()
			, "HRemark": $("#HRemark").val()
			, "HSourceInterID": $("#HSourceInterID").val()
			, "HSourceEntryID": $("#HSourceEntryID").val()
			, "HSourceBillNo": $("#HSourceBillNo").val()
			, "HSourceBillType": $("#HSourceBillType").val()
			, "HBadReasonID": $("#HBadReasonID").val()
			, "HBadTypeID": $("#HBadTypeID").val()
			, "HBadResultID": $("#HBadResultID").val()
			, "HBadProcID": $("#HBadProcID").val()
			, "HRepairResult": $("#HRepairResult").val()
			, "HCreator": $("#HCreator").val()
			, "HCreateDate": $("#HCreateDate").val()
			}

			//è·åè¡¨å¤´æ°æ®å¹¶åºåå
			var sMainStr = JSON.stringify(tableMain); //ä¸»è¡¨æ°æ®
			var sMainStr = JSON.stringify(tableMain);
			//åºåååè¡¨1æ°æ®
			var sSubStr = JSON.stringify(tableSub);
			//è·ååè¡¨2æ°æ®åºåå
			var sSubMaterStr = $("#subMaterList_Temp").val();


			//æ¼æ¥åºååçæ°æ®
			var sMainSub = sMainStr + ';' + HSaveType + ";" + sessionStorage["HUserName"];
			var sMainSub = sMainStr + ';' + sSubStr + ";" + sSubMaterStr + ";" + sessionStorage["HUserName"];

			var index = layer.load();
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "Sc_ICMOBillQualityStatus_Tmp/AddICMOBillQualityStatus_Tmp",
			url: GetWEBURL() + "Sc_SourceLineRepairBillSub/AddSourceLineRepairBill",
			async: true,
			data: { "sMainSub": sMainSub },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) {
			//set_ClearBill();

			//çæå¹¶è®¾ç½®ä¸»è¡¨çåç ååæ®å·ãæ¥æ
			createBillNo();
			//æ´æ°è¡¨å¤´
			getMainInfo();
			//æ´æ°åè¡¨
			get_InitGrid();
			//æ´æ°ä¸è¯çå æ¯åæ
			//æ´æ°ä¸è¯çå æ¯åæå¾
			getBadReasonRateInfo();

			layer.close(index);
			@@ -1218,13 +1288,14 @@
			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() + "/Sc_ICMOBillQualityStatus_Tmp/deleteSubInfo",
			url: GetWEBURL() + "/Sc_SourceLineRepairBill/deleteSubInfo",
			type: "GET",
			async: false,
			data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },
			data: { "HInterID": HInterID, "HEntryID": HEntryID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg("å é¤æåï¼");