From 2ce4adc0e5b083181c315676f9017a1afb40b9e4 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 14 十一月 2022 08:07:02 +0800
Subject: [PATCH] 修复订单功能

---
 src/main/webapp/views/order/order.html |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index d89f0c4..3412745 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -86,13 +86,13 @@
 </div>
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->
 <script type="text/html" id="operate">
-    {{# if (d.settle == 1 || d.settle == 2) { }}
+    {{# if (d.settle == 0 || d.settle == 1) { }}
         <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
-        {{# if (d.settle == 2) { }}
-            <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
-        {{# } }}
+        <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
     {{# } }}
-    <a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
+    {{# if (d.settle == 2) { }}
+    <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
+    {{# } }}
 </script>
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->
 <script type="text/html" id="tbLook">
@@ -141,7 +141,8 @@
         <div class="layui-form-item">
             <label class="layui-form-label">鍗曟嵁缂栧彿锛�</label>
             <div class="layui-input-block">
-                <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" lay-verify="required"/>
+                <input id="orderNo" name="orderNo" placeholder="杈撳叆鍗曟嵁缂栧彿" type="text" class="layui-input" maxlength="20" lay-verType="tips" />
+<!--                lay-verify="required"-->
             </div>
         </div>
         <div class="layui-form-item" style="position: relative;">
@@ -175,7 +176,7 @@
                 <div id="mat" name="mat">
                 </div>
             </div>
-        </div>
+       
         <div class="layui-form-item text-right" style="display: inline-block; margin-left: 35px">
             <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
             <button class="layui-btn" lay-filter="matEditSubmit" lay-submit>淇濆瓨</button>

--
Gitblit v1.9.1