From adf3a1c6591b8db2c47f45c2ac2370e66d505edb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 22 四月 2022 23:01:55 +0800
Subject: [PATCH] #三方接口日志

---
 src/main/webapp/views/order/order.html |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 101cce5..2797d16 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -14,6 +14,20 @@
     <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
     <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
+    <style>
+        .btn-add {
+            display: none;
+        }
+        .btn-edit {
+            display: none;
+        }
+        .btn-complete {
+            display: none;
+        }
+        .btn-delete {
+            display: none;
+        }
+    </style>
 </head>
 <body>
 
@@ -38,7 +52,7 @@
                         <button class="layui-btn icon-btn" lay-filter="tbSearch" lay-submit>
                             <i class="layui-icon">&#xe615;</i>鎼滅储
                         </button>
-                        <button id="orderAddBtn" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>娣诲姞
+                        <button id="orderAddBtn" class="layui-btn icon-btn btn-add"><i class="layui-icon">&#xe654;</i>娣诲姞
                         </button>
                     </div>
                 </div>
@@ -55,8 +69,13 @@
 </div>
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->
 <script type="text/html" id="operate">
-    <a class="layui-btn layui-btn-primary layui-btn-xs" lay-event="edit">淇敼</a>
-    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+    {{# if (d.settle == 1 || d.settle == 2) { }}
+        <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>
 </script>
 <!-- 琛ㄦ牸鎿嶄綔鍒� -->
 <script type="text/html" id="tbLook">
@@ -133,14 +152,14 @@
 <script type="text/html" id="matEditDialog">
     <form id="matEditForm" lay-filter="matEditForm" class="layui-form model-form">
         <input name="experimentId" type="hidden"/>
-        <div class="layui-form-item">
+        <div class="layui-form-item" style="float: left">
             <label class="layui-form-label">鐗╂枡 - 澶氶��</label>
             <div class="layui-input-block">
                 <div id="mat" name="mat">
                 </div>
             </div>
         </div>
-        <div class="layui-form-item text-right">
+        <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>
         </div>

--
Gitblit v1.9.1