From 938d10604366db71cb73fddc2320fb573b7949f2 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期五, 25 十一月 2022 10:06:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'aliyun/hylyasrs' into hylyasrs
---
src/main/webapp/views/order/order.html | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 938579a..2892005 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -54,6 +54,8 @@
</select>
</div>
</div>
+
+
<div class="layui-inline">
<div class="layui-input-inline">
<select name="settle">
@@ -86,13 +88,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">
@@ -176,7 +178,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