Przeglądaj źródła

导入重庆招标、控制价文件时,暂列金额、专业工程暂估价、索赔计价汇总、现场签证计价汇总的金额应导入数值,否则在不造价计算的情况下,子项有值父项无值

zhongzewei 6 lat temu
rodzic
commit
4a8708e69c

+ 2 - 2
web/building_saas/main/js/models/exportStandardInterface.js

@@ -1636,7 +1636,7 @@ const XMLStandard = (function () {
             let claimNode = detail.Bills.tree.items.find(node => node.getFlag() === fixedFlag.CLAIM);
             if (claimNode && claimNode.children.length > 0) {   //必须要有子项才能显示索赔计价汇总元素
                 let claimEle = new XML_EXPORT_BASE.Element('索赔计价汇总', [
-                    {name: '金额', value: exportKind === _config.EXPORT_KIND.Tender ? _util.getFee(claimNode.data.fees, 'common.totalFee') : '0'}]);
+                    {name: '金额', value: _util.getFee(claimNode.data.fees, 'common.totalFee')}]);
                 for (let n of claimNode.children) {
                     claimEle.children.push(new ClaimVisaFeeItem(n.data));
                 }
@@ -1646,7 +1646,7 @@ const XMLStandard = (function () {
             let visaNode = detail.Bills.tree.items.find(node => node.getFlag() === fixedFlag.VISA);
             if (visaNode && visaNode.children.length > 0) {     //必须要有子项才能显示现场签证计价汇总元素
                 let visaEle = new XML_EXPORT_BASE.Element('现场签证计价汇总', [
-                    {name: '金额', value: exportKind === _config.EXPORT_KIND.Tender ? _util.getFee(visaNode.data.fees, 'common.totalFee') : '0'}
+                    {name: '金额', value: _util.getFee(visaNode.data.fees, 'common.totalFee')}
                 ]);
                 for (let n of visaNode.children) {
                     visaEle.children.push(new ClaimVisaFeeItem(n.data));

+ 4 - 4
web/building_saas/main/js/models/importStandardInterface.js

@@ -813,13 +813,13 @@ const ImportXML = (() => {
                 }
                 return obj;
             })};
+            provisional.fees = [{fieldName: 'common', totalFee: getValue(otherSrc, ['暂列金额', '_金额']) || '0'}];
+            engineeringPro.fees = [{fieldName: 'common', totalFee: getValue(otherSrc, ['专业工程暂估价', '_金额']) || '0'}];
+            claim.fees = [{fieldName: 'common', totalFee: getValue(otherSrc, ['索赔计价汇总', '_金额']) || '0'}];
+            visa.fees = [{fieldName: 'common', totalFee: getValue(otherSrc, ['现场签证计价汇总', '_金额']) || '0'}];
             if (importFileKind === FileKind.tender) {
-                provisional.fees = [{fieldName: 'common', totalFee: getValue(otherSrc, ['暂列金额', '_金额']) || '0'}];
-                engineeringPro.fees = [{fieldName: 'common', totalFee: getValue(otherSrc, ['专业工程暂估价', '_金额']) || '0'}];
                 dayWork.fees = [{fieldName: 'common', totalFee: getValue(otherSrc, ['计日工', '_金额']) || '0'}];
                 service.fees = [{fieldName: 'common', totalFee: getValue(otherSrc, ['总承包服务费', '_金额']) || '0'}];
-                claim.fees = [{fieldName: 'common', totalFee: getValue(otherSrc, ['索赔计价汇总', '_金额']) || '0'}];
-                visa.fees = [{fieldName: 'common', totalFee: getValue(otherSrc, ['现场签证计价汇总', '_金额']) || '0'}];
                 others.fees = [{fieldName: 'common', totalFee: getValue(otherSrc, ['其他', '_金额']) || '0'}];
             }
             return {provisional, engineeringPro, dayWork, service, claim, visa, others};