From ae4f26b64e2dc981986f2990a65b59cd994f7b9b Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 25 十一月 2025 18:35:37 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/order/order.html |   54 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index a3a7753..df74b30 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -97,11 +97,12 @@
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->
 <script type="text/html" id="operate">
     {{# if (d.settle == 0 || d.settle == 1) { }}
-        <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+<!--        <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>-->
         <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
     {{# } }}
-    {{# if (d.settle == 2) { }}
-    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
+    {{# if (d.settle == 98) { }}
+    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">褰诲簳瀹岀粨</a>
+    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="continueExecution">缁х画鎵ц</a>
     {{# } }}
 </script>
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->
@@ -161,6 +162,25 @@
             <div class="layui-input-block">
                 <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
 <!--                lay-verify="required"-->
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">瀹㈡埛PO锛�</label>
+            <div class="layui-input-block">
+                <input id="standby1" name="standby1" placeholder="杈撳叆瀹㈡埛PO" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
+                <!--                lay-verify="required"-->
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label">璐т富锛�</label>
+            <div class="layui-input-block cool-auto-complete">
+                <input class="layui-input" name="owner" placeholder="杈撳叆璐т富鍚嶇О" style="display: none">
+                <input id="owner$" name="owner$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヨ揣涓诲悕绉�" onfocus=this.blur() lay-verType="tips" lay-verify="required">
+                <div class="cool-auto-complete-window">
+                    <input class="cool-auto-complete-window-input" data-key="locOwnerQueryBydocType" onkeyup="autoLoad(this.getAttribute('data-key'))">
+                    <select class="cool-auto-complete-window-select" data-key="locOwnerQueryBydocTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+                    </select>
+                </div>
             </div>
         </div>
         <div class="layui-form-item" style="position: relative;">
@@ -256,20 +276,32 @@
                         </div>
 
                         <table class="layui-table" lay-skin="nob" style="width: 80%">
-                            <thead>
-                            <tr style="background: none">
-                                <td>No.</td>
-                                <td>鍟嗗搧缂栧彿</td>
-                                <td>鏁伴噺</td>
-                            </tr>
-                            </thead>
                             <tbody>
                             {{#  layui.each(item.wrkDetls, function(idx, wrkDetl){ }}
-                            <tr>
+                            <tr style="background: none">
+                                <td>No.</td>
                                 <td><span class="layui-badge layui-bg-cyan">{{ idx+1 }}</span></td>
+                            </tr>
+                            <tr style="background: none">
+                                <td>鍝佸彿锛�</td>
                                 <td>{{ wrkDetl.matnr }}</td>
+                            </tr>
+                            <tr style="background: none">
+                                <td>鍝佸悕锛�</td>
+                                <td>{{ wrkDetl.maktx }}</td>
+                            </tr>
+                            <tr style="background: none">
+                                <td>瑙勬牸锛�</td>
+                                <td>{{ wrkDetl.specs }}</td>
+                            </tr>
+                            <tr style="background: none">
+                                <td>鏁伴噺锛�</td>
                                 <td style="font-weight: bold">{{ wrkDetl.anfme }}</td>
                             </tr>
+                            <tr style="background: none">
+                                <td>鏉$爜锛�</td>
+                                <td style="font-weight: bold">{{ wrkDetl.zpallet }}</td>
+                            </tr>
                             {{#  }); }}
                             </tbody>
                         </table>

--
Gitblit v1.9.1