Merge branch '1.0.0_online' of http://192.168.1.41:3000/SmartCost/ConstructionCost into 1.0.0_online

web/building_saas/main/js/models/bills.js

@@ -42,10 +42,10 @@ var Bills = {
                 }
                 if (uData.fees) {
                     for (let fee of uData.fees) {
-                        fee.unitFee = fee.unitFee.toFixed(2);
-                        fee.totalFee = fee.totalFee.toFixed(2);
-                        fee.tenderUnitFee = fee.tenderUnitFee.toFixed(2);
-                        fee.tenderTotalFee = fee.tenderTotalFee.toFixed(2);
+                        if(fee.unitFee)fee.unitFee = fee.unitFee.toFixed(2);
+                        if(fee.totalFee)fee.totalFee = fee.totalFee.toFixed(2);
+                        if(fee.tenderUnitFee)fee.tenderUnitFee = fee.tenderUnitFee.toFixed(2);
+                        if(fee.tenderTotalFee)fee.tenderTotalFee = fee.tenderTotalFee.toFixed(2);
                     }
                 }
                 return uData;

web/building_saas/main/js/models/calc_program.js

@@ -1919,6 +1919,8 @@ class CalcProgram {
     saveNodes(treeNodes, callback){
         if (treeNodes.length < 1) {
             $.bootstrapLoading.end();
+            this.rationMap = null;
+            this.pgljMap = null;
             return;
         }
 

web/building_saas/main/js/models/exportStandardInterface.js

@@ -546,7 +546,7 @@ const XMLStandard = (function () {
                     failHint: `第${source.row}行清单-“名称”`},
                 {name: '计算基础表达式', value: source.calcBase, required: true},
                 {name: '计算基础说明', value: source.calcBaseState},
-                {name: '费率', value: exportKind === _config.EXPORT_KIND.Tender ? source.feeRate : '100', required: true},
+                {name: '费率', value: exportKind === _config.EXPORT_KIND.Tender ? source.feeRate : '0', required: true},
                 {name: '金额', value: exportKind === _config.EXPORT_KIND.Tender ? _util.getFee(source.fees, 'common.totalFee') : '0', required: true},
                 {name: '暂估价标志', value: !!source.isEstimate, type: _config.TYPE.BOOL},
                 {name: '备注', value: source.remark},
@@ -748,10 +748,10 @@ const XMLStandard = (function () {
                 {name: '行代号', value: source.rowCode, maxLen: 20, required: true},
                 {name: '名称', value: source.name, minLen: 1, maxLen: 255, whiteSpace: _config.WHITE_SPACE.COLLAPSE, required: true,
                     failHint: `第${source.row}行清单-“名称”`},
-                {name: '计算基础表达式', value: exportKind === _config.EXPORT_KIND.Tender ? source.calcBase : '', maxLen: 255, required: true,
+                {name: '计算基础表达式', value: source.calcBase, maxLen: 255, required: true,
                     failHint: `第${source.row}行清单-“计算基础表达式”`},
-                {name: '计算基础说明', value: exportKind === _config.EXPORT_KIND.Tender ? source.calcBaseState : '', maxLen: 255},
-                {name: '费率', value: exportKind === _config.EXPORT_KIND.Tender ? source.feeRate : '100', type: _config.TYPE.DECIMAL, required: true},
+                {name: '计算基础说明', value: source.calcBaseState, maxLen: 255},
+                {name: '费率', value: exportKind === _config.EXPORT_KIND.Tender ? source.feeRate : '0', type: _config.TYPE.DECIMAL, required: true},
                 {name: '金额', value: exportKind === _config.EXPORT_KIND.Tender ? _util.getFee(source.fees, 'common.totalFee') : '0', type: _config.TYPE.NUM2, required: true},
                 {name: '费用类别', value: source.feeType, enumeration: ['800', '900', '9001', '9002', '9003'], required: true,
                     enumerationHint: ['规费', '税金', '增值税', '附加税', '环境保护税'],
@@ -1727,7 +1727,7 @@ const XMLStandard = (function () {
                             code: node.data.code,
                             name: node.data.name,
                             serviceContent: node.data.serviceContent,
-                            calcBaseValue: node.data.calcBase,
+                            calcBaseValue: node.data.calcBaseValue,
                             feeRate: _util.hasValue(node.data.feeRate) ? node.data.feeRate : 100,
                             fees: node.data.fees,
                             remark: node.data.remark
@@ -1735,6 +1735,7 @@ const XMLStandard = (function () {
                         if (hasBillsClass) {
                             _failList.push(`第${source.row}行清单应是清单分类，其下必须有清单项目。<span style="color: red">(错误清单结构)</span>`);
                         }
+                        debugger;
                         parent.children.push(new TurnKeyContractItem(source));
                     }
                 }

web/building_saas/main/js/models/importStandardInterface.js

@@ -1021,10 +1021,11 @@ const ImportXML = (() => {
                         ParentID: addtionalTax.ID,
                         NextSiblingID: -1,
                         name: feeBills.name,
+                        rowCode: feeBills.rowCode,
                         feeRate: feeBills.feeRate,
                     };
                     if (importFileKind === FileKind.tender) {
-                        subTaxData.rowCode = feeBills.rowCode;
+                        //subTaxData.rowCode = feeBills.rowCode;
                         subTaxData.fees = feeBills.fees;
                     }
                     if (preSubTax) {
@@ -1062,12 +1063,13 @@ const ImportXML = (() => {
                         isMatched = true;
                         findBills.calcBase = feeBills.calcBase;
                         findBills.feeRate = feeBills.feeRate;
+                        findBills.rowCode = feeBills.rowCode;
                         //后台配置的feeRateID优先级比feeRate高，导入数据有费率值时，需要清空这个配置
                         if (findBills.feeRate && parseFloat(findBills.feeRate) !== 0) {
                             findBills.feeRateID = null;
                         }
                         if (importFileKind === FileKind.tender) {
-                            findBills.rowCode = feeBills.rowCode;
+                            //findBills.rowCode = feeBills.rowCode;
                             findBills.fees = feeBills.fees;
                         }
                         break;
@@ -1079,11 +1081,12 @@ const ImportXML = (() => {
                             ParentID: -1,
                             NextSiblingID: -1,
                             name: feeBills.name,
+                            rowCode: feeBills.rowCode,
                             calcBase: feeBills.calcBase,
                             feeRate: feeBills.feeRate,
                         };
                         if (importFileKind === FileKind.tender) {
-                            dxfyData.rowCode = feeBills.rowCode;
+                            //dxfyData.rowCode = feeBills.rowCode;
                             dxfyData.fees = feeBills.fees;
                         }
                         if (!preDXFY) {
@@ -1119,6 +1122,7 @@ const ImportXML = (() => {
                     matchBills.calcBase = curBills.calcBase;
                     matchBills.feeRate = curBills.feeRate;
                     matchBills.fees = curBills.fees || [];
+                    matchBills.rowCode = curBills.rowCode;
                     if (curBills.flags && curBills.flags.length) {
                         matchBills.flags = curBills.flags;
                     }