From 1ca8b748a3541b88b12b7e9e7f5f77a5c8df7fd2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 31 十月 2025 15:29:28 +0800
Subject: [PATCH] #1
---
src/main/webapp/views/order/order.html | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index a3a7753..04ab4c5 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>
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
@@ -256,20 +257,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