From bb71b47a43244e6db57cbc3cd0223bc5a64023d7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 10:40:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/webapp/views/order/order.html | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index a8f943f..75c7762 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -104,8 +104,12 @@
</div>
<script type="text/html" id="operate">
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+ {{# if (d.status == 0) { }}
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ {{# } }}
+ {{# if (d.status != 1) { }}
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+ {{# } }}
<a class="layui-btn icon-btn layui-btn-sm" lay-event="business">鍑哄樊</a>
</script>
@@ -178,12 +182,10 @@
</div>
</div>
</div>
- <div class="layui-form-item" style="display: none;" id="statusNone">
- <label class="layui-form-label layui-form-required">椤圭洰鐘舵�� : </label>
- <div class="layui-input-block" >
- <input type="radio" name="status" value="0" title="璺熻釜涓�" checked/>
- <input type="radio" name="status" value="1" title="瀹屾垚"/>
- <input type="radio" name="status" value="2" title="鍏抽棴"/>
+ <div class="layui-form-item">
+ <label class="layui-form-label">蹇冨緱浣撲細: </label>
+ <div class="layui-input-block">
+ <textarea class="layui-textarea" name="memoExperience" placeholder="璇疯緭鍏ュ績寰椾綋浼�" maxlength="1024" autocomplete="off"></textarea>
</div>
</div>
</div>
@@ -229,6 +231,14 @@
<textarea class="layui-textarea" name="remarks" placeholder="璇疯緭鍏ュ娉�" maxlength="1024" autocomplete="off"></textarea>
</div>
</div>
+ <div class="layui-form-item" style="display: none;" id="statusNone">
+ <label class="layui-form-label layui-form-required">椤圭洰鐘舵�� : </label>
+ <div class="layui-input-block" >
+ <input type="radio" name="status" value="0" title="璺熻釜涓�" checked/>
+ <input type="radio" name="status" value="1" title="瀹屾垚"/>
+ <input type="radio" name="status" value="2" title="鍏抽棴"/>
+ </div>
+ </div>
</div>
</div>
<hr class="layui-bg-gray">
--
Gitblit v1.9.1