Browse Source

feat: 选择审批人弹窗优化

lanjianrong 4 years ago
parent
commit
7309d2340d

+ 9 - 9
app/public/js/advance_audit.js

@@ -69,19 +69,19 @@ $(document).ready(function () {
     })
 
     // 添加审批流程按钮逻辑
-    $('.book-list').on('click', '.acc-btn', function () {
-        const idx = $(this).attr('data-groupid')
-        const type = $(this).attr('data-type')
+    $('.book-list').on('click', 'dt', function () {
+        const idx = $(this).find('.acc-btn').attr('data-groupid')
+        const type = $(this).find('.acc-btn').attr('data-type')
         if (type === 'hide') {
-            $(this).parent().parent().find(`div[data-toggleid="${idx}"]`).show(() => {
-                $(this).children().removeClass('fa-plus-square').addClass('fa-minus-square-o')
-                $(this).attr('data-type', 'show')
+            $(this).parent().find(`div[data-toggleid="${idx}"]`).show(() => {
+                $(this).children().find('i').removeClass('fa-plus-square').addClass('fa-minus-square-o')
+                $(this).find('.acc-btn').attr('data-type', 'show')
 
             })
         } else {
-            $(this).parent().parent().find(`div[data-toggleid="${idx}"]`).hide(() => {
-                $(this).children().removeClass('fa-minus-square-o').addClass('fa-plus-square')
-                $(this).attr('data-type', 'hide')
+            $(this).parent().find(`div[data-toggleid="${idx}"]`).hide(() => {
+                $(this).children().find('i').removeClass('fa-minus-square-o').addClass('fa-plus-square')
+                $(this).find('.acc-btn').attr('data-type', 'hide')
             })
         }
         return false

+ 1 - 3
app/public/js/ledger.js

@@ -2697,13 +2697,11 @@ $(document).ready(function() {
                         </a> ${group.groupName}</dt>
                         <div class="dd-content" data-toggleid="${idx}">`
                         group.groupList.forEach(item => {
-                            if (item.id !== cur_uid) {
-                                html += `<dd class="border-bottom p-2 mb-0 " data-id="${item.id}" >
+                            html += `<dd class="border-bottom p-2 mb-0 " data-id="${item.id}" >
                                     <p class="mb-0 d-flex"><span class="text-primary">${item.name}</span><span
                                             class="ml-auto">${item.mobile || ''}</span></p>
                                     <span class="text-muted">${item.role || ''}</span>
                                 </dd>`
-                            }
                         });
                         html += '</div>'
                     })

+ 1 - 1
app/view/advance/audit_btn.ejs

@@ -13,7 +13,7 @@
 <% } else if (ctx.advance.status === auditConst.status.checkNo) { %>
     <a href="#sp-list" data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm text-muted sp-list-btn">审批退回</a>
     <% if (ctx.session.sessionUser.accountId === ctx.advance.uid) { %>
-        <a data-type="show" href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-primary btn-sm sp-list-btn">重新上报</a>
+        <a href="#sub-sp" data-target="#sub-sp" data-toggle="modal"  class="btn btn-primary btn-sm">重新上报</a>
     <% } %>
 <% } else if (ctx.advance.status === auditConst.status.checkNoPre) { %>
     <a href="#sp-list" data-type="hide" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm text-muted sp-list-btn">审批退回</a>

+ 3 - 2
app/view/advance/detail.ejs

@@ -140,8 +140,9 @@
                                                         <% group.groupList.forEach(item => { %>
                                                             <% if (item.id !== ctx.session.sessionUser.accountId) { %>
                                                                 <dd class="border-bottom p-2 mb-0 " data-id="<%- item.id %>" >
-                                                                    <p class="mb-0 d-flex"><span class="text-primary"><%- item.name %></span><span
-                                                                            class="ml-auto"><%- item.mobile %></span></p>
+                                                                    <p class="mb-0 d-flex">
+                                                                        <span class="text-primary"><%- item.name %></span>
+                                                                        <span class="ml-auto"><%- item.mobile %></span></p>
                                                                     <span class="text-muted"><%- item.role %></span>
                                                                 </dd>
                                                             <% } %>