|
|
@@ -402,10 +402,11 @@ module.exports = app => {
|
|
|
for (const prjAcc of prjAccList) {
|
|
|
prjAcc.account_group = accountGroup[prjAcc.account_group];
|
|
|
}
|
|
|
- const rpt_tpl_items = '{ customize: [], common: [] }';
|
|
|
- // if (custTreeNodes.length > 0) {
|
|
|
- // rpt_tpl_items = custTreeNodes[0].rpt_tpl_items;
|
|
|
- // }
|
|
|
+ // const rpt_tpl_items = '{ customize: [], common: [] }';
|
|
|
+ const rpt_tpl_items = { customize: [], common: [] };
|
|
|
+ commonArrs.forEach(item => {
|
|
|
+ rpt_tpl_items.common.push(item.name);
|
|
|
+ });
|
|
|
|
|
|
// 获取所有项目参与者
|
|
|
const accountList = await ctx.service.projectAccount.getAllDataByCondition({
|
|
|
@@ -434,7 +435,8 @@ module.exports = app => {
|
|
|
tender: null,
|
|
|
tenderInfo: null,
|
|
|
rpt_tpl_data: JSON.stringify(treeNodes),
|
|
|
- cust_tpl_data: rpt_tpl_items,
|
|
|
+ // cust_tpl_data: rpt_tpl_items,
|
|
|
+ cust_tpl_data: JSON.stringify(rpt_tpl_items),
|
|
|
cust_cfg: JSON.stringify(custCfg),
|
|
|
project_id: tender.pid,
|
|
|
tender_id: tenderId,
|
|
|
@@ -552,7 +554,11 @@ module.exports = app => {
|
|
|
for (const prjAcc of prjAccList) {
|
|
|
prjAcc.account_group = accountGroup[prjAcc.account_group];
|
|
|
}
|
|
|
- const rpt_tpl_items = '{ customize: [], common: [] }';
|
|
|
+ // const rpt_tpl_items = '{ customize: [], common: [] }';
|
|
|
+ const rpt_tpl_items = { customize: [], common: [] };
|
|
|
+ commonArrs.forEach(item => {
|
|
|
+ rpt_tpl_items.common.push(item.name);
|
|
|
+ });
|
|
|
|
|
|
// 获取所有项目参与者
|
|
|
const accountList = await ctx.service.projectAccount.getAllDataByCondition({
|
|
|
@@ -581,7 +587,8 @@ module.exports = app => {
|
|
|
tender: null,
|
|
|
tenderInfo: null,
|
|
|
rpt_tpl_data: JSON.stringify(treeNodes),
|
|
|
- cust_tpl_data: rpt_tpl_items,
|
|
|
+ // cust_tpl_data: rpt_tpl_items,
|
|
|
+ cust_tpl_data: JSON.stringify(rpt_tpl_items),
|
|
|
cust_cfg: JSON.stringify(custCfg),
|
|
|
project_id: pid,
|
|
|
tender_id: tenderId,
|
