From 09a482e8fb4d4dac63aed1503fd91e738ddb070d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 04 七月 2024 10:42:24 +0800
Subject: [PATCH] # 并板出库

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

diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index ad4bbd3..847a887 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -83,6 +83,10 @@
                         </button>
                         <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>
@@ -258,36 +262,32 @@
         <thead></thead>
         <tbody style="font-weight: bold">
         <tr style="height: 30px;">
-            <td align="center" scope="col" colspan="1">鍟嗗搧</td>
-            <td align="lift" colspan="4" style="padding-left: 8px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.maktx}}</td>
+            <td align="center" scope="col" colspan="1">鏂欏彿</td>
+            <td align="lift" colspan="4" style="padding-left: 8px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.matnr}}</td>
             <td align="center" scope="col" colspan="3" rowspan="3">
                 <img class="template-code template-qrcode" src="{{this.barcodeUrl}}" width="80%">
             </td>
         </tr>
         <tr style="height: 30px">
-            <td align="center" scope="col" colspan="1">鏂欏彿</td>
+            <td align="center" scope="col" colspan="1">鍟嗗搧</td>
             <!--            overflow:hidden; 婧㈠嚭闅愯棌 white-space:nowrap; text-overflow:ellipsis;-->
             <!--             word-break : break-all;  瓒呭嚭鑷姩鎹㈣-->
-            <td align="lift" colspan="4" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.matnr}}</td>
+            <td align="lift" colspan="4" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.maktx}}</td>
+        </tr>
+        <tr style="height: 30px">
+            <td align="center" scope="col" colspan="1">鎵瑰彿</td>
+            <td align="lift" colspan="4" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.batch}}</td>
+        </tr>
+        <tr style="height: 30px">
+            <td align="center" scope="col" colspan="1">瑙勬牸</td>
+            <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.specs}}</td>
+            <td align="center" scope="col" colspan="1">鏁伴噺</td>
+            <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.anfme}}</td>
         </tr>
         <tr style="height: 30px">
             <td align="center" scope="col" colspan="1">鏃ユ湡</td>
-            <td align="lift" colspan="4" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.createTime$}}</td>
+            <td align="lift" colspan="7  " style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.createTime$}}</td>
         </tr>
-        <tr style="height: 30px">
-            <td align="center" scope="col" colspan="1">鐗屽彿</td>
-            <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.brand}}</td>
-            <td align="center" scope="col" colspan="1">鎵瑰彿</td>
-            <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.batch}}</td>
-        </tr>
-        <tr style="height: 30px">
-            <td align="center" scope="col" colspan="1">鏁伴噺</td>
-            <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.anfme}}</td>
-            <td align="center" scope="col" colspan="1">鐘舵��</td>
-            <td align="lift" colspan="3" style="padding-left: 8px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.status$}}</td>
-        </tr>
-
-
         </tbody>
     </table>
     <div style="height: 20px">

--
Gitblit v1.9.1