|
@@ -400,6 +400,10 @@ INTERFACE_EXPORT = (() => {
|
|
|
name: "Type",
|
|
name: "Type",
|
|
|
value: "ZDEK",
|
|
value: "ZDEK",
|
|
|
},
|
|
},
|
|
|
|
|
+ {
|
|
|
|
|
+ name: "KeyId",
|
|
|
|
|
+ value: uuid.v1()
|
|
|
|
|
+ },
|
|
|
];
|
|
];
|
|
|
Element.call(this, "NormLib", attrs);
|
|
Element.call(this, "NormLib", attrs);
|
|
|
}
|
|
}
|
|
@@ -475,6 +479,10 @@ INTERFACE_EXPORT = (() => {
|
|
|
name: "Ratio",
|
|
name: "Ratio",
|
|
|
value: "100",
|
|
value: "100",
|
|
|
},
|
|
},
|
|
|
|
|
+ {
|
|
|
|
|
+ name: "KeyId",
|
|
|
|
|
+ value: uuid.v1()
|
|
|
|
|
+ }
|
|
|
];
|
|
];
|
|
|
Element.call(this, "RateParam", attrs);
|
|
Element.call(this, "RateParam", attrs);
|
|
|
}
|
|
}
|
|
@@ -520,6 +528,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
function Pract(tpdata, seriNo) {
|
|
function Pract(tpdata, seriNo) {
|
|
|
let pgljData = tpdata.projectGLJ.datas;
|
|
let pgljData = tpdata.projectGLJ.datas;
|
|
|
let decimalObj = tpdata.property.decimal;
|
|
let decimalObj = tpdata.property.decimal;
|
|
|
|
|
+ let ccsObj = $("#vvTax")[0];
|
|
|
const attrs = [{
|
|
const attrs = [{
|
|
|
name: "PractNo",
|
|
name: "PractNo",
|
|
|
value: seriNo,
|
|
value: seriNo,
|
|
@@ -529,6 +538,14 @@ INTERFACE_EXPORT = (() => {
|
|
|
value: pgljData.constData.usedUnitPriceInfo.name,
|
|
value: pgljData.constData.usedUnitPriceInfo.name,
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
|
|
+ name: "TaxLibNo",
|
|
|
|
|
+ value: ccsObj.options[ccsObj.selectedIndex].text //读取车船税标准名称
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
+ name: "PriceFileNo",
|
|
|
|
|
+ value: "JGXX"
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
name: "KeyId",
|
|
name: "KeyId",
|
|
|
value: uuid.v1()
|
|
value: uuid.v1()
|
|
|
}
|
|
}
|
|
@@ -574,7 +591,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
- this.children.push(Param);
|
|
|
|
|
|
|
+ // this.children.push(Param);
|
|
|
|
|
|
|
|
function Mp(g) {
|
|
function Mp(g) {
|
|
|
const attrs = [{
|
|
const attrs = [{
|
|
@@ -959,7 +976,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
//输出招标文件时,取0
|
|
//输出招标文件时,取0
|
|
|
if (isBidInvitation) attrs[1].value = 0;
|
|
if (isBidInvitation) attrs[1].value = 0;
|
|
|
Element.call(this, "EprjInfo", attrs);
|
|
Element.call(this, "EprjInfo", attrs);
|
|
|
- this.children.push(new SummaryOfCost(totalItem, proItem,safeItem,oneToSevenItem,feature));
|
|
|
|
|
|
|
+ // this.children.push(new SummaryOfCost(totalItem, proItem,safeItem,oneToSevenItem,feature));
|
|
|
this.children.push(new MakeInfo(tenderProject));
|
|
this.children.push(new MakeInfo(tenderProject));
|
|
|
this.children.push(new Params(tenderProject));
|
|
this.children.push(new Params(tenderProject));
|
|
|
this.children.push(new getBillsItems(tenderProject));
|
|
this.children.push(new getBillsItems(tenderProject));
|
|
@@ -1207,13 +1224,12 @@ INTERFACE_EXPORT = (() => {
|
|
|
type: TYPE.DECIMAL,
|
|
type: TYPE.DECIMAL,
|
|
|
toFix:3
|
|
toFix:3
|
|
|
},
|
|
},
|
|
|
- {
|
|
|
|
|
- name: "QtyFormula",
|
|
|
|
|
- // value: data.feesIndex && data.feesIndex.common ? data.feesIndex.common.tenderTotalFee : "",//data.calcBase //data.calcBase ? cbParser.toFExpr(data.calcBase, tenderProject.mainTree.items) : "",
|
|
|
|
|
- value: _getStrValueByExportKind(data.feesIndex && data.feesIndex.common ? data.feesIndex.common.tenderTotalFee : ""),
|
|
|
|
|
- type: TYPE.DECIMAL,
|
|
|
|
|
- toFix:2
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ // {
|
|
|
|
|
+ // name: "QtyFormula",
|
|
|
|
|
+ // value: _getStrValueByExportKind(data.feesIndex && data.feesIndex.common ? data.feesIndex.common.tenderTotalFee : ""),
|
|
|
|
|
+ // type: TYPE.DECIMAL,
|
|
|
|
|
+ // toFix:2
|
|
|
|
|
+ // },
|
|
|
{
|
|
{
|
|
|
name: "Price",
|
|
name: "Price",
|
|
|
value: 0,//data.feesIndex && data.feesIndex.common ? data.feesIndex.common.tenderUnitFee : "",
|
|
value: 0,//data.feesIndex && data.feesIndex.common ? data.feesIndex.common.tenderUnitFee : "",
|
|
@@ -1221,28 +1237,12 @@ INTERFACE_EXPORT = (() => {
|
|
|
toFix:2
|
|
toFix:2
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- name: "Rate",
|
|
|
|
|
- value: 100,
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
name: "Sum",
|
|
name: "Sum",
|
|
|
value: 0,//data.feesIndex && data.feesIndex.common ? data.feesIndex.common.tenderTotalFee : "",
|
|
value: 0,//data.feesIndex && data.feesIndex.common ? data.feesIndex.common.tenderTotalFee : "",
|
|
|
type: TYPE.DECIMAL,
|
|
type: TYPE.DECIMAL,
|
|
|
toFix:2
|
|
toFix:2
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- name: "ChapterKind",
|
|
|
|
|
- value: level > 3 ? 3 : level,
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- name: "CostKind",
|
|
|
|
|
- value: CostKind,
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- name: "CalcType",
|
|
|
|
|
- value: CalcType,
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
name: "ProvisionalType",
|
|
name: "ProvisionalType",
|
|
|
value: ProvisionalType,
|
|
value: ProvisionalType,
|
|
|
mustHasValue:true
|
|
mustHasValue:true
|
|
@@ -1259,26 +1259,6 @@ INTERFACE_EXPORT = (() => {
|
|
|
name: "Remarks",
|
|
name: "Remarks",
|
|
|
value: data.remark,
|
|
value: data.remark,
|
|
|
},
|
|
},
|
|
|
- /* {
|
|
|
|
|
- name: "MpRatio",
|
|
|
|
|
- value: MpRatio,
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- name: "MaterialRatio",
|
|
|
|
|
- value: MaterialRatio,
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- name: "MechRatio",
|
|
|
|
|
- value: MechRatio,
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- name: "AdjustedPrice",
|
|
|
|
|
- value: data.feesIndex && data.feesIndex.common ? data.feesIndex.common.tenderUnitFee : "",
|
|
|
|
|
- },
|
|
|
|
|
- {
|
|
|
|
|
- name: "AdjustedSums",
|
|
|
|
|
- value: data.feesIndex && data.feesIndex.common ? data.feesIndex.common.tenderTotalFee : "",
|
|
|
|
|
- }, */
|
|
|
|
|
{
|
|
{
|
|
|
name: "ItemType",
|
|
name: "ItemType",
|
|
|
value: getItemType(bNode),
|
|
value: getItemType(bNode),
|
|
@@ -1299,10 +1279,10 @@ INTERFACE_EXPORT = (() => {
|
|
|
//投标、招标控制价时。取单价。
|
|
//投标、招标控制价时。取单价。
|
|
|
//招标时,如果是“安全生产费”或“暂列金额”,取单价,否则取0。
|
|
//招标时,如果是“安全生产费”或“暂列金额”,取单价,否则取0。
|
|
|
if (isBidSubmission || isControl || CostKind==1 ||CostKind==2) {
|
|
if (isBidSubmission || isControl || CostKind==1 ||CostKind==2) {
|
|
|
- attrs[5].value = data.feesIndex && data.feesIndex.common ? data.feesIndex.common.tenderUnitFee : "";
|
|
|
|
|
- attrs[7].value = data.feesIndex && data.feesIndex.common ? data.feesIndex.common.tenderTotalFee : "";
|
|
|
|
|
|
|
+ attrs[4].value = data.feesIndex && data.feesIndex.common ? data.feesIndex.common.tenderUnitFee : "";
|
|
|
|
|
+ attrs[5].value = data.feesIndex && data.feesIndex.common ? data.feesIndex.common.tenderTotalFee : "";
|
|
|
//暂列金额 数量为0的时候,单价输出0
|
|
//暂列金额 数量为0的时候,单价输出0
|
|
|
- if( CostKind==2 && !gljUtil.isNotEmpty(data.quantity)) attrs[5].value = 0
|
|
|
|
|
|
|
+ if( CostKind==2 && !gljUtil.isNotEmpty(data.quantity)) attrs[4].value = 0
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
Element.call(this, "Item", attrs);
|
|
Element.call(this, "Item", attrs);
|
|
@@ -1726,10 +1706,11 @@ INTERFACE_EXPORT = (() => {
|
|
|
baseMap[key] = i;
|
|
baseMap[key] = i;
|
|
|
}
|
|
}
|
|
|
//mustHasValue
|
|
//mustHasValue
|
|
|
- const attrs = [{
|
|
|
|
|
- name: "ValuationModel",
|
|
|
|
|
- value: property.taxType,
|
|
|
|
|
- },
|
|
|
|
|
|
|
+ const attrs = [
|
|
|
|
|
+ // {
|
|
|
|
|
+ // name: "ValuationModel",
|
|
|
|
|
+ // value: property.taxType,
|
|
|
|
|
+ // },
|
|
|
{
|
|
{
|
|
|
name: "Manage",
|
|
name: "Manage",
|
|
|
value: baseMap["constructingUnit"] ? baseMap["constructingUnit"].value : "",
|
|
value: baseMap["constructingUnit"] ? baseMap["constructingUnit"].value : "",
|