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 | 91 +++++++++++++++++++++++++++++----------------
1 files changed, 59 insertions(+), 32 deletions(-)
diff --git a/src/main/webapp/views/plan/plan.html b/src/main/webapp/views/plan/plan.html
index ffb748c..eec3a9d 100644
--- a/src/main/webapp/views/plan/plan.html
+++ b/src/main/webapp/views/plan/plan.html
@@ -106,11 +106,20 @@
</div>
</div>
-<div id="myModal" layui-hide="true">
+<!-- 琛ㄦ牸鎿嶄綔鍒� -->
+<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,15 +143,24 @@
</div>
<script type="text/html" id="operate">
- {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3 || d.settle == 4) { }}
+ {{# 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>
- <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.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>-->
-<scrpt type="text/html" id="plannerListDialog">
+<script type="text/html" id="plannerListDialog">
<div class="layui-form admin-form">
<div class="model-form" style="padding: 30px">
<div id="plannerXmlSel"></div>
@@ -152,14 +171,15 @@
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
</div>
</div>
-</scrpt>
-
+</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>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<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">
@@ -203,6 +223,13 @@
</div>
</div>
<div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">瀹㈡埛鍚嶇О: </label>
+ <div class="layui-input-block" >
+ <div id="cstmrXmlSel" name="cstmrXmlSel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item" style="display: none">
<label class="layui-form-label layui-form-required">涓氬姟鍛�: </label>
<div class="layui-input-block">
<div id="userXmlSel" name="userXmlSel">
@@ -210,27 +237,20 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鎵�闇�: </label>
+ <label class="layui-form-label layui-form-required">涓氬姟鍛樿仈绯绘柟寮�: </label>
<div class="layui-input-block">
- <div id="planNeedXmlSel" name="planNeedXmlSel">
- </div>
+ <input class="layui-input" name="userXmlSelPhone" autocomplete="off" placeholder="璇疯緭鍏ヤ笟鍔″憳鑱旂郴鏂瑰紡" lay-vertype="tips" lay-verify="required">
</div>
</div>
</div>
<div class="layui-col-md6">
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鐢宠鏃ユ湡: </label>
- <div class="layui-input-block">
- <input class="layui-input" autocomplete="off" name="appleTime" id="appleTime$" placeholder="璇疯緭鍏ョ敵璇锋棩鏈�" lay-vertype="tips" lay-verify="required">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label layui-form-required">瀹㈡埛鍚嶇О: </label>
- <div class="layui-input-block">
- <div id="cstmrXmlSel" name="cstmrXmlSel">
- </div>
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label layui-form-required">鐢宠鏃ユ湡: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" autocomplete="off" name="appleTime" id="appleTime$" placeholder="璇疯緭鍏ョ敵璇锋棩鏈�" lay-vertype="tips" lay-verify="required">-->
+<!-- </div>-->
+<!-- </div>-->
+
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">涓氬姟绫诲瀷: </label>
<div class="layui-input-block">
@@ -245,6 +265,13 @@
<option value="1">鏄�</option>
<option value="0">鍚︼紙闇�鍞墠鎶�鏈窡杩涢」鐩紝涓庡鎴风洿鎺ユ矡閫氱瓑锛�</option>
</select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎵�闇�: </label>
+ <div class="layui-input-block">
+ <div id="planNeedXmlSel" name="planNeedXmlSel">
+ </div>
</div>
</div>
</div>
@@ -263,12 +290,12 @@
<blockquote class="layui-elem-quote" style="margin-left: 30px;padding: 8px 15px;">鍞墠瑙勫垝</blockquote>
<div class="layui layui-row">
<div class="layui-col-md6">
- <div class="layui-form-item">
- <label class="layui-form-label">瑙勫垝鍛�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="planner$" placeholder="璇疯緭鍏ヨ鍒掑憳" disabled>
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">瑙勫垝鍛�: </label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input class="layui-input" name="planner$" placeholder="璇疯緭鍏ヨ鍒掑憳">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label">鏇存敼鏂规: </label>
<div class="layui-input-block">
@@ -296,7 +323,7 @@
<div class="layui-form-item">
<label class="layui-form-label">瀹屾垚鏃堕棿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="finishTime" id="finishTime$" placeholder="璇疯緭鍏ュ畬鎴愭椂闂�">
+ <input class="layui-input" name="finishTime" id="finishTime$" placeholder="璇疯緭鍏ュ畬鎴愭椂闂�" readonly="readonly">
</div>
</div>
<div class="layui-form-item">
--
Gitblit v1.9.1