From 82bcd0328dddbaad65933e2fada22bc68e82b3d5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 26 八月 2023 10:07:46 +0800
Subject: [PATCH] # 导入订单增加单据类型
---
 src/main/webapp/views/order/out.html |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 1048a7d..c3687e3 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -168,6 +168,33 @@
     </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="pakoutPreviewMergeBox" style="display: none">
+    <div style="padding: 25px; line-height: 22px; background-color: #393D49; 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="stoPreTabMerge" lay-filter="stoPreTabMerge"></table>
+        </div>
+        <button class="layui-btn layui-btn-primary layui-border-black layui-btn-sm" lay-filter="batchModifySta" lay-submit style="display: block;float: right;margin-right: 1rem">
+            鎵归噺淇敼
+        </button>
+    </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