MES-WEB-LayUI.git

			@@ -99,6 +99,7 @@
			<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
			<div class="layui-card-header">
			<div class="layui-btn-group">
			<button type="button" id="Add" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Add">æ°å¢</button>
			<button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">ä¿å</button>
			<button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">å®¡æ ¸</button>
			<button type="button" id="ReVerIfySaver" class="layui-btn layui-btn-normal layui-btn-circle" lay-submit="" lay-filter="ReVerIfySaver">åå®¡æ ¸</button>
			@@ -229,9 +230,9 @@
			<div class="layui-inline">
			<label class="layui-form-label">æä½å:</label>
			<div class="layui-input-inline">
			<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" id="HEmpList" style="width:40px;">
			<input type="text" name="HWorkerName" id="HWorkerName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HWorkerID" id="HWorkerID" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkerList" id="HEmpList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			@@ -395,6 +396,7 @@
			var option2;
			//#endregion


			//åå§åè¡¨åæä»¶
			set_InitFrom();

			@@ -452,19 +454,19 @@

			}

			//åå§åä¿å»é¡¹åè¡¨
			//åå§åéæåè¡¨
			function Table1() {
			//è¡¨å¤´
			columns = [
			{ type: 'checkbox', fixed: 'left' }
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe" }
			, { field: 'HBarCode', title: 'æ«ææ¡ç ', edit: 'text', hide: true }
			, { field: 'HMaterID', title: 'ç©æID', edit: 'text', hide: true }
			, { field: 'HNumber', title: 'ç©æä»£ç ', edit: 'text' }
			, { field: 'HName', title: 'ç©æåç§°', edit: 'text' }
			, { field: 'HModel', title: 'è§æ ¼åå·', edit: 'text' }
			, { field: 'HUnitID', title: 'åä½ID', edit: 'text', hide: true }
			, { field: 'HUnitName', title: 'åä½', edit: 'text' }
			, { field: 'HModel', title: 'è§æ ¼åå·', edit: 'text' }
			, { field: 'HMQty', title: 'éææ°é', edit: 'text' }
			, { field: 'HQty', title: 'å®éæ°é', edit: 'text' }
			];
			@@ -546,52 +548,35 @@
			form.render('select');
			$('#HICMOBillNo').attr("disabled", true);

			set_EditForm(linterid); //ç¼è¾è·åè¡¨å¤´
			set_EditGrid(linterid); //ç¼è¾è·åè¡¨ä½

			}

			//ç¼è¾è·åè¡¨å¤´
			function set_EditForm(linterid) {
			//æ¥è¯¢æ£éªæ¹æ¡åæ¯å¦åå¨
			$.ajax({
			url: GetWEBURL() + "Sc_MESBeginWorkBill/Sc_MESBeginWorkBillListCheckDetai",
			url: GetWEBURL() + "Sc_MouldMaintainBill/Sc_MouldMaintainBillListCheckDetai",
			type: "GET",
			data: {
			"HID": linterid
			},
			success: function (result) {

			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data.h_v_Sc_MESBeginWorkBillList_NEW[0];
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HInterID": data.hmainid
			, "HBillNo": data.åæ®å·
			var data = result.data.h_v_Sc_MouldMaintain[0];
			form.val("component-form-group", {
			"HBillNo": data.åæ®å·
			, "HDate": formatDate(data.æ¥æ)
			, "HProcID": data.HProcID
			, "HProcName": data.å·¥åºåç§°
			, "HMaterID": data.HMaterID
			, "HMaterCode": data.äº§åä»£ç
			, "HMaterName": data.äº§ååç§°
			, "HMaterSpec": data.è§æ ¼åå·
			, "HBeginDate": data.å¼å·¥æ¶é´
			, "HSourceID": data.HSourceID //èµæºID
			, "HSourceName": data.èµæºåç§° //èµæºåç§°
			, "HEmpID": data.HEmpID //æä½åID
			, "HEmpName": data.ç³è¯·å¼å·¥äººå //æä½å
			, "HMainSourceInterID": data.HMainSourceInterID //æºåID
			, "HMainSourceEntryID": data.HMainSourceEntryID //æºååID
			, "HMainSourceBillNo": data.HMainSourceBillNo //æºååå·
			, "HMainSourceBillType": data.HMainSourceBillType //æºåç±»å
			, "HGroupID": data.HGroupID //çç»ID
			, "HGroupName": data.çç»åç§° //çç»åç§°

			, "HICMOInterID": data.HICMOInterID //çäº§è®¢åä¸»ID
			, "HICMOEntryID": data.HICMOEntryID //çäº§è®¢ååID
			, "HICMOBillNo": data.HICMOBillNo //çäº§è®¢å
			, "HRemark": data.å¤æ³¨ //å¤æ³¨
			, "HMaker": data.å¶åäºº //å¶åäºº
			, "HMakeDate": data.å¶åæ¥æ //å¶åæ¥æ
			, "HUpDater": sessionStorage["HUserName"] //ä¿®æ¹äºº
			, "HUpDateDate": Format(new Date(), "yyyy-MM-dd hh:mm:ss")//ä¿®æ¹æ¥æ
			, "HChecker": data.å®¡æ ¸äºº //å®¡æ ¸äºº
			, "HCheckDate": data.å®¡æ ¸æ¥æ //å®¡æ ¸æ¥æ
			, "HCloseMan": data.å³éäºº //å³éäºº
			, "HCloseDate": data.å³éæ¥æ //å³éæ¥æ
			, "HDeleteMan": data.ä½åºäºº //ä½åºäºº
			, "HDeleteDate": data.ä½åºæ¥æ //ä½åºæ¥æ
			, "HInnerBillNo": data.åé¨åæ®å·
			, "HBeginDate": formatDate(data.ä¿å»å¼å§æ¥æ)
			, "HEndDate": formatDate(data.ä¿å»ç»ææ¥æ)
			, "HExplanation": data.æè¦
			, "HRemark": data.å¤æ³¨
			, "HPlanNo": data.ä¿å»è®¡åç¼å·
			, "HPlanInterID": data.ä¿å»è®¡ååç
			, "HMouldID": data.HMouldID
			, "HMouldName": data.äº§åæ¨¡å·

			});

			@@ -604,6 +589,43 @@
			});
			}

			// ç¼è¾è·åè¡¨å¤´æ¶æ¶é´æ ¼å¼ç«æ£æ¹å¼
			function formatDate(date) {
			var d = new Date(date),
			month = '' + (d.getMonth() + 1),
			day = '' + d.getDate(),
			year = d.getFullYear();

			if (month.length < 2) month = '0' + month;
			if (day.length < 2) day = '0' + day;

			return [year, month, day].join('-');
			}

			// ç¼è¾è·åè¡¨ä½
			function set_EditGrid(linterid) {
			$("#HInterID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
			//ç¼è¾å è½½æ°æ®
			$.ajax({
			url: GetWEBURL() + 'Sc_MouldMaintainBill/Sc_MouldMaintainBillListProjectDetaiNew',
			type: "GET",
			data: { "HInterID": linterid },
			success: function (result) {
			if (result.count == 1) {
			option.data = result.list[0];
			table.render(option);
			option2.data = result.list[1];
			table.render(option2);

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(index0);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			//ææºåæ°å¢
			function set_SourceAdd() {
			@@ -693,6 +715,18 @@
			});
			}

			//æ°å¢ä¿å
			form.on('submit(Add)', function (data) {
			refSav = "Add";
			//åå§åºæ¬ä¿¡æ¯èµå¼
			$("#form0")[0].reset();
			layui.form.render();
			get_MAXNum();
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //åæ®æ¥æ
			$("#HWorkReportDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //æ¥å·¥æ¥æ
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //å¶åæ¥æ
			$("#HMaker").val(sessionStorage["HUserName"]); //å¶åäºº
			});

			//ä¿åæäº¤
			form.on('submit(Saver)', function (data) {
			@@ -715,7 +749,7 @@
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			$("#HInterID").val(data.HInterID);//è·åæäº¤æåè¿åçåæ®ä¸»ID
			layer.confirm(data.Message, {
			layer.confirm(data.Message, {icon: 1,
			btn: ['ç¡®è®¤']
			}, function (index) {
			if (data.Verify == "Y") //èªå¨å®¡æ ¸
			@@ -760,17 +794,19 @@
			}
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/Sc_MaterToSourceBill/AuditProcessReportList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
			dataType: "json",
			success: function (data) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
			//layer.close(layer.index);
			//window.parent.location.reload();
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			else {
			layer.alert(data.Message, { icon: 5 })
			}
			},
			error: function (err) {
			@@ -790,17 +826,19 @@
			}
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "/Sc_MaterToSourceBill/AuditProcessReportList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "HInterID": InterID, "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
			dataType: "json",
			success: function (data) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 2000, icon: 1 }, function () {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
			//layer.close(layer.index);
			//window.parent.location.reload();
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			else {
			layer.alert(data.Message, { icon: 5 })
			}
			},
			error: function (err) {
			@@ -845,7 +883,7 @@
			tableBak = table.cache.mainTable;
			console.log(tableBak.length);
			//è·åç©ææ¡ç ä¿¡æ¯
			var NewRow = { "HMaterID": result.data[0].HMaterID, "HNumber": result.data[0].HNumber, "HName": result.data[0].HName, "HModel": result.data[0].HModel, "HUnitID": result.data[0].HUnitID, "HUnitName": result.data[0].HUnitName, "HMQty": result.data[0].HMQty, "HQty": result.data[0].HQty };
			var NewRow = { "HBarCode": result.data[0].HBarCode, "HMaterID": result.data[0].HMaterID, "HNumber": result.data[0].HNumber, "HName": result.data[0].HName, "HModel": result.data[0].HModel, "HUnitID": result.data[0].HUnitID, "HUnitName": result.data[0].HUnitName, "HMQty": result.data[0].HMQty, "HQty": result.data[0].HQty };
			if (tableBak.length <= 0) {
			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];
			@@ -858,13 +896,12 @@
			console.log(tableBak[i].HMaterID, result.data[0].HMaterID);
			if (tableBak[i].HMaterID == result.data[0].HMaterID) {
			layer.msg("å·²æ«æ,è¯·å¿éå¤æ«ç ï¼", { icon: 0, time: 2000 });
			return;
			}
			else {
			}
			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];
			table.render(option);
			}
			}
			}
			}
			}
			@@ -958,7 +995,7 @@
			});

			//æä½å
			form.on('submit(HEmpList)', function () {
			form.on('submit(HWorkerList)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			@@ -978,8 +1015,8 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HEmpName").val(checkStatus.data[0].HName);
			$("#HEmpID").val(checkStatus.data[0].HItemID);
			$("#HWorkerName").val(checkStatus.data[0].HName);
			$("#HWorkerID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -1175,7 +1212,7 @@
			layer.msg("çäº§èµæºä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			if ($("#HEmpID").val() == '' \|\| $("#HEmpID").val() == null) {
			if ($("#HWorkerID").val() == '' \|\| $("#HWorkerID").val() == null) {
			layer.msg("æä½åä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}