瀏覽代碼

多人协同数目显示

laiguoran 4 年之前
父節點
當前提交
486df8c917
共有 4 個文件被更改,包括 7 次插入2 次删除
  1. 3 0
      app/controller/tender_controller.js
  2. 2 0
      app/public/js/shenpi.js
  3. 1 1
      app/service/ledger_cooperation.js
  4. 1 1
      app/view/tender/shenpi.ejs

+ 3 - 0
app/controller/tender_controller.js

@@ -804,6 +804,8 @@ module.exports = app => {
             const lastRevise = await ctx.service.ledgerRevise.getLastestRevise(ctx.tender.id);
             const lastRevise = await ctx.service.ledgerRevise.getLastestRevise(ctx.tender.id);
             const revising = (lastRevise && lastRevise.status !== auditConst.revise.status.checked) || false;
             const revising = (lastRevise && lastRevise.status !== auditConst.revise.status.checked) || false;
 
 
+            const cooperationNum = await ctx.service.ledgerCooperation.count({ tid: ctx.tender.id, status: 1 });
+
             const renderData = {
             const renderData = {
                 shenpi: shenpiConst,
                 shenpi: shenpiConst,
                 accountList,
                 accountList,
@@ -813,6 +815,7 @@ module.exports = app => {
                 auditConst,
                 auditConst,
                 revising,
                 revising,
                 measureType,
                 measureType,
+                cooperationNum,
                 jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.tender.shenpi),
                 jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.tender.shenpi),
             };
             };
             await this.layout('tender/shenpi.ejs', renderData, 'tender/shenpi_modal.ejs');
             await this.layout('tender/shenpi.ejs', renderData, 'tender/shenpi_modal.ejs');

+ 2 - 0
app/public/js/shenpi.js

@@ -751,6 +751,7 @@ $(document).ready(function () {
                     } else {
                     } else {
                         ledger_cooperation_list.push(result);
                         ledger_cooperation_list.push(result);
                     }
                     }
+                    $('#cooperation-num').text(ledger_cooperation_list.length);
                     setLeftTable(ledgerTree.datas, ledger_cooperation_list, user_id, $('#stage_audits option:selected').text());
                     setLeftTable(ledgerTree.datas, ledger_cooperation_list, user_id, $('#stage_audits option:selected').text());
                     const refreshNode = ledgerTree.loadPostData({update: select});
                     const refreshNode = ledgerTree.loadPostData({update: select});
                     ledgerSpreadObj.refreshTree(info.sheet, refreshNode);
                     ledgerSpreadObj.refreshTree(info.sheet, refreshNode);
@@ -851,6 +852,7 @@ $(document).ready(function () {
             const refreshNode = ledgerTree.loadPostData({update: select});
             const refreshNode = ledgerTree.loadPostData({update: select});
             ledgerSpreadObj.refreshTree(ledgerSpread.getActiveSheet(), refreshNode);
             ledgerSpreadObj.refreshTree(ledgerSpread.getActiveSheet(), refreshNode);
             ledgerSpreadObj.setFontColor();
             ledgerSpreadObj.setFontColor();
+            $('#cooperation-num').text(ledger_cooperation_list.length);
         });
         });
     });
     });
 
 

+ 1 - 1
app/service/ledger_cooperation.js

@@ -58,7 +58,7 @@ module.exports = app => {
         }
         }
 
 
         async getValidData(tid, uid) {
         async getValidData(tid, uid) {
-            const condition = {where: {tid: tid, status: 1}};
+            const condition = { where: { tid, status: 1 } };
             if (uid) {
             if (uid) {
                 condition.where.user_id = uid;
                 condition.where.user_id = uid;
                 condition.colums = ['ledger_id', 'pwd'];
                 condition.colums = ['ledger_id', 'pwd'];

+ 1 - 1
app/view/tender/shenpi.ejs

@@ -17,7 +17,7 @@
                                     <a class="pull-right set-otherTender" data-name="<%- sp.name %>" data-code="<%- sp.code %>" href="#batch" data-toggle="modal" data-target="#batch">设置其他标段</a>
                                     <a class="pull-right set-otherTender" data-name="<%- sp.name %>" data-code="<%- sp.code %>" href="#batch" data-toggle="modal" data-target="#batch">设置其他标段</a>
                                     <a class="pull-right set-otherShenpi mr-3" data-name="<%- sp.name %>" data-code="<%- sp.code %>" href="#batch2" data-toggle="modal" data-target="#batch2">设置其他流程</a>
                                     <a class="pull-right set-otherShenpi mr-3" data-name="<%- sp.name %>" data-code="<%- sp.code %>" href="#batch2" data-toggle="modal" data-target="#batch2">设置其他流程</a>
                                     <% if (sp.code === 'stage' && !revising && ctx.tender.data.ledger_status === auditConst.ledger.status.checked) { %>
                                     <% if (sp.code === 'stage' && !revising && ctx.tender.data.ledger_status === auditConst.ledger.status.checked) { %>
-                                    <a class="pull-right mr-3" id="stage_cooperation" <% if (sp.status !== shenpi.sp_status.gdspl) { %>style="display: none"<% } %> data-name="<%- sp.name %>" data-code="<%- sp.code %>" href="#cooperation" data-toggle="modal" data-target="#cooperation">多人协同</a>
+                                    <a class="pull-right mr-3" id="stage_cooperation" <% if (sp.status !== shenpi.sp_status.gdspl) { %>style="display: none"<% } %> data-name="<%- sp.name %>" data-code="<%- sp.code %>" href="#cooperation" data-toggle="modal" data-target="#cooperation">多人协同 <i class="fa fa-lock"></i> <span id="cooperation-num"><%- cooperationNum %></span></a>
                                     <% } %>
                                     <% } %>
                                     <h5 class="card-title"><%- sp.name %></h5>
                                     <h5 class="card-title"><%- sp.name %></h5>
                                     <div class="form-group">
                                     <div class="form-group">