Browse Source

引入其他标段数据问题

MaiXinRong 3 years ago
parent
commit
2d674aee5e

+ 2 - 0
app/controller/ledger_controller.js

@@ -160,6 +160,7 @@ module.exports = app => {
                 }
 
                 const whiteList = this.ctx.app.config.multipart.whitelist;
+                const categoryData = await this.ctx.service.category.getAllCategory(this.ctx.session.sessionProject.id);
                 const renderData = {
                     tender: tender.data,
                     tenderInfo: tender.info,
@@ -180,6 +181,7 @@ module.exports = app => {
                     stdChapters,
                     dealBillsPermission: this._canUpdateDealBills(tender.data, auditors.filter(x => {return x.audit_order > 0})),
                     shenpiConst,
+                    categoryData,
                 };
                 if ((tender.data.ledger_status === auditConst.status.uncheck || tender.data.ledger_status === auditConst.status.checkNo) && tender.data.user_id === ctx.session.sessionUser.accountId) {
                     // renderData.accountGroup = accountGroup;

+ 1 - 0
app/controller/revise_controller.js

@@ -385,6 +385,7 @@ module.exports = app => {
             });
             renderData.auditorList = await ctx.service.reviseAudit.getAuditors(revise.id, revise.times);
             renderData.curAuditor = await ctx.service.reviseAudit.getCurAuditor(revise.id, revise.times);
+            renderData.categoryData = await this.ctx.service.category.getAllCategory(this.ctx.session.sessionProject.id);
             await this.layout('revise/info.ejs', renderData, 'revise/info_modal.ejs');
         }
 

+ 1 - 0
app/controller/stage_controller.js

@@ -207,6 +207,7 @@ module.exports = app => {
                 renderData.sfAttDelPower = ctx.session.sessionUser.accountId === ctx.stage.user_id || ctx.helper._.findIndex(ctx.stage.auditors2, { aid: ctx.session.sessionUser.accountId }) !== -1;
                 const projectFunInfo = await this.ctx.service.project.getFunRela(ctx.session.sessionProject.id);
                 renderData.hintOver = projectFunInfo.hintOver && ctx.tender.info.fun_rela.hintOver;
+                renderData.categoryData = await this.ctx.service.category.getAllCategory(this.ctx.session.sessionProject.id);
                 await this.layout('stage/index.ejs', renderData, 'stage/modal.ejs');
             } catch (err) {
                 this.log(err);

+ 4 - 1
app/view/shares/tender_select_modal.ejs

@@ -37,4 +37,7 @@
             </div>
         </div>
     </div>
-</div>
+</div>
+<script>
+    const category = JSON.parse('<%- JSON.stringify(categoryData) %>');
+</script>