From 09de90a273d413c06306a921adc4fd25f205e2da Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 21 八月 2025 11:10:37 +0800
Subject: [PATCH] 1

---
 src/main/webapp/views/forklift.html |   29 +++++++++--------------------
 1 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/views/forklift.html b/src/main/webapp/views/forklift.html
index 62f93aa..2f5c1a0 100644
--- a/src/main/webapp/views/forklift.html
+++ b/src/main/webapp/views/forklift.html
@@ -50,12 +50,7 @@
                 <tr>
                     <th>鎻愬崌鏈�</th>
                     <th>宸ヤ綔鍙�</th>
-                    <th>浠诲姟鍦板潃</th>
-                    <th>鐩殑鍦板潃</th>
-                    <th>宸插畬鎴愮殑浠诲姟鍙�</th>
-                    <th>灞�</th>
-                    <th>浣滀笟鏍囪</th>
-                    <th>绌挎杞﹀彿</th>
+                    <th>绔欑偣淇℃伅</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -122,12 +117,6 @@
                         <input id="workNo" name="workNo" type="number" class="layui-input" lay-verify="number" autocomplete="off">
                     </div>
                 </div>
-                <div class="form-item">
-                    <label class="form-label">浣滀笟鏍囪:</label>
-                    <div class="form-input">
-                        <input id="pakMk" name="pakMk" type="text" class="layui-input" autocomplete="off">
-                    </div>
-                </div>
                 <div class="form-item form-button-container">
                     <button class="form-button" id="save">淇濆瓨</button>
                     <button class="form-button" id="cancel" style="background-color: #D0D0D0">鍙栨秷</button>
@@ -182,8 +171,6 @@
         http.post(baseUrl+ "/forkLift/detl/update", {
             liftNo: $('#liftNo').val(),
             workNo: $('#workNo').val(),
-            pakMk: $('#pakMk').val(),
-            token: $('#token').val(),
         }, function (res) {
             layer.msg("淇敼鎴愬姛", {icon: 1,});
             layer.close(layerDetl);
@@ -276,14 +263,16 @@
                     }
                     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);
                     }
                 } else if (res.code === 403){
                     window.location.href = baseUrl+"/login";

--
Gitblit v1.9.1