From 32e8ae44d542d6f6d2dc82896f5ffe58ce695889 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 06 六月 2025 15:00:36 +0800
Subject: [PATCH] 修改任务界面跟测量界面

---
 河北望美项目/MES_11/src/main/webapp/WEB-INF/views/cutmanage/gotasks.jsp |   38 ++++++++++++++++++++++++++++----------
 1 files changed, 28 insertions(+), 10 deletions(-)

diff --git "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/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/src/main/webapp/WEB-INF/views/cutmanage/gotasks.jsp"
index a4bef3f..a448eeb 100644
--- "a/\346\262\263\345\214\227\346\234\233\347\276\216\351\241\271\347\233\256/MES_11/src/main/webapp/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/src/main/webapp/WEB-INF/views/cutmanage/gotasks.jsp"
@@ -10,37 +10,37 @@
 <script type="text/javascript">
 	//鍋滄椤甸潰鑷姩鍒锋柊
 
-	function delecttask(id) {
+	function delecttask(groups,id) {
 		//disableAutoRefresh();
 		$.ajax({
 			async : false,
 
 			type : "GET",
 
-			url : "${ctx}/cutmanage/delecttask/" + id,
+			url : "${ctx}/cutmanage/delecttask/" + id +"/" +groups,
 
 			dataType : "text",
 
 			success : function(data) {
-				window.location.href = "${ctx}/cutmanage/gettask/" + id;
+				window.location.href = "${ctx}/cutmanage/gettask/" + groups;
 			}
 		});
-		alert(id);
+		alert(groups);
 	}
 
-	function delecttask1(id) {
+	function delecttask1(groups,id) {
 		//disableAutoRefresh();disableAutoRefresh();
 		$.ajax({
 			async : false,
 
 			type : "GET",
 
-			url : "${ctx}/cutmanage/delecttask1/" + id,
+			url : "${ctx}/cutmanage/delecttask1/" + id+"/" +groups,
 
 			dataType : "text",
 
 			success : function(data) {
-				window.location.href = "${ctx}/cutmanage/gettask/" + id;
+				window.location.href = "${ctx}/cutmanage/gettask/" + groups;
 			}
 		});
 	}
@@ -78,6 +78,17 @@
 			}
 		});
 	}
+	
+	function collectingTasks() {
+		//disableAutoRefresh();
+		var groups = document.getElementsByName('groups')[0].value;
+		var state = document.getElementsByName('state')[0].value;
+		if(state=="0"){
+			window.location.href = "${ctx}/cutmanage/gettasks/" + groups;
+		}
+		
+	}
+	
 	function updatedengluname() {
 		$("#updatedengluname").modal('show');
 		//disableAutoRefresh();
@@ -187,6 +198,9 @@
 				<button id="btnOffWork" type='button' class='btn btn-primary ' onclick='offWork()'>鍒囧壊-浜ч噺</button>
 				&nbsp; 
 				&nbsp;
+				<button id="btnOffWork" type='button' class='btn btn-primary ' onclick='collectingTasks()'>棰嗗彇浠诲姟</button>
+				&nbsp; 
+				&nbsp;
 				<small>褰撳墠涓婄墖宸ヤ綅妯″紡:</small> &nbsp; 
 
 				<button id="btnStatcionMode" type='button' class='btn btn-primary' onclick='onChangeMode(${groups})' >鍗曞伐浣�</button>
@@ -208,6 +222,8 @@
 		<!-- Main content -->
 		<input style="display: none" type="text" name="groups"
 			value="${groups}" />
+			<input style="display: none" type="text" name="state"
+			value="${state}" />
 		<section class="content container-fluid">
 			<div></div>
 			<div>
@@ -218,7 +234,7 @@
 
 			</div>
 			<div class="box"
-				style="height: 120px; overflow: auto; margin-top: 10px;">
+				style="height: 172px; overflow: auto; margin-top: 10px;">
 				<table class="table table-striped table-hover"
 					style="overflow-x: auto">
 					<thead>
@@ -231,6 +247,7 @@
 							<th>瀹屾垚鏁伴噺</th>
 							<th>鎬绘暟閲�</th>
 							<th>瀹屾垚闈㈢Н(mm)</th>
+							<th>鐘舵��</th>
 							<th>鎿嶄綔</th>
 
 						</tr>
@@ -240,7 +257,7 @@
 				</table>
 			</div>
 			<div class="box"
-				style="height: 600px; overflow: auto; margin-top: 10px;">
+				style="height: 500px; overflow: auto; margin-top: 10px;">
 				<table class="table table-striped table-hover2"
 					style="overflow-x: auto">
 					<thead>
@@ -251,6 +268,7 @@
 							<th>鍘氬害</th>
 							<th>棰滆壊</th>
 							<th>鐘舵��</th>
+							<th>宸ョ▼</th>
 							<th>鎿嶄綔</th>
 
 						</tr>
@@ -262,7 +280,7 @@
 		</section>
 
 		<%@ include file="/WEB-INF/views/mes/view/modal_banzu.jsp"%>
-		<%-- <%@ include file="/WEB-INF/views/mes/view/modal_tijiaobaogong.jsp"%> --%>
+		<%@ include file="/WEB-INF/views/mes/view/modal_tijiaobaogong.jsp"%>
 		<%@ include file="/WEB-INF/views/mes/view/modal_tishi.jsp"%>
 		<%@ include file="/WEB-INF/views/mes/view/modal_QG_tijiaobaogong.jsp"%>
 		<!-- /.content -->

--
Gitblit v1.8.0