From 7cf2e143941e1548cc468992ada42106a27805a1 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 09 十二月 2025 19:22:40 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

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

diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 99663dc..6b14702 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -256,22 +256,30 @@
                         </div>
 
                         <table class="layui-table" lay-skin="nob" style="width: 80%">
-                            <thead>
-                            <tr style="background: none">
-                                <td>No.</td>
-                                <td>鍟嗗搧缂栧彿</td>
-<!--                                <td>瑙勬牸</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>
-<!--                                <td>{{ wrkDetl.specs }}</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>
                             {{#  }); }}
@@ -293,6 +301,9 @@
 
 
 </script>
+<script type="text/html" id="orderItem">
+    <table id="itemTable" lay-filter="itemTable"></table>
+</script>
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
 <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
 <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>

--
Gitblit v1.9.1