From e45d0852eff0e494e232ffcc60e0c190acb28801 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 22 四月 2025 08:47:37 +0800
Subject: [PATCH] Merge branch 'master' of http://159.223.171.199:10439/r/Haier_MES_II

---
 gmms/WebContent/qiegeguanli/qiegerenwu.jsp |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/gmms/WebContent/qiegeguanli/qiegerenwu.jsp b/gmms/WebContent/qiegeguanli/qiegerenwu.jsp
index a9bb37a..927318f 100644
--- a/gmms/WebContent/qiegeguanli/qiegerenwu.jsp
+++ b/gmms/WebContent/qiegeguanli/qiegerenwu.jsp
@@ -15,8 +15,6 @@
 
 <link rel="stylesheet" href="../static/css/element.css">
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-
-	
 <script type="text/javascript">
 /*   var interval = setInterval('refreshStatus()', 20000);
    $(document).ready(function(){
@@ -86,7 +84,7 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="item in shuzu" style="height: 51px;">
+							<tr v-for="(item, index) in shuzu" :key="index" style="height: 51px;">
 								<td>{{item['1_order_id']}}</td>
 								<td>{{item['2_largeglass_length']}}</td>
 								<td>{{item['3_largeglass_width']}}</td>
@@ -110,8 +108,8 @@
 									鎵嬪姩瀹屾垚
 								</td>
 								<td v-else>
-									 
-									 
+
+
 								</td>
 								<td>{{item['12_order_maker']}}</td>
 								<td  v-if="item['11_order_status']==1">
@@ -120,7 +118,7 @@
 									<button @click="dainjishijian('鎵嬪姩瀹屾垚',item['0_id'])" style='background-color: #5CADFE' class='btn btn-large btn-success' >鎵嬪姩瀹屾垚</button>
 								</td>
 								<td  v-else-if="item['11_order_status']==2">
-									
+
 									<button @click="dainjishijian('缁撴潫浠诲姟',item['0_id'])" style='background-color: red' class='btn btn-large btn-success' >缁撴潫浠诲姟</button>
 									&nbsp;&nbsp;&nbsp;
 									<button @click="dainjishijian('鍙栨秷浠诲姟',item['0_id'])" style='background-color: #5CADFE' class='btn btn-large btn-success' >鍙栨秷浠诲姟</button>
@@ -129,7 +127,7 @@
 									<button @click="dainjishijian('閲嶆柊涓嬪彂',item[0])" style='background-color: #5CADFE' class='btn btn-large btn-success' >閲嶆柊涓嬪彂</button>
 								</td> -->
 								<td v-else>
-									
+
 								</td>
 							</tr>
 						</tbody>
@@ -365,10 +363,11 @@
 		 let canshu={
 				 line:<%= request.getParameter("id") %>
 		 }
-		 this.shuzu="";
-		  let sql="{call AXJ_qiegeguanli_threelinetask_list1()}";
+		 // this.shuzu="";
+		 let sql="{call AXJ_qiegeguanli_threelinetask_list1()}";
 		 let flag=2;
-		 this.loadAjxss('浠诲姟鏌ヨ鎴愬姛',sql,flag,"shuzu"); 
+		 this.loadAjxss('浠诲姟鏌ヨ鎴愬姛',sql,flag,"shuzu");
+		 console.log("sql:",this.shuzu);
 		 /* sql="{call AXJ_qiegeguanli_peifanghao_cahxun()}";
 		 loadAjxs('閰嶆柟鍙锋煡璇�',sql,flag,"peifanhao");  */
 	  }

--
Gitblit v1.8.0