From 0916bb4ea987c0599b6af6bb8dd251a071770e05 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 23 十月 2025 14:32:15 +0800
Subject: [PATCH] 通用下拉选择框值从视图获取

---
 src/main/webapp/views/picking/picking.html |   31 ++++++++++++++++++++++---------
 1 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/views/picking/picking.html b/src/main/webapp/views/picking/picking.html
index acb1649..f5a6f9b 100644
--- a/src/main/webapp/views/picking/picking.html
+++ b/src/main/webapp/views/picking/picking.html
@@ -50,6 +50,9 @@
                         </div>
                     </div>
                     <div class="layui-inline">&emsp;
+                        <button class="layui-btn icon-btn" lay-filter="exportExcel" lay-submit>
+                            <i class="layui-icon">&#xe67d;</i>瀵煎嚭
+                        </button>
                         <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                             <i class="layui-icon">&#xe615;</i>鎼滅储
                         </button>
@@ -76,15 +79,8 @@
 </script>
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->
 <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-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
-    {{# } }}
-    {{# if ((d.settle == 0 || d.settle == 1) && (d.docType == 21 || d.docType == 11 || d.docType == 12)) { }}
-    {{# } }}
-    {{# if (d.settle == 2) { }}
-    <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="printExcel">瀵煎嚭Excel</a>
+    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="exportExcel2">鍙戣揣Excel</a>
     <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="btnPrint2">鎵撳嵃</a>
     <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
  <!--   <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="btnPrint"><img src="../../static/image/nav/fn_3.png" alt="浜岀淮鐮�"></a>
@@ -174,6 +170,7 @@
         <div style="height: 50px;text-align: center;font-size: 25px;">{{docNum}}</div>
         <div style="height: 40px;text-align: left;line-height: 40px;font-size: 20px;">鍑哄簱鍗曞彿锛歿{docNum}}</div>
         <div style="height: 40px;text-align: left;line-height: 40px;font-size: 20px;">鎬绘暟閲忥細{{anfmeSum}}</div>
+        <div style="height: 40px;text-align: left;line-height: 40px;font-size: 20px;">瀹㈡埛鍚嶇О锛歿{custName}}</div>
     </div>
     {{#each data}}
     <table width="100%" style="border:0;border-bottom:#0C0C0C solid 2px; margin-bottom:20px;padding:0;overflow: hidden;font-size: xx-small;table-layout: fixed;">
@@ -196,6 +193,14 @@
 <!--                {{this.maktx}}--> {{this.barcode}}
             </td>
         </tr>
+        <tr style="height: 25px;font-size: 15px;">
+            <td align="left" scope="col" colspan="1" style="width: 100px;">
+                鐗屽彿
+            </td>
+            <td>
+                {{this.maktx}}
+            </td>
+        </tr>
         <tr style="height: 25px; font-size: 15px;">
         <td align="left" scope="col" colspan="1" style="width: 100px;">
             鎷ｈ揣鏁伴噺:
@@ -212,6 +217,14 @@
                 {{this.locNo}}
             </td>
         </tr>
+        <tr style="height: 30px; font-size: 15px;">
+            <td align="left" scope="col" colspan="1" style="width: 100px;">
+                鍙戣揣鏃堕棿:
+            </td>
+            <td align="left" scope="col" colspan="1">
+                {{this.specs}}
+            </td>
+        </tr>
     </table>
     {{/each}}
 </script>

--
Gitblit v1.9.1