From 09ee5added9d59e90310a2586e846137ea597b19 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 01 十二月 2023 13:15:42 +0800
Subject: [PATCH] #
---
src/main/webapp/views/priOnline2/priOnline.html | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/views/priOnline2/priOnline.html b/src/main/webapp/views/priOnline2/priOnline.html
index 3bee7d9..ba18e13 100644
--- a/src/main/webapp/views/priOnline2/priOnline.html
+++ b/src/main/webapp/views/priOnline2/priOnline.html
@@ -45,10 +45,15 @@
</div>
</div>
<div class="layui-form-item">
+
<div class="layui-inline">
<div class="layui-input-inline">
<input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off"
style="border-color: #e1e1e1">
+ </div>
+ <label class="layui-form-label">ALL锛�</label>
+ <div class="layui-input-inline" style="text-align: left">
+ <input id="allSwitch" name="allSwitch" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
</div>
</div>
<div class="layui-inline"> 
@@ -66,7 +71,7 @@
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-sm" lay-event="addBlank">鏂板鏍镐环</button>
- <button class="layui-btn layui-btn-sm" lay-event="addBlank2">鎺ュ彇闆嗘垚鏍镐环浠诲姟</button>
+<!-- <button class="layui-btn layui-btn-sm" lay-event="addBlank2">鎺ュ彇闆嗘垚鏍镐环浠诲姟</button>-->
<button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="deleteData">鍒犻櫎</button>
</div>
</script>
@@ -80,7 +85,7 @@
<div style="padding: 10px">
<div class="layui-upload">
<button type="button" class="layui-btn layui-btn-normal" id="data-btn-file2">閫夋嫨鏂囦欢</button><input id="data-btn-upload" class="layui-upload-file" type="file" accept="" name="file" multiple="">
- <div class="layui-upload-list" style="max-width: 1000px;">
+ <div class="layui-upload-list" style="max-width: 1000px;height:400px;overflow: scroll">
<table class="layui-table">
<colgroup>
<col>
@@ -91,6 +96,7 @@
<thead>
<tr><th>鏂囦欢鍚�</th>
<th>澶у皬</th>
+ <th>涓婁紶鑰�</th>
<th>涓婁紶杩涘害</th>
<th>鎿嶄綔</th>
</tr></thead>
@@ -103,21 +109,21 @@
</div>
<script type="text/html" id="operate">
- {{# if ((d.settle == 0) || (d.settle == 1 && d.settleSize == 4)){ }}
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">鎻愪氦</a>
- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+ {{# if (d.settle == 0 && d.nowUserId == d.memberId){ }}
+ <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">鎻愪氦</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
{{# } }}
- {{# if ((d.settle == 1 && d.settleSize == 3) || (d.settle == 2 && d.settleSize == 4)){ }}
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">纭</a>
- {{# } }}
- {{# if (d.settle == 1 || (d.settle == 2 && d.settleSize == 4)){ }}
- <a class="layui-btn layui-btn-xs btn-edit" lay-event="approvalEnd">鍥為��瀹℃壒</a>
+ {{# if (d.settle == 1 && d.nowUserId == d.memberId){ }}
+ <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">纭</a>
+ <a class="layui-btn layui-btn-xs btn-edit" lay-event="approvalEnd">鍥為��瀹℃壒</a>
{{# } }}
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="uploadLink">闄勪欢</a>
<a class="layui-btn layui-btn-xs btn-edit" lay-event="check">鏍镐环</a>
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="upload">涓婁紶璇环</a>
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="viewCheck">鏌ョ湅璇环</a>
+ {{# if (d.nowUserId == d.userId){ }}
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="viewCheck">鏌ョ湅璇环</a>
+ {{# } }}
</script>
<script type="text/html" id="plannerListDialog">
--
Gitblit v1.9.1