From afa3bc1e2f39f66f59ee9b15d6af16593acdc9a4 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期六, 02 十二月 2023 10:38:27 +0800
Subject: [PATCH] #
---
src/main/webapp/views/plan/plan.html | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/views/plan/plan.html b/src/main/webapp/views/plan/plan.html
index 89e3e6b..eec3a9d 100644
--- a/src/main/webapp/views/plan/plan.html
+++ b/src/main/webapp/views/plan/plan.html
@@ -106,11 +106,20 @@
</div>
</div>
+<!-- 琛ㄦ牸鎿嶄綔鍒� -->
+<script type="text/html" id="tbLook">
+ <span class="layui-text">
+ <a href="javascript:;" lay-event="look">
+ <i class="layui-icon" style="font-size: 12px;"></i> 鏌ョ湅鍏宠仈娴佺▼
+ </a>
+ </span>
+</script>
+
<div id="myModal" style="display: none;">
<div style="padding: 10px">
<div class="layui-upload">
- <button type="button" class="layui-btn layui-btn-normal" id="data-btn-file2">閫夋嫨鏂囦欢</button><input class="layui-upload-file" type="file" accept="" name="file" multiple="">
- <div class="layui-upload-list" style="max-width: 1000px;">
+ <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;height:400px;overflow: scroll">
<table class="layui-table">
<colgroup>
<col>
@@ -121,6 +130,7 @@
<thead>
<tr><th>鏂囦欢鍚�</th>
<th>澶у皬</th>
+ <th>涓婁紶鑰�</th>
<th>涓婁紶杩涘害</th>
<th>鎿嶄綔</th>
</tr></thead>
@@ -133,16 +143,22 @@
</div>
<script type="text/html" id="operate">
- {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3) { }}
+ {{# if ((((d.settle == 2 || d.settle == 3) && d.settleSize==4) || d.settle == 1) && d.nowUserId==d.director) { }}
<a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">瀹℃壒</a>
{{# } }}
+ {{# if (((d.settle == 2 || d.settle == 3)&& d.settleSize==4) && d.nowUserId==d.director) { }}
+ <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>
- {{# if (d.settle == 1) { }}
+ {{# if (d.settle == 1 && d.nowUserId==d.userId) { }}
<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.assistantHostSign == 0 && d.assistantPlanId==0)&& d.settleSize==4 && d.nowUserId==d.userId ) { }}
+ <a class="layui-btn layui-btn-xs btn-edit" lay-event="assistantPlan">鍒涘缓璐ф灦瑙勫垝浠诲姟</a>
+ {{# } }}
</script>
+<!--<a class="layui-btn layui-btn-xs btn-edit" lay-event="assistantPlan">{{d.nowUserId}}+-+{{d.director}}+-+{{d.userId}}</a>-->
<script type="text/html" id="plannerListDialog">
<div class="layui-form admin-form">
@@ -156,7 +172,6 @@
</div>
</div>
</script>
-
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/js/FileSaver.js"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
@@ -164,6 +179,7 @@
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/layui/lay/modules/cascader/citys-data.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/aliyun-oss-sdk.min.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/plan/plan.js" charset="utf-8"></script>
</body>
<script type="text/html" id="addDialogPre">
--
Gitblit v1.9.1