From b1cbb59d39cea44d35110d95e54fbd86d4a12e13 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 01 八月 2025 12:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs

---
 src/main/webapp/views/order/order.html |   39 +++++++++++++++++++++++++++++++++++----
 1 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 48c2868..4a13f1a 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -54,6 +54,11 @@
                             <input name="order_no" class="layui-input" type="text" placeholder="杈撳叆鍗曟嵁缂栧彿"/>
                         </div>
                     </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline mr0">
+                            <input name="cstmr_name" 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">
@@ -82,6 +87,8 @@
                         </button>
 <!--                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>娣诲姞-->
 <!--                        </button>-->
+                        <input type="file" id="fileInput" accept=".xlsx, .xls">
+                        <button onclick="exportExc()">瀵煎叆璁㈠崟</button>
                     </div>
                 </div>
             </div>
@@ -96,7 +103,31 @@
         </div>
     </div>
 </div>
+<script>
+    function exportExc() {
+        var fileInput = document.getElementById('fileInput');
+        var file = fileInput.files[0];
+        if (file === undefined) {
+            alert('璇峰厛閫夋嫨鏂囦欢')
+            return
+        }
+        var formData = new FormData();
+        formData.append('file', file);
 
+        fetch(baseUrl+'/importOrder', {
+            method: 'POST',
+            headers: {'token': localStorage.getItem('token')},
+            body: formData
+        }).then(response => {
+            response.text().then(data => {
+                var res = JSON.parse(data)
+                alert(res.msg)
+            })
+        }).catch(error => {
+            alert('瀵煎叆寮傚父');
+        });
+    }
+</script>
 <div id="myModal"  style="display: none">
     <div style="padding: 10px">
         <div class="layui-upload">
@@ -127,14 +158,14 @@
     {{# 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>
-        <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="labelUp">涓婁紶鏍囩</a>
+<!--        <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="labelUp">涓婁紶鏍囩</a>-->
     {{# } }}
     {{# if (d.settle == 2) { }}
-    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="labelUp">涓婁紶鏍囩</a>
+<!--    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="labelUp">涓婁紶鏍囩</a>-->
     <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
     {{# } }}
     {{# if (d.settle == 4 && d.tkType=='1') { }}
-        <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="refundLoc">閫�搴�</a>
+<!--        <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="refundLoc">閫�搴�</a>-->
     {{# } }}
 </script>
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->
@@ -292,7 +323,7 @@
                             <thead>
                             <tr style="background: none">
                                 <td>No.</td>
-                                <td>鍟嗗搧缂栧彿</td>
+                                <td>瑙勬牸</td>
                                 <!--                                <td>瑙勬牸</td>-->
                                 <td>绠卞彿</td>
 <!--                                <td>绠卞瓙绫诲瀷</td>-->

--
Gitblit v1.9.1