From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/views/wrkCharge/wrkCharge.html | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/views/wrkCharge/wrkCharge.html b/src/main/webapp/views/wrkCharge/wrkCharge.html
index 726982c..ae32c43 100644
--- a/src/main/webapp/views/wrkCharge/wrkCharge.html
+++ b/src/main/webapp/views/wrkCharge/wrkCharge.html
@@ -63,10 +63,13 @@
<script type="text/html" id="memoTpl">
{{# if(d.memo === "charge"){ }}
- <span name="memo" class="layui-badge layui-badge-red" >鍏呯數浠诲姟</span>
+ <span name="memo" class="layui-badge layui-badge-red">鍏呯數浠诲姟</span>
{{# } }}
{{# if(d.memo === "memo"){ }}
- <span name="memo" class="layui-badge layui-badge-red" >婕旂ず浠诲姟</span>
+ <span name="memo" class="layui-badge layui-badge-red">婕旂ず浠诲姟</span>
+ {{# } }}
+ {{# if(d.memo === "reset"){ }}
+ <span name="memo" class="layui-badge layui-badge-red">澶嶄綅浠诲姟</span>
{{# } }}
</script>
@@ -74,6 +77,7 @@
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm layui-btn-normal" id="btn-clear-charge" lay-event="clearCharge">閲嶇疆鍏呯數浠诲姟</button>
<button class="layui-btn layui-btn-sm " id="btn-clear-memo" lay-event="clearMemo">閲嶇疆婕旂ず浠诲姟</button>
+ <button class="layui-btn layui-btn-sm layui-btn-primary layui-border-blue" id="btn-clear-reset" lay-event="clearReset">閲嶇疆澶嶄綅浠诲姟</button>
<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
</div>
--
Gitblit v1.9.1