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 | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/views/plan/plan.html b/src/main/webapp/views/plan/plan.html
index 91f4b2c..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>
@@ -135,7 +135,9 @@
<script type="text/html" id="operate">
{{# if (d.settle == 1 || d.settle == 2 || d.settle == 3) { }}
<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>
+ {{# } }}
+ {{# 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>
{{# if (d.settle == 1) { }}
@@ -165,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">
--
Gitblit v1.9.1