From 7f9d058a0e632be6a3daf6f46d26b69742db0720 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 08 十一月 2023 13:13:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/webapp/views/plan/plan.html | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/views/plan/plan.html b/src/main/webapp/views/plan/plan.html
index 1a108a8..e7e832b 100644
--- a/src/main/webapp/views/plan/plan.html
+++ b/src/main/webapp/views/plan/plan.html
@@ -109,7 +109,7 @@
<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="">
+ <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;">
<table class="layui-table">
<colgroup>
@@ -133,12 +133,15 @@
</div>
<script type="text/html" id="operate">
- {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3 || d.settle == 4) { }}
+ {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3) { }}
<a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">瀹℃壒</a>
{{# } }}
+ {{# if (d.settle == 2 || d.settle == 3) { }}
+ <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>
- {{# if (d.settle == 1 || d.settle == 2 || d.settle == 3) { }}
+ {{# if (d.settle == 1) { }}
+ <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>
{{# } }}
@@ -164,6 +167,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">
@@ -207,6 +211,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">
@@ -227,13 +238,7 @@
<!-- <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">
@@ -273,12 +278,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 layui-form-required">瑙勫垝鍛�: </label>
- <div class="layui-input-block">
- <input class="layui-input" name="planner$" placeholder="璇疯緭鍏ヨ鍒掑憳" lay-verify="required">
- </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">
@@ -306,7 +311,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