|
|
@@ -2462,6 +2462,7 @@ async function exportMainData(userID,projectID) {
|
|
|
result['compilationID'] = project.compilation;
|
|
|
result['from'] = "construction";
|
|
|
result.projects.push(project);
|
|
|
+ tenderIDs.push(project.ID);
|
|
|
let subProjects = await projectModel.find({"$or": [{'ParentID':projectID}, {"property.rootProjectID": projectID}]});
|
|
|
for(let s of subProjects){
|
|
|
if(!s.deleteInfo || !s.deleteInfo.deleted){
|
|
|
@@ -2509,6 +2510,7 @@ async function exportTenderData(data){
|
|
|
let result = {};
|
|
|
let projectSetting = await projectSettingModel.findOne({"projectID": data.projectID}, '-_id');
|
|
|
if(projectSetting) result['projSetting'] = projectSetting;
|
|
|
+ result.projectID = data.projectID;
|
|
|
result.bills = await billsModel.find({"projectID": data.projectID});
|
|
|
result.rations = await rationModel.find({'$or': [{projectID: data.projectID, deleteInfo: null}, {projectID: data.projectID, 'deleteInfo.deleted': {$in: [null, false]}}]});
|
|
|
result.projectGLJs = await gljListModel.find({'project_id':data.projectID});
|
|
|
@@ -2817,7 +2819,7 @@ async function handleEachProject(data,projectIDMap,labourCoeFileIDMap,calcProgra
|
|
|
let bills = [],rations = [],projectGLJs = [],installationFees=[],rationGLJs=[],rationCoes=[],quantityDetails=[],rationInstallations=[],rationTemplates=[],evaluateList=[],bidList=[],contractorList=[];
|
|
|
let newProjectSetting =null,newCalcProgramsFile = null,newLabourCoe = null;
|
|
|
let billsIDMap = {},projectGLJIDMap={},rationIDMap = {};
|
|
|
- let newProjectID = projectIDMap[data.projSetting.projectID];
|
|
|
+ let newProjectID = projectIDMap[data.projectID];
|
|
|
//生成安装增加费设置
|
|
|
if(data.installationFees && data.installationFees.length > 0){
|
|
|
for(let ins of data.installationFees){
|
