From 09ee5added9d59e90310a2586e846137ea597b19 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 01 十二月 2023 13:15:42 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/priOnline2/priOnline.html |   82 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/views/priOnline2/priOnline.html b/src/main/webapp/views/priOnline2/priOnline.html
index 75b5af2..ba18e13 100644
--- a/src/main/webapp/views/priOnline2/priOnline.html
+++ b/src/main/webapp/views/priOnline2/priOnline.html
@@ -45,10 +45,15 @@
                     </div>
                 </div>
                 <div class="layui-form-item">
+
                     <div class="layui-inline">
                         <div class="layui-input-inline">
                             <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off"
                                    style="border-color: #e1e1e1">
+                        </div>
+                        <label class="layui-form-label">ALL锛�</label>
+                        <div class="layui-input-inline" style="text-align: left">
+                            <input id="allSwitch" name="allSwitch" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
                         </div>
                     </div>
                     <div class="layui-inline">&emsp;
@@ -66,6 +71,7 @@
 <script type="text/html" id="toolbar">
     <div class="layui-btn-container">
         <button class="layui-btn layui-btn-sm" lay-event="addBlank">鏂板鏍镐环</button>
+<!--        <button class="layui-btn layui-btn-sm" lay-event="addBlank2">鎺ュ彇闆嗘垚鏍镐环浠诲姟</button>-->
         <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="deleteData">鍒犻櫎</button>
     </div>
 </script>
@@ -75,20 +81,49 @@
     <input type="button" onclick="upload()" value="涓婁紶"/>
 </form>
 
+<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 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>
+                        <col width="150">
+                        <col width="260">
+                        <col width="150">
+                    </colgroup>
+                    <thead>
+                    <tr><th>鏂囦欢鍚�</th>
+                        <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 == 0) || (d.settle == 1 && d.settleSize == 4)){ }}
-    <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">鎻愪氦</a>
-    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+    {{# if (d.settle == 0 && d.nowUserId == d.memberId){ }}
+        <a class="layui-btn layui-btn-xs btn-edit" lay-event="approval">鎻愪氦</a>
+        <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
     {{# } }}
-    {{# if ((d.settle == 1 && d.settleSize == 3) || (d.settle == 2 && d.settleSize == 4)){ }}
-    <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 == 1 && d.nowUserId == d.memberId){ }}
+        <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>
     {{# } }}
+    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="uploadLink">闄勪欢</a>
     <a class="layui-btn layui-btn-xs btn-edit" lay-event="check">鏍镐环</a>
-    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>
+<!--    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">缂栬緫</a>-->
     <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="upload">涓婁紶璇环</a>
-    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="viewCheck">鏌ョ湅璇环</a>
+    {{# if (d.nowUserId == d.userId){ }}
+        <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="viewCheck">鏌ョ湅璇环</a>
+    {{# } }}
 </script>
 
 <script type="text/html" id="plannerListDialog">
@@ -112,6 +147,7 @@
 <script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
 <script type="text/javascript" src="../../static/js/luckysheet_js/pako.es5.js" charset="utf-8"></script>
 <script type="text/javascript" src="../../static/js/luckysheet_js/base64.min.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/priOnline2/priOnline.js" charset="utf-8"></script>
 <!-- 琛ㄥ崟寮圭獥 -->
 <script type="text/html" id="editDialog">
@@ -137,12 +173,12 @@
                     </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" type="text" name="name" placeholder="鏍镐环鍚�" autocomplete="off">
-                    </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" type="text" name="name" placeholder="鏍镐环鍚�" autocomplete="off">-->
+<!--                    </div>-->
+<!--                </div>-->
 
                 <div class="layui-form-item">
                     <label class="layui-form-label layui-form-required">妯℃澘: </label>
@@ -167,6 +203,24 @@
     </div>
 </script>
 
+<script type="text/html" id="editDialogHJ">
+    <div id="detailHJ" lay-filter="detail" class="layui-form admin-form model-form">
+        <input name="id" type="hidden">
+        <div class="layui-form-item">
+            <label class="layui-form-label layui-form-required">瀹㈡埛鍚嶇О: </label>
+            <div class="layui-input-block">
+                <div id="nameXmlSel" name="nameXmlSel">
+                </div>
+            </div>
+        </div>
+        <hr class="layui-bg-gray">
+        <div class="layui-form-item text-right">
+            <button class="layui-btn" lay-filter="editSubmitHJ" lay-submit="">淇濆瓨</button>
+            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+        </div>
+    </div>
+</script>
+
 <!-- 琛ㄥ崟寮圭獥 -->
 <script type="text/html" id="editStatus">
     <div id="editStatusDetail" lay-filter="editStatusDetail" class="layui-form admin-form model-form">

--
Gitblit v1.9.1