MaiXinRong 1 год назад
Родитель
Сommit
ce2fe316b6
2 измененных файлов с 30 добавлено и 10 удалено
  1. 2 0
      app/controller/tender_controller.js
  2. 28 10
      app/service/tender_cache.js

+ 2 - 0
app/controller/tender_controller.js

@@ -241,6 +241,8 @@ module.exports = app => {
 
         async listInfoFinish(ctx) {
             this.jsFiles = this.app.jsFiles.tender.info;
+            const projectColSet = await ctx.service.projectColSet.getProjectColSet(ctx.session.sessionProject.id);
+            this.colSet = ctx.service.projectColSet.analysisColSetWithDefine(projectSetting.colSet.info, projectColSet.info);
             await this._listDetailFinish('tender/info.ejs', 'tender/modal.ejs');
         }
 

+ 28 - 10
app/service/tender_cache.js

@@ -56,11 +56,20 @@ module.exports = app => {
                     : 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) : null;
                 tender.stage_tp = JSON.parse(cache.stage_flow_cur_tp || cache.stage_flow_pre_tp);
-                tender.progress = {
-                    title: `第${tender.cur_flow.order === undefined ? tender.cur_flow[0].order : tender.cur_flow.order}期`,
-                    status: auditConst.stage.tiStatusString[cache.stage_status],
-                    status_class: auditConst.stage.tiStatusStringClass[cache.stage_status],
-                };
+                try {
+                    tender.progress = {
+                        title: `第${tender.cur_flow.order === undefined ? tender.cur_flow[0].order : tender.cur_flow.order}期`,
+                        status: auditConst.stage.tiStatusString[cache.stage_status],
+                        status_class: auditConst.stage.tiStatusStringClass[cache.stage_status],
+                    };
+                } catch (err) {
+                    console.log(tender.id);
+                    tender.progress = {
+                        title: `第${tender.stage_count}期`,
+                        status: auditConst.stage.tiStatusString[cache.stage_status],
+                        status_class: auditConst.stage.tiStatusStringClass[cache.stage_status],
+                    };
+                }
             } else {
                 tender.stage_status = auditConst.stage.status.checked;
                 tender.stage_count = tender.stage_complete_count;
@@ -69,11 +78,20 @@ module.exports = app => {
                     ? 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) : null;
                 tender.stage_tp = cache.stage_flow_pre_tp ? JSON.parse(cache.stage_flow_pre_tp) : {};
-                tender.progress = {
-                    title: `第${tender.pre_flow.order === undefined ? tender.pre_flow[0].order : tender.pre_flow.order}期`,
-                    status: auditConst.stage.tiStatusString[auditConst.stage.status.checked],
-                    status_class: auditConst.stage.tiStatusStringClass[auditConst.stage.status.checked],
-                };
+                try {
+                    tender.progress = {
+                        title: `第${tender.pre_flow.order === undefined ? tender.pre_flow[0].order : tender.pre_flow.order}期`,
+                        status: auditConst.stage.tiStatusString[auditConst.stage.status.checked],
+                        status_class: auditConst.stage.tiStatusStringClass[auditConst.stage.status.checked],
+                    };
+                } catch(err) {
+                    console.log(tender.id);
+                    tender.progress = {
+                        title: `第${tender.stage_count}期`,
+                        status: auditConst.stage.tiStatusString[auditConst.stage.status.checked],
+                        status_class: auditConst.stage.tiStatusStringClass[auditConst.stage.status.checked],
+                    };
+                }
             }
             tender.contract_price = cache.contract_price;
             tender.advance_tp = cache.advance_tp;