소스 검색

Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

MaiXinRong 5 년 전
부모
커밋
03f7b6026f
3개의 변경된 파일5개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 0
      app/public/js/stage.js
  2. 1 0
      app/public/js/stage_detail.js
  3. 3 3
      app/view/change/info_modal.ejs

+ 1 - 0
app/public/js/stage.js

@@ -2246,6 +2246,7 @@ $(document).ready(() => {
                         $('.img-view').append(html.join(''));
                         $('.img-bar').click(removeImageItem);
                         setdraggrable();
+                        $('#upload-img-file').val('');
                     });
                 }
             });

+ 1 - 0
app/public/js/stage_detail.js

@@ -686,6 +686,7 @@ $(document).ready(() => {
                 $('.img-bar').click(removeImageItem);
                 setdraggrable();
                 needCheckDetail();
+                $('#upload-img-file').val('');
             });
         }
     });

+ 3 - 3
app/view/change/info_modal.ejs

@@ -235,11 +235,11 @@
                             <a href="#sub-ap" data-toggle="modal" data-category="" data-target="#sub-ap" id="hideSp">修改审批流程</a>
                             <div class="card mt-3">
                                 <ul class="list-group list-group-flush">
-                                    <% for (const audit of auditList) { %>
+                                    <% for (const [index, audit] of auditList.entries()) { %>
                                         <% if (audit.usite === 0) { %>
                                             <li class="list-group-item">
                                                 <i class="fa fa-play-circle fa-rotate-90"></i>
-                                                <%= audit.name %>  <small class="text-muted"><%= audit.jobs %></small>
+                                                <%= audit.name %>  <small class="text-muted"><%= audit.jobs %></small><span class="pull-right"><%= index === 0 ? '原报' : (index+1 === auditList.length ? '终审' : ctx.helper.transFormToChinese(index+1) + '审') %></span>
                                             </li>
                                         <% } %>
                                     <% } %>
@@ -344,7 +344,7 @@
                                         <% } else if (index+1 === auditList2.length) { %>
                                             <i class="fa fa-stop-circle"></i>
                                         <% } %>
-                                        <%= a.name %>  <small class="text-muted"><%= a.jobs %></small>
+                                        <%= a.name %>  <small class="text-muted"><%= a.jobs %></small><span class="pull-right"><%= a.usite === 0 ? '原报' : (index+1 === auditList2.length ? '终审' : ctx.helper.transFormToChinese(index+1) + '审') %></span>
                                     </li>
                                 <% } %>
                             </ul>