From dd09d869994a4eca50a6df80b34c9d444a99fb2d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 18 十月 2022 13:55:09 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/order/out.html |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 1048a7d..ba96968 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -168,6 +168,18 @@
     </div>
 </script>
 
+<!-- 鍚堝苟琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="mergeDialog">
+    <div style="padding: 25px; line-height: 22px; background-color: #1E9FFF; color: #fff; font-weight: 300;">
+        <span style="font-size: large; font-weight: bold">鍚堝苟鍑哄簱</span>
+    </div>
+    <div class="layui-card">
+        <div class="layui-card-body" style="padding: 10px">
+            <table id="orderMergeTab" lay-filter="orderMergeTab"></table>
+        </div>
+    </div>
+</script>
+
 <script type="text/html" id="tbBasicTbStaNos">
     <div class="ew-select-fixed">
         <select class="order-sta-select" lay-filter="tbBasicTbStaNos">

--
Gitblit v1.9.1