MaiXinRong 2 tahun lalu
induk
melakukan
0a65a3bc4f
1 mengubah file dengan 4 tambahan dan 16 penghapusan
  1. 4 16
      app/service/tender_cache.js

+ 4 - 16
app/service/tender_cache.js

@@ -31,20 +31,10 @@ module.exports = app => {
         _analysisTenderCache(tender, cache, uid) {
             commonField.forEach(f => { tender[f] = cache[f]; });
             tender.ledger_tp = cache.ledger_tp ? JSON.parse(cache.ledger_tp) : {};
-            if (cache.ledger_status === auditConst.ledger.status.uncheck) {
+            if (!cache.stage_count || (cache.stage_count === 1 && cache.stage_status === auditConst.stage.status.uncheck && cache.stage_flow_cur_uid !== uid)) {
                 tender.cur_flow = JSON.parse(cache.ledger_flow_cur_info || cache.ledger_flow_pre_info);
                 tender.cur_flow.title = '台账';
-                tender.pre_flow = null;
-                tender.stage_tp = {};
-                tender.progress = {
-                    title: '台账',
-                    status: auditConst.ledger.tiStatusString[cache.ledger_status],
-                    status_class: auditConst.ledger.tiStatusStringClass[cache.ledger_status],
-                };
-            } else if (!cache.stage_count || (cache.stage_count === 1 && cache.stage_status === auditConst.stage.status.uncheck && cache.stage_flow_cur_uid !== uid)) {
-                tender.cur_flow = JSON.parse(cache.ledger_flow_cur_info || cache.ledger_flow_pre_info);
-                tender.cur_flow.title = '台账';
-                tender.pre_flow = JSON.parse(cache.ledger_flow_pre_info || cache.ledger_flow_cur_info);
+                tender.pre_flow = cache.ledger_flow_pre_info ? JSON.parse(cache.ledger_flow_pre_info) : null;
                 tender.stage_tp = {};
                 tender.progress = {
                     title: '台账',
@@ -58,9 +48,7 @@ module.exports = app => {
                 tender.cur_flow = cache.stage_status === auditConst.stage.status.checkNo
                     ? JSON.parse(cache.stage_flow_pre_info)
                     : JSON.parse(cache.stage_flow_cur_info || cache.stage_flow_pre_info);
-                tender.pre_flow = cache.stage_count === 1
-                    ? JSON.parse(cache.ledger_flow_pre_info || cache.ledger_flow_cur_info)
-                    : cache.stage_flow_pre_info ? JSON.parse(cache.stage_flow_pre_info) : {};
+                tender.pre_flow = cache.stage_flow_pre_info ? JSON.parse(cache.stage_flow_pre_info) : null;
                 tender.stage_tp = JSON.parse(cache.stage_flow_cur_tp || cache.stage_flow_pre_tp);
                 tender.progress = {
                     title: `第${cache.stage_count}期`,
@@ -73,7 +61,7 @@ module.exports = app => {
                 tender.stage_complete_count = tender.stage_complete_count;
                 tender.cur_flow = (cache.stage_status !== auditConst.stage.status.uncheck || cache.stage_flow_cur_uid !== uid)
                     ? JSON.parse(cache.stage_flow_pre_info) : JSON.parse(cache.stage_flow_cur_info || cache.stage_flow_pre_info);
-                tender.pre_flow = cache.stage_flow_pre_info ? JSON.parse(cache.stage_flow_pre_info) : {};
+                tender.pre_flow = cache.stage_flow_pre_info ? JSON.parse(cache.stage_flow_pre_info) : null;
                 tender.stage_tp = cache.stage_flow_pre_tp ? JSON.parse(cache.stage_flow_pre_tp) : {};
                 tender.progress = {
                     title: `第${cache.stage_complete_count}期`,