From 298b5c1e9aad4d64a160c35262320988671489eb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 19 十月 2022 16:18:26 +0800
Subject: [PATCH] Merge branches 'bfasrs' and 'ynasrs' of http://47.97.1.152:5880/r/zy-asrs into ynasrs

---
 src/main/webapp/views/order/order.html |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 0c4cb7f..4690b27 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -80,8 +80,13 @@
                         <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 id="orderAddBtn" class="layui-btn icon-btn btn-add">
+                            <i class="layui-icon">&#xe654;</i>娣诲姞
                         </button>
+                        <button id="importOrder" class="layui-btn icon-btn btn-add">
+                            <i class="layui-icon layui-icon-upload"></i>&nbsp;瀵煎叆閿�鍞崟
+                        </button>
+                        <input style="display:none" id="importExcel" type="file" onchange="upload(this)" >
                     </div>
                 </div>
             </div>

--
Gitblit v1.9.1