From cff0c053baeb229a6c7a7794c061c179111e0b7f Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 31 八月 2023 10:46:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/webapp/views/plan/plan.html | 319 ++++++++++++++++++++++++++++++----------------------
1 files changed, 182 insertions(+), 137 deletions(-)
diff --git a/src/main/webapp/views/plan/plan.html b/src/main/webapp/views/plan/plan.html
index ebba1ce..44464a1 100644
--- a/src/main/webapp/views/plan/plan.html
+++ b/src/main/webapp/views/plan/plan.html
@@ -10,6 +10,7 @@
<link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
<link rel="stylesheet" href="../../static/css/cool.css" media="all">
<link rel="stylesheet" href="../../static/css/tree.css" media="all">
+ <link rel="stylesheet" href="../../static/layui/lay/modules/formDesigner/coolForm.css" />
<style>
.nav-box {
position: absolute;
@@ -46,15 +47,11 @@
margin-right: 5px;
}
- #detail .layui-form-label {
- width: 120px;
- }
- #detail .layui-input-block {
- margin-left: 150px;
- }
-
.layui-form-radio {
display: block;
+ }
+ .layui-unselect.layui-form-radio {
+ display: inline-block;
}
.layui-form-radio:hover *, .layui-form-radioed, .layui-form-radioed>i {
color: #2d8cf0;
@@ -65,7 +62,7 @@
<div class="layui-fluid">
<div class="layui-card" style="margin-bottom: 5px">
- <div class="layui-card-body">
+ <div class="layui-card-body" style="padding-top: 5px;padding-bottom: 5px ">
<div id="search-box" class="layui-form toolbar" style="display: flex;justify-content: flex-end;position: relative">
<div class="nav-box">
<div class="nav-box-item">
@@ -101,20 +98,67 @@
<input style="display:none" id="importExcel" type="file" onchange="upload(this)" >
</div>
</div>
- <div class="layui-card" style="margin-bottom: 0">
- <div class="layui-card-body">
+ <div class="layui-card" style="margin-bottom: 0;">
+ <div class="layui-card-body" style="padding-top: 5px;padding-bottom: 5px ">
瑙勫垝鍗曞垪琛紝
<span class="text-danger">璇峰嬁闅忔剰鍒犻櫎銆�</span>
</div>
</div>
</div>
+<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;">
+ <table class="layui-table">
+ <colgroup>
+ <col>
+ <col width="150">
+ <col width="260">
+ <col width="150">
+ </colgroup>
+ <thead>
+ <tr><th>鏂囦欢鍚�</th>
+ <th>澶у皬</th>
+ <th>涓婁紶杩涘害</th>
+ <th>鎿嶄綔</th>
+ </tr></thead>
+ <tbody id="data-btn-file3"></tbody>
+ </table>
+ </div>
+ <button type="button" class="layui-btn" id="testListAction">寮�濮嬩笂浼�</button>
+ </div>
+ </div>
+</div>
+
<script type="text/html" id="operate">
+ {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3 || d.settle == 4) { }}
+ <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">瀹℃壒</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.settle == 2 || d.settle == 3) { }}
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+ {{# } }}
+
+</script>
+
+<script type="text/html" id="plannerListDialog">
+ <div class="layui-form admin-form">
+ <div class="model-form" style="padding: 30px">
+ <div id="plannerXmlSel"></div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right" style="padding-right: 30px">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </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>
<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>
@@ -141,152 +185,153 @@
<!-- 琛ㄥ崟寮圭獥 -->
<script type="text/html" id="editDialog">
- <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
- <input name="id" type="hidden">
+ <div id="detail" lay-filter="detail" class="layui-form admin-form" style="height: 100%;overflow-y: hidden;">
+ <div class="model-form" style="height: 87%;overflow-x: hidden;overflow-y: scroll">
+ <input name="id" type="hidden">
- <blockquote class="layui-elem-quote" style="margin-left: 30px;padding: 8px 15px;">鍩烘湰淇℃伅</blockquote>
- <div class="layui-row">
- <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" name="name" placeholder="璇疯緭鍏ヨ鍒掑崟鍚嶇О" lay-vertype="tips" lay-verify="required">
+ <!--鍩烘湰淇℃伅-->
+ <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 layui-form-required">鍞墠瑙勫垝鍗曞悕绉�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="name" autocomplete="off" placeholder="璇疯緭鍏ヨ鍒掑崟鍚嶇О" lay-vertype="tips" lay-verify="required">
+ </div>
</div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">璺熻釜椤圭洰: </label>
- <div class="layui-input-block">
- <div id="orderXmlSel" name="orderXmlSel">
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">璺熻釜椤圭洰: </label>
+ <div class="layui-input-block">
+ <div id="orderXmlSel" name="orderXmlSel">
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">涓氬姟鍛�: </label>
+ <div class="layui-input-block">
+ <div id="userXmlSel" name="userXmlSel">
+ </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" name="userXmlSelPhone" autocomplete="off" placeholder="璇疯緭鍏ヤ笟鍔″憳鑱旂郴鏂瑰紡" lay-vertype="tips" lay-verify="required">
+ </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>
- <div class="layui-form-item">
- <label class="layui-form-label">涓氬姟鍛�: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="userId" placeholder="璇疯緭鍏ヤ笟鍔″憳" style="display: none">
- <input id="userId$" name="userId$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏ヤ笟鍔″憳" onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryByuserId" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryByuserIdSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
+ <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" name="planTypeName" lay-vertype="tips" lay-verify="required" disabled>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">绔嬮」: </label>
+ <div class="layui-input-block">
+ <select name="beItem">
+ <option value="">璇烽�夋嫨绔嬮」</option>
+ <option value="1">鏄�</option>
+ <option value="0">鍚︼紙闇�鍞墠鎶�鏈窡杩涢」鐩紝涓庡鎴风洿鎺ユ矡閫氱瓑锛�</option>
</select>
</div>
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">鎵�闇�: </label>
- <div class="layui-input-block">
- <div id="planNeedXmlSel" name="planNeedXmlSel">
+ </div>
+
+ <!--涓�у寲閰嶇疆-->
+ <blockquote class="layui-elem-quote" style="margin-left: 30px;padding: 8px 15px;">涓�у寲閰嶇疆</blockquote>
+ <div class="formDes layui-row" id="customizeBox">
+ <div class="layui-col-md6">
+ </div>
+ <div class="layui-col-md6">
+ </div>
+ </div>
+
+ <!--鍞墠瑙勫垝-->
+ <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 layui-form-required">瑙勫垝鍛�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="planner$" placeholder="璇疯緭鍏ヨ鍒掑憳" lay-verify="required" disabled>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏇存敼鏂规: </label>
+ <div class="layui-input-block">
+ <select name="change">
+ <option value="">璇烽�夋嫨鏇存敼鏂规</option>
+ <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">
+ <input class="layui-input" name="changeReason" placeholder="璇疯緭鍏ユ洿鏀规柟妗堝師鍥�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瑙勬牸缁勯暱濂栭噾: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="planLeaderBonus" placeholder="璇疯緭鍏ヨ鏍肩粍闀垮閲�">
</div>
</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" name="appleTime" id="appleTime$" placeholder="璇疯緭鍏ョ敵璇锋棩鏈�" lay-vertype="tips" lay-verify="required">
+ <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="finishTime" id="finishTime$" placeholder="璇疯緭鍏ュ畬鎴愭椂闂�">
+ </div>
</div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鐢叉柟鍗曚綅: </label>
- <div class="layui-input-block">
- <div id="cstmrXmlSel" name="cstmrXmlSel">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏇存敼娆℃暟: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="changeTime" placeholder="璇疯緭鍏ユ洿鏀规鏁�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">瑙勬牸濂栭噾: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="planBonus" placeholder="璇疯緭鍏ヨ鏍煎閲�">
</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" name="planTypeName" lay-vertype="tips" lay-verify="required" disabled>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">绔嬮」: </label>
- <div class="layui-input-block">
- <select name="beItem">
- <option value="">璇烽�夋嫨绔嬮」</option>
- <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">-->
-<!-- <input class="layui-input" name="memo" placeholder="璇疯緭鍏ユ敞閲�">-->
-<!-- </div>-->
-<!-- </div>-->
</div>
</div>
-
- <blockquote class="layui-elem-quote" style="margin-left: 30px;padding: 8px 15px;">涓�у寲淇℃伅</blockquote>
- <div class="layui-row">
- <div class="layui-col-md6">
- </div>
- <div class="layui-col-md6">
+ <div style="height: 10%">
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right" style="padding-right: 30px">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
</div>
</div>
-
- <blockquote class="layui-elem-quote" style="margin-left: 30px;padding: 8px 15px;">鍞墠瑙勫垝</blockquote>
- <div class="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="璇疯緭鍏ヨ鍒掑憳">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鏇存敼鏂规: </label>
- <div class="layui-input-block">
- <select name="change">
- <option value="">璇烽�夋嫨鏇存敼鏂规</option>
- <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">
- <input class="layui-input" name="changeReason" placeholder="璇疯緭鍏ユ洿鏀规柟妗堝師鍥�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">瑙勬牸缁勯暱濂栭噾: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="planLeaderBonus" placeholder="璇疯緭鍏ヨ鏍肩粍闀垮閲�">
- </div>
- </div>
- </div>
- <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="finishTime" id="finishTime$" placeholder="璇疯緭鍏ュ畬鎴愭椂闂�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鏇存敼娆℃暟: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="changeTime" placeholder="璇疯緭鍏ユ洿鏀规鏁�">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">瑙勬牸濂栭噾: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="planBonus" placeholder="璇疯緭鍏ヨ鏍煎閲�">
- </div>
- </div>
- </div>
- </div>
- <hr class="layui-bg-gray">
- <div class="layui-form-item text-right">
- <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
- <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
- </div>
- </form>
+ </div>
</script>
</html>
--
Gitblit v1.9.1