焦点变换性能调优

modules/pm/facade/pm_facade.js

@@ -615,10 +615,12 @@ function getTotalFee(bills, feeName) {
     return 0;
 }
 
-function summarizeToParent(parent, child) {
+function summarizeToParent(parent, child, fields = null) {
     const decimal = -2;
-    let costFields = ['engineeringCost', 'subEngineering', 'measure', 'safetyConstruction', 'other', 'charge', 'tax', 'estimate'];
-    for (let field of costFields) {
+    if (!fields) {
+        fields = ['engineeringCost', 'subEngineering', 'measure', 'safetyConstruction', 'other', 'charge', 'tax', 'estimate'];
+    }
+    for (let field of fields) {
         parent[field] = scMathUtil.roundTo(parseFloat(parent[field]) + parseFloat(child[field]), decimal);
     }
    /* const decimal = -2;
@@ -731,18 +733,37 @@ async function getTendersFeeInfo(tenders) {
     return IDMapping;
 }
 
-async function getSummaryInfo(projectIDs){
+async function getSummaryInfo(projectIDs, feeFields = null){
+    function initFees(obj, feeFields) {
+        for (let data of feeFields) {
+            obj[data.v] = 0;
+        }
+    }
+    if (!feeFields) {
+        feeFields = [
+            {k: billsFlags.ENGINEERINGCOST, v: 'engineeringCost'},
+            {k: billsFlags.SUB_ENGINERRING, v: 'subEngineering'},
+            {k: billsFlags.MEASURE, v: 'measure'},
+            {k: billsFlags.SAFETY_CONSTRUCTION, v: 'safetyConstruction'},
+            {k: billsFlags.OTHER, v: 'other'},
+            {k: billsFlags.CHARGE, v: 'charge'},
+            {k: billsFlags.TAX, v: 'tax'}
+        ];
+    }
     //ID与汇总信息映射
     let IDMapping = {};
     //固定清单类别与汇总金额字段映射
     let flagFieldMapping = {};
-    flagFieldMapping[billsFlags.ENGINEERINGCOST] = 'engineeringCost';
+    for (let data of feeFields) {
+        flagFieldMapping[data.k] = data.v;
+    }
+    /*flagFieldMapping[billsFlags.ENGINEERINGCOST] = 'engineeringCost';
     flagFieldMapping[billsFlags.SUB_ENGINERRING] = 'subEngineering';
     flagFieldMapping[billsFlags.MEASURE] = 'measure';
     flagFieldMapping[billsFlags.SAFETY_CONSTRUCTION] = 'safetyConstruction';
     flagFieldMapping[billsFlags.OTHER] = 'other';
     flagFieldMapping[billsFlags.CHARGE] = 'charge';
-    flagFieldMapping[billsFlags.TAX] = 'tax';
+    flagFieldMapping[billsFlags.TAX] = 'tax';*/
     let projects = await projectModel.find({ID: {$in : projectIDs}, projType: projectType.project, $or: [{deleteInfo: null}, {'deleteInfo.deleted': false}]});
     //设置建设项目的总建筑面积
     for(let project of projects){
@@ -758,7 +779,10 @@ async function getSummaryInfo(projectIDs){
                 }
             }
         }
-        IDMapping[project.ID] = {engineeringCost: 0, subEngineering: 0, measure: 0, safetyConstruction: 0, other: 0, charge: 0, tax: 0, estimate: 0, rate: 0, buildingArea: grossArea, perCost: ''};
+        //IDMapping[project.ID] = {engineeringCost: 0, subEngineering: 0, measure: 0, safetyConstruction: 0, other: 0, charge: 0, tax: 0, estimate: 0, rate: 0, buildingArea: grossArea, perCost: ''};
+        IDMapping[project.ID] = {estimate: 0, rate: 0, buildingArea: grossArea, perCost: ''};
+        initFees(IDMapping[project.ID], feeFields);
+        console.log(IDMapping[project.ID]);
     }
 
     //单项工程
@@ -768,7 +792,9 @@ async function getSummaryInfo(projectIDs){
     let engIDs = [];
     for(let eng of engineerings){
         engIDs.push(eng.ID);
-        IDMapping[eng.ID] = {engineeringCost: 0, subEngineering: 0, measure: 0, safetyConstruction: 0, other: 0, charge: 0, tax: 0, estimate: 0, rate: 0, buildingArea: '', perCost: ''};
+        //IDMapping[eng.ID] = {engineeringCost: 0, subEngineering: 0, measure: 0, safetyConstruction: 0, other: 0, charge: 0, tax: 0, estimate: 0, rate: 0, buildingArea: '', perCost: ''};
+        IDMapping[eng.ID] = {estimate: 0, rate: 0, buildingArea: '', perCost: ''};
+        initFees(IDMapping[eng.ID], feeFields);
     }
     if(engIDs.length > 0){
         tenders = await projectModel.find({ParentID: {$in : engIDs}, projType: projectType.tender, $or: [{deleteInfo: null}, {'deleteInfo.deleted': false}]});
@@ -777,16 +803,19 @@ async function getSummaryInfo(projectIDs){
     if(tenders.length > 0){
         for(let tender of tenders){
             tenderIDs.push(tender.ID);
-            IDMapping[tender.ID] = {engineeringCost: 0, subEngineering: 0, measure: 0, safetyConstruction: 0, other: 0, charge: 0, tax: 0, rate: 0, estimate: 0,
-                buildingArea: '', perCost: '',changeMark:tender.changeMark,property:tender.property};
+            /*IDMapping[tender.ID] = {engineeringCost: 0, subEngineering: 0, measure: 0, safetyConstruction: 0, other: 0, charge: 0, tax: 0, rate: 0, estimate: 0,
+                buildingArea: '', perCost: '',changeMark:tender.changeMark,property:tender.property};*/
+            IDMapping[tender.ID] = {rate: 0, estimate: 0, buildingArea: '', perCost: '', changeMark:tender.changeMark,property:tender.property};
+            initFees(IDMapping[tender.ID], feeFields);
             let buildingArea = getBuildingArea(tender.property.projectFeature);
             if(buildingArea){
                 IDMapping[tender.ID]['buildingArea'] = buildingArea;
             }
         }
-        //需要获取的清单固定类别综合合价:工程造价、分部分项、措施项目、安全文明施工专项、规费、其他项目、税金
-        let needFlags = [billsFlags.ENGINEERINGCOST, billsFlags.SUB_ENGINERRING, billsFlags.MEASURE,
-            billsFlags.SAFETY_CONSTRUCTION, billsFlags.CHARGE, billsFlags.OTHER, billsFlags.TAX];
+        //需要获取的清单固定类别综合合价:工程造价、分部分项、措施项目、安全文明施工专项、规费、其他项目、税金...
+        /*let needFlags = [billsFlags.ENGINEERINGCOST, billsFlags.SUB_ENGINERRING, billsFlags.MEASURE,
+            billsFlags.SAFETY_CONSTRUCTION, billsFlags.CHARGE, billsFlags.OTHER, billsFlags.TAX];*/
+        let needFlags = feeFields.map(data => data.k);
         //获取单位工程汇总金额需要用到的所有清单
         let allBills = await billsModel.find({projectID: {$in: tenderIDs}, 'flags.flag': {$in: needFlags}, $or: [{deleteInfo: null}, {'deleteInfo.deleted': false}]},
                                             '-_id projectID fees flags');
@@ -800,13 +829,15 @@ async function getSummaryInfo(projectIDs){
                 IDMapping[bills.projectID]['estimate'] = getTotalFee(bills, 'estimate');
             }
         }
+        let summaryFields = feeFields.map(data => data.v);
+        summaryFields.push('estimate');
         //进行单项工程级别的汇总
         for(let tender of tenders){
-            summarizeToParent(IDMapping[tender.ParentID], IDMapping[tender.ID]);
+            summarizeToParent(IDMapping[tender.ParentID], IDMapping[tender.ID], summaryFields);
         }
         //进行建设项目级别的汇总
         for(let eng of engineerings){
-            summarizeToParent(IDMapping[eng.ParentID], IDMapping[eng.ID]);
+            summarizeToParent(IDMapping[eng.ParentID], IDMapping[eng.ID], summaryFields);
         }
         //占造价比例、单方造价
         const rateDecimal = -2;
@@ -1090,7 +1121,22 @@ async function getProjectByGranularity(tenderID, granularity, userID, versionNam
     }
     constructionProject._doc.children = engineerings;
     //获取汇总信息
-    constructionProject._doc.summaryInfo = await getSummaryInfo([constructionProject.ID]);
+    let feeFields = [
+        {k: billsFlags.ENGINEERINGCOST, v: 'engineeringCost'},
+        {k: billsFlags.SUB_ENGINERRING, v: 'subEngineering'},
+        {k: billsFlags.MEASURE, v: 'measure'},
+        {k: billsFlags.SAFETY_CONSTRUCTION, v: 'safetyConstruction'},
+        {k: billsFlags.OTHER, v: 'other'},
+        {k: billsFlags.CHARGE, v: 'charge'},
+        {k: billsFlags.PROVISIONAL, v: 'provisional'},
+        {k: billsFlags.MATERIAL_PROVISIONAL, v: 'materialProvisional'},
+        {k: billsFlags.ENGINEERING_ESITIMATE, v: 'engineeringEstimate'},
+        {k: billsFlags.DAYWORK, v: 'daywork'},
+        {k: billsFlags.TURN_KEY_CONTRACT, v: 'turnKeyContract'},
+        {k: billsFlags.CLAIM_VISA, v: 'claimVisa'},
+        {k: billsFlags.TAX, v: 'tax'}
+    ];
+    constructionProject._doc.summaryInfo = await getSummaryInfo([constructionProject.ID], feeFields);
     //获取编制软件信息: 软件公司;软件名;版本号;授权信息; base64
     let product = await productModel.findOne({});
     let company = product.company || '珠海纵横创新软件有限公司',

public/web/common_util.js

@@ -58,9 +58,11 @@ function seqString(num,length){
 };
 
 function customRowHeader(sheet, dataLength) {
+    sheet.suspendPaint();   //提升焦点变换性能 2019年4月12日
     for (let i = 0; i < dataLength; i++) {
         sheet.setValue(i, 0, `F${i + 1}`, GC.Spread.Sheets.SheetArea.rowHeader);
     }
+    sheet.resumePaint();    //提升焦点变换性能 2019年4月12日
 };
 
 function changePropNames(object, oldNames, newNames) {

web/building_saas/main/js/controllers/material_controller.js

@@ -181,7 +181,7 @@ let MaterialController = {
         $("#subSpread").removeClass("ration_glj_spread");
         $("#subSpread").css("width",""); //左右拖动调整表格大小的时候会设置css属性，所以隐藏这个div的时候也要把这个属性给去掉
         $("#replaceM").hide();
-        refreshSubSpread();
+        //refreshSubSpread();   //提升焦点变换性能 2019年4月12日
     },
     showReplaceSpread:function(node){
         $("#replaceM").addClass("ovf-hidden");

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

@@ -14,6 +14,37 @@
 * */
 
 const XMLStandard = (function () {
+    //属性类型
+    const TYPE = {
+        DATE: 1,        //日期类型YYYY-MM-DD
+        DATE_TIME: 2,   //日期类型YYY-MM-DDTHH:mm:ss
+        INT: 3,         //整数类型
+        DECIMAL: 4,     //数值类型，不限制小数位数
+        NUM2: 5,        //数值类型2：最多两位小数
+        BOOL: 6         //布尔型
+    };
+    const WHITE_SPACE = {
+        COLLAPSE: 1 //移除所有空白字符（换行、回车、空格以及制表符会被替换为空格，开头和结尾的空格会被移除，而多个连续的空格会被缩减为一个单一的空格）
+    };
+    //费用类别：固定行ID对应
+    const FEE_TYPE = {
+        [fixedFlag.SUB_ENGINERRING]: '1100',
+        [fixedFlag.MEASURE]: '1200',
+        [fixedFlag.CONSTRUCTION_ORGANIZATION]: '120201',
+        [fixedFlag.SAFETY_CONSTRUCTION]: '1204',
+        [fixedFlag.OTHER]: '1300',
+        [fixedFlag.CHARGE]: '800',
+        [fixedFlag.TAX]: '900',
+        [fixedFlag.ADDED_VALUE_TAX]: '9001',
+        [fixedFlag.ADDITIONAL_TAX]: '9002',
+        [fixedFlag.ENVIRONMENTAL_PROTECTION_TAX]: '9003',
+        0: '1800',  //其他未定义的大项费用
+    };
+    //加载数据间隔，减少服务器压力
+    const TIMEOUT_TIME = 500;
+    function isDef(v) {
+        return typeof v !== 'undefined' && v !== null;
+    }
     return function (userID, granularity) {
         this.GRANULARITY = {
             PROJECT: 1,         //导出建设项目
@@ -24,24 +55,6 @@ const XMLStandard = (function () {
         if (!granularity || ![1, 2, 3].includes(granularity)) {
             granularity = this.GRANULARITY.PROJECT;
         }
-        //属性类型
-        const TYPE = {
-            DATE: 1,        //日期类型YYYY-MM-DD
-            DATE_TIME: 2,   //日期类型YYY-MM-DDTHH:mm:ss
-            INT: 3,         //整数类型
-            DECIMAL: 4,     //数值类型，不限制小数位数
-            NUM2: 5,        //数值类型2：最多两位小数
-            BOOL: 6         //布尔型
-        };
-        const WHITE_SPACE = {
-            COLLAPSE: 1 //移除所有空白字符（换行、回车、空格以及制表符会被替换为空格，开头和结尾的空格会被移除，而多个连续的空格会被缩减为一个单一的空格）
-        };
-        //加载数据间隔，减少服务器压力
-        const TIMEOUT_TIME = 500;
-
-        function isDef(v) {
-            return typeof v !== 'undefined' && v !== null;
-        }
         /*
          * 检查
          * 创建节点时检查节点的数据
@@ -176,7 +189,7 @@ const XMLStandard = (function () {
                 {name: '编制单位', value: getValueByKey(source.basicInformation, 'establishmentUnit'), required: true},
                 {name: '审核单位', value: getValueByKey(source.basicInformation, 'auditUnit')},
                 {name: '编制人', value: getValueByKey(source.basicInformation, 'buildingUnitAuthor'), required: true},
-                {name: '审核人', value: 'todo'},
+                {name: '审核人', value: getValueByKey(source.basicInformation, 'auditUnitAuditor')},
                 {name: '开工日期', value: getValueByKey(source.basicInformation, 'commencementDate'), type: TYPE.DATE},
                 {name: '竣工日期', value: getValueByKey(source.basicInformation, 'completionDate'), type: TYPE.DATE},
                 {name: '编制日期', value: getValueByKey(source.basicInformation, 'establishDate'), type: TYPE.DATE, required: true},
@@ -237,6 +250,12 @@ const XMLStandard = (function () {
                 {name: '措施项目清单合计', value: summaryInfo.measure, required: true, type: TYPE.NUM2},
                 {name: '安全文明施工专项费', value: summaryInfo.safetyConstruction, required: true, type: TYPE.NUM2},
                 {name: '其他项目清单合计', value: summaryInfo.other, required: true, type: TYPE.NUM2},
+                {name: '暂列金额合计', value: summaryInfo.provisional, type: TYPE.NUM2},
+                {name: '材料暂估价合计', value: summaryInfo.materialProvisional, type: TYPE.NUM2},
+                {name: '专业工程暂估价合计', value: summaryInfo.engineeringEstimate, type: TYPE.NUM2},
+                {name: '计日工合计', value: summaryInfo.daywork, type: TYPE.NUM2},
+                {name: '总承包服务费合计', value: summaryInfo.turnKeyContract, type: TYPE.NUM2},
+                {name: '签证索赔合计', value: summaryInfo.claimVisa, type: TYPE.NUM2},
                 {name: '规费', value: summaryInfo.charge, required: true, type: TYPE.NUM2},
                 {name: '税金', value: summaryInfo.tax, required: true, type: TYPE.NUM2},
             ];
@@ -391,15 +410,15 @@ const XMLStandard = (function () {
                 {name: '单位', value: source.unit, required: true, minLen: 1, maxLen: 20, whiteSpace: WHITE_SPACE.COLLAPSE},
                 {name: '定额库编码', value: source.libCode, required: true},
                 {name: '原始定额编号', value: source.code, minLen: 1, maxLen: 80, whiteSpace: WHITE_SPACE.COLLAPSE},
-                {name: '子目类型', value: source.subType, required: true, type: TYPE.INT, enumeration: ['0', '1', '2', '3', '4', '5', '6']},  //todo
+                {name: '子目类型', value: source.subType, required: true, type: TYPE.INT, enumeration: ['0', '1', '2', '3', '4', '5', '6']},
                 {name: '工程量', value: source.quantity, required: true, type: TYPE.DECIMAL},
                 {name: '工程量计算式', value: source.quantityEXP},
                 {name: '定额单价', value: getFee(source.fees, 'rationUnitPrice.unitFee'), required: true, type: TYPE.DECIMAL},
                 {name: '定额合价', value: getFee(source.fees, 'rationUnitPrice.totalFee'), required: true, type: TYPE.NUM2},
                 {name: '综合单价', value: getFee(source.fees, 'common.unitFee'), required: true, type: TYPE.DECIMAL},
                 {name: '综合合价', value: getFee(source.fees, 'common.totalFee'), required: true, type: TYPE.NUM2},
-                {name: '单价构成文件ID', value: 0, required: true, type: TYPE.INT}, //todo
-                {name: '分包标志', value: !!source.isSubcontract, type: TYPE.BOOL},
+                {name: '单价构成文件ID', value: source.programID, required: true, type: TYPE.INT},
+                {name: '分包标志', value: false, type: TYPE.BOOL},
                 {name: '备注', value: source.remark}
             ];
             element.call(this, '定额子目', attrs);
@@ -601,7 +620,7 @@ const XMLStandard = (function () {
             let attrs = [
                 {name: '编号', value: source.code, minLen: 1, maxLen: 20, whiteSpace: WHITE_SPACE.COLLAPSE, required: true},
                 {name: '工程名称', value: source.name, minLen: 1, maxLen: 255, whiteSpace: WHITE_SPACE.COLLAPSE, required: true},
-                {name: '计算基础', value: 0, type: TYPE.DECIMAL, required: true},   //todo
+                {name: '计算基础', value: source.calcBaseValue, type: TYPE.DECIMAL, required: true},
                 {name: '服务内容', value: source.serviceContent, maxLen: 255, required: true},
                 {name: '费率', value: source.feeRate, type: TYPE.DECIMAL, required: true},
                 {name: '金额', value: getFee(source.fees, 'common.totalFee'), type: TYPE.NUM2, required: true},
@@ -618,8 +637,9 @@ const XMLStandard = (function () {
                 {name: '数量', value: source.quantity, type: TYPE.DECIMAL, required: true},
                 {name: '单价', value: getFee(source.fees, 'common.unitFee'), type: TYPE.DECIMAL, required: true},
                 {name: '合价', value: getFee(source.fees, 'common.totalFee'), type: TYPE.NUM2, required: true},
-                {name: '依据', value: '', required: true},
-            ]
+                {name: '依据', value: source.claimVisa, required: true},
+            ];
+            element.call(this, '签证索赔计价汇总费用项', attrs);
         }
         //其他定义
         function Other(source) {
@@ -702,6 +722,32 @@ const XMLStandard = (function () {
             ];
             element.call(this, '人材机配比', attrs);
         }
+        //清单综合单价计算程序定义
+        function CalcProgram() {
+            element.call(this, '清单综合单价计算程序', []);
+        }
+        //综合单价计算程序文件定义
+        function CalcProgramFile(source) {
+            let attrs = [
+                {name: 'ID', value: source.ID, type: TYPE.INT, required: true},
+                {name: '名称', value: source.name, minLen: 1, maxLen: 255, whiteSpace: WHITE_SPACE.COLLAPSE, required: true}
+            ];
+            element.call(this, '综合单价计算程序文件', attrs);
+        }
+        //综合单价计算程序费用项定义
+        function CalcProgramFeeItem(source) {
+            let attrs = [
+                {name: '序号', value: source.serialNo, minLen: 1, maxLen: 20, whiteSpace: WHITE_SPACE.COLLAPSE},
+                {name: '行代号', value: source.rowCode, minLen: 1, maxLen: 20, whiteSpace: WHITE_SPACE.COLLAPSE, required: true},
+                {name: '项目名称', value: source.name, minLen: 1, maxLen: 255, whiteSpace: WHITE_SPACE.COLLAPSE, required: true},
+                {name: '计算基础表达式', value: source.calcBase, maxLen: 255, required: true},
+                {name: '计算基础说明', value: source.statement, maxLen: 255},
+                {name: '费率', value: source.feeRate, type: TYPE.DECIMAL},
+                {name: '费用类别', value: source.feeType, type: TYPE.INT, required: true},
+                {name: '备注', value: source.remark, maxLen: 255},
+            ];
+            element.call(this, '综合单价计算程序费用项', attrs);
+        }
         //主要清单汇总定义
         function MainBillsSummary() {
             element.call(this, '主要清单汇总', []);
@@ -858,7 +904,8 @@ const XMLStandard = (function () {
                 engData.children = sortByNext(engData.children);
             }
             //标段
-            let project = curProjectEle = new Project({basicInformation: projectData.property.basicInformation, name: projectData.name});
+            let project = new Project({basicInformation: projectData.property.basicInformation, name: projectData.name});
+            curProjectEle = project;
             //项目信息
             let projectInfo = new ProjectInfo({basicInformation: projectData.property.basicInformation});
             project.children.push(projectInfo);
@@ -902,6 +949,9 @@ const XMLStandard = (function () {
             let engineering = new Engineering(source);
             //单项工程编号要唯一
             checkUnique(curProjectEle.constraints.engCode, source.code, '单项工程编号');
+            //费用构成
+            /*let feeForm = new FeeFrom(summaryInfo[engData.ID]);
+            engineering.children.push(feeForm);*/
             //分批次获取单位工程
             for (let tenderData of engData.children) {
                 curPMData.tender = tenderData;
@@ -969,6 +1019,11 @@ const XMLStandard = (function () {
             if (gljSummary) {
                 tender.children.push(gljSummary);
             }
+            //清单综合单价计算程序
+            let calcProgram = loadCalcProgram(tenderDetail);
+            if (calcProgram) {
+                tender.children.push(calcProgram);
+            }
             //给建设项目下主要清单汇总设置主要清单明细
             let curMainBillsSummary = curProjectEle.children.find(ele => ele.name === '主要清单汇总');
             if (curMainBillsSummary) {
@@ -995,7 +1050,7 @@ const XMLStandard = (function () {
                     rowCode: `F${serialNo}`,
                     name: node.data.name,
                     calcBase: node.data.calcBase,
-                    feeRate: node.data.feeRate,
+                    feeRate: node.data.feeRate !== '' ? node.data.feeRate : 100,
                     fees: node.data.fees,
                     feeType: FEE_TYPE[flag],
                     remark: node.data.remark
@@ -1092,6 +1147,24 @@ const XMLStandard = (function () {
                 }
             }
             loadFeatureContent();
+            //解析工程量计算式
+            function parseQuantityExp(rationData) {
+                if (rationData.quantityEXP === 'QDL') { //取清单工程量
+                    return node.data.quantity;
+                } else if (rationData.quantityEXP === 'GCLMXHJ') {  //从明细汇总成数值
+                    let referDetail = detail.quantity_detail.datas.filter(data => data.rationID === rationData.ID && data.isSummation);
+                    if (referDetail.length === 0) {
+                        return '';
+                    }
+                    let rst = 0;
+                    for (let d of referDetail) {
+                        rst = scMathUtil.roundForObj(rst + d.result, detail.projectInfo.property.decimal.process);
+                    }
+                    return scMathUtil.roundForObj(rst, detail.projectInfo.property.decimal.ration.quantity);
+                } else {
+                    return rationData.quantityEXP;
+                }
+            }
             /*
              * 加载定额子目
              * @param {Array}rationData(清单项目下定额数据) {Array}rationGljData(定额的人材机数据) {Object}decimal(项目小数位数)
@@ -1105,17 +1178,27 @@ const XMLStandard = (function () {
                 if (rationData.adjustState) {
                     viewCode += '换';
                 }
+                //子目类型 补充定额为“1”，标准定额无换算为“0”，标准定额有换算为“2”，其他待完善……
+                let subType;
+                if (rationData.from === 'cpt') {
+                    subType = '1';
+                } else if (!rationData.adjustState) {
+                    subType = '0';
+                } else {
+                    subType = '2';
+                }
                 let rationSource = {
                     viewCode: viewCode,
                     name: rationData.name,
                     unit: rationData.unit,
                     libCode: '',
                     code: rationData.code,
-                    subType: 1,
+                    subType: subType,
                     quantity: rationData.quantity,
-                    quantityEXP: rationData.quantityEXP,
+                    quantityEXP: parseQuantityExp(rationData),
                     fees: rationData.fees,
                     isSubcontract: rationData.isSubcontract,
+                    programID: rationData.programID,
                     remark: rationData.remark
                 };
                 if (rationData.from === 'std' && isDef(rationData.libID)) {    //来自标准库，设置定额库编码
@@ -1246,7 +1329,7 @@ const XMLStandard = (function () {
                             code: node.data.code,
                             name: node.data.name,
                             calcBase: node.data.calcBase,
-                            feeRate: node.data.feeRate,
+                            feeRate: node.data.feeRate !== '' ? node.data.feeRate : 100,
                             fees: node.data.fees,
                             remark: node.data.remark,
                             feeType: FEE_TYPE[fixedFlag.CONSTRUCTION_ORGANIZATION]
@@ -1446,8 +1529,10 @@ const XMLStandard = (function () {
                     } else {    //总承包服务费费用项
                         let source = {
                             code: node.data.code,
+                            name: node.data.name,
                             serviceContent: node.data.serviceContent,
-                            feeRate: node.data.feeRate,
+                            calcBaseValue: node.data.calcBaseValue,
+                            feeRate: node.data.feeRate !== '' ? node.data.feeRate : 100,
                             fees: node.data.fees,
                             remark: node.data.remark
                         };
@@ -1483,7 +1568,7 @@ const XMLStandard = (function () {
                         code: node.data.code,
                         name: node.data.name,
                         calcBase: node.data.calcBase,
-                        feeRate: node.data.feeRate,
+                        feeRate: node.data.feeRate !== '' ? node.data.feeRate : 100,
                         commonTotalFee: totalFee,
                         remark: node.data.remark
                     });
@@ -1521,7 +1606,7 @@ const XMLStandard = (function () {
                     rowCode: `F${serialNo}`,
                     name: node.data.name,
                     calcBase: node.data.calcBase,
-                    feeRate: node.data.feeRate,
+                    feeRate: node.data.feeRate !== '' ? node.data.feeRate : 100,
                     fees: node.data.fees,
                     feeType: FEE_TYPE[getNodeFlag(node)],
                     remark: node.data.remark
@@ -1538,7 +1623,10 @@ const XMLStandard = (function () {
         * @return {void}
         * */
         function loadMainBillsItems(parent, detail) {
-            let mainBills = detail.Bills.datas.filter(data => data.mainBills);
+            let mainBills = detail.Bills.datas.filter(data => {
+                let billsNode = detail.Bills.tree.nodes[`${detail.Bills.tree.prefix}${data.ID}`];
+                return data.mainBills && billsNode && billsNode.children.length === 0;
+            });
             for (let bills of mainBills) {
                 let source = {
                     code: bills.code,
@@ -1572,9 +1660,15 @@ const XMLStandard = (function () {
                 for (let glj of allGljs) {
                     let price = gljUtil.getGLJPrice(glj, detail.projectGLJ.datas,
                         curPMData.tender.property.calcOptions, detail.labourCoe.datas, curPMData.tender.property.decimal, false, _, scMathUtil);
+                    //获取人材机费用类别: 1=人工费 2=材料费 3=机械费 4=未计价费
+                    let feeType = glj.type.toString()[0];
+                    if (feeType && !['1', '2', '3'].includes(feeType)) {
+                        feeType = '4';
+                    }
                     let gljSource = {
                         code: glj.code,
                         name: glj.name,
+                        feeType: feeType,
                         spec: glj.spec,
                         unit: glj.unit,
                         orgCode: glj.original_code,
@@ -1605,6 +1699,51 @@ const XMLStandard = (function () {
                 return gljSummary;
             }
         }
+        /*
+        * 加载清单综合单价计算程序
+        * */
+        function loadCalcProgram(detail) {
+            let calcProgram = detail.calcProgram;
+            if (!calcProgram) {
+                return null;
+            }
+            let calcProramTemplates = calcProgram.templates;
+            if (!Array.isArray(calcProramTemplates) || calcProramTemplates.length === 0) {
+                return null;
+            }
+            //创建清单综合单价计算程序
+            let calcProgramEle = new CalcProgram();
+            //创建综合单价计算程序文件
+            for (let calcFile of calcProramTemplates) {
+                let calcFileEle = new CalcProgramFile({ID: calcFile.ID, name: calcFile.name});
+                //创建计算程序费用项
+                for (let calcItem of calcFile.calcItems) {
+                    let idx = calcFile.calcItems.indexOf(calcItem);
+                    //如果是有[]的基数则转换为其简称，如“[定额人工费]”对应的检查是"RGF"
+                    let calcBase = calcItem.dispExpr.replace(/\[[\u4e00-\u9fa5]+\]/g, str => rationBaseShort[str] ? rationBaseShort[str] : '');
+                    let feeType = calcProgram.feeTypes.find(data => data.type === calcItem.fieldName);
+                    if (feeType) {
+                        feeType = feeType.code;
+                    }
+                    let source = {
+                        serialNo: idx + 1,
+                        rowCode: `F${idx + 1}`,
+                        name: calcItem.name,
+                        calcBase: calcBase,
+                        statement: calcItem.statement,
+                        feeRate: calcItem.feeRate !== '' ? calcItem.feeRate : 100,
+                        feeType: feeType,
+                        remark: calcItem.memo
+                    };
+                    let calcItemEle = new CalcProgramFeeItem(source);
+                    calcFileEle.children.push(calcItemEle);
+                }
+                if (calcFileEle.children.length > 0) {  //计算程序文件必须有费用项
+                    calcProgramEle.children.push(calcFileEle);
+                }
+            }
+            return calcProgramEle.children.length > 0 ? calcProgramEle : null;
+        }
         //开始标签
         function startTag(ele) {
             let rst = `<${ele.name}`;
@@ -1669,11 +1808,13 @@ const XMLStandard = (function () {
         }
         /*
          * 导出数据
-         * @param {Number}tenderID(当前界面的单位工程ID，后台根据这个单位工程，去找其建设项目下所有数据)
+         * @param {Number}tenderID(当前界面的单位工程ID，后台根据这个单位工程，根据导出粒度去找其建设项目下相关数据)
          * @return {void}
          * */
         this.toXml = async function (tenderID) {
             let eleData = await loadProject(tenderID);
+            this.datas = eleData;
+            //console.log(eleData);
             if (!eleData) {
                 return;
             }
@@ -1683,7 +1824,7 @@ const XMLStandard = (function () {
             xmlStr = `<?xml version="1.0" encoding="utf-8"?>${xmlStr}`;
             //格式化
             xmlStr = formatXml(xmlStr);
-            let blob = new Blob([xmlStr], {type: 'text/plain;charset=uft-8'});
+            let blob = new Blob([xmlStr], {type: 'text/plain;charset=utf-8'});
             saveAs(blob, '重庆标准交换数据.xml');
         }
     }

web/building_saas/main/js/models/main_consts.js

@@ -263,20 +263,6 @@ const fixedFlag = {
     //环境保护税
     ENVIRONMENTAL_PROTECTION_TAX: 29
 };
-//费用类别：固定行ID对应
-const FEE_TYPE = {
-    [fixedFlag.SUB_ENGINERRING]: '1100',
-    [fixedFlag.MEASURE]: '1200',
-    [fixedFlag.CONSTRUCTION_ORGANIZATION]: '120201',
-    [fixedFlag.SAFETY_CONSTRUCTION]: '1204',
-    [fixedFlag.OTHER]: '1300',
-    [fixedFlag.CHARGE]: '800',
-    [fixedFlag.TAX]: '900',
-    [fixedFlag.ADDED_VALUE_TAX]: '9001',
-    [fixedFlag.ADDITIONAL_TAX]: '9002',
-    [fixedFlag.ENVIRONMENTAL_PROTECTION_TAX]: '9003',
-    0: '1800',  //其他未定义的大项费用
-};
 const gljKeyArray =['code','name','specs','unit','type'];
 const rationKeyArray =['code','name','specs','unit','subType'];
 const gljLibKeyArray =['code', 'name', 'specs', 'unit', 'gljType'];
@@ -406,3 +392,31 @@ const materialComboMap = [
     {text:materialType[materialTypeMap.SN],value:materialTypeMap.SN},
     {text:materialType[materialTypeMap.SZ],value:materialTypeMap.SZ}
 ];
+
+//定额计算基数简称对应关系，目前只有导出标准接口使用
+const rationBaseShort = {
+    '[定额人工费]': 'RGF',
+    '[定额材料费]': 'CLF',
+    '[定额其他材料费]': 'QTCLF',
+    '[定额施工机具使用费]': 'JXF',
+    '[市场价主材费]': 'SCJZCF',
+    '[市场价设备费]': 'SCJSBF',
+    '[人工工日]': 'RGGR',
+    '[人工费价差]': 'RGJC',
+    '[材料费价差]': 'CLJC',
+    '[机上人工费价差]': 'JSRGJC',
+    '[燃料动力费价差]': 'RLDLJC',
+    '[建筑面积]': 'JZMJ',
+    '[甲供定额人工费]': 'JGRGF',
+    '[甲供定额材料费]': 'JGCLF',
+    '[甲供定额施工机具费]': 'JGJXF',
+    '[甲供主材费]': 'JGZCF',
+    '[暂估材料费]': 'ZGF',
+    '[机械折旧费]': 'JXZJF',
+    '[特大机械检修费]': 'TDJXJXF',
+    '[中小机械检修费]': 'ZXJXJXF',
+    '[特大机械维护费]': 'TDJXWHF',
+    '[中小机械维护费]': 'ZXJXWHF',
+    '[安拆费及场外运输费]': 'ACCWYSF',
+    '[定额仪器仪表费]': 'YQYBF',
+};

web/building_saas/main/js/views/glj_view.js

@@ -16,6 +16,7 @@ var gljOprObj = {
     GLJSelection: [],
     selectedGLJClass: null,
     parentNodeIds: {},
+    preActiveTab: '', //提升焦点变换性能 2019年4月12日
     activeTab: '#linkGLJ',
     rationTab:'#linkGLJ',
     billsTab:'#linkQDJL',

web/building_saas/main/js/views/project_view.js

@@ -2356,16 +2356,16 @@ $('#compilationIllustration').keyup(function () {
 });
 $('#property_ok').click(async function () {
     //test-----
-    /*$.bootstrapLoading.start();
+   /* $.bootstrapLoading.start();
     let xmlObj = new XMLStandard(userID, 1);
     await xmlObj.toXml(projectObj.project.ID());
     console.log(xmlObj);
+    xmlObj = null;
     $.bootstrapLoading.end();
     return;*/
     //test-----
     let project = projectObj.project,
         projectID = project.ID(),
-
         properties = {},
         options = {},
         labourCoes = {},

web/building_saas/main/js/views/sub_view.js

@@ -9,6 +9,7 @@
 
 let subSpread = null;
 let subObj = {
+    fisrtLinked: true,  //提升焦点变换性能 2019年4月12日
     TZJNRrePercent:null,
     showGljSubTab:false,
     showQDSubTab:false,
@@ -194,29 +195,37 @@ let subObj = {
     showGljSubTabData:function () {
         this.initGljSubTab();
         zmhs_obj.showDatas();
-        refreshSubSpread();
+        if (gljOprObj.activeTab !== gljOprObj.preActiveTab) {   //提高焦点变换性能 2019年4月12日
+            refreshSubSpread();
+        }
     },
     showQDSubTabData:function () {
         this.initQDSubTab();
         MaterialController.showItemCharacterText(null,"tzCharacterText");
-        refreshSubSpread();
+        if (gljOprObj.activeTab !== gljOprObj.preActiveTab) {   //提供焦点变换性能 2019年4月12日
+            refreshSubSpread();
+        }
     }
 };
 
-
-
 $("#linkGLJ").click(function(){
     $("#subItems").children().hide();//控制显示subSpread,隐藏特征及内容spread
     //show
     //MaterialController.showReplaceDiv();
-    subObj.showGljSubTabData();
+    //subObj.showGljSubTabData();   //提高焦点变换性能 2019年4月12日
     $("#subSpread").show();
     $("#itemTextDiv").show();
     $("#gljItemTab").show();
     pageCCOprObj.active = false;
     subSpread.options.allowUserDragFill = false;
-    refreshSubSpread();
+    //refreshSubSpread();   //提高焦点变换性能 2019年4月12日
     subSpread.setActiveSheetIndex(0);
+    //提高焦点变换性能 2019年4月12日--
+    if (!subObj.fisrtLinked) {
+        gljOprObj.preActiveTab = gljOprObj.activeTab;
+    }
+    subObj.fisrtLinked = false;
+    //--
     gljOprObj.activeTab='#linkGLJ';
     gljOprObj.setNodeShowTab();
 });
@@ -229,6 +238,7 @@ $("#linkAZZJF").click(function(){
     pageCCOprObj.active = false;
     refreshSubSpread();
     subSpread.setActiveSheetIndex(3);
+    gljOprObj.preActiveTab = gljOprObj.activeTab;   //提高焦点变换性能 2019年4月12日
     gljOprObj.activeTab='#linkAZZJF';
     gljOprObj.setNodeShowTab();
 });
@@ -239,8 +249,9 @@ $("#linkGCLMX").click(function(){
     $("#subSpread").show();
     subSpread.options.allowUserDragFill = true;
     pageCCOprObj.active = false;
-    refreshSubSpread();
+    //refreshSubSpread(); //提升焦点变换性能 2019年4月12日
     subSpread.setActiveSheetIndex(1);
+    gljOprObj.preActiveTab = gljOprObj.activeTab;   //提高焦点变换性能 2019年4月12日
     gljOprObj.activeTab='#linkGCLMX';
     gljOprObj.setNodeShowTab();
 });
@@ -250,7 +261,7 @@ $("#linkJSCX").click(function(){        // 计算程序
     MaterialController.hideReplaceDiv();
     $("#subSpread").show();
     pageCCOprObj.active = false;
-    refreshSubSpread();
+    //refreshSubSpread();   //提升焦点变换性能 2019年4月12日
     subSpread.setActiveSheetIndex(2);
     calcProgramObj.initSheet(subSpread.getSheet(2));
 
@@ -258,6 +269,7 @@ $("#linkJSCX").click(function(){        // 计算程序
         projectObj.mainController.tree.selected = projectObj.mainController.tree.firstNode();
     let sel = projectObj.mainController.tree.selected;
     calcProgramObj.refreshCalcProgram(sel, 3);
+    gljOprObj.preActiveTab = gljOprObj.activeTab;   //提高焦点变换性能 2019年4月12日
     gljOprObj.activeTab='#linkJSCX';
     gljOprObj.setNodeShowTab();
 });
@@ -270,6 +282,7 @@ $("#linkZMHS").click(function(){        // 子目换算
     zmhs_obj.loadSideResize();
     pageCCOprObj.active = false;
     refreshSubSpread();
+    gljOprObj.preActiveTab = gljOprObj.activeTab;   //提高焦点变换性能 2019年4月12日
     gljOprObj.activeTab='#linkZMHS';
     gljOprObj.setNodeShowTab();
 });
@@ -277,7 +290,10 @@ $("#linkMBZM").click(function(){        // 模板子目
     $("#subItems").children().hide();
     $("#tabMBZM").show();
     pageCCOprObj.active = false;
-    refreshSubSpread();
+    if (gljOprObj.activeTab !== gljOprObj.preActiveTab) {   //提高焦点变换性能 2019年4月12日
+        refreshSubSpread();
+    }
+    gljOprObj.preActiveTab = gljOprObj.activeTab;   //提高焦点变换性能 2019年4月12日
     gljOprObj.activeTab='#linkMBZM';
     gljOprObj.setNodeShowTab();
 });
@@ -335,21 +351,28 @@ function adaptiveTzjnrWidth() {
 }
 //清单精灵
 $('#linkQDJL').click(function () {
+    //提高焦点变换性能 2019年4月12日--
+    if (!subObj.fisrtLinked) {
+        gljOprObj.preActiveTab = gljOprObj.activeTab;
+    }
+    subObj.fisrtLinked = false;
+    //--
     gljOprObj.activeTab='#linkQDJL';
     $("#subItems").children().hide();
-    subObj.showQDSubTabData();
+    //subObj.showQDSubTabData();    //提升焦点变换性能 2019年4月12日
     $('#qdjl').show();
     $("#xmtzTextDiv").show();
     $("#tzItemTab").show();
     let selectedNode = projectObj.mainController.tree.selected;
     BillsElf.billsSelElf(selectedNode.data.code);
-    refreshSubSpread();
+    //refreshSubSpread();      //提升焦点变换性能 2019年4月12日
     gljOprObj.setNodeShowTab();
-    BillsElf.refreshWorkBook();
+    //BillsElf.refreshWorkBook();   //提升焦点变换性能 2019年4月12日
 
 });
 //特征及内容
 $("#linkTZJNR").click(function () {
+    gljOprObj.preActiveTab = gljOprObj.activeTab;   //提高焦点变换性能 2019年4月12日
     gljOprObj.activeTab='#linkTZJNR';
     $("#subItems").children().hide();
     $("#tzjnrCon").show();

web/over_write/js/chongqing_2018.js

@@ -178,29 +178,29 @@ function overwriteRationCalcBases (taxType){
 };
 
 var cpFeeTypes2018 = [
-    {type: 'rationUnitPrice', name: '定额综合单价'},
-    {type: 'labour', name: '人工费'},
-    {type: 'material', name: '材料费'},
-    {type: 'machine', name: '施工机具使用费'},
-    {type: 'mainMaterial', name: '主材费'},
-    {type: 'manage', name: '企业管理费'},
-    {type: 'profit', name: '利润'},
-    {type: 'risk', name: '一般风险费'},
-    {type: 'labourDiff', name: '人工价差'},
-    {type: 'materialDiff', name: '材料价差'},
-    {type: 'machineDiff', name: '施工机具使用价差'},
-    {type: 'otherRisk', name: '其他风险费'},
-    {type: 'unratedMaterial', name: '未计价材料费'},
-    {type: 'organizeMeasures', name: '组织措施费'},
-    {type: 'safeCivilization', name: '安全文明施工费'},
-    {type: 'document', name: '建设工程竣工档案编制费'},
-    {type: 'acceptance', name: '住宅工程质量分户验收费'},
-    {type: 'forceFee', name: '规费'},
-    {type: 'tax', name: '税金'},
-    {type: 'VAT', name: '增值税'},
-    {type: 'surtax', name: '附加税'},
-    {type: 'environmentTax', name: '环境保护税'},
-    {type: 'common', name: '工程造价'}
+    {type: 'rationUnitPrice', name: '定额综合单价', code: '1800'},
+    {type: 'labour', name: '人工费', code: '101'},
+    {type: 'material', name: '材料费', code: '201'},
+    {type: 'machine', name: '施工机具使用费', code: '301'},
+    {type: 'mainMaterial', name: '主材费', code: '501'},
+    {type: 'manage', name: '企业管理费', code: '600'},
+    {type: 'profit', name: '利润', code: '700'},
+    {type: 'risk', name: '一般风险费', code: '1000'},
+    {type: 'labourDiff', name: '人工价差', code: '104'},
+    {type: 'materialDiff', name: '材料价差', code: '203'},
+    {type: 'machineDiff', name: '施工机具使用价差', code: '304'},
+    {type: 'otherRisk', name: '其他风险费', code: '1800'},
+    {type: 'unratedMaterial', name: '未计价材料费', code: '1800'},
+    {type: 'organizeMeasures', name: '组织措施费', code: '1200'},
+    {type: 'safeCivilization', name: '安全文明施工费', code: '1204'},
+    {type: 'document', name: '建设工程竣工档案编制费', code: '10041'},
+    {type: 'acceptance', name: '住宅工程质量分户验收费', code: '1206'},
+    {type: 'forceFee', name: '规费', code: '800'},
+    {type: 'tax', name: '税金', code: '900'},
+    {type: 'VAT', name: '增值税', code: '1800'},
+    {type: 'surtax', name: '附加税', code: '1800'},
+    {type: 'environmentTax', name: '环境保护税', code: '1800'},
+    {type: 'common', name: '工程造价', code: '1'}
 ];
 
 if(typeof cpFeeTypes !== 'undefined'){