From b7c05c9a8fa17542af39e5e12a2fb98bcea3451f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 13 四月 2021 17:34:33 +0800
Subject: [PATCH] #

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

diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index fd88883..98ef806 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -86,20 +86,17 @@
                     <form class="layui-form toolbar">
                         <div class="layui-form-item">
                             <div class="layui-inline">
-                                <label class="layui-form-label">瀛楀吀鍚嶇О:</label>
+                                <label class="layui-form-label">璁㈠崟缂栧彿:</label>
                                 <div class="layui-input-inline">
-                                    <input name="dictDataName" class="layui-input" placeholder="杈撳叆瀛楀吀鍚嶇О"/>
-                                </div>
-                            </div>
-                            <div class="layui-inline">
-                                <label class="layui-form-label">瀛楀吀閿��:</label>
-                                <div class="layui-input-inline">
-                                    <input name="dictDataCode" class="layui-input" placeholder="杈撳叆瀛楀吀閿��"/>
+                                    <input name="order_no" class="layui-input" placeholder="杈撳叆璁㈠崟缂栧彿"/>
                                 </div>
                             </div>
                             <div class="layui-inline">&emsp;
-                                <button class="layui-btn icon-btn" lay-filter="dictDataTbSearch" lay-submit>
+                                <button class="layui-btn icon-btn" lay-filter="orderTbSearch" lay-submit>
                                     <i class="layui-icon">&#xe615;</i>鎼滅储
+                                </button>
+                                <button class="layui-btn icon-btn" lay-filter="orderTbReset" lay-submit>
+                                    <i class="layui-icon">&#xe666;</i>閲嶇疆
                                 </button>
                             </div>
                         </div>
@@ -110,6 +107,50 @@
             </div>
         </div>
     </div>
+</div>
+
+<script type="text/html" id="operate">
+    {{#if (d.settle == 1){ }}
+    <a class="layui-btn layui-btn-sm layui-btn-danger" lay-event="stockOut" style="font-size: 16px">鎷ｈ揣鍗�</a>
+    {{# } }}
+    {{#if (d.settle == 2 || d.settle == 4){ }}
+    <a class="layui-btn layui-btn-sm layui-btn-normal" lay-event="print" style="font-size: 16px">鎵撳嵃</a>
+    {{# } }}
+</script>
+
+<script type="text/html" id="settleTpl">
+    <span name="settle"
+          {{# if( d.settle === 1){ }}
+          class="layui-badge layui-badge-blue"
+          {{# } else if(d.settle === 2){ }}
+          class="layui-badge layui-badge-red"
+          {{# } else if(d.settle === 3){ }}
+          class="layui-badge layui-badge-gray"
+          {{# } else if(d.settle === 4){ }}
+          class="layui-badge layui-badge-green"
+          {{# } }}
+    >{{d.settle$}}</span>
+</script>
+
+<script type="text/html" id="typeTpl">
+    <span name="type"
+          {{# if( d.type === 1){ }}
+          class="layui-badge layui-badge-blue" ><span style="display: none">{{d.number}}</span>骞充粨</span>
+    {{# } else if(d.type === 2){ }}
+    class="layui-badge layui-badge-green" ><span style="display: none">{{d.number}}</span>绔嬪簱</span>
+    {{# } else if(d.type === 0){ }}
+    class="layui-badge layui-badge-red" ><span style="display: none">{{d.number}}</span>缂鸿揣</span>
+    {{# } }}
+</script>
+
+<!-- 鎵撳嵃瀹瑰櫒 -->
+<div id="pakoutPrintBox" style="display: none"></div>
+<!-- 鍑哄簱棰勮瀹瑰櫒 -->
+<div id="stoukOutPreview" 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>
+    <table id="stoPreTab" lay-filter="stoPreTab"></table>
 </div>
 
 <!-- 鍗曟嵁绫诲瀷琛ㄥ崟 -->
@@ -143,9 +184,12 @@
     </form>
 </script>
 
-<script type="text/html" id="operate">
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="detail">璇︽儏</a>
-    <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
+<!-- 璁㈠崟琛ㄥご鎿嶄綔 -->
+<script type="text/html" id="orderToolbar">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-add" lay-event="add"><i class="layui-icon">&#xe654;</i>鏂板</button>
+        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="del"><i class="layui-icon">&#xe640;</i>鍒犻櫎</button>
+    </div>
 </script>
 
 <script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>

--
Gitblit v1.9.1