From 42154214c5698326710edf336b3148830b646bb2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 11 六月 2025 13:17:56 +0800
Subject: [PATCH] 望美切换订单模式修改
---
河北望美项目/MES_11/target/gmms2-1.0-SNAPSHOT/WEB-INF/views/cutmanage/gotasks.jsp | 53 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 13 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 a4bef3f..7b75cc5 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,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,23 @@
}
});
}
+
+ function collectingTasks() {
+ stopRefresh();
+ var groups = document.getElementsByName('groups')[0].value;
+ var state = document.getElementsByName('state')[0].value;
+ var fileName = document.getElementById("fileName").innerHTML;
+ if(state=="0"&&fileName.includes('P')){
+ window.location.href = "${ctx}/cutmanage/gettasks/" + groups;
+ }
+ if(state=="1"){
+ alert("褰撳墠宸插瓨鍦ㄤ袱涓换鍔�")
+ }
+ if(!fileName.includes('P')){
+ alert("琛ョ墖/鎵嬪姩宸ョ▼璇风粨鏉熶换鍔″啀棰嗗彇")
+ }
+ }
+
function updatedengluname() {
$("#updatedengluname").modal('show');
//disableAutoRefresh();
@@ -187,6 +204,9 @@
<button id="btnOffWork" type='button' class='btn btn-primary ' onclick='offWork()'>鍒囧壊-浜ч噺</button>
+ <button id="btnOffWork" type='button' class='btn btn-primary ' onclick='collectingTasks()'>棰嗗彇浠诲姟</button>
+
+
<small>褰撳墠涓婄墖宸ヤ綅妯″紡:</small>
<button id="btnStatcionMode" type='button' class='btn btn-primary' onclick='onChangeMode(${groups})' >鍗曞伐浣�</button>
@@ -208,6 +228,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 +240,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 +253,7 @@
<th>瀹屾垚鏁伴噺</th>
<th>鎬绘暟閲�</th>
<th>瀹屾垚闈㈢Н(mm)</th>
+ <th>鐘舵��</th>
<th>鎿嶄綔</th>
</tr>
@@ -240,7 +263,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 +274,7 @@
<th>鍘氬害</th>
<th>棰滆壊</th>
<th>鐘舵��</th>
+ <th>宸ョ▼</th>
<th>鎿嶄綔</th>
</tr>
@@ -262,7 +286,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 -->
@@ -280,9 +304,12 @@
interval = setInterval('refreshStatus()', rTime);//鍒锋柊鎭㈠
}
- function stopRefresh() {
- clearInterval(interval);//鍋滄鍒锋柊
- } */
+ */
+ function stopRefresh() {
+ clearInterval(interval);//鍋滄鍒锋柊
+ }
+
+
var interval = setInterval('isStop()', rTime);//瀹氭椂鍒锋柊
function isStop(){ //2024-1-10 yzx 淇敼 鍘熷洜锛氬師鍒锋柊椤甸潰鏈夐棶棰�
var str=['baogong_info','div_banzu'];
--
Gitblit v1.8.0