MES-WEB-LayUI.git

			@@ -324,6 +324,7 @@
			var HSourceEntryID = ""; //æºåååç
			var HSourceBillNo = ""; //æºååå·
			var HSourceBillType = ""; //æºåç±»å
			var refSav = ""; //æäº¤ç±»å
			//è·åé¡µé¢è·³è½¬åæ° //åæ®ç¼è¾ç¶æï¼ 1.æ æºåæ°å¢Â Â 2.ææºåæ°å¢Â Â 3.ç¼è¾Â 4.æµè§Â 5.åæ´
			var params = get_UrlVars();
			if (typeof (params[params[0]]) == "undefined") {
			@@ -364,9 +365,17 @@

			//å¤ææä½ç±»å
			if (OperationType == 1) {//æ æºå
			$("#HEmpID").val(sessionStorage["HEmpID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½åID
			$("#HEmpName").val(sessionStorage["HEmpName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½å
			$("#HGroupID").val(sessionStorage["HGroupID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»ID
			$("#HGroupName").val(sessionStorage["HGroup"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»
			set_AddFNew();
			}
			else if (OperationType == 2) {//ææºå
			$("#HEmpID").val(sessionStorage["HEmpID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½åID
			$("#HEmpName").val(sessionStorage["HEmpName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½å
			$("#HGroupID").val(sessionStorage["HGroupID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»ID
			$("#HGroupName").val(sessionStorage["HGroup"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»
			set_AddNew();
			}
			else if (OperationType == 3) {//ç¼è¾
			@@ -423,6 +432,7 @@

			//ææºåæ°å¢
			function set_AddNew() {
			refSav = "Add";
			//åå§åºæ¬ä¿¡æ¯èµå¼
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); //åæ®æ¥æ
			$("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")) //å¼å·¥æ¥æ
			@@ -470,7 +480,7 @@
			$("#HMaterSpec").val(LoadData[0].HModel); //äº§åè§æ ¼
			$("#HSourceID").val(LoadData[0].HSourceID); //çäº§èµæºID
			$("#HSourceName").val(LoadData[0].HSourceName); //çäº§èµæº
			$("#HMainSourceBillNo").val(LoadData[0].HICMOBillNo); //æºååå·ï¼ææ¶åå¼è®¢åç¼å·ï¼
			$("#HMainSourceBillNo").val(LoadData[0].HSourceBillNo); //æºååå·
			$("#HMainSourceInterID").val(LoadData[0].HSourceInterID); //æºåä¸»åç (åå¼HInterID)
			$("#HMainSourceEntryID").val(LoadData[0].HSourceEntryID); //æºåååç (æºåè¡å·)
			$("#HMainSourceBillType").val(HSourceBillType); //æºåç±»å
			@@ -494,6 +504,7 @@
			//ç¼è¾
			function set_EditFromGrid()
			{
			refSav = "Update";
			$('#HMaterCode').attr("disabled", true);
			$('#HMaterList').addClass("layui-btn-disabled").attr("disabled", true);
			$('#HMaterName').attr("disabled", true);
			@@ -614,8 +625,10 @@


			//ä¿åæäº¤
			form.on('submit(Saver)', function (data) {
			form.on('submit(Saver)', function (data) {

			var sMainStr = JSON.stringify(data.field);
			var sMainSub = sMainStr + ';' + sessionStorage["HUserName"] + ';' + refSav;
			if (!AllowLoadData())//æ°æ®éªè¯
			{
			return false;
			@@ -623,20 +636,37 @@
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESBeginWorkFrom", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "msg": sMainStr },
			async: false,
			data: { "msg": sMainSub },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			$("#HInterID").val(data.HInterID);//è·åæäº¤æåè¿åçåæ®ä¸»ID
			layer.confirm(data.Message, {
			btn: ['ç¡®è®¤']
			}, function (index) {
			if (data.Verify == "Y") //èªå¨å®¡æ ¸
			{
			SaveVerify(); //å®¡æ ¸
			}
			layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
			//layer.close(layer.index);
			//window.parent.location.reload();
			if (data.Verify == "Y") //èªå¨å®¡æ ¸
			{
			layer.close(index);
			SaveVerify(); //å®¡æ ¸
			}
			else {
			layer.close(index);
			}
			});

			//layer.confirm(data.Message, {
			// btn: ['ç¡®è®¤']
			//}, function (index) {
			// if (data.Verify == "Y") //èªå¨å®¡æ ¸
			// {
			// layer.close(index);
			// SaveVerify(); //å®¡æ ¸
			// }
			// else {
			// layer.close(index);
			// }
			//});
			}
			else {
			layer.alert(data.Message, { icon: 5 })
			@@ -662,7 +692,7 @@
			return false;
			}
			$.ajax({
			type: "POST",
			type: "GET",
			url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
			@@ -688,7 +718,7 @@
			//éåº
			form.on('submit(Exit)', function (data) {
			Pub_Close(1);
			window.parent.location.reload();
			parent.location.reload();
			});


			@@ -703,7 +733,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/PartInformation.html', 'yes'],
			content: ['../../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -713,10 +743,10 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HMaterName").val(checkStatus.data[0].HName);
			$("#HMaterCode").val(checkStatus.data[0].HNumber);
			$("#HMaterName").val(checkStatus.data[0].ç©æåç§°);
			$("#HMaterNumber").val(checkStatus.data[0].ç©æä»£ç );
			$("#HMaterID").val(checkStatus.data[0].HItemID);
			$("#HMaterSpec").val(checkStatus.data[0].HModel);
			$("#HMaterSpec").val(checkStatus.data[0].è§æ ¼åå·);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -743,7 +773,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/SourceInformation.html', 'yes'],
			content: ['../../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -753,7 +783,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HSourceName").val(checkStatus.data[0].HName);
			$("#HSourceName").val(checkStatus.data[0].çäº§èµæºåç§°);
			$("#HSourceID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -781,7 +811,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/UserInformation.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -791,7 +821,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HEmpName").val(checkStatus.data[0].HName);
			$("#HEmpName").val(checkStatus.data[0].èååç§°);
			$("#HEmpID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -821,7 +851,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/GroupInformation.html', 'yes'],
			content: ['../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_Group.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -831,7 +861,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HGroupName").val(checkStatus.data[0].HName);
			$("#HGroupName").val(checkStatus.data[0].çç»åç§°);
			$("#HGroupID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -859,7 +889,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/DeptInformation.html', 'yes'],
			content: ['../../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -869,7 +899,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HDeptName").val(checkStatus.data[0].HName);
			$("#HDeptName").val(checkStatus.data[0].é¨é¨åç§°);
			$("#HDeptID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}