Quellcode durchsuchen

金额概况,计量进度,当前流程人问题

MaiXinRong vor 1 Jahr
Ursprung
Commit
cfd66e2d1c
2 geänderte Dateien mit 3 neuen und 2 gelöschten Zeilen
  1. 1 1
      app/public/js/tender_list_info.js
  2. 2 1
      app/public/js/tender_list_progress.js

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

@@ -44,7 +44,7 @@ const tenderListSpec = (function(){
         if (!node.cid && node.cur_flow) {
             const curUser = node.cur_flow instanceof Array && node.cur_flow[0].audit_type !== auditType.key.common
                 ? transFormToChinese(node.cur_flow[0].audit_order) + '审'
-                : 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) {
                 html.push((node.stage_status === auditConst.stage.status.uncheck || node.ledger_status === auditConst.ledger.status.uncheck)
                     ? curUser

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

@@ -53,9 +53,10 @@ const tenderListSpec = (function(){
         // 当前流程
         html.push('<td style="width: 8%">');
         if (!node.cid && node.cur_flow) {
+            if (node.id === 4811) console.log(node.cur_flow);
             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) + '审'
-                : 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) {
                 html.push((node.stage_status === auditConst.stage.status.uncheck || node.ledger_status === auditConst.ledger.status.uncheck)
                     ? curUser