浏览代码

修复列表部分标段不展示流程bug

ellisran 1 年之前
父节点
当前提交
8e48560656
共有 3 个文件被更改,包括 7 次插入3 次删除
  1. 1 1
      app/public/js/tender_list_info.js
  2. 4 1
      app/public/js/tender_list_progress.js
  3. 2 1
      app/service/tender_cache.js

+ 1 - 1
app/public/js/tender_list_info.js

@@ -47,7 +47,7 @@ const tenderListSpec = (function(){
                 ? transFormToChinese(node.cur_flow[0].audit_order) + '审'
                 ? transFormToChinese(node.cur_flow[0].audit_order) + '审'
                 : node.cur_flow instanceof Array ? (node.cur_flow[0].name + (node.cur_flow[0].role ? '-'+node.cur_flow[0].role  : '')): (node.cur_flow.name + (node.cur_flow.role ? '-'+node.cur_flow.role  : ''));
                 : node.cur_flow instanceof Array ? (node.cur_flow[0].name + (node.cur_flow[0].role ? '-'+node.cur_flow[0].role  : '')): (node.cur_flow.name + (node.cur_flow.role ? '-'+node.cur_flow.role  : ''));
             if (node.stage_status !== undefined) {
             if (node.stage_status !== undefined) {
-                html.push((node.stage_status === auditConst.stage.status.uncheck || node.ledger_status === auditConst.ledger.status.uncheck)
+                html.push(((node.stage_count && node.stage_status === auditConst.stage.status.uncheck) || node.ledger_status === auditConst.ledger.status.uncheck)
                     ? curUser
                     ? curUser
                     : `<a href="#sp-list" data-toggle="modal" data-target="#sp-list"  data-type="${node.stage_count ? 'stage' : 'ledger'}" data-tender="${node.id}" data-order="${node.stage_count ? node.stage_count + '' : ''}">${curUser}</a>`
                     : `<a href="#sp-list" data-toggle="modal" data-target="#sp-list"  data-type="${node.stage_count ? 'stage' : 'ledger'}" data-tender="${node.id}" data-order="${node.stage_count ? node.stage_count + '' : ''}">${curUser}</a>`
                 );
                 );

+ 4 - 1
app/public/js/tender_list_progress.js

@@ -55,11 +55,14 @@ const tenderListSpec = (function(){
         html.push('<td style="width: 8%">');
         html.push('<td style="width: 8%">');
         if (!node.cid && node.cur_flow) {
         if (!node.cid && node.cur_flow) {
             if (node.id === 4811) console.log(node.cur_flow);
             if (node.id === 4811) console.log(node.cur_flow);
+            if (node.id === 3866) {
+                console.log(node);
+            }
             const curUser = node.cur_flow instanceof Array && node.cur_flow[0].audit_type && node.cur_flow[0].audit_type !== auditType.key.common
             const curUser = node.cur_flow instanceof Array && node.cur_flow[0].audit_type && node.cur_flow[0].audit_type !== auditType.key.common
                 ? transFormToChinese(node.cur_flow[0].audit_order) + '审'
                 ? transFormToChinese(node.cur_flow[0].audit_order) + '审'
                 : node.cur_flow instanceof Array ? (node.cur_flow[0].name + (node.cur_flow[0].role ? '-'+node.cur_flow[0].role  : '')): (node.cur_flow.name + (node.cur_flow.role ? '-'+node.cur_flow.role  : ''));
                 : node.cur_flow instanceof Array ? (node.cur_flow[0].name + (node.cur_flow[0].role ? '-'+node.cur_flow[0].role  : '')): (node.cur_flow.name + (node.cur_flow.role ? '-'+node.cur_flow.role  : ''));
             if (node.stage_status !== undefined) {
             if (node.stage_status !== undefined) {
-                html.push((node.stage_status === auditConst.stage.status.uncheck || node.ledger_status === auditConst.ledger.status.uncheck)
+                html.push(((node.stage_count && node.stage_status === auditConst.stage.status.uncheck) || node.ledger_status === auditConst.ledger.status.uncheck)
                     ? curUser
                     ? curUser
                     : `<a href="#sp-list" data-toggle="modal" data-target="#sp-list"  data-type="${node.stage_count ? 'stage' : 'ledger'}" data-tender="${node.id}" data-order="${node.stage_count ? node.stage_count + '' : ''}">${curUser}</a>`
                     : `<a href="#sp-list" data-toggle="modal" data-target="#sp-list"  data-type="${node.stage_count ? 'stage' : 'ledger'}" data-tender="${node.id}" data-order="${node.stage_count ? node.stage_count + '' : ''}">${curUser}</a>`
                 );
                 );

+ 2 - 1
app/service/tender_cache.js

@@ -40,6 +40,7 @@ module.exports = app => {
                 tender.cur_flow.title = '台账';
                 tender.cur_flow.title = '台账';
                 tender.pre_flow = cache.ledger_flow_pre_info ? JSON.parse(cache.ledger_flow_pre_info) : null;
                 tender.pre_flow = cache.ledger_flow_pre_info ? JSON.parse(cache.ledger_flow_pre_info) : null;
                 tender.stage_tp = {};
                 tender.stage_tp = {};
+                tender.stage_count = 0;
                 tender.progress = {
                 tender.progress = {
                     title: '台账',
                     title: '台账',
                     status: auditConst.ledger.tiStatusString[cache.ledger_status],
                     status: auditConst.ledger.tiStatusString[cache.ledger_status],
@@ -530,4 +531,4 @@ module.exports = app => {
     }
     }
 
 
     return TenderCache;
     return TenderCache;
-};
+};