From 539d9ffc477d28a23a923b41fdeabc8c37c99ce6 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 23 九月 2024 14:43:31 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/picking/picking.html |   49 +++++++++++++++++++++++++++++++++++++------------
 1 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/views/picking/picking.html b/src/main/webapp/views/picking/picking.html
index 32f447f..16c4665 100644
--- a/src/main/webapp/views/picking/picking.html
+++ b/src/main/webapp/views/picking/picking.html
@@ -38,6 +38,17 @@
                             <input class="layui-input" type="text" name="doc_num" placeholder="鎷ｈ揣鍗曞彿" autocomplete="off">
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <label class="layui-form-label">瀹㈡埛鍚嶇О:</label>
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="cust_name" placeholder="鎷ｈ揣鍗曞彿" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline" style="width: 300px">
+                        <div class="layui-input-inline">
+                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+                        </div>
+                    </div>
                     <div class="layui-inline">&emsp;
                         <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
                             <i class="layui-icon">&#xe615;</i>鎼滅储
@@ -65,19 +76,16 @@
 </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="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>
 -->
+</script>
+
+<!-- 鏄庣粏琛ㄦ牸鎿嶄綔鍒� -->
+<script type="text/html" id="operateDetl">
+    <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="delDetl">鍒犻櫎</a>
 </script>
 
 <script type="text/html" id="orderNoTpl">
@@ -158,15 +166,16 @@
         <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;">
         <tr style="height: 25px;font-size: 15px;">
             <td align="left" scope="col" colspan="1" style="width: 100px;">
-                鏂欏彿:
+                <!-- 鏂欏彿: -->鎵瑰彿
             </td>
             <td>
-                {{this.matnr}}
+                <!-- {{this.matnr}} -->{{this.batch}}
             </td>
             <td align="left" scope="col" colspan="1" rowspan="4">
                 <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="100px">
@@ -174,7 +183,15 @@
         </tr>
         <tr style="height: 25px;font-size: 15px;">
             <td align="left" scope="col" colspan="1" style="width: 100px;">
-                鍟嗗搧鍚�:
+<!--                鍟嗗搧鍚�:-->鍖呭彿
+            </td>
+            <td>
+<!--                {{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}}
@@ -196,6 +213,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