From fe0b22ed3a56a53f0d9ccd95e09d009634d34b65 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期日, 13 七月 2025 16:05:01 +0800
Subject: [PATCH] *

---
 src/main/webapp/views/orderGift/orderGift.html |   56 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/main/webapp/views/orderGift/orderGift.html b/src/main/webapp/views/orderGift/orderGift.html
index b31aaf3..00e5262 100644
--- a/src/main/webapp/views/orderGift/orderGift.html
+++ b/src/main/webapp/views/orderGift/orderGift.html
@@ -54,40 +54,43 @@
                             <input name="order_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿"/>
                         </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">
-                        <div class="layui-input-inline">
-                            <select name="doc_type" id="docType-query">
-                            </select>
-                        </div>
-                    </div>
-                    <div class="layui-inline">
-                        <div class="layui-input-inline">
-                            <select name="settle">
-                                <option value="">閫夋嫨鐘舵��</option>
-                                <option value="1">寰呭鐞�</option>
-                                <option value="2">浣滀笟涓�</option>
-                                <option value="4">宸插畬鎴�</option>
-                                <option value="6">涓婃姤瀹屾垚</option>
-                            </select>
-                        </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">-->
+<!--                        <div class="layui-input-inline">-->
+<!--                            <select name="doc_type" id="docType-query">-->
+<!--                            </select>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                    <div class="layui-inline">-->
+<!--                        <div class="layui-input-inline">-->
+<!--                            <select name="settle">-->
+<!--                                <option value="">閫夋嫨鐘舵��</option>-->
+<!--                                <option value="1">寰呭鐞�</option>-->
+<!--                                <option value="2">浣滀笟涓�</option>-->
+<!--                                <option value="4">宸插畬鎴�</option>-->
+<!--                                <option value="6">涓婃姤瀹屾垚</option>-->
+<!--                            </select>-->
+<!--                        </div>-->
+<!--                    </div>-->
                     <div class="layui-inline">
                         <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
                             <i class="layui-icon">&#xe615;</i>鎼滅储
                         </button>
-<!--                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>娣诲姞-->
-<!--                        </button>-->
+                        <button id="orderAddExcel" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>瀵煎叆鏁版嵁
+                        </button>
+                        <button id="orderAddExcelDownload" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>瀵煎叆妯℃澘涓嬭浇
+                        </button>
                     </div>
                 </div>
             </div>
             <table id="order" lay-filter="order"></table>
         </div>
     </div>
+    <span style="display: none"><input id="importExcel" type="file" onchange="upload(this)">鍚姩鍑哄簱</span>
     <div class="layui-card">
         <div class="layui-card-body">
 <!--            鍏ュ簱閫氱煡鍗曪細鐢盓RP鎻愪緵鍗曟嵁缂栧彿銆佺被鍨嬨�佸崟鎹椂闂村強鐗╂枡鏄庣粏锛岀敓鎴愬叆搴撲綔涓氬崟锛屼负缁存姢绯荤粺楂樺彲鐢紝鐢ㄦ埛鍙嚜琛屾坊鍔犲叆搴撻�氱煡鍗曟暟鎹紝瀹屾垚鐙珛鐨勫叆搴撲綔涓氥��-->
@@ -96,7 +99,6 @@
         </div>
     </div>
 </div>
-
 <div id="myModal"  style="display: none">
     <div style="padding: 10px">
         <div class="layui-upload">
@@ -124,9 +126,7 @@
 </div>
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->
 <script type="text/html" id="operate">
-    {{# if (d.settle == 0 || d.settle == 1) { }}
-        <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</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.settle == 2) { }}
         <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
     {{# } }}

--
Gitblit v1.9.1