|
@@ -178,33 +178,34 @@ INTERFACE_EXPORT = (() => {
|
|
|
|
|
|
|
|
function addRations(ABillItem, ABillNode){
|
|
function addRations(ABillItem, ABillNode){
|
|
|
for (let i = 0; i < ABillItem.children.length; i++) {
|
|
for (let i = 0; i < ABillItem.children.length; i++) {
|
|
|
- let r = ABillItem.children[i].data;
|
|
|
|
|
|
|
+ let r = ABillItem.children[i];
|
|
|
|
|
+ let rData = ABillItem.children[i].data;
|
|
|
const attrs = [
|
|
const attrs = [
|
|
|
- { name: '序号', value: i + 1},
|
|
|
|
|
- { name: '定额编号', value: r.code},
|
|
|
|
|
- { name: '定额名称', value: r.name},
|
|
|
|
|
- { name: '单位', value: r.unit},
|
|
|
|
|
- { name: '数量', value: r.tenderQuantity},
|
|
|
|
|
- { name: '单价', value: r.feesIndex && r.feesIndex.common ? r.feesIndex.common.tenderUnitFee : 0},
|
|
|
|
|
- { name: '合价', value: r.feesIndex && r.feesIndex.common ? r.feesIndex.common.tenderTotalFee : 0},
|
|
|
|
|
|
|
+ { name: '序号', value: r.row()},
|
|
|
|
|
+ { name: '定额编号', value: rData.code},
|
|
|
|
|
+ { name: '定额名称', value: rData.name},
|
|
|
|
|
+ { name: '单位', value: rData.unit},
|
|
|
|
|
+ { name: '数量', value: rData.tenderQuantity},
|
|
|
|
|
+ { name: '单价', value: rData.feesIndex && rData.feesIndex.common ? rData.feesIndex.common.tenderUnitFee : 0},
|
|
|
|
|
+ { name: '合价', value: rData.feesIndex && rData.feesIndex.common ? rData.feesIndex.common.tenderTotalFee : 0},
|
|
|
{ name: '备注', value: ''},
|
|
{ name: '备注', value: ''},
|
|
|
- { name: '数据类型', value: GetRationDataType(ABillItem.children[i])},
|
|
|
|
|
- { name: '人工费', value: getFee(r.fees, 'marketLabour.tenderTotalFee'), type: TYPE.DECIMAL},
|
|
|
|
|
- { name: '主材费', value: getFee(r.fees, 'marketMaterial.tenderTotalFee'), type: TYPE.DECIMAL},
|
|
|
|
|
|
|
+ { name: '数据类型', value: GetRationDataType(r)},
|
|
|
|
|
+ { name: '人工费', value: getFee(rData.fees, 'marketLabour.tenderTotalFee'), type: TYPE.DECIMAL},
|
|
|
|
|
+ { name: '主材费', value: getFee(rData.fees, 'marketMaterial.tenderTotalFee'), type: TYPE.DECIMAL},
|
|
|
{ name: '辅材费', value: 0},
|
|
{ name: '辅材费', value: 0},
|
|
|
- { name: '机械使用费', value: getFee(r.fees, 'marketMachine.tenderTotalFee'), type: TYPE.DECIMAL},
|
|
|
|
|
|
|
+ { name: '机械使用费', value: getFee(rData.fees, 'marketMachine.tenderTotalFee'), type: TYPE.DECIMAL},
|
|
|
{ name: '设备费', value: 0},
|
|
{ name: '设备费', value: 0},
|
|
|
- { name: '措施费1', value: getFee(r.fees, 'measure.tenderTotalFee'), type: TYPE.DECIMAL}, // FQuery2.FieldByName('OtherDirectFee'},
|
|
|
|
|
|
|
+ { name: '措施费1', value: getFee(rData.fees, 'measure.tenderTotalFee'), type: TYPE.DECIMAL}, // FQuery2.FieldByName('OtherDirectFee'},
|
|
|
{ name: '措施费2', value: 0}, //getFee(r.fees, 'measure.tenderTotalFee'), type: TYPE.DECIMAL
|
|
{ name: '措施费2', value: 0}, //getFee(r.fees, 'measure.tenderTotalFee'), type: TYPE.DECIMAL
|
|
|
- { name: '企业管理费', value: getFee(r.fees, 'manage.tenderTotalFee'), type: TYPE.DECIMAL},
|
|
|
|
|
- { name: '规费', value: getFee(r.fees, 'force.tenderTotalFee'), type: TYPE.DECIMAL},
|
|
|
|
|
- { name: '利润', value: getFee(r.fees, 'profit.tenderTotalFee'), type: TYPE.DECIMAL},
|
|
|
|
|
- { name: '税金', value: getFee(r.fees, 'tax.tenderTotalFee'), type: TYPE.DECIMAL},
|
|
|
|
|
|
|
+ { name: '企业管理费', value: getFee(rData.fees, 'manage.tenderTotalFee'), type: TYPE.DECIMAL},
|
|
|
|
|
+ { name: '规费', value: getFee(rData.fees, 'force.tenderTotalFee'), type: TYPE.DECIMAL},
|
|
|
|
|
+ { name: '利润', value: getFee(rData.fees, 'profit.tenderTotalFee'), type: TYPE.DECIMAL},
|
|
|
|
|
+ { name: '税金', value: getFee(rData.fees, 'tax.tenderTotalFee'), type: TYPE.DECIMAL},
|
|
|
];
|
|
];
|
|
|
let rationNode = new CreateNode('定额信息表', attrs);
|
|
let rationNode = new CreateNode('定额信息表', attrs);
|
|
|
ABillNode.children.push(rationNode);
|
|
ABillNode.children.push(rationNode);
|
|
|
|
|
|
|
|
- addRationGLJs(r, rationNode);
|
|
|
|
|
|
|
+ addRationGLJs(rData, rationNode);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -216,7 +217,7 @@ INTERFACE_EXPORT = (() => {
|
|
|
serialNo++;
|
|
serialNo++;
|
|
|
let zmh = (AItem.parent == vTree.roots[0]) ? getNum(AItem.data.name) : AItem.data.code;
|
|
let zmh = (AItem.parent == vTree.roots[0]) ? getNum(AItem.data.name) : AItem.data.code;
|
|
|
const attrs = [
|
|
const attrs = [
|
|
|
- {name: "序号", value: serialNo}, //AItem.data.ID
|
|
|
|
|
|
|
+ {name: "序号", value: AItem.row()}, //AItem.data.ID
|
|
|
{name: "清单章节号", value: zmh},
|
|
{name: "清单章节号", value: zmh},
|
|
|
{name: "子目号", value: zmh},
|
|
{name: "子目号", value: zmh},
|
|
|
{name: "子目名称", value: AItem.data.name},
|
|
{name: "子目名称", value: AItem.data.name},
|
|
@@ -288,6 +289,61 @@ INTERFACE_EXPORT = (() => {
|
|
|
recursiveAddBills(vTree.roots[0].children[0], gongCLQDB);
|
|
recursiveAddBills(vTree.roots[0].children[0], gongCLQDB);
|
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
+ function createJiRGXXB(tenderData, jiRGXXB){
|
|
|
|
|
+ let vJRG, vKind, vChild;
|
|
|
|
|
+ let vJRGNode, vKindNode, vChildNode;
|
|
|
|
|
+
|
|
|
|
|
+ vJRG = vTree.roots.find(function getElement(e) {return e.getFlag() == fixedFlag.DAYWORK_LABOR});
|
|
|
|
|
+ let attrs = [
|
|
|
|
|
+ { name: '序号', value: vJRG.row() },
|
|
|
|
|
+ { name: '名称', value: vJRG.data.name },
|
|
|
|
|
+ { name: '数据类型', value: 0 },
|
|
|
|
|
+ { name: '合价', value: isBidInvitation ? 0 : ( vJRG.data.feesIndex && vJRG.data.feesIndex.common ? vJRG.data.feesIndex.common.tenderTotalFee : 0) },
|
|
|
|
|
+ ];
|
|
|
|
|
+ vJRGNode = new CreateNode('计日工信息标题', attrs);
|
|
|
|
|
+ jiRGXXB.children.push(vJRGNode);
|
|
|
|
|
+
|
|
|
|
|
+ function getDataType_JRG(name) {
|
|
|
|
|
+ if (name.includes('劳务'))
|
|
|
|
|
+ return 1
|
|
|
|
|
+ else if (name.includes('材料'))
|
|
|
|
|
+ return 2
|
|
|
|
|
+ else if (name.includes('机械'))
|
|
|
|
|
+ return 3
|
|
|
|
|
+ else
|
|
|
|
|
+ return 0;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ for (let i = 0; i < vJRG.children.length; i++) {
|
|
|
|
|
+ vKind = vJRG.children[i];
|
|
|
|
|
+ let attrs = [
|
|
|
|
|
+ { name: '序号', value: vKind.row() },
|
|
|
|
|
+ { name: '名称', value: vKind.data.name },
|
|
|
|
|
+ { name: '数据类型', value: getDataType_JRG(vKind.data.name) },
|
|
|
|
|
+ { name: '合价', value: isBidInvitation ? 0 : (vKind.data.feesIndex && vKind.data.feesIndex.common ? vKind.data.feesIndex.common.tenderTotalFee : 0) },
|
|
|
|
|
+ ];
|
|
|
|
|
+ vKindNode = new CreateNode('计日工信息标题', attrs);
|
|
|
|
|
+ jiRGXXB.children.push(vKindNode);
|
|
|
|
|
+
|
|
|
|
|
+ for (let j = 0; j < vKind.children.length; i++) {
|
|
|
|
|
+ vChild = vKind.children[j];
|
|
|
|
|
+
|
|
|
|
|
+ let attrs = [
|
|
|
|
|
+ { name: '编号', value: vChild.data.code },
|
|
|
|
|
+ { name: '名称', value: vChild.data.name },
|
|
|
|
|
+ { name: '数据类型', value: getDataType_JRG(vKind.data.name) + 3},
|
|
|
|
|
+ { name: '单位', value: vChild.data.unit },
|
|
|
|
|
+ { name: '暂定数量', value: vChild.data.quantity },
|
|
|
|
|
+ { name: '单价', value: isBidInvitation ? 0 : (vChild.data.feesIndex && vChild.data.feesIndex.common ? vChild.data.feesIndex.common.tenderUnitFee : 0) },
|
|
|
|
|
+ { name: '合价', value: isBidInvitation ? 0 : (vChild.data.feesIndex && vChild.data.feesIndex.common ? vChild.data.feesIndex.common.tenderTotalFee : 0) }
|
|
|
|
|
+ ];
|
|
|
|
|
+ vChildNode = new CreateNode('计日工信息明细', attrs);
|
|
|
|
|
+ vKindNode.children.push(vChildNode);
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// 生成标段工程
|
|
// 生成标段工程
|
|
|
function createGLBDGC(tenderData, gongLGCSJ, gongLGCHZ, Num){
|
|
function createGLBDGC(tenderData, gongLGCSJ, gongLGCHZ, Num){
|
|
|
let attrs0 = [
|
|
let attrs0 = [
|
|
@@ -306,8 +362,9 @@ INTERFACE_EXPORT = (() => {
|
|
|
gongLBDGC.children = [gongCLQDB, jiRGXXB, ZaoJHZB, RenCJHZ];
|
|
gongLBDGC.children = [gongCLQDB, jiRGXXB, ZaoJHZB, RenCJHZ];
|
|
|
|
|
|
|
|
createGCLQDB(tenderData, gongCLQDB);
|
|
createGCLQDB(tenderData, gongCLQDB);
|
|
|
- // createJiRGXXB(jiRGXXB);
|
|
|
|
|
-
|
|
|
|
|
|
|
+ createJiRGXXB(tenderData, jiRGXXB);
|
|
|
|
|
+ // createZaoJHZB(tenderData, ZaoJHZB);
|
|
|
|
|
+ // createRenCJHZ(tenderData, RenCJHZ);
|
|
|
|
|
|
|
|
// 同步生成 公路工程汇总明细 数据
|
|
// 同步生成 公路工程汇总明细 数据
|
|
|
const attrs2 = [{ name: '备注', value: '' }];
|
|
const attrs2 = [{ name: '备注', value: '' }];
|