소스 검색

修复待办页需要你关注一些bug

laiguoran 5 년 전
부모
커밋
6eab7a2cb3
2개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      app/service/change_audit.js
  2. 2 2
      app/view/dashboard/index.ejs

+ 1 - 1
app/service/change_audit.js

@@ -302,7 +302,7 @@ module.exports = app => {
                         '  FROM (SELECT * FROM ?? WHERE `user_id` = ? OR `id` in (SELECT `tid` FROM ?? WHERE `uid` = ? GROUP BY `tid`)) As t' +
                         '  LEFT JOIN ?? As c ON c.`tid` = t.`id`' +
                         '  LEFT JOIN ?? As ca ON ca.`cid` = c.`cid`' +
-                        '  WHERE t.`project_id` = ? and `ca`.`sin_time` > ?' +
+                        '  WHERE t.`project_id` = ? and `ca`.`sin_time` > ? and `ca`.`usite` != 0' +
                         '  ORDER By ca.`sin_time` DESC LIMIT 1000) as new_t GROUP BY new_t.`id`' +
                         '  ORDER BY new_t.`cu_time`';
             const sqlParam = [this.ctx.service.tender.tableName, uid, this.tableName, uid, this.ctx.service.change.tableName, this.tableName, pid, time];

+ 2 - 2
app/view/dashboard/index.ejs

@@ -180,7 +180,7 @@
                                                 <div class="row">
                                                     <div class="col-auto"><span class="badge badge-info">台账修订</span></div>
                                                     <div class="col-6">
-                                                        <a href="/tender/<%- nr.id %>>"><%- nr.name %></a>
+                                                        <a href="/tender/<%- nr.t_id %>"><%- nr.t_name %></a>
                                                         <a href="/tender/<%- nr.t_id %>/revise/info">台账修订(第<%- nr.corder %>次)</a>
                                                         <%- acRevise.statusString[nr.status]%>
                                                     </div>
@@ -233,7 +233,7 @@
                                                     <div class="col-6">
                                                         <a href="/tender/<%- nm.tid %>"><%- nm.name %></a>
                                                         <a href="/tender/<%- nm.tid %>/measure/stage/<%- nm.m_order %>">第<%- nm.m_order %>期 </a>
-                                                        <%- acStage.statusString[nm.status]%>
+                                                        <%- acMaterial.statusString[nm.status]%>
                                                     </div>
                                                 </div>
                                                 <p class="mt-1 mb-0"><%- nm.su_name %><small class="ml-1 text-muted"><%- (nm.su_role ? '- ' + nm.su_role : '') %></small>