|
|
@@ -289,7 +289,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
value: Zbdljg?Zbdljg.value:""
|
|
|
},
|
|
|
{
|
|
|
- name: "Shijian",
|
|
|
+ name: "ShiJian",
|
|
|
value: Shijian?Shijian.value:""
|
|
|
},
|
|
|
{
|
|
|
@@ -980,9 +980,9 @@ INTERFACE_EXPORT = (() => {
|
|
|
this.children.push(new MakeInfo(tenderProject));
|
|
|
this.children.push(new Params(tenderProject));
|
|
|
this.children.push(new getBillsItems(tenderProject));
|
|
|
- this.children.push(new getIndexs(tenderProject));
|
|
|
- let bidEvaluationMainMaterials = getBidEvaluationMainMaterial(tenderProject);
|
|
|
- if(bidEvaluationMainMaterials.length > 0) this.children.push(...bidEvaluationMainMaterials);
|
|
|
+ // this.children.push(new getIndexs(tenderProject));
|
|
|
+ // let bidEvaluationMainMaterials = getBidEvaluationMainMaterial(tenderProject);
|
|
|
+ // if(bidEvaluationMainMaterials.length > 0) this.children.push(...bidEvaluationMainMaterials);
|
|
|
}
|
|
|
|
|
|
function _getNumValueByExportKind(orgSum) {
|
|
|
@@ -1794,6 +1794,31 @@ INTERFACE_EXPORT = (() => {
|
|
|
mustHasValue:true
|
|
|
},
|
|
|
{
|
|
|
+ name: "CompileCertNo",
|
|
|
+ value: baseMap["compileCertNo"] ? baseMap["compileCertNo"].value : "",
|
|
|
+ mustHasValue:true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "ReviewApprover",
|
|
|
+ value: baseMap["reviewApprover"] ? baseMap["reviewApprover"].value : "",
|
|
|
+ mustHasValue:true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "ReviewDate",
|
|
|
+ value: baseMap["reviewDate"] ? baseMap["reviewDate"].value : "",
|
|
|
+ mustHasValue:true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "ReviewCertNo",
|
|
|
+ value: baseMap["reviewCertNo"] ? baseMap["reviewCertNo"].value : "",
|
|
|
+ mustHasValue:true
|
|
|
+ },
|
|
|
+ {
|
|
|
+ name: "Designer",
|
|
|
+ value: baseMap["designUnit"] ? baseMap["designUnit"].value : "",
|
|
|
+ mustHasValue:true
|
|
|
+ },
|
|
|
+ {
|
|
|
name: "KeyId",
|
|
|
value: uuid.v1()
|
|
|
}
|
|
|
@@ -1812,15 +1837,17 @@ INTERFACE_EXPORT = (() => {
|
|
|
let Rates = [];
|
|
|
let Practs = [];
|
|
|
let EprjInfos = [];
|
|
|
+ let Indexs = [];
|
|
|
for (let c of projectData.children) {
|
|
|
let tenderProject = tenderDetailMap[c.ID];
|
|
|
let feeRataDatas = tenderProject.FeeRate.datas;
|
|
|
Rates.push(new Rate(tenderProject, feeRataDatas, seriNo));
|
|
|
Practs.push(new Pract(tenderProject, seriNo));
|
|
|
EprjInfos.push(new EprjInfo(tenderProject));
|
|
|
+ Indexs.push(new getIndexs(tenderProject));
|
|
|
seriNo++;
|
|
|
}
|
|
|
- data.children.push(...Rates,...Practs,...EprjInfos);
|
|
|
+ data.children.push(...Rates,...Practs,...EprjInfos,...Indexs);
|
|
|
return [{
|
|
|
data: data,
|
|
|
exportKind: exportKind,
|