From 6067c5e5e7e568caa915f5124c71f39fbd2dc1b9 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 16 六月 2025 08:03:29 +0800
Subject: [PATCH] 结束任务新增弹窗，以及理片界面显示工程号

---
 河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/gotasks.jsp |  118 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 103 insertions(+), 15 deletions(-)

diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/gotasks.jsp" "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/gotasks.jsp"
index 490c9f5..f1a12b0 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/gotasks.jsp"
+++ "b/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/gotasks.jsp"
@@ -10,25 +10,78 @@
 <script type="text/javascript">
 	//鍋滄椤甸潰鑷姩鍒锋柊
 
-	function delecttask(groups,id) {
-		//disableAutoRefresh();
-		$.ajax({
-			async : false,
+	var groups=0;
+	var id=0;
+	var state=0;
+	//缁撴潫浠诲姟寮圭獥
+	function delecttask(groups1,id1) {
+		if(typeof stopRefresh === "function"){
+			stopRefresh();
+		}
+		$("#add-info1").modal('show');
+		groups=groups1;
+		id=id1;
+		state=1
+		
+	}
+	//涓柇浠诲姟寮圭獥
+	function delecttask1(groups1,id1) {
+		if(typeof stopRefresh === "function"){
+			stopRefresh();
+		}
+		$("#add-info1").modal('show');
+		groups=groups1;
+		id=id1;
+		state=2
+		
+	}
+	//缁撴潫涓柇浠诲姟
+	function delecttask3() {
+		if(state==1){
+			$.ajax({
+				async : false,
 
-			type : "GET",
+				type : "GET",
 
-			url : "${ctx}/cutmanage/delecttask/" + id +"/" +groups,
+				url : "${ctx}/cutmanage/delecttask/" + id +"/" +groups,
 
-			dataType : "text",
+				dataType : "text",
 
-			success : function(data) {
-				window.location.href = "${ctx}/cutmanage/gettask/" + groups;
-			}
-		});
-		alert(groups);
+				success : function(data) {
+					alert(groups+"鍙风嚎"+data);
+					if(data=="缁撴潫鎴愬姛"){
+						window.location.href = "${ctx}/cutmanage/gettask/" + groups;
+					}
+					
+				}
+			}); 
+		}else if(state==2){
+			$.ajax({
+				async : false,
+
+				type : "GET",
+
+				url : "${ctx}/cutmanage/delecttask1/" + id+"/" +groups,
+
+				dataType : "text",
+
+				success : function(data) {
+					alert(groups+"鍙风嚎"+data);
+					if(data=="涓柇鎴愬姛"){
+						window.location.href = "${ctx}/cutmanage/gettask/" + groups;
+					}
+					
+				}
+			});
+		}
+		
+	}
+	//寮圭獥鍙栨秷
+	function delecttask4() {
+		window.location.href = "${ctx}/cutmanage/gettask/" + groups;
 	}
 
-	function delecttask1(groups,id) {
+	/* function delecttask1(groups,id) {
 		//disableAutoRefresh();disableAutoRefresh();
 		$.ajax({
 			async : false,
@@ -40,10 +93,14 @@
 			dataType : "text",
 
 			success : function(data) {
-				window.location.href = "${ctx}/cutmanage/gettask/" + groups;
+				alert(groups+"鍙风嚎"+data);
+				if(data=="涓柇鎴愬姛"){
+					window.location.href = "${ctx}/cutmanage/gettask/" + groups;
+				}
+				
 			}
 		});
-	}
+	} */
 
 	function updatetask(id) {
 		//disableAutoRefresh();
@@ -283,6 +340,37 @@
 					</tbody>
 				</table>
 			</div>
+			
+			
+			<div class="modal fade" id="add-info1" tabindex="-1" role="dialog"
+			aria-labelledby="myModalLabel" aria-hidden="true">
+			<form class="form-horizontal" role="form">
+				<div class="modal-dialog">
+					<div class="modal-content">
+						<div class="modal-header">
+							<button type="button" class="close" onclick="delecttask4()" data-dismiss="modal"
+								aria-hidden="true">&times;</button>
+							<h3 class="modal-title" id="DEL_AlertTitle">鎿嶄綔鎻愮ず锛�</h3>
+						</div>
+						<div class="modal-body" style="text-align: left;">
+							<h3 id="DEL_MsgShow">
+								鏄惁纭畾鎵ц <span id="DEL_Id" style="sixe: 25px; font-weight: bold"></span>
+								<span style="sixe: 20px; color: red; font-weight: bold">缁撴潫/涓柇浠诲姟
+								</span> 鎿嶄綔锛�
+							</h3>
+						</div>
+						<div class="modal-footer">
+
+							<button type="button" onclick="delecttask4()" class="btn btn-default btn-lg"
+									data-dismiss="modal">鍚�</button>
+								<button type="button" onclick="delecttask3()" class="btn btn-primary btn-lg" id="addbtnsubmit">鏄�</button>
+						</div>
+					</div>
+				</div>
+			</form>
+		</div>
+			
+		
 		</section>
 
 		<%@ include file="/WEB-INF/views/mes/view/modal_banzu.jsp"%>

--
Gitblit v1.8.0