From ba77f258c619b296e51cadc0958bff23965dfc6d Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 14 一月 2025 16:10:02 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/forklift.html |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/views/forklift.html b/src/main/webapp/views/forklift.html
index 62f93aa..d9de518 100644
--- a/src/main/webapp/views/forklift.html
+++ b/src/main/webapp/views/forklift.html
@@ -50,12 +50,8 @@
                 <tr>
                     <th>鎻愬崌鏈�</th>
                     <th>宸ヤ綔鍙�</th>
-                    <th>浠诲姟鍦板潃</th>
-                    <th>鐩殑鍦板潃</th>
-                    <th>宸插畬鎴愮殑浠诲姟鍙�</th>
-                    <th>灞�</th>
+                    <th>绔欑偣淇℃伅</th>
                     <th>浣滀笟鏍囪</th>
-                    <th>绌挎杞﹀彿</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -276,14 +272,17 @@
                     }
                     for (var i=1;i<=table.length;i++){
                         var tr = tableEl.find("tr").eq(i);
+                        let staDiv = "";
+                        table[i-1].forkLiftStaProtocols.forEach((item) => {
+                            let hasTray = item.hasTray ? "Y" : "N";
+                            let hasCar = item.hasCar ? "Y" : "N";
+                            staDiv += "<div>" + item.lev + "灞傦紝鎵樼洏锛�" + hasTray + "锛屽皬杞︼細" + hasCar + "</div>"
+                        })
+
                         setVal(tr.children("td").eq(0), table[i-1].liftNo);
                         setVal(tr.children("td").eq(1), table[i-1].workNo);
-                        setVal(tr.children("td").eq(2), table[i-1].taskAddress);
-                        setVal(tr.children("td").eq(3), table[i-1].distAddress);
-                        setVal(tr.children("td").eq(4), table[i-1].completeTaskNo);
-                        setVal(tr.children("td").eq(5), table[i-1].lev);
-                        setVal(tr.children("td").eq(6), table[i-1].pakMk);
-                        setVal(tr.children("td").eq(7), table[i-1].shuttleNo);
+                        setVal(tr.children("td").eq(2), staDiv);
+                        setVal(tr.children("td").eq(3), table[i-1].pakMk);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";

--
Gitblit v1.9.1