Merge branch 'master' of http://192.168.1.12:3000/SmartCost/ConstructionCost

modules/glj/models/glj_list_model.js

@@ -163,10 +163,10 @@ class GLJListModel extends BaseModel {
                     }else {
                         mixRationMap[t_index]=[tmp];
                     }
-                    if (mixRatioConnectData[tmp.glj_id] !== undefined) {
-                        mixRatioConnectData[tmp.glj_id].push(tmp.connect_key);
+                    if (mixRatioConnectData[m_index] !== undefined) {
+                        mixRatioConnectData[m_index].push(tmp.connect_key);
                     } else {
-                        mixRatioConnectData[tmp.glj_id] = [tmp.connect_key];
+                        mixRatioConnectData[m_index] = [tmp.connect_key];
                     }
                 }
             }

modules/glj/models/unit_price_model.js

@@ -86,10 +86,10 @@ class UnitPriceModel extends BaseModel {
             return [null, false];
         }
         // 先查找是否有原始code相同的记录
-        let unitPriceData = await this.findDataByCondition({original_code: data.original_code, unit_price_file_id: unitPriceFileId}, null, false);
+        let unitPriceData = await this.db.model.find({original_code: data.original_code, unit_price_file_id: unitPriceFileId}).sort('code').exec();
         // 如果有记录，判断是否存在一样的名称，单位...等，有则直接返回数据
         let unitPrice=null;
-        if(operation=='add'){//新增操作时，要把code也一起判断，是否完全一样
+        if(operation=='add'){//新增操作时，要把code也一起判断，是否完全一样。(新增的时候有可能存在编码一样，但是名称规格等不一样的情况，这种情况的话编码不用改变)
             unitPrice =  this.isPropertyInclude(unitPriceData,['code','name','specs','unit','type'],data);
         }else {//修改操作时，code不用加入判断，因为code是需要改变的
             unitPrice =  this.isPropertyInclude(unitPriceData,['name','specs','unit','type'],data);
@@ -123,7 +123,7 @@ class UnitPriceModel extends BaseModel {
             insertData.is_add=1;
         }
 
-        if (unitPriceData&&unitPriceData.length>0) {// 如果原始编码能找到，但不存在一样的编号，名称，单位.型号等，更改code和添加新增标记
+        if (unitPriceData&&unitPriceData.length>0&&operation!='add') {// 如果原始编码能找到，但不存在一样的编号，名称，单位.型号等，更改code和添加新增标记，新增的时候除外。新增的情况下能到这一步说明有存在编码一致但其它属性不一致的情况，所以不用更改编码
             insertData.code = data.original_code+"-"+unitPriceData.length;
             insertData.is_add=1;
         }
@@ -219,14 +219,20 @@ class UnitPriceModel extends BaseModel {
         // 额外更新数据
         if (extend !== '') {
             extend = JSON.parse(extend);
-            for (let code in extend) {
+            let indexList = ['code','name','specs','unit','type'];
+            for (let conKey in extend) {
                 let extendUpdateData = {
-                    market_price: extend[code].market_price,
+                    market_price: extend[conKey].market_price,
                 };
                 let tmpCondition = {
                     unit_price_file_id: unitPriceData.unit_price_file_id,
-                    code: code
                 };
+                let keyList = conKey.split("|-|");
+                for(let i = 1;i<keyList.length;i++){
+                    if(keyList[i]!='null'){
+                        tmpCondition[indexList[i]]=keyList[i];
+                    }
+                }
                 let extendResult = await this.db.update(tmpCondition, extendUpdateData);
                 if (!extendResult) {
                     throw '更新额外数据，编码为' + code + '的数据失败!';

modules/main/controllers/bills_controller.js

@@ -2,7 +2,7 @@
  * Created by jimiz on 2017/4/7.
  */
 var billsData = require('../models/bills');
-
+let ProjectsData = require('../../pm/models/project_model').project;
 //统一回调函数
 var callback = function(req, res, err, message, data){
     res.json({error: err, message: message, data: data});
@@ -54,9 +54,24 @@ module.exports = {
         const data = JSON.parse(request.body.data);
         const findSet = data.findSet;
         const updateData = data.updateData;
+        let settingData = {};
+        // 筛选出要保存在项目属性的设置
+        for (const index in updateData) {
+            if (updateData[index].field === 'addRule') {
+                settingData = updateData[index].value;
+                delete updateData[index];
+            }
+        }
+        // 更新项目属性
+        const propertyUpdateData = {
+            property: 'addRule',
+            data: settingData
+        };
+        const projectResult = await ProjectsData.updateProjectProperty(findSet.projectID, propertyUpdateData);
+
         const result = await billsData.updateBill(findSet, updateData);
-        const message = !result ? '修改失败' : '修改成功';
-        const err = !result ? 1 : 0;
+        const message = !result || !projectResult ? '修改失败' : '修改成功';
+        const err = !result || !projectResult ? 1 : 0;
         callback(request, response, err, message, null);
     }
 

modules/main/models/bills.js

@@ -61,8 +61,6 @@ let billsSchema = new Schema({
     // 标记字段
     flags: [subSchema.flagsSchema],
     deleteInfo: deleteSchema,
-    // 添加规则
-    addRule: subSchema.addRuleSchema,
 });
 
 let bills = db.model("bills", billsSchema);
@@ -152,6 +150,9 @@ class billsModel extends baseModel {
         }
 
         for (const tmp of updateData) {
+            if (tmp === undefined) {
+                continue;
+            }
             update[tmp.field] = tmp.value;
         }
 

modules/main/models/bills_sub_schemas.js

@@ -44,20 +44,5 @@ let itemCharacterSchema = new Schema({
     eigenvalue: [eigenvalueSchema],//特征值
     isChecked: Boolean //是否勾选(输出)
 }, {_id: false});
-// 添加规则字段
-let addRuleSchema = new Schema({
-    // 添加位置
-    position: Number,
-    // 添加内容
-    addContent: Number,
-    // 显示格式
-    displayFormat: Number,
-    // 特征生成方式
-    characterFormat: Number,
-    // 子目生成方式
-    childDisplayFormat: Number,
-    // 序号格式
-   serialType: Number,
-}, {_id: false});
 
-module.exports = {feesSchema: feesSchema, flagsSchema: flagsSchema, jobContentSchema: jobContentSchema, itemCharacterSchema: itemCharacterSchema, addRuleSchema};
+module.exports = {feesSchema: feesSchema, flagsSchema: flagsSchema, jobContentSchema: jobContentSchema, itemCharacterSchema: itemCharacterSchema};

modules/pm/models/project_model.js

@@ -5,7 +5,14 @@ import mongoose from 'mongoose';
 import async_c from 'async';
 import UnitPriceFileModel from "../../glj/models/unit_price_file_model";
 import UnitPriceFiles from '../../glj/models/schemas/unit_price_file';
-import {defaultDecimal, billsQuantityDecimal, basicInformation, projectFeature,displaySetting} from './project_property_template';
+import {
+    defaultDecimal,
+    billsQuantityDecimal,
+    basicInformation,
+    projectFeature,
+    displaySetting,
+    calcOptions
+} from './project_property_template';
 import fixedFlag from '../../common/const/bills_fixed';
 let FeeRateFiles = mongoose.model('fee_rate_file');
 let counter = require("../../../public/counter/counter.js");
@@ -30,25 +37,36 @@ let fileType = {
     feeRateFile: 'FeeRateFile'
 };
 
-let ProjectsDAO = function(){};
+let ProjectsDAO = function () {
+};
 
-ProjectsDAO.prototype.getUserProjects = async function(userId, compilation, callback){
+ProjectsDAO.prototype.getUserProjects = async function (userId, compilation, callback) {
     try {
-        let projects = await Projects.find({'$or': [{'userID': userId, 'compilation': compilation, 'deleteInfo': null}, {'userID': userId, 'compilation': compilation, 'deleteInfo.deleted': {'$in': [null, false]}}]}, '-_id');
-        for(let i = 0 , len = projects.length; i < len; i++){
+        let projects = await Projects.find({
+            '$or': [{
+                'userID': userId,
+                'compilation': compilation,
+                'deleteInfo': null
+            }, {'userID': userId, 'compilation': compilation, 'deleteInfo.deleted': {'$in': [null, false]}}]
+        }, '-_id');
+        for (let i = 0, len = projects.length; i < len; i++) {
             let proj = projects[i];
-            let engineeringCost = await BillsModel.find({projectID: proj.ID, 'flags.flag': fixedFlag.ENGINEERINGCOST, 'fees.totalFee': {$exists:  true}});
+            let engineeringCost = await BillsModel.find({
+                projectID: proj.ID,
+                'flags.flag': fixedFlag.ENGINEERINGCOST,
+                'fees.totalFee': {$exists: true}
+            });
             proj._doc.engineeringCost = engineeringCost.length > 0 ? engineeringCost[0].fees[0].totalFee : 0;
         }
         callback(0, '', projects);
     }
-    catch (err){
+    catch (err) {
         callback(1, 'Error', null);
     }
 };
 
 ProjectsDAO.prototype.getUserProject = function (userId, ProjId, callback) {
-    Projects.findOne({userID: userId, ID: ProjId}, '-_id', function(err, template){
+    Projects.findOne({userID: userId, ID: ProjId}, '-_id', function (err, template) {
         if (err) {
             callback(1, '找不到标段数据', null);
         } else {
@@ -57,22 +75,22 @@ ProjectsDAO.prototype.getUserProject = function (userId, ProjId, callback) {
     });
 }
 
-ProjectsDAO.prototype.updateUserProjects = async function(userId, compilationId, datas, callback){
+ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId, datas, callback) {
     let data, project, updateLength = 0, hasError = false, deleteInfo = null, i, newProject;
     let updateAll = function (err) {
-            if (!err){
-                updateLength += 1;
-                if (updateLength === datas.length) {
-                    callback(0, '', datas);
-                }
-            } else {
-                hasError = true;
-                console.log(err);
-                callback(1, '提交数据出错.', null);
+        if (!err) {
+            updateLength += 1;
+            if (updateLength === datas.length) {
+                callback(0, '', datas);
             }
-        };
-    if (datas){
-        for (i = 0; i < datas.length && !hasError; i++){
+        } else {
+            hasError = true;
+            console.log(err);
+            callback(1, '提交数据出错.', null);
+        }
+    };
+    if (datas) {
+        for (i = 0; i < datas.length && !hasError; i++) {
             data = datas[i];
             if (data.updateData.name !== undefined) {
                 data.updateData.name = data.updateData.name.trim();
@@ -103,7 +121,7 @@ ProjectsDAO.prototype.updateUserProjects = async function(userId, compilationId,
                     }
                     data.updateData.property.unitPriceFile.id = addResult.id;
                 }
-                if(data.updateData.projType === projectType.tender){
+                if (data.updateData.projType === projectType.tender) {
                     //小数位数
                     data.updateData.property.decimal = defaultDecimal;
                     //清单工程量精度
@@ -114,10 +132,13 @@ ProjectsDAO.prototype.updateUserProjects = async function(userId, compilationId,
                     //工程特征
                     data.updateData.property.projectFeature = projectFeature;
                     //呈现选项
-		    data.updateData.property.displaySetting = displaySetting;
-		    
+                    data.updateData.property.displaySetting = displaySetting;
+
                     data.updateData.property.billsCalcMode = 0;
-		    data.updateData.property.zanguCalcMode = 0;
+                    data.updateData.property.zanguCalcMode = 0;
+                    //计算选项
+                    data.updateData.property.calcOptions = calcOptions
+
                 }
                 newProject = new Projects(data.updateData);
                 // 查找同级是否存在同名数据
@@ -126,9 +147,9 @@ ProjectsDAO.prototype.updateUserProjects = async function(userId, compilationId,
                     callback(1, '同级目录已存在相同名称数据.', null);
                     return;
                 }
-                if(data.updateData.projType==='Tender'){
-                    let  feeRateFileID = await feeRateFacade.newFeeRateFile(userId, data.updateData);
-                    newProject.property.feeFile = feeRateFileID?feeRateFileID:-1;
+                if (data.updateData.projType === 'Tender') {
+                    let feeRateFileID = await feeRateFacade.newFeeRateFile(userId, data.updateData);
+                    newProject.property.feeFile = feeRateFileID ? feeRateFileID : -1;
 
                     // 新建人工系数文件 CSL, 2017.10.13
                     let lcFile = await labourCoeFacade.newProjectLabourCoe(data.updateData);
@@ -153,22 +174,28 @@ ProjectsDAO.prototype.updateUserProjects = async function(userId, compilationId,
                 data.updateData['deleteInfo'] = deleteInfo;
                 //Projects.update({userID: userId, ID: data.updateData.ID}, data.updateData, updateAll);
                 //update
-                try{
-                    if(data.updateData.projType === projectType.project){
+                try {
+                    if (data.updateData.projType === projectType.project) {
                         let engineerings = await Projects.find({userID: userId, ParentID: data.updateData.ID});
                         let isExist = false;
-                        if(engineerings.length > 0){
-                            for(let j = 0, jLen = engineerings.length; j < jLen; j++){
+                        if (engineerings.length > 0) {
+                            for (let j = 0, jLen = engineerings.length; j < jLen; j++) {
                                 let e_tenders = await Projects.find({userID: userId, ParentID: engineerings[j].ID});
-                                if(e_tenders.length > 0){
+                                if (e_tenders.length > 0) {
                                     isExist = true;
                                     break;
                                 }
                             }
                         }
-                        if(isExist){//fake
-                            await UnitPriceFiles.update({user_id: userId, root_project_id: data.updateData.ID}, {$set: {deleteInfo: deleteInfo}}, {multi: true});
-                            await FeeRateFiles.update({userID: userId, rootProjectID: data.updateData.ID}, {$set: {deleteInfo: deleteInfo}}, {multi: true});
+                        if (isExist) {//fake
+                            await UnitPriceFiles.update({
+                                user_id: userId,
+                                root_project_id: data.updateData.ID
+                            }, {$set: {deleteInfo: deleteInfo}}, {multi: true});
+                            await FeeRateFiles.update({
+                                userID: userId,
+                                rootProjectID: data.updateData.ID
+                            }, {$set: {deleteInfo: deleteInfo}}, {multi: true});
                             await Projects.update({userID: userId, ID: data.updateData.ID}, data.updateData, updateAll);
                         }
                         else {//true
@@ -178,9 +205,9 @@ ProjectsDAO.prototype.updateUserProjects = async function(userId, compilationId,
                             await Projects.remove({userID: userId, ID: data.updateData.ID}, updateAll);
                         }
                     }
-                    else if(data.updateData.projType === projectType.engineering){
+                    else if (data.updateData.projType === projectType.engineering) {
                         let tenders = await Projects.find({userID: userId, ParentID: data.updateData.ID});
-                        if(tenders.length > 0){//fake
+                        if (tenders.length > 0) {//fake
                             await Projects.update({userID: userId, ID: data.updateData.ID}, data.updateData, updateAll);
                         }
                         else {//true
@@ -188,15 +215,15 @@ ProjectsDAO.prototype.updateUserProjects = async function(userId, compilationId,
                             await Projects.remove({userID: userId, ID: data.updateData.ID}, updateAll);
                         }
                     }
-                    else if(data.updateData.projType === projectType.tender){//fake
+                    else if (data.updateData.projType === projectType.tender) {//fake
                         await Projects.update({userID: userId, ID: data.updateData.ID}, data.updateData, updateAll);
                     }
-                    else if(data.updateData.projType === projectType.folder){//true
+                    else if (data.updateData.projType === projectType.folder) {//true
                         await Projects.remove({userID: userId, ID: data.updateData.ID}, updateAll);
                     }
                     else throw '未知文件类型，删除失败！';
                 }
-                catch (error){
+                catch (error) {
                     callback(1, error, null);
                 }
             }
@@ -208,29 +235,38 @@ ProjectsDAO.prototype.updateUserProjects = async function(userId, compilationId,
     }
 };
 
-ProjectsDAO.prototype.udpateUserFiles = async function (userId, datas, callback){
+ProjectsDAO.prototype.udpateUserFiles = async function (userId, datas, callback) {
     let updateType = {update: 'update', delete: 'delete'};
     let deleteInfo = Object.create(null);
     deleteInfo.deleted = true;
     deleteInfo.deleteBy = userId;
     deleteInfo.deleteDateTime = new Date();
-    try{
-        for(let i = 0, len = datas.length; i < len; i++){
+    try {
+        for (let i = 0, len = datas.length; i < len; i++) {
             let data = datas[i];
-            if(data.updateType === updateType.update && data.fileType === fileType.unitPriceFile){
+            if (data.updateType === updateType.update && data.fileType === fileType.unitPriceFile) {
                 await UnitPriceFiles.update({user_id: userId, id: parseInt(data.updateData.id)}, data.updateData);
-                await Projects.update({userID: userId, 'property.unitPriceFile.id': data.updateData.id}, {$set: {'property.unitPriceFile.name': data.updateData.name}});
+                await Projects.update({
+                    userID: userId,
+                    'property.unitPriceFile.id': data.updateData.id
+                }, {$set: {'property.unitPriceFile.name': data.updateData.name}});
             }
-            else if(data.updateType === updateType.update && data.fileType === fileType.feeRateFile){
+            else if (data.updateType === updateType.update && data.fileType === fileType.feeRateFile) {
                 await FeeRateFiles.update({userID: userId, ID: data.updateData.ID}, data.updateData);
-                await Projects.update({userID: userId, 'property.feeFile.id': data.updateData.ID}, {$set: {'property.feeFile.name': data.updateData.name}});
+                await Projects.update({
+                    userID: userId,
+                    'property.feeFile.id': data.updateData.ID
+                }, {$set: {'property.feeFile.name': data.updateData.name}});
             }
-            else if(data.updateType === updateType.delete && data.fileType === fileType.unitPriceFile){
+            else if (data.updateType === updateType.delete && data.fileType === fileType.unitPriceFile) {
                 data.updateData.deleteInfo = deleteInfo;
                 await UnitPriceFiles.update({user_id: userId, id: parseInt(data.updateData.id)}, data.updateData);
-                await Projects.update({userID: userId, 'property.feeFile.id': data.updateData.id}, {$set: {'property.feeFile.name': data.updateData.name}});
+                await Projects.update({
+                    userID: userId,
+                    'property.feeFile.id': data.updateData.id
+                }, {$set: {'property.feeFile.name': data.updateData.name}});
             }
-            else if(data.updateType === updateType.delete && data.fileType === fileType.feeRateFile){
+            else if (data.updateType === updateType.delete && data.fileType === fileType.feeRateFile) {
                 data.updateData.deleteInfo = deleteInfo;
                 await FeeRateFiles.update({userID: userId, ID: data.updateData.ID}, data.updateData);
             }
@@ -238,7 +274,7 @@ ProjectsDAO.prototype.udpateUserFiles = async function (userId, datas, callback)
         }
         callback(false, '删除成功', null);
     }
-    catch(error){
+    catch (error) {
         callback(true, '删除失败', null);
     }
 };
@@ -246,7 +282,7 @@ ProjectsDAO.prototype.udpateUserFiles = async function (userId, datas, callback)
 ProjectsDAO.prototype.copyUserProjects = function (userId, datas, callback) {
     let data, project, updateLength = 0, hasError = false, deleteInfo = null, tempType = 1, i;
     let updateAll = function (err) {
-        if (!err){
+        if (!err) {
             updateLength += 1;
             if (updateLength === datas.length) {
                 callback(0, '', datas);
@@ -281,7 +317,7 @@ ProjectsDAO.prototype.copyUserProjects = function (userId, datas, callback) {
     }
 };
 
-ProjectsDAO.prototype.rename = async function (userId, compilationId, data, callback){
+ProjectsDAO.prototype.rename = async function (userId, compilationId, data, callback) {
     try {
         if (data.id === undefined || data.id === '') {
             throw '数据错误!';
@@ -296,8 +332,8 @@ ProjectsDAO.prototype.rename = async function (userId, compilationId, data, call
             throw '同级目录已存在相同名称数据';
         }
 
-        Projects.update({userID: userId, ID: data.id}, {name: data.newName}, function(err){
-            if (err){
+        Projects.update({userID: userId, ID: data.id}, {name: data.newName}, function (err) {
+            if (err) {
                 throw '项目不存在';
             }
         });
@@ -308,10 +344,10 @@ ProjectsDAO.prototype.rename = async function (userId, compilationId, data, call
     callback(0, '');
 };
 
-ProjectsDAO.prototype.beforeOpenProject = function (userId, projectId, updateData, callback){
+ProjectsDAO.prototype.beforeOpenProject = function (userId, projectId, updateData, callback) {
     updateData['recentDateTime'] = new Date();
-    Projects.update({userID: userId, ID: projectId}, updateData, function(err){
-        if (err){
+    Projects.update({userID: userId, ID: projectId}, updateData, function (err) {
+        if (err) {
             callback(1, '项目不存在.');
         } else {
             callback(0, '');
@@ -344,28 +380,28 @@ ProjectsDAO.prototype.getProject = function (key, callback) {
     }
 };
 
-ProjectsDAO.prototype.getProjectsByIds = async function (userId, compilationId, ids){
+ProjectsDAO.prototype.getProjectsByIds = async function (userId, compilationId, ids) {
     return await Projects.find({userID: userId, compilation: compilationId, ID: {$in: ids}});
 };
 
-ProjectsDAO.prototype.getGCFiles = async function (fileType, userID){
+ProjectsDAO.prototype.getGCFiles = async function (fileType, userID) {
     let rst;
-    if(fileType === 'UnitPriceFile'){
+    if (fileType === 'UnitPriceFile') {
         let unitPriceFileModel = new UnitPriceFileModel();
         rst = await unitPriceFileModel.getGCUnitPriceFiles(userID);
     }
-    else if(fileType === 'FeeRateFile'){
+    else if (fileType === 'FeeRateFile') {
         rst = await feeRateFacade.getGCFeeRateFiles(userID);
     }
     else {
         let isExist = false;
-        for(let type in projectType){
-            if(projectType[type] === fileType) {
+        for (let type in projectType) {
+            if (projectType[type] === fileType) {
                 isExist = true;
                 break;
             }
         }
-        if(!isExist) throw '不存在此项目类型！';
+        if (!isExist) throw '不存在此项目类型！';
         rst = await Projects.find({userID: userID, projType: fileType, 'deleteInfo.deleted': true});
     }
     return rst;
@@ -373,55 +409,55 @@ ProjectsDAO.prototype.getGCFiles = async function (fileType, userID){
 
 ProjectsDAO.prototype.getFirstNodeID = async function (userID, pid) {
     let nodes = await Projects.find({userID: userID, ParentID: pid, deleteInfo: null});
-    if(nodes.length === 0){
+    if (nodes.length === 0) {
         return -1;
     }
     else {
         let prefix = 'ID_';
         let chain = Object.create(null);
-        for(let i = 0, len = nodes.length; i < len; i++){
+        for (let i = 0, len = nodes.length; i < len; i++) {
             let nodeDoc = nodes[i]._doc;
             let node = Object.create(null);
             node.ID = nodeDoc.ID;
             node.NextSiblingID = nodeDoc.NextSiblingID;
             chain[prefix + node.ID] = node;
         }
-        for(let i =0, len = nodes.length; i < len; i++){
+        for (let i = 0, len = nodes.length; i < len; i++) {
             let nodeDoc = nodes[i]._doc;
             let next = nodeDoc.NextSiblingID > 0 ? chain[prefix + nodeDoc.NextSiblingID] : null;
             chain[prefix + nodeDoc.ID].next = next;
-            if(next){
+            if (next) {
                 next.pre = chain[prefix + nodeDoc.ID]
             }
         }
-        for(let node in chain){
+        for (let node in chain) {
             let pre = chain[node].pre || null;
-            if(!pre){
+            if (!pre) {
                 return chain[node].ID;
             }
         }
     }
 };
 
-ProjectsDAO.prototype.recGC = async function(userID, datas, callback){
+ProjectsDAO.prototype.recGC = async function (userID, datas, callback) {
     let functions = [];
     let updateDatas = [];
-    for(let i = 0, len = datas.length; i < len; i++){
-        if(datas[i].findData.ParentID !== undefined && datas[i].findData.NextSiblingID === -1 && !datas[i].findData.deleteInfo){//维护项目管理树
+    for (let i = 0, len = datas.length; i < len; i++) {
+        if (datas[i].findData.ParentID !== undefined && datas[i].findData.NextSiblingID === -1 && !datas[i].findData.deleteInfo) {//维护项目管理树
             let findNode = await Projects.find(datas[i].findData);
-            if(findNode.length > 0){
+            if (findNode.length > 0) {
                 datas[i].findData = Object.create(null);
                 datas[i].findData.ID = findNode[0].ID;
                 updateDatas.push(datas[i]);
             }
         }
         else {
-            if(datas[i].updateType === projectType.project && datas[i].updateData.NextSiblingID === undefined){//则为待查询NextSiblingID，前端无法查询
+            if (datas[i].updateType === projectType.project && datas[i].updateData.NextSiblingID === undefined) {//则为待查询NextSiblingID，前端无法查询
                 let projData = await Projects.find({userID: userID, ID: datas[i].findData.ID});//建设项目原本可能属于某文件夹、文件夹的存在需要判断
                 let projPid = projData[0].ParentID;
-                if(projPid !== -1){
+                if (projPid !== -1) {
                     let projFolder = await Projects.find({userID: userID, ID: projPid});
-                    if(projFolder.length === 0){//文件夹已不存在
+                    if (projFolder.length === 0) {//文件夹已不存在
                         projPid = -1;
                         datas[i].updateData.ParentID = -1;
                     }
@@ -432,45 +468,50 @@ ProjectsDAO.prototype.recGC = async function(userID, datas, callback){
             updateDatas.push(datas[i])
         }
     }
-    for(let i = 0, len = updateDatas.length; i < len; i ++){
-        functions.push((function(data){
+    for (let i = 0, len = updateDatas.length; i < len; i++) {
+        functions.push((function (data) {
                 return function (cb) {
-                    if(data.updateType === fileType.unitPriceFile){
+                    if (data.updateType === fileType.unitPriceFile) {
                         UnitPriceFiles.update({id: parseInt(data.findData.id)}, data.updateData, function (err) {
-                            if(err) cb(err);
+                            if (err) cb(err);
                             else {
-                                Projects.update({userID: userID, 'property.unitPriceFile.id': data.findData.id}, {$set: {'property.unitPriceFile.name': data.updateData.name}}, function (err) {
-                                    if(err) cb(err);
+                                Projects.update({
+                                    userID: userID,
+                                    'property.unitPriceFile.id': data.findData.id
+                                }, {$set: {'property.unitPriceFile.name': data.updateData.name}}, function (err) {
+                                    if (err) cb(err);
                                     else cb(false);
                                 });
                             }
                         })
                     }
-                    else if(data.updateType === fileType.feeRateFile){
+                    else if (data.updateType === fileType.feeRateFile) {
                         FeeRateFiles.update(data.findData, data.updateData, function (err) {
-                            if(err) cb(err);
+                            if (err) cb(err);
                             else {
-                                Projects.update({userID: userID, 'property.feeFile.id': data.findData.ID}, {$set: {'property.feeFile.name': data.updateData.name}}, function (err) {
-                                    if(err) cb(err);
+                                Projects.update({
+                                    userID: userID,
+                                    'property.feeFile.id': data.findData.ID
+                                }, {$set: {'property.feeFile.name': data.updateData.name}}, function (err) {
+                                    if (err) cb(err);
                                     else cb(false);
                                 });
                             }
                         });
                     }
-                    else{
-                        if(data){
+                    else {
+                        if (data) {
                             Projects.update(data.findData, data.updateData, function (err) {
-                                if(err)cb(err);
+                                if (err) cb(err);
                                 else cb(false);
                             });
                         }
                     }
                 }
-            }
-        )(updateDatas[i]));
+            })(updateDatas[i]));
     }
     async_c.parallel(functions, function (err, results) {
-        if(err) callback(err, 'fail', null);
+        if (err) callback(err, 'fail', null);
         else callback(0, 'success', null);
     });
 };
@@ -481,12 +522,18 @@ ProjectsDAO.prototype.recGC = async function(userID, datas, callback){
  * @param {Object} data
  * @return {Boolean}
  */
-ProjectsDAO.prototype.isExist = async function(userId, compilationId, name, parentID) {
+ProjectsDAO.prototype.isExist = async function (userId, compilationId, name, parentID) {
     parentID = parseInt(parentID);
     if (name === '' || isNaN(parentID)) {
         return true;
     }
-    let condition = {userID: userId, compilation: compilationId, ParentID: parentID, name: name, "$or":[{deleteInfo: null}, {"deleteInfo.deleted": false}]};
+    let condition = {
+        userID: userId,
+        compilation: compilationId,
+        ParentID: parentID,
+        name: name,
+        "$or": [{deleteInfo: null}, {"deleteInfo.deleted": false}]
+    };
     let count = await Projects.count(condition);
     return count > 0;
 };
@@ -497,7 +544,7 @@ ProjectsDAO.prototype.isExist = async function(userId, compilationId, name, pare
  * @param {Number} projectId
  * @return {Promise}
  */
-ProjectsDAO.prototype.getTenderByProjectId = async function(projectId) {
+ProjectsDAO.prototype.getTenderByProjectId = async function (projectId) {
     let result = [];
     // 首先获取对应的单位工程id
     let engineeringData = await Projects.find({ParentID: projectId});
@@ -506,7 +553,7 @@ ProjectsDAO.prototype.getTenderByProjectId = async function(projectId) {
     }
 
     let engineeringIdList = [];
-    for(let tmp of engineeringData) {
+    for (let tmp of engineeringData) {
         engineeringIdList.push(tmp.ID);
     }
 
@@ -516,7 +563,7 @@ ProjectsDAO.prototype.getTenderByProjectId = async function(projectId) {
         return result;
     }
 
-    for(let tmp of tenderData) {
+    for (let tmp of tenderData) {
         result.push(tmp.ID);
     }
 
@@ -529,7 +576,7 @@ ProjectsDAO.prototype.getTenderByProjectId = async function(projectId) {
  * @param {Number} unitPriceFileId
  * @return {Promise}
  */
-ProjectsDAO.prototype.getTenderByUnitPriceFileId = async function(unitPriceFileId) {
+ProjectsDAO.prototype.getTenderByUnitPriceFileId = async function (unitPriceFileId) {
     let result = [];
 
     unitPriceFileId = parseInt(unitPriceFileId);
@@ -549,7 +596,7 @@ ProjectsDAO.prototype.getTenderByUnitPriceFileId = async function(unitPriceFileI
  * @param {Number} projectId
  * @return {Promise}
  */
-ProjectsDAO.prototype.getUnitPriceFileId = async function(projectId) {
+ProjectsDAO.prototype.getUnitPriceFileId = async function (projectId) {
     let result = 0;
     let projectData = await Projects.findOne({ID: projectId});
     if (projectData === null) {
@@ -566,12 +613,12 @@ ProjectsDAO.prototype.getUnitPriceFileId = async function(projectId) {
  * @param {Number} userId
  * @return {Promise}
  */
-ProjectsDAO.prototype.getUserProjectData = async function(userId) {
+ProjectsDAO.prototype.getUserProjectData = async function (userId) {
     let projectList = await Projects.find({
         '$or': [
             {'userID': userId, 'deleteInfo': null, projType: 'Project'},
             {'userID': userId, 'deleteInfo.deleted': {'$in': [null, false]}, projType: 'Project'}
-            ]
+        ]
     }, {_id: 0, name: 1, ID: 1});
 
     return projectList;
@@ -584,7 +631,7 @@ ProjectsDAO.prototype.getUserProjectData = async function(userId) {
  * @param {Object} changeInfo
  * @return {Promise}
  */
-ProjectsDAO.prototype.changeUnitPriceFileInfo = async function(projectId, changeInfo) {
+ProjectsDAO.prototype.changeUnitPriceFileInfo = async function (projectId, changeInfo) {
     projectId = parseInt(projectId);
     if (isNaN(projectId) || projectId <= 0) {
         return false;
@@ -594,8 +641,27 @@ ProjectsDAO.prototype.changeUnitPriceFileInfo = async function(projectId, change
     return result.ok === 1;
 };
 
-module.exports ={
-    project: new ProjectsDAO(),
+
+/**
+ * 更新项目属性
+ *
+ * @param {Number} projectId - 项目id
+ * @param {Object} propertyData - 项目属性数据
+ * @return {Promise}
+ */
+ProjectsDAO.prototype.updateProjectProperty = async function(projectId, propertyData) {
+    projectId = parseInt(projectId);
+    if (isNaN(projectId) || projectId <= 0 || propertyData.property === undefined || propertyData.data === undefined) {
+        return false;
+    }
+    const updateData = {};
+    updateData["property." + propertyData.property] = propertyData.data;
+    let result = await Projects.update({ID: projectId}, updateData);
+
+    return result.ok === 1;
+};
+
+module.exports ={    project: new ProjectsDAO(),
     projType: projectType,
     fileType: fileType
 };

modules/pm/models/project_property_template.js

@@ -16,6 +16,11 @@ const displaySetting = {
     disPlayMainMaterial:true
 }
 
+const calcOptions={
+    calc_main:false,
+    calc_add:true,
+    calc_est:true
+}
 /*
 * 单位工程清单工程量精度模板
 * */
@@ -123,4 +128,4 @@ const projectFeature = [
     {dispName: '门窗材料及装饰', key: 'doorsWindowsMaterial', value: ''}
 ];
 
-export {defaultDecimal, billsQuantityDecimal, basicInformation, projectFeature,displaySetting};
+export {defaultDecimal, billsQuantityDecimal, basicInformation, projectFeature,displaySetting,calcOptions};

web/building_saas/css/main.css

@@ -328,4 +328,10 @@ label.title{
 
 .gc-column-header-cell{
     text-align: center!important;
+}
+div.resize{
+    height: 4px;
+    background: #f7f7f9;
+    width: 100%;
+    cursor: s-resize;
 }

web/building_saas/glj/js/common_spread.js

@@ -294,4 +294,30 @@ CommonSpreadJs.prototype.getActiveDataByField = function(field) {
 
     result = this.sheet.getValue(activeGLJRow, column);
     return result;
+};
+CommonSpreadJs.prototype.setProjectGLJDiffPrice = function (data) {
+    if(gljOprObj.calcPriceDiff(data)==true){//是否记算价差
+        data.base_price = data.unit_price.base_price;
+        data.adjust_price = projectObj.project.projectGLJ.getAdjustPrice(data);
+    }else {
+        data.base_price = data.unit_price.market_price;
+        data.adjust_price = data.unit_price.market_price;
+    }
+    return data;
+};
+
+CommonSpreadJs.prototype.getUnitPrice = function (data) {
+    let gljList=projectObj.project.projectGLJ.datas.gljList;
+    var pg = _.find(gljList, {
+        'code': data.code,
+        'name': data.name,
+        'specs': data.specs,
+        'type': data.type,
+        'unit': data.unit
+    })
+    if(pg){
+        return pg.unit_price;
+    }
+
+    return null;
 };

web/building_saas/glj/js/composition.js

@@ -67,9 +67,9 @@ function compositionSuccess(info) {
     let row= projectGLJSheet.sheet.getActiveRowIndex();//取父机械或组成物的下标
     let parentData = jsonData[row];
     let ratioData = _.find(parentData.ratio_data,{"id":info.id});
-    let con_key = gljOprObj.getIndex(ratioData,['code', 'name', 'specs', 'unit', 'type']);
+    let con_key = gljOprObj.getIndex(ratioData,gljKeyArray);
     for(let i=0;i< jsonData.length;i++){
-        let tem_key = gljOprObj.getIndex(jsonData[i],['code', 'name', 'specs', 'unit', 'type']);
+        let tem_key = gljOprObj.getIndex(jsonData[i],gljKeyArray);
         if(con_key == tem_key){
             //乘以父工料机的消耗量得到该组成物总消耗量的改变量
             info.change = operationWithRound(parentData.quantity,info.change,"glj.quantity","*");

web/building_saas/glj/js/composition_spread.js

@@ -32,7 +32,7 @@ CompositionSpread.prototype.init = function(target) {
         {name: '单位', field: 'unit', visible: true},
         {name: 'ID', field: 'id', visible: false},
         {name: '类型', field: 'unit_price.type', visible: false},
-        {name: '定额价', field: "unit_price.base_price", visible: true,decimalField:"glj.unitPrice"},
+        {name: '定额价', field: "base_price", visible: true,decimalField:"glj.unitPrice"},
         {name: '调整价', field: 'adjust_price', visible: true,decimalField:"glj.unitPrice"},
         {name: '市场价', field: "unit_price.market_price", visible: true,decimalField:"glj.unitPrice"},
         {name: name, field: 'consumption', visible: true, validator: 'number',decimalField:'glj.quantity'},
@@ -46,7 +46,7 @@ CompositionSpread.prototype.init = function(target) {
     let codeColumn = this.sheetObj.getFieldColumn('code');
     let unitColumn = this.sheetObj.getFieldColumn('unit');
     let consumptionColumn = this.sheetObj.getFieldColumn('consumption');
-    let basePriceCol = this.sheetObj.getFieldColumn('unit_price.base_price');
+    let basePriceCol = this.sheetObj.getFieldColumn('base_price');
     let adjustPriceCol = this.sheetObj.getFieldColumn('adjust_price');
     let marketPriceCol = this.sheetObj.getFieldColumn('unit_price.market_price');
     // 居中样式
@@ -154,6 +154,8 @@ CompositionSpread.prototype.specialColumn = function(sourceData) {
     let rowCounter = 0;
     // 获取市场单价列号
     let consumptionColumn = this.sheetObj.getFieldColumn('consumption');
+    let basePriceColumn = this.sheetObj.getFieldColumn('base_price');
+    let adjustPriceColumn = this.sheetObj.getFieldColumn('adjust_price');
     let idColumn = this.sheetObj.getFieldColumn('mix_ratio_id');
     let activeSheet = this.sheetObj.getSheet();
     for(let data of sourceData) {
@@ -162,6 +164,9 @@ CompositionSpread.prototype.specialColumn = function(sourceData) {
             activeSheet.setValue(rowCounter, consumptionColumn, data.ratio_data.consumption);
             activeSheet.setValue(rowCounter, idColumn, data.ratio_data.id);
         }
+        data=this.sheetObj.setProjectGLJDiffPrice(data);
+        activeSheet.setValue(rowCounter, basePriceColumn, data.base_price);
+        activeSheet.setValue(rowCounter, adjustPriceColumn, data.adjust_price);
         rowCounter++;
     }
 };
@@ -249,7 +254,7 @@ CompositionSpread.prototype.getCompositionSumPrice = function(scene, affectRow,
     // 获取对应列的列号
     let marketPriceColumn = this.sheetObj.getFieldColumn('unit_price.market_price');
     let consumptionColumn = this.sheetObj.getFieldColumn('consumption');
-    let basePriceColumn = this.sheetObj.getFieldColumn('unit_price.base_price');
+    let basePriceColumn = this.sheetObj.getFieldColumn('base_price');
 
     let parentMarketPrice = 0;
     let parentBasePrice = 0;

web/building_saas/glj/js/project_glj.js

@@ -26,6 +26,7 @@ let usedTenderList = [];
 let otherFileData = {};
 let currentTag = '';
 let isChanging = false;
+let initPage = false;
 $(document).ready(function () {
     $('#tab_gongliaoji').on('show.bs.tab', function (e) {
         $(e.relatedTarget.hash).removeClass('active');
@@ -225,7 +226,7 @@ $(document).ready(function () {
  */
 function init() {
     projectObj.project.projectGLJ.loadData(function (data) {
-        if (jsonData.length <= 0) {
+        if (initPage==false||jsonData.length <= 0) {
             // 赋值
             jsonData = data.gljList !== undefined && data.gljList.length > 0 ? data.gljList : [];
             jsonData = filterProjectGLJ(jsonData);
@@ -245,6 +246,7 @@ function init() {
             unitPriceFileInit();
 
             setTimeout(spreadInit, 1);
+            initPage=true;
         } else {
             projectObj.project.projectGLJ.loadCacheData();
         }
@@ -325,7 +327,7 @@ function getUsedTenderInfo() {
  * @param {object} info
  * @return {void}
  */
-function successTrigger(field, info) {
+function successTrigger(field, info,id) {
     let updateData = {};
     switch (field) {
         case 'unit_price.market_price':
@@ -334,22 +336,47 @@ function successTrigger(field, info) {
 
             // 触发websocket通知
             socket.emit('dataNotify', JSON.stringify(info));
-            console.log(info);
             break;
         case 'supply':
             // 供货方式更改成功后
             projectGLJSpread.changeSupplyType(info);
             break;
+        case 'is_evaluate':
+            changeIsEvaluate(id);
+            break;
     }
     // 重新加载数据到缓存
     projectObj.project.projectGLJ.loadData(function () {
         projectObj.project.projectGLJ.loadCacheData();
+        $.bootstrapLoading.end();
     });
 
     // 更新定额工料机
     gljOprObj.refreshView();
 }
 
+//更新是否暂估
+function changeIsEvaluate (id){
+    let projectGLJ = projectObj.project.projectGLJ
+    let datas = projectGLJ.datas;
+    let gljList = datas.gljList;
+    let glj = _.find(gljList, {'id': id});
+    if(glj){
+        let con_key = gljOprObj.getIndex(glj,gljKeyArray);
+        let pratioM =datas.mixRatioConnectData[con_key];//找到父key
+        let conditions = [];
+        if(pratioM&&pratioM.length>0){
+            for(let p_key in pratioM ){
+                conditions.push(gljOprObj.getConditionByKey(p_key));
+            }
+        }
+        let gljs = projectGLJ.getProjectGLJs(conditions,false);
+        gljs.push(glj);
+        let nodes = projectGLJ.getImpactRationNodes(gljs);//取到因为改变工料机价格而受影响的定额
+        projectObj.project.calcProgram.calcRationsAndSave(nodes);//触发计算程序
+    }
+}
+
 /**
  * socket.io相关初始化
  *

web/building_saas/glj/js/project_glj_spread.js

@@ -48,7 +48,7 @@ ProjectGLJSpread.prototype.init = function () {
         {name: 'ID', field: 'id', visible: false},
         {name: '类型', field: 'unit_price.type', visible: false},
         {name: '总消耗量', field: 'quantity', visible: true,width:100,decimalField:'glj.quantity'},
-        {name: '定额价', field: "unit_price.base_price", visible: true,width:70,decimalField:"glj.unitPrice"},
+        {name: '定额价', field: "base_price", visible: true,width:70,decimalField:"glj.unitPrice",validator: 'number'},//这里feiedID设置是为了在计不计取价差的时候做显示用
         {name: '调整价', field: 'adjust_price', visible: true,width:70,decimalField:"glj.unitPrice"},
         {name: '市场价', field: "unit_price.market_price", visible: true, validator: 'number',width:70,decimalField:"glj.unitPrice"},
         {
@@ -87,7 +87,7 @@ ProjectGLJSpread.prototype.init = function () {
     let isAdjustPriceColumn = this.sheetObj.getFieldColumn('is_adjust_price');
     let unitColumn = this.sheetObj.getFieldColumn('unit');
     let quantityColumn = this.sheetObj.getFieldColumn('quantity');
-    let basePriceColumn = this.sheetObj.getFieldColumn('unit_price.base_price');
+    let basePriceColumn = this.sheetObj.getFieldColumn('base_price');
     let adjustPriceColumn = this.sheetObj.getFieldColumn('adjust_price');
     let marketPriceColumn = this.sheetObj.getFieldColumn('unit_price.market_price');
     let supplyColumn = this.sheetObj.getFieldColumn('supply');
@@ -112,6 +112,7 @@ ProjectGLJSpread.prototype.init = function () {
     this.sheetObj.setStyle(-1, supplyQuantity, rightStyleSetting);
 
     // 设置可编辑列
+    this.sheetObj.setColumnEditable(basePriceColumn);
     this.sheetObj.setColumnEditable(marketPriceColumn);
     this.sheetObj.setColumnEditable(isEvaluateColumn);
     this.sheetObj.setColumnEditable(isAdjustPriceColumn);
@@ -198,7 +199,8 @@ ProjectGLJSpread.prototype.updateProjectGLJField = function(info, callback) {
 
     // 直接在前端计算后传值后台改
     let extend = {};
-    let parentMarketPrice = projectGLJSpread.compositionCalculate(row);
+/*    let updateRecord = jsonData[row];  这时修改成在后端计算后直接更新，因为还要重新计算受影响的清单节点
+    let parentMarketPrice = projectGLJSpread.compositionCalculate(updateRecord);
     if (parentMarketPrice !== null && Object.keys(parentMarketPrice).length > 0) {
         for (let activeCode in parentMarketPrice) {
             let tmpObject = {
@@ -206,7 +208,7 @@ ProjectGLJSpread.prototype.updateProjectGLJField = function(info, callback) {
             };
             extend[activeCode] = tmpObject;
         }
-    }
+    }*/
 
     // 如果是供货方式则需要处理数据
     if (field === 'supply') {
@@ -216,10 +218,18 @@ ProjectGLJSpread.prototype.updateProjectGLJField = function(info, callback) {
     if(field === 'supply_quantity'){//修改数量需做4舍5入
         value= value.toDecimal(getDecimal('glj.quantity'));
     }
-    if(field === 'unit_price.market_price'){
-        value= value.toDecimal(getDecimal('glj.unitPrice'));
+    if(field === 'unit_price.market_price'||field === 'base_price'){
+        value= scMathUtil.roundForObj(value,getDecimal('glj.unitPrice'));//修改市场价和修改定额价时需要重新记算很多受影响的树节点，现在改成与定字额工料机那里调相同的方法。
+        let editField = field === 'base_price'?field:"market_price";
+        projectObj.project.projectGLJ.updatePrice(jsonData[row],editField,value);
+        return;
     }
     extend = Object.keys(extend).length > 0 ?  JSON.stringify(extend) : '';
+    this.postUpdate(id,field,value,info,extend,callback);
+};
+
+ProjectGLJSpread.prototype.postUpdate=function (id,field,value,info,extend,callback) {
+    $.bootstrapLoading.start();
     $.ajax({
         url: '/glj/update',
         type: 'post',
@@ -235,22 +245,25 @@ ProjectGLJSpread.prototype.updateProjectGLJField = function(info, callback) {
         success: function(response) {
             isChanging = false;
             // 修改失败则恢复原值
-            if (response.err !== 0) {
-                activeSheet.setValue(row, column, info.oldValue);
+            if (response.err !== 0&&info.fromRG!=true) {
+                projectGLJSheet.getSheet().setValue(info.row, info.col, info.oldValue);
                 alert('更改数据失败!');
             } else {
                 // 成功则触发相应事件
-                if (parentMarketPrice !== null) {
-                    info.parentMarketPrice = parentMarketPrice;
+                /* if (parentMarketPrice !== null) {
+                 info.parentMarketPrice = parentMarketPrice;
+                 }*/
+                if(field !== 'supply'&&info.fromRG!=true){ //供货方式需做转换才能直接设置值， 这里设置值是为了早点更新数据，等getdata返回数据再刷新的话会有比较大的延时
+                    projectGLJSheet.getSheet().setValue(info.row, info.col, value);
                 }
-                if(field !== 'supply'){ //供货方式需做转换才能直接设置值， 这里设置值是为了早点更新数据，等getdata返回数据再刷新的话会有比较大的延时
-                    activeSheet.setValue(row, column, value);
-                }
-                callback(field, info);
+                callback(field, info,id);
             }
         }
     });
-};
+
+
+}
+
 
 /**
  * 设置特殊单元格数据
@@ -263,6 +276,7 @@ ProjectGLJSpread.prototype.specialColumn = function (sourceData) {
     // 获取列号
     let isEvaluateColumn = this.sheetObj.getFieldColumn('is_evaluate');
     let marketPriceColumn = this.sheetObj.getFieldColumn('unit_price.market_price');
+    let basePriceColumn = this.sheetObj.getFieldColumn('base_price');
     let adjustPriceColumn = this.sheetObj.getFieldColumn("adjust_price");
     let connectCodeColumn = this.sheetObj.getFieldColumn('connect_code');
     let consumptionColumn = this.sheetObj.getFieldColumn('consumption');
@@ -311,18 +325,22 @@ ProjectGLJSpread.prototype.specialColumn = function (sourceData) {
             this.firstMachineRow = this.firstMachineRow === -1 && data.unit_price.type === GLJTypeConst.GENERAL_MACHINE ?
                 rowCounter : this.firstMachineRow;
             // 锁定该单元格
-            if (data.ratio_data  && data.ratio_data.length > 0){//有组成物时，市场单价不可修改
+            if (data.ratio_data  && data.ratio_data.length > 0){//有组成物时，市场单价、定额价不可修改
                 activeSheet.getCell(rowCounter, marketPriceColumn,  GC.Spread.Sheets.SheetArea.viewport).locked(true);
+                activeSheet.getCell(rowCounter, basePriceColumn, GC.Spread.Sheets.SheetArea.viewport).locked(true);
             }
             activeSheet.getCell(rowCounter, supplyColumn,  GC.Spread.Sheets.SheetArea.viewport).locked(true);
         }
+        if(data.unit_price.is_add!=1){//如果不是新增，定额价不可修改。
+            activeSheet.getCell(rowCounter, basePriceColumn, GC.Spread.Sheets.SheetArea.viewport).locked(true);
+        }
 
         // 处理数据
         if (data.ratio_data !== undefined && data.ratio_data.length > 0) {
             let connectCode = [];
             let consumption = [];
             for (let tmp of data.ratio_data) {
-                connectCode.push(tmp.connect_code);
+                connectCode.push(tmp.connect_key);
                 consumption.push(tmp.consumption);
             }
             let connectCodeString = connectCode.join(',');
@@ -330,7 +348,8 @@ ProjectGLJSpread.prototype.specialColumn = function (sourceData) {
             activeSheet.setValue(rowCounter, connectCodeColumn, connectCodeString);
             activeSheet.setValue(rowCounter, consumptionColumn, consumptionString);
         }
-        data.adjust_price = projectObj.project.projectGLJ.getAdjustPrice(data);
+        data=this.sheetObj.setProjectGLJDiffPrice(data);
+        activeSheet.setValue(rowCounter,basePriceColumn,data.base_price);
         activeSheet.setValue(rowCounter,adjustPriceColumn,data.adjust_price);
         rowCounter++;
     }
@@ -342,53 +361,29 @@ ProjectGLJSpread.prototype.specialColumn = function (sourceData) {
  * @param {Number} row
  * @return {Object}
  */
-ProjectGLJSpread.prototype.compositionCalculate = function(row) {
-    let activeSheet = this.sheetObj.getSheet();
-    // 获取相关列号
-    let connectCodeColumn = this.sheetObj.getFieldColumn('connect_code');
-    let consumptionColumn = this.sheetObj.getFieldColumn('consumption');
-    let marketPriceColumn = this.sheetObj.getFieldColumn('unit_price.market_price');
-
-    let activeConnectCode = activeSheet.getValue(row, connectCodeColumn);
-    // 不属于组成物则忽略
-    if (activeConnectCode === '' || activeConnectCode === null) {
+ProjectGLJSpread.prototype.compositionCalculate = function(updateRecord) {
+    let gljData = projectObj.project.projectGLJ.datas;
+    let m_index = gljOprObj.getIndex(updateRecord,gljKeyArray);
+    let parent_connect_keys = gljData.mixRatioConnectData[m_index];
+    if(!parent_connect_keys||parent_connect_keys.length<=0){// 不属于组成物则忽略
         return null;
     }
-    activeConnectCode = activeConnectCode.split(',');
-    // 计算同级组成物的价格
-    // 遍历所有记录
-    let maxRow = activeSheet.getRowCount();
-
+    let q_decimal = getDecimal("glj.quantity");
+    let p_decimal = getDecimal("glj.unitPrice");
     let parentMarketPrice = {};
-    for (let i = 0; i < maxRow; i++) {
-        let connectCode = activeSheet.getValue(i, connectCodeColumn);
-        if (connectCode === null) {
-            continue;
-        }
-        connectCode = connectCode.split(',');
-        // 消耗量
-        let consumption = activeSheet.getValue(i, consumptionColumn);
-        consumption = consumption.split(',');
-
-        // 获取市场价
-        let marketPrice = activeSheet.getValue(i, marketPriceColumn);
-
-        for (let active of activeConnectCode) {
-            let index = connectCode.indexOf(active);
-            if (index < 0) {
-                continue;
+    for(let p  of parent_connect_keys) {
+        let mix_ratios = gljData.mixRatioMap[p];
+        let sum = 0;
+        for (let m of mix_ratios) {
+            let unitPrice = this.sheetObj.getUnitPrice(m);
+            if (unitPrice) {
+                let com = scMathUtil.roundForObj(m.consumption, q_decimal);
+                let marketPrice = scMathUtil.roundForObj(unitPrice.market_price, p_decimal);
+                sum = scMathUtil.roundForObj(marketPrice * com + sum, p_decimal);
             }
-            let rowConsumption = consumption[index] === undefined ? 0 : consumption[index];
-            let decimal = getDecimal("glj.unitPrice");
-            // 计算价格
-            let rowMarketPrice = (marketPrice * rowConsumption).toDecimal(decimal);
-            parentMarketPrice[active] = parentMarketPrice[active] === undefined ?
-                rowMarketPrice : (parentMarketPrice[active] + rowMarketPrice).toDecimal(decimal);
-
         }
-
+        parentMarketPrice[p]=sum;
     }
-
     return parentMarketPrice;
 };
 
@@ -417,12 +412,23 @@ ProjectGLJSpread.prototype.compositionParentUpdate = function(parentMarketPrice)
 ProjectGLJSpread.prototype.priceCalculate = function(info) {
     let row = info.row;
     let typeColumn = this.sheetObj.getFieldColumn('unit_price.type');
-    let basePriceColumn = this.sheetObj.getFieldColumn('unit_price.base_price');
+    let basePriceColumn = this.sheetObj.getFieldColumn('base_price');
     let adjustPriceColumn = projectGLJSheet.getFieldColumn('adjust_price');
     let activeSheet = this.sheetObj.getSheet();
 
     // 获取类型
     let type = activeSheet.getValue(row, typeColumn);
+  /*  let data = jsonData[row];
+    if(gljOprObj.calcPriceDiff(data)==true){//是否记算价差
+        data.base_price = data.unit_price.base_price;
+        data.adjust_price = projectObj.project.projectGLJ.getAdjustPrice(data);
+    }else {
+        data.base_price = data.unit_price.market_price;
+        data.adjust_price = data.unit_price.market_price;
+    }
+    activeSheet.setValue(info.row,basePriceColumn,data.base_price);
+    activeSheet.setValue(info.row,adjustPriceColumn,data.adjust_price);*/
+
 
   /*  // 基价单价计算
     switch (type) {
@@ -433,7 +439,7 @@ ProjectGLJSpread.prototype.priceCalculate = function(info) {
             break;
     }*/
 
-    // 调整基价计算
+ /*   // 调整基价计算
     switch (type) {
         // 材料、主材、设备 调整基价=基价单价
         case GLJTypeConst.MAIN_MATERIAL:
@@ -442,7 +448,7 @@ ProjectGLJSpread.prototype.priceCalculate = function(info) {
             activeSheet.setValue(info.row, adjustPriceColumn, basePrice);
             break;
 
-    }
+    }*/
 
     // 市场单价计算
     switch (type) {

web/building_saas/main/html/main.html

@@ -84,6 +84,7 @@
                           <div class="top-content">
                               <div class="main-data-top" id="billsSpread"></div>
                           </div>
+                          <div class="resize"></div>
                           <div class="bottom-content">
                               <ul class="nav nav-tabs" role="tablist">
                                   <li class="nav-item">
@@ -107,9 +108,6 @@
                                   <li class="nav-item">
                                       <a class="nav-link" id="linkTZJNR" data-toggle="tab" href="#subSpread" role="tab">特征及内容</a>
                                   </li>
-                                  <li class="nav-item ml-auto mr-4">
-                                      <a class="nav-link text-muted position-absolute resize" data-toggle="tooltip" data-placement="bottom" title="按住，上下拖动调整高度"><i class="fa fa-arrows-v"></i></a>
-                                  </li>
                               </ul>
                               <!-- Tab panes -->
                               <div class="tab-content" id="tabCon">
@@ -289,7 +287,7 @@
                                 <li class="nav-item"><a class="nav-link active" data-toggle="pill" href="#poj-settings-basicInfo" role="tab" id="tab_poj-settings-basicInfo">基本信息</a></li>
                                 <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-projFeature" id="tab_poj-settings-projFeature" role="tab">工程特征</a></li>
                                 <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-3" role="tab">指标信息</a></li>
-                                <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-4" role="tab">关于计算</a></li>
+                                <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-4" id="about-calc" role="tab">关于计算</a></li>
                                 <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-billsQuanDecimal" id="tab_poj-settings-bqDecimal" role="tab">清单工程量精度</a></li>
                                 <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-decimal" role="tab" id="tab_poj-settings-decimal">小数位数</a></li>
                                 <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-6" role="tab" id="tab_poj-settings-6">人工单价调整</a></li>
@@ -360,6 +358,27 @@
                                                 </label>
                                             </div>
                                         </fieldset>
+                                        <fieldset class="form-group">
+                                            <h5>计算选项</h5>
+                                            <div class="form-check">
+                                                <label class="form-check-label">
+                                                    <input class="form-check-input" type="checkbox" id="calc_main">
+                                                    主材、设备、未计价材料计取价差
+                                                </label>
+                                            </div>
+                                            <div class="form-check">
+                                                <label class="form-check-label">
+                                                    <input class="form-check-input" type="checkbox" id="calc_add">
+                                                    新增工料机计取价差
+                                                </label>
+                                            </div>
+                                            <div class="form-check">
+                                                <label class="form-check-label">
+                                                    <input class="form-check-input" type="checkbox" id="calc_est">
+                                                    暂估材料计取价差
+                                                </label>
+                                            </div>
+                                        </fieldset>
                                     </div>
                                 </div>
                                 <!--清单工程精度-->

web/building_saas/main/js/main.js

@@ -68,7 +68,7 @@ function slideResize(rootElement, callback) {
         // 获取下部分的高度
         bottomContentHeight = bottomContentEle.height();
         // nav高度部分
-        navHeight = bottomContentEle.children('ul.nav').height();
+        navHeight = bottomContentEle.children('ul.nav').height() + 4;
         element.tooltip('hide');
     });
 
@@ -120,7 +120,7 @@ function loadSize(tag, callback) {
     if (topHeight === null || bottomHeight === null) {
         return;
     }
-    const navHeight = $("#"+ tag +" .bottom-content").children('ul.nav').height();
+    const navHeight = $("#"+ tag +" .bottom-content").children('ul.nav').height() + 4;
     topHeight = parseFloat(topHeight);
     bottomHeight = parseFloat(bottomHeight);
     $("#"+ tag +" .main-data-top").height(topHeight);

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

@@ -536,11 +536,6 @@ class CalcProgram {
                 template.compiledSeq.push(itemIdx);
             }
         };
-        let private_setup_seq = function(item, itemIdx){
-            if (template.compiledSeq.indexOf(itemIdx) < 0) {
-                private_parse_ref(item, itemIdx);
-            }
-        };
         let private_compile_items = function() {
             for (let idx of template.compiledSeq) {
                 let item = template.calcItems[idx];
@@ -584,8 +579,12 @@ class CalcProgram {
             }
 
             for (let i = 0; i < template.calcItems.length; i++) {
-                private_setup_seq(template.calcItems[i], i);
+                let item = template.calcItems[i];
+                if (template.compiledSeq.indexOf(i) < 0) {
+                    private_parse_ref(item, i);
+                }
             }
+
             if (template.errs.length == 0) {
                 private_compile_items();
                 template.hasCompiled = true;
@@ -956,7 +955,7 @@ class CalcProgram {
         };
     };
 
-/*    计算所有树结点(分3种情况)，并返回发生变动的零散的多个树结点。
+    /* 计算所有树结点(分3种情况)，并返回发生变动的零散的多个树结点。
     参数取值如下：
     calcAllType.catAll       计算所有树结点 (不指定参数时的默认值)
     calcAllType.catBills     计算所有清单 (改变项目属性中清单取费算法时会用到)

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

@@ -132,3 +132,6 @@ const zanguCalcType = {
     common: 0,
     gatherMaterial: 1
 };
+
+const gljKeyArray =['code','name','specs','unit','type'];
+const gljLibKeyArray =['code', 'name', 'specs', 'unit', 'gljType']

web/building_saas/main/js/models/project_glj.js

@@ -132,7 +132,7 @@ ProjectGLJ.prototype.updateData = function (id, data) {
  *
  * @return {void}
  */
-ProjectGLJ.prototype.loadCacheData = function () {
+ProjectGLJ.prototype.loadCacheData = function (resort) {
     // 加载工料机数据
     let data = this.datas === null ? null : this.datas;
     if (data === null) {
@@ -141,16 +141,18 @@ ProjectGLJ.prototype.loadCacheData = function () {
     jsonData = data.gljList !== undefined && data.gljList.length > 0 ? data.gljList : [];
     jsonData = filterProjectGLJ(jsonData);
     jsonData = sortProjectGLJ(jsonData);
-    projectGLJSheet.setData(jsonData);
-    projectGLJSpread.specialColumn(jsonData);
+    if(projectGLJSheet&&projectGLJSpread){
+        projectGLJSheet.setData(jsonData);
+        projectGLJSpread.specialColumn(jsonData);
+    }
 };
 
 ProjectGLJ.prototype.updatePriceFromRG = function (recode, updateField, newval) {
     if (updateField == 'marketPrice') {
-        this.updateBasePriceFromRG(recode, "market_price", newval);
+        this.updatePrice(recode, "market_price", newval,"rg");
     }
     if (updateField == 'basePrice') {
-        this.updateBasePriceFromRG(recode, "base_price", newval);
+        this.updatePrice(recode, "base_price", newval,"rg");
     }
 };
 
@@ -223,11 +225,11 @@ ProjectGLJ.prototype.updateGLJProperty = function (node, updateField, newval) {
 
 }
 
-ProjectGLJ.prototype.updateBasePriceFromRG = function (recode, updateField, newval) {
+ProjectGLJ.prototype.updatePrice = function (recode, updateField, newval,from) {
     let me = this;
     let projectGljs = this.datas.gljList;
-    let glj = _.find(projectGljs, {'id': recode.projectGLJID});
-    console.log(glj);
+    let pgljID = from=="rg"?recode.projectGLJID:recode.id;//和定额工料机统一接口，项目工料机ID取值不一样
+    let glj = _.find(projectGljs, {'id': pgljID});
     if (glj) {
         let data = {id: glj.unit_price.id, field: updateField, newval: newval};
         let callback = function (data) {
@@ -237,12 +239,14 @@ ProjectGLJ.prototype.updateBasePriceFromRG = function (recode, updateField, newv
             } else {
                 glj.unit_price.market_price = newval;
             }
-            //更新项目工料机价格
-            me.refreshProjectGLJPrice(data);
+            //更新回传的父节点项目工料机价格
+           let gljs = me.getProjectGLJs(data);
             me.refreshRationGLJPrice(glj);//刷新定额工料机列表的记录
+            projectObj.project.projectGLJ.loadCacheData();//更新工料机汇总缓存和显示
             gljOprObj.showRationGLJSheetData();
             me.refreshTreeNodePriceIfNeed(glj);//刷新造价书中主树上的定额工料机;
-            let nodes = me.getImpactRationNodes(glj);//取到因为改变工料机价格而受影响的定额
+            gljs.push(glj);
+            let nodes = me.getImpactRationNodes(gljs);//取到因为改变工料机价格而受影响的定额
             projectObj.project.calcProgram.calcRationsAndSave(nodes);//触发计算程序
             $.bootstrapLoading.end();
         }
@@ -254,8 +258,10 @@ ProjectGLJ.prototype.updateBasePriceFromRG = function (recode, updateField, newv
         gljOprObj.showRationGLJSheetData();
     }
 }
+
+
 ProjectGLJ.prototype.refreshTreeNodePriceIfNeed = function (data) {
-    if ((data.unit_price.type = gljType.MAIN_MATERIAL || data.unit_price.type == gljType.EQUIPMENT) && projectInfoObj.projectInfo.property.displaySetting.disPlayMainMaterial == true) {
+    if ((data.unit_price.type == gljType.MAIN_MATERIAL || data.unit_price.type == gljType.EQUIPMENT) && projectInfoObj.projectInfo.property.displaySetting.disPlayMainMaterial == true) {
         var nodes = _.filter(projectObj.project.mainTree.items, function (tem) {
             if (tem.sourceType == ModuleNames.ration_glj && tem.data.projectGLJID == data.id) {
                 tem.data.marketUnitFee = data.unit_price.market_price;
@@ -268,21 +274,24 @@ ProjectGLJ.prototype.refreshTreeNodePriceIfNeed = function (data) {
 }
 
 //根据工料机，取得所有受影响的定额节点
-ProjectGLJ.prototype.getImpactRationNodes = function (glj) {
+ProjectGLJ.prototype.getImpactRationNodes = function (gljs) {
     let nodes = [];
     let rationMap = {};
+    let idArray = _.map(gljs,'id');
+    let priceArray = _.map(gljs,'unit_price');
     //先根据项目工料机ID，找到受影响定额的ID
     let ration_glj_list = projectObj.project.ration_glj.datas; //取定额工料机数据
     for (let rg of ration_glj_list) {
-        if (rg.projectGLJID == glj.id) {
+        if (_.indexOf(idArray,rg.projectGLJID)!=-1) {
             rationMap[rg.rationID] = true;  //取所有定额ID，用MAP方式去重
         }
     }
     for (let item of projectObj.project.mainTree.items) {
         if (item.sourceType == ModuleNames.ration) {
             if (item.data.type == rationType.gljRation) {//取定额类型的工料机
-                if (item.data.projectGLJID == glj.id) {
-                    item.data.marketUnitFee = glj.unit_price.market_price; //更新市场单价
+                let idx = _.indexOf(idArray,item.data.projectGLJID);
+                if (idx != -1) {
+                    item.data.marketUnitFee = priceArray[idx].market_price; //更新市场单价
                     nodes.push(item);
                 }
             } else if (rationMap[item.data.ID] == true) {  //受影响的定额
@@ -306,9 +315,11 @@ ProjectGLJ.prototype.refreshRationTypeGLJ = function (glj) {
 
 }
 
-ProjectGLJ.prototype.refreshProjectGLJPrice = function (data) {
+ProjectGLJ.prototype.getProjectGLJs = function (data,refreshPrice=true) {
+    let parentGlj = [];
+    //
     let projectGljs = this.datas.gljList;
-    let indexList = ['code', 'name', 'specs', 'unit', 'type'];
+    let indexList = gljKeyArray;
     for (let d of data) {
         if (d) {
             let condition = {};
@@ -319,14 +330,18 @@ ProjectGLJ.prototype.refreshProjectGLJPrice = function (data) {
             }
             let glj = _.find(projectGljs, condition);
             if (glj) {
-                glj.unit_price.base_price = d.base_price;
-                glj.unit_price.market_price = d.market_price;
-                this.setAdjustPrice(glj);
-                this.refreshRationGLJPrice(glj);
-                this.refreshTreeNodePriceIfNeed(glj);
+                if(refreshPrice==true){
+                    glj.unit_price.base_price = d.base_price;
+                    glj.unit_price.market_price = d.market_price;
+                    this.setAdjustPrice(glj);
+                    this.refreshRationGLJPrice(glj);
+                    this.refreshTreeNodePriceIfNeed(glj);
+                }
+                parentGlj.push(glj);
             }
         }
     }
+    return parentGlj;
 }
 
 ProjectGLJ.prototype.setAdjustPrice = function (glj) {

web/building_saas/main/js/models/ration_glj.js

@@ -447,7 +447,7 @@ var ration_glj = {
             serialNo == 0 ? serialNo = children.length : "";
             for (let con_key of GLJSelection) {
                 var glj = _.find(allGLJ, function (item) {
-                    let i_key = gljOprObj.getIndex(item, ['code', 'name', 'specs', 'unit', 'gljType']);
+                    let i_key = gljOprObj.getIndex(item, gljLibKeyArray);
                     return i_key == con_key;
                 });
                 if (glj) {
@@ -529,7 +529,7 @@ var ration_glj = {
             GLJSelection.sort();
             _.forEach(GLJSelection, function (g) {
                 var glj = _.find(allGLJ, function (item) {
-                    var i_key = gljOprObj.getIndex(item, ['code', 'name', 'specs', 'unit', 'gljType']);
+                    var i_key = gljOprObj.getIndex(item, gljLibKeyArray);
                     return i_key == g;
                 });
                 var ration_glj = {
@@ -568,10 +568,10 @@ var ration_glj = {
         ration_glj.prototype.replaceGLJ = function (selectCode, oldData, callback) {
             var allGLJ = gljOprObj.AllRecode;
             var glj = _.find(allGLJ, function (item) {
-                var i_key = gljOprObj.getIndex(item, ['code', 'name', 'specs', 'unit', 'gljType']);
+                var i_key = gljOprObj.getIndex(item, gljLibKeyArray);
                 return i_key == selectCode;
             });
-            if (selectCode == gljOprObj.getIndex(oldData, ['code', 'name', 'specs', 'unit', 'type'])) {
+            if (selectCode == gljOprObj.getIndex(oldData, gljKeyArray)) {
                 return callback(null);
             }
             if (oldData.createType != 'replace') {
@@ -603,10 +603,10 @@ var ration_glj = {
         ration_glj.prototype.mReplaceGLJ = function (selectCode, oldData, callback) {
             var allGLJ = gljOprObj.AllRecode;
             var glj = _.find(allGLJ, function (item) {
-                var i_key = gljOprObj.getIndex(item, ['code', 'name', 'specs', 'unit', 'gljType']);
+                var i_key = gljOprObj.getIndex(item, gljLibKeyArray);
                 return i_key == selectCode;
             });
-            if (selectCode == gljOprObj.getIndex(oldData, ['code', 'name', 'specs', 'unit', 'type'])) {
+            if (selectCode == gljOprObj.getIndex(oldData, gljKeyArray)) {
                 return callback(null);
             }
             var query = {
@@ -678,7 +678,7 @@ var ration_glj = {
                     ration.basePrice = glj.unit_price.base_price;
                     ration.marketUnitFee = glj.unit_price.market_price;
                     ration.isAdd = glj.unit_price.is_add;
-                    var connect_index = gljOprObj.getIndex(glj, ['code', 'name', 'specs', 'unit', 'type'])
+                    var connect_index = gljOprObj.getIndex(glj, gljKeyArray);
                     if (mixRatioMap.hasOwnProperty(connect_index)) {
                         var mixRatios = gljOprObj.getMixRationShowDatas(mixRatioMap[connect_index], projectGljs);
                         ration.subList = mixRatios;

web/building_saas/main/js/views/character_content_view.js

@@ -118,10 +118,13 @@ let contentOprObj = {
 
     },
     save: function () {
-        let me = contentOprObj;
-        let contentTxt = me.getColData(me.currentCache);
-        let txtObj =  {field: 'jobContentText', text: contentTxt ? contentTxt : ''};
-        pageCCOprObj.updateCharacterContent(pageCCOprObj.currentFindSet, {field: 'jobContent', updateArr: me.currentCache}, txtObj, contentOprObj);
+        let selectedNode = projectObj.mainController.tree.selected;
+        const setting = projectObj.project.property.addRule !== undefined ? projectObj.project.property.addRule : null;
+        pageCCOprObj.setCharacterBySetting(selectedNode, setting);
+        // let me = contentOprObj;
+        // let contentTxt = me.getColData(me.currentCache);
+        // let txtObj =  {field: 'jobContentText', text: contentTxt ? contentTxt : ''};
+        // pageCCOprObj.updateCharacterContent(pageCCOprObj.currentFindSet, {field: 'jobContent', updateArr: me.currentCache}, txtObj, contentOprObj);
     },
     onEditEnded: function (sender, args) {
         let me = contentOprObj;
@@ -489,10 +492,13 @@ let characterOprObj = {
         }
     },
     save: function () {
-        let me = characterOprObj;
-        let characterTxt = me.getColData(me.currentCache);
-        let txtObj =  {field: 'itemCharacterText', text: characterTxt ? characterTxt : ''};
-        pageCCOprObj.updateCharacterContent(pageCCOprObj.currentFindSet, {field: 'itemCharacter', updateArr: me.currentCache}, txtObj, characterOprObj);
+        let selectedNode = projectObj.mainController.tree.selected;
+        const setting = projectObj.project.property.addRule !== undefined ? projectObj.project.property.addRule : null;
+        pageCCOprObj.setCharacterBySetting(selectedNode, setting);
+        // let me = characterOprObj;
+        // let characterTxt = me.getColData(me.currentCache);
+        // let txtObj =  {field: 'itemCharacterText', text: characterTxt ? characterTxt : ''};
+        // pageCCOprObj.updateCharacterContent(pageCCOprObj.currentFindSet, {field: 'itemCharacter', updateArr: me.currentCache}, txtObj, characterOprObj);
     },
     onEditStart: function (sender, args) {
         let me = characterOprObj;
@@ -640,6 +646,7 @@ let characterOprObj = {
 let pageCCOprObj = {
     currentFindSet: null,
     mainActiveCell: null,//mainSpread焦点单元格
+    nameCache: '',
     //获得造价书当前焦点行的类型：清单、定额
     isBillsType: function () {
         let rst = false;
@@ -650,17 +657,22 @@ let pageCCOprObj = {
         return rst;
 
     },
-    setItemContentNode: function (node, jobs, items) {
+    setItemContentNode: function (node, jobs, items, name = '') {
         let theCont = contentOprObj, theCha = characterOprObj,
             jobContent, itemCharacter, contentTxt, characterTxt;
         jobContent = theCont.buildJobContent(jobs);
         itemCharacter = theCha.buildItemCharactet(items);
-        contentTxt = theCont.getColData(jobContent);
-        characterTxt = theCha.getColData(itemCharacter);
+        // contentTxt = theCont.getColData(jobContent);
+        // characterTxt = theCha.getColData(itemCharacter);
         node.data.jobContent = jobContent;
         node.data.itemCharacter = itemCharacter;
-        node.data.jobContentText = contentTxt ? contentTxt : '';
-        node.data.itemCharacterText = characterTxt ? characterTxt : '';
+        this.nameCache = name;
+        // 根据规则设置对应特征、内容、名称格式
+        const setting = projectObj.project.property.addRule !== undefined ? projectObj.project.property.addRule : null;
+        const updateData = pageCCOprObj.getCharacterUpdateData(setting, node);
+        node.data.jobContentText = updateData.jobContentText;
+        node.data.itemCharacterText = updateData.itemCharacterText;
+        node.data.name = updateData.name;
     },
     safeItemCharater: function (itemCharater) {
         return characterOprObj.buildItemCharactet(itemCharater);
@@ -777,32 +789,26 @@ let pageCCOprObj = {
      *
      * @param {Object} node - 节点数据
      * @param {Object} refreshData - 刷新的数据
-     * @param {Object} defaultData - 默认数据
      * @return {void}
      */
-    refreshView: function(node, refreshData, defaultData) {
+    refreshView: function(node, refreshData) {
         // 更新清单行特征列或内容列
         let updateCol = [
-            { name: 'character', col: 4 },
-            { name: 'content', col: 5 },
+            { name: 'itemCharacterText', col: 4 },
+            { name: 'jobContentText', col: 5 },
             { name: 'name', col: 2 }
         ];
         if (updateCol === '') {
             return;
         }
-        const row = node.getID() - 1;
+        const row = node.serialNo();
         // 刷新输出显示
         for (const tmp of updateCol) {
             // 没有默认的数据则跳过刷新
-            if (defaultData[tmp.name] === undefined) {
-                continue;
-            }
-            // 不存在更新的数据则全部用默认数据替代
             if (refreshData[tmp.name] === undefined) {
-                projectObj.mainSpread.getActiveSheet().setValue(row, tmp.col, defaultData[tmp.name] + '');
-            } else {
-                projectObj.mainSpread.getActiveSheet().setValue(row, tmp.col, refreshData[tmp.name] + '');
+                continue;
             }
+            projectObj.mainSpread.getActiveSheet().setValue(row, tmp.col, refreshData[tmp.name] + '');
         }
         projectObj.mainSpread.getActiveSheet().autoFitRow(row);
     },
@@ -814,122 +820,26 @@ let pageCCOprObj = {
      * @return {void}
      */
     setCharacterBySetting: function(node, setting) {
-        let contentArray = [];
         let self = this;
 
         // 保存的条件数据
         const findSet = { ID: node.data.ID, projectID: node.data.projectID };
-        // 获取默认数据
-        const defaultData = this.getDataBySetting(node, {
-            serialType: "1",
-            characterFormat: "2",
-        });
-        // console.log(defaultData);return false;
-        defaultData.character = defaultData.character.join("\r\n");
-        defaultData.content = defaultData.content.join("\r\n");
+        const updateData = this.getCharacterUpdateData(setting, node);
 
-        // 获取当前设置数据
-        const currentData = this.getDataBySetting(node, setting);
-
-        // 组合数据
-        let content = '';
-        switch (setting.addContent) {
-            case "1":
-                // 项目特征+工作内容
-                contentArray.push('[项目特征]');
-                contentArray.push.apply(contentArray, currentData.character);
-                contentArray.push('[工作内容]');
-                contentArray.push.apply(contentArray, currentData.content);
-                break;
-            case "2":
-                // 工作内容+项目特征
-                contentArray.push('[工作内容]');
-                contentArray.push.apply(contentArray, currentData.content);
-                contentArray.push('[项目特征]');
-                contentArray.push.apply(contentArray, currentData.character);
-                break;
-            case "3":
-                // 项目特征
-                contentArray.push.apply(contentArray, currentData.character);
-                break;
-            case "4":
-                // 工作内容
-                contentArray.push.apply(contentArray, currentData.content);
-                break;
-            case "5":
-                // 定额子目
-                const rationChapter = this.getRationChapter(node, setting);
-                contentArray.push.apply(contentArray, rationChapter);
-                break;
-            case "":
-                // 无
-                break;
-        }
-        // 显示格式
-        switch (setting.displayFormat) {
-            case "1":
-                // 换行分隔
-                content = contentArray.join("\r\n");
-                break;
-            case "2":
-                // 逗号分隔
-                content = contentArray.join(',');
-                break;
-            case "3":
-                // 括号分隔
-                content = '(' + contentArray.join(',') + ')';
-                break;
-        }
-        // 添加到对应位置
         let saveObj = [];
-        let refreshData = {};
-        saveObj.push({ field: 'addRule', value: setting });
-        switch (setting.position) {
-            case "1":
-                // 添加到项目特征列
-                saveObj.push({field: 'itemCharacterText', value: content});
-                // 还原名称及内容
-                saveObj.push({field: 'name', value: defaultData.name});
-                saveObj.push({field: 'jobContentText', value: defaultData.content});
-                // 刷新数据
-                refreshData = {'character': content};
-                break;
-            case "2":
-                // 添加到清单名称列
-                content = defaultData.name + "\r\n" + content;
-                saveObj.push({field: 'name', value: content});
-                // 还原特征及内容
-                saveObj.push({field: 'itemCharacterText', value: defaultData.character});
-                saveObj.push({field: 'jobContentText', value: defaultData.content});
-                // 刷新数据
-                refreshData = {'name': content};
-                break;
-            case "3":
-                // 添加到工作内容列
-                saveObj.push({field: 'jobContentText', value: content});
-                // 还原名称以及特征
-                saveObj.push({field: 'itemCharacterText', value: defaultData.character});
-                saveObj.push({field: 'name', value: defaultData.name});
-                // 刷新数据
-                refreshData = {'content': content};
-                break;
-            case "4":
-                // 分别添加到对应列
-                if (Object.keys(defaultData).length <= 0) {
-                    return;
-                }
-                // 特征
-                saveObj.push({field: 'itemCharacterText', value: defaultData.character});
-                // 内容
-                saveObj.push({field: 'jobContentText', value: defaultData.content});
-                // 名称
-                saveObj.push({field: 'name', value: defaultData.name});
-                refreshData = {};
-                break;
+        for (const index in updateData) {
+            saveObj.push({field: index, value: updateData[index]});
         }
+        saveObj.push({field: 'addRule', value: setting});
         // 更新到数据库
         pageCCOprObj.updateBill(findSet, saveObj, function(response) {
-            self.refreshView(node, refreshData, defaultData);
+            self.refreshView(node, updateData);
+            // 更新项目属性的配置
+            projectObj.project.property.addRule = setting;
+            // 更新节点数据
+            node.data.name = updateData.name;
+            node.data.itemCharacterText = updateData.itemCharacterText;
+            node.data.jobContentText = updateData.jobContentText;
         });
 
     },
@@ -1006,9 +916,7 @@ let pageCCOprObj = {
                 throw '内部数据错误';
             }
             // 默认名称
-            let nodeNameList = node.data.name.split("\r\n");
-            const nameContent = nodeNameList[0] !== undefined ? nodeNameList[0] : '';
-            result['name'] = nameContent;
+            result['name'] = this.nameCache;
 
             // 特征
             let characterArray = [];
@@ -1057,54 +965,109 @@ let pageCCOprObj = {
             }
             result['content'] = jobArray;
         } catch (error) {
+            console.log(error);
             result = {};
         }
         return result;
     },
+
     /**
-     * 还原数据
+     * 获取特征内容名称更新的数据
      *
+     * @param {Object} setting - 设置
      * @param {Object} node - 节点数据
-     * @param {String} setType - 当前设置的项
-     * @param {Object} baseData - 需要用到的基础数据
-     * @param {Object} defaultContentInfo - 默认数据
-     * @return {void}
+     * @return {Object} - 返回更新的数据
      */
-    restoreData: function(node, setType, baseData, defaultContentInfo) {
-        if (baseData.findSet === undefined ||
-        baseData.itemJob === undefined || baseData.itemCharacter === undefined) {
-            return;
+    getCharacterUpdateData: function(setting, node) {
+        let updateData = {
+            itemCharacterText: '',
+            jobContentText: '',
+            name: this.nameCache,
+        };
+        let contentArray = [];
+
+        // 获取当前设置数据
+        const currentData = this.getDataBySetting(node, setting);
+
+        // 组合数据
+        let content = '';
+        switch (setting.addContent) {
+            case "1":
+                // 项目特征+工作内容
+                contentArray.push('[项目特征]');
+                contentArray.push.apply(contentArray, currentData.character);
+                contentArray.push('[工作内容]');
+                contentArray.push.apply(contentArray, currentData.content);
+                break;
+            case "2":
+                // 工作内容+项目特征
+                contentArray.push('[工作内容]');
+                contentArray.push.apply(contentArray, currentData.content);
+                contentArray.push('[项目特征]');
+                contentArray.push.apply(contentArray, currentData.character);
+                break;
+            case "3":
+                // 项目特征
+                contentArray.push.apply(contentArray, currentData.character);
+                break;
+            case "4":
+                // 工作内容
+                contentArray.push.apply(contentArray, currentData.content);
+                break;
+            case "5":
+                // 定额子目
+                const rationChapter = this.getRationChapter(node, setting);
+                contentArray.push.apply(contentArray, rationChapter);
+                break;
+            case "":
+                // 无
+                break;
         }
+        // 显示格式
+        switch (setting.displayFormat) {
+            case "1":
+                // 换行分隔
+                content = contentArray.join("\r\n");
 
-        switch (setType) {
+                currentData.character = currentData.character.join("\r\n");
+                currentData.content = currentData.content.join("\r\n");
+                break;
+            case "2":
+                // 逗号分隔
+                content = contentArray.join(',');
+
+                currentData.character = currentData.character.join("，");
+                currentData.content = currentData.content.join("，");
+                break;
+            case "3":
+                // 括号分隔
+                content = '(' + contentArray.join(',') + ')';
+                break;
+        }
+        // 添加到对应位置
+        switch (setting.position) {
             case "1":
                 // 添加到项目特征列
-                // 把其他字段还原回原来数据
-                // 还原名称
-                projectObj.project.Bills.updateField(node.source, 'name', defaultContentInfo.nameContent, true);
-                projectObj.mainController.refreshTreeNode([node], false);
-                // 还原工作内容
-                pageCCOprObj.updateCharacterContent(baseData.findSet, {field: 'jobContent', updateArr: baseData.itemJob},
-                    {field: 'jobContentText', text: contentOprObj.lastTextCache}, node);
+                updateData.itemCharacterText = content;
                 break;
             case "2":
-                // 添加到清单名称
-                // 还原特征
-                pageCCOprObj.updateCharacterContent(baseData.findSet, {field: 'itemCharacter', updateArr: baseData.itemCharacter},
-                    {field: 'itemCharacterText', text: characterOprObj.lastTextCache}, node);
-                // 还原工作内容
-                pageCCOprObj.updateCharacterContent(baseData.findSet, {field: 'jobContent', updateArr: baseData.itemJob},
-                    {field: 'jobContentText', text: contentOprObj.lastTextCache}, node);
+                // 添加到清单名称列
+                content = this.nameCache + "\r\n" + content;
+                updateData.name = content;
                 break;
             case "3":
                 // 添加到工作内容列
-                // 还原名称
-                projectObj.project.Bills.updateField(node.source, 'name', defaultContentInfo.nameContent, true);
-                projectObj.mainController.refreshTreeNode([node], false);
-                // 还原特征
-                pageCCOprObj.updateCharacterContent(baseData.findSet, {field: 'itemCharacter', updateArr: baseData.itemCharacter},
-                    {field: 'itemCharacterText', text: characterOprObj.lastTextCache}, node);
+                updateData.jobContentText = content;
+                break;
+            case "4":
+                updateData = {
+                    itemCharacterText: currentData.character,
+                    jobContentText: currentData.content,
+                    name: currentData.name,
+                };
                 break;
         }
+
+        return updateData;
     },
 }

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

@@ -390,19 +390,18 @@ var gljOprObj = {
         }
     },
     onCheckBoxClick: function (sender, args) {
-        if (args.sheetName == 'ration_glj') {
-            return;
-        }
         var checkboxValue = args.sheet.getCell(args.row, args.col).value();
         var newval = 0;
         if (checkboxValue) {
             newval = 0;
             args.sheet.getCell(args.row, args.col).value(newval);
         } else {
-            newval = 1
+            newval = 1;
             args.sheet.getCell(args.row, args.col).value(newval);
         }
-        if (args.sheetName == 'ration_coe') {
+        if (args.sheetName == 'ration_glj') {
+            gljOprObj.updateIsEstimate(args,newval);
+        } else if (args.sheetName == 'ration_coe') {
             gljOprObj.updateRationCoe(args, newval)
         } else if (args.sheetName == 'quantity_detail') {
             projectObj.project.quantity_detail.isSummationUpdate(args, gljOprObj.detailData, newval);
@@ -602,7 +601,7 @@ var gljOprObj = {
     },
     hasComposition:function (ration_glj) {//判断是否有组成物，有则返回true
         if(notEditType.indexOf(ration_glj.type)!=-1){
-            let con_key = this.getIndex(ration_glj,['code', 'name', 'specs', 'unit', 'type']);
+            let con_key = this.getIndex(ration_glj,gljKeyArray);
             var mixRatioMap = projectObj.project.projectGLJ.datas.mixRatioMap;
             if(mixRatioMap[con_key]&&mixRatioMap[con_key].length>0){
                 return true;
@@ -712,6 +711,7 @@ var gljOprObj = {
         }
     },
     showRationGLJSheetData: function (init) {
+        this.combineWithProjectGlj(this.sheetData);
         this.sheet.setRowCount(0);
         //console.log(+new Date())
         //this.sheet.getRange(0,-1,this.sheet.getRowCount(),-1).visible(true); //这个方法导致加载缓慢
@@ -749,7 +749,7 @@ var gljOprObj = {
         return gljList;
     },
     showInSheet: function (gljList) {
-        this.sheetData = this.combineWithProjectGlj(gljList);
+        this.sheetData = gljList;
         this.showRationGLJSheetData(true);
     },
     sumQuantity: function (node) {
@@ -803,15 +803,12 @@ var gljOprObj = {
                 var glj = _.find(projectGljs, {'id': ration_gljs[i].projectGLJID});
                 if (glj) {
                     let typeString = ration_gljs[i].type + "";
-                    if (typeString.indexOf("2") != -1) {//只有材料类型才显示是否暂估
+                    if (typeString.indexOf("2") != -1||typeString=='4'||typeString=='5') {//只有材料类型才显示是否暂估
                         ration_gljs[i].isEstimate = glj.is_evaluate;
                     }
-                    ration_gljs[i].basePrice = glj.unit_price.base_price;
-                    ration_gljs[i].marketPrice = glj.unit_price.market_price;
-                    //ration_gljs[i].adjustPrice=glj.adjust_price;
                     ration_gljs[i].isAdd = glj.unit_price.is_add;
-                    ration_gljs[i].adjustPrice = projectObj.project.projectGLJ.getAdjustPrice(glj);
-                    var connect_index = this.getIndex(glj, ['code', 'name', 'specs', 'unit', 'type'])
+                    ration_gljs[i]=this.setGLJPrice(ration_gljs[i],glj);//设置工料机价格
+                    var connect_index = this.getIndex(glj, gljKeyArray)
                     if (mixRatioMap.hasOwnProperty(connect_index)) {
                         var mixRatios = this.getMixRationShowDatas(mixRatioMap[connect_index], projectGljs);
                         ration_gljs[i].subList = mixRatios;
@@ -821,6 +818,34 @@ var gljOprObj = {
         }
         return ration_gljs;
     },
+    setGLJPrice:function (data,glj) {
+        glj = glj?glj:_.find(projectObj.project.projectGLJ.datas.projectGljs, {'id': ration_gljs[i].projectGLJID});
+        if(this.calcPriceDiff(glj)==true) {//计取价差
+            data.basePrice = glj.unit_price.base_price;
+            data.marketPrice = glj.unit_price.market_price;
+            data.adjustPrice = projectObj.project.projectGLJ.getAdjustPrice(glj);
+        }else {//不计价差
+            data.basePrice = glj.unit_price.market_price;
+            data.marketPrice = glj.unit_price.market_price;
+            data.adjustPrice = glj.unit_price.market_price;
+        }
+        return data;
+
+    },
+    calcPriceDiff:function (glj) {
+        let calcOptions=projectInfoObj.projectInfo.property.calcOptions;
+        if(glj.is_evaluate==1){//先按是否暂估判断
+            return calcOptions.calc_est;
+        }
+        if(glj.type==gljType.MAIN_MATERIAL||glj.type==gljType.EQUIPMENT){//再判断是否是主材和设备
+            return calcOptions.calc_main;
+        }
+        if(glj.unit_price.is_add==1){//再判断是否新增
+            return calcOptions.calc_add;
+        }
+        return true;
+    },
+
     getIndex(obj, pops){
         let t_index = '';
         let k_arr = [];
@@ -831,6 +856,16 @@ var gljOprObj = {
         t_index = k_arr.join("|-|");
         return t_index;
     },
+    getConditionByKey(conKey){//将连接字符串转换成对象
+        let valueArray = conKey.split("|-|");
+        let obj ={};
+        for(let i = 0;i<valueArray.length;i++){
+            if(valueArray[i]!='null'){
+                obj[gljKeyArray[i]]=valueArray[i];
+            }
+        }
+        return obj;
+    },
     getMixRationShowDatas: function (mixRatioList, projectGljs) {
         var temRationGLJs = [];
         for (var i = 0; i < mixRatioList.length; i++) {
@@ -1010,6 +1045,20 @@ var gljOprObj = {
         var recode = me.coeSheetData[args.row];
         projectObj.project.ration_coe.adjustCoeClick(recode, newval);
     },
+    updateIsEstimate:function (args, newval) {
+        var me = gljOprObj;
+        if(me.setting.header[args.col].dataCode=="isEstimate"){
+            var pspread= new ProjectGLJSpread();
+            var recode = me.sheetData[args.row];
+            let projectGljs = projectObj.project.projectGLJ.datas.gljList;
+            let glj = _.find(projectGljs, {'id': recode.projectGLJID});
+            if(glj){
+                glj["is_evaluate"]=newval;
+                args.fromRG=true;
+                pspread.postUpdate(recode.projectGLJID,"is_evaluate",newval,args,null,successTrigger);
+            }
+        }
+    },
     numberValueChecking: function (val) {
         var newval = Number(val);
         if (number_util.isNumber(newval)) {
@@ -1084,7 +1133,7 @@ var gljOprObj = {
         }
     },
     addGLJsSelection: function (args, newVal) {
-        var con_key = this.getIndex(this.gljLibSheetData[args.row], ['code', 'name', 'specs', 'unit', 'gljType'])
+        var con_key = this.getIndex(this.gljLibSheetData[args.row], gljLibKeyArray);
         if (newVal == 1) {
             this.GLJSelection.push(con_key);
             this.gljLibSheetData[args.row].select = 1;
@@ -1100,10 +1149,10 @@ var gljOprObj = {
             args.sheet.getCell(args.row, args.col).value(1);
             return;
         }
-        this.GLJSelection = [me.getIndex(this.gljLibSheetData[args.row], ['code', 'name', 'specs', 'unit', 'gljType'])];
+        this.GLJSelection = [me.getIndex(this.gljLibSheetData[args.row], gljLibKeyArray)];
         this.gljLibSheetData[args.row].select = 1;
         var oindex = _.findIndex(this.gljLibSheetData, function (item) {
-            var i_key = me.getIndex(item, ['code', 'name', 'specs', 'unit', 'gljType']);
+            var i_key = me.getIndex(item, gljLibKeyArray);
             return oldSelection == i_key;
         });
         if (oindex != -1) {
@@ -1111,7 +1160,7 @@ var gljOprObj = {
             this.gljLibSheetData[oindex].select = 0;
         } else {
             var oldData = _.find(gljOprObj.AllRecode, function (item) {
-                var i_key = me.getIndex(item, ['code', 'name', 'specs', 'unit', 'gljType']);
+                var i_key = me.getIndex(item, gljLibKeyArray);
                 return oldSelection == i_key;
             });
             oldData ? oldData.select = 0 : "";
@@ -1172,7 +1221,7 @@ var gljOprObj = {
         var project = projectObj.project;
         gljOprObj.GLJSelection = _.filter(gljOprObj.GLJSelection, function (n) {
             var rg = _.find(gljOprObj.sheetData, function (item) {
-                var i_key = gljOprObj.getIndex(item, ['code', 'name', 'specs', 'unit', 'type']);
+                var i_key = gljOprObj.getIndex(item, gljKeyArray);
                 return n == i_key
             })
             return rg ? false : true;
@@ -1245,10 +1294,10 @@ var gljOprObj = {
         project.ration_glj.mReplaceGLJ(selectCode, oldData, function (result) {
             var data = result.data;
             var stateList = result.stateList;
-            var n_index = me.getIndex(data.query, ['code', 'name', 'specs', 'unit', 'type']);
+            var n_index = me.getIndex(data.query, gljKeyArray);
             var nodes = [];
             _.forEach(project.ration_glj.datas, function (t) {
-                var t_index = me.getIndex(t, ['code', 'name', 'specs', 'unit', 'type']);
+                var t_index = me.getIndex(t, gljKeyArray);
                 if (n_index == t_index) {
                     me.updateProperty(t, data.doc);
                     if (project.ration_glj.needShowToTree(t)) {//如果是造价书中的树节点，则也须刷新
@@ -1444,15 +1493,15 @@ $(function () {
             gljOprObj.GLJSelection = [];
         } else {
             selected = gljOprObj.sheetData[gljContextMenu.selectedRow];
-            var connect_key = gljOprObj.getIndex(selected, ['code', 'name', 'specs', 'unit', 'type'])
+            var connect_key = gljOprObj.getIndex(selected, gljKeyArray);
             gljOprObj.GLJSelection = [connect_key];
             gljOprObj.filterLibGLJByType();
         }
 
         if (selected != null) {
-            var s_key = gljOprObj.getIndex(selected, ['code', 'name', 'specs', 'unit', 'gljType']);
+            var s_key = gljOprObj.getIndex(selected, gljLibKeyArray);
             var r = _.find(gljOprObj.gljLibSheetData, function (item) {
-                var item_key = gljOprObj.getIndex(item, ['code', 'name', 'specs', 'unit', 'type']);
+                var item_key = gljOprObj.getIndex(item, gljKeyArray);
                 return s_key == item_key;
             });
             r ? r.select = 1 : "";

web/building_saas/main/js/views/project_property_display_view.js

@@ -3,38 +3,68 @@
  */
 let projDisplayView = {
     datas: null,//just for view
-    init:function () {
+    init: function () {
         this.datas = projectInfoObj.projectInfo.property.displaySetting;
-        this.datas = this.datas === undefined ? { autoHeight: true, disPlayMainMaterial: true } : this.datas;
-        $("#autoHeight").attr("checked",this.datas.autoHeight);
-        $("#disPlayMainMaterial").attr("checked",this.datas.disPlayMainMaterial);
+        this.datas = this.datas === undefined ? {autoHeight: true, disPlayMainMaterial: true} : this.datas;
+        $("#autoHeight").attr("checked", this.datas.autoHeight);
+        $("#disPlayMainMaterial").attr("checked", this.datas.disPlayMainMaterial);
         //$('#disPlayMainMateria').prop('checked')
- },
+    },
 
-    needUpdate: function(autoHeight, disPlayMainMaterial) {
-        if(this.datas==null){
+    needUpdate: function (autoHeight, disPlayMainMaterial) {
+        if (this.datas == null) {
             return;
         }
         return autoHeight !== this.datas.autoHeight || disPlayMainMaterial !== this.datas.disPlayMainMaterial;
     },
 
-    updateChecking:function (projectID,properties) {
-        if(this.datas==null){
+    updateChecking: function (properties) {
+        if (this.datas == null) {
             return;
         }
-        var autoHeight = $('#autoHeight').prop('checked');
-        var disPlayMainMaterial = $('#disPlayMainMaterial').prop('checked');
-        if(this.datas.autoHeight!==autoHeight||this.datas.disPlayMainMaterial!==disPlayMainMaterial){
-            this.datas.autoHeight=autoHeight;
-            this.datas.disPlayMainMaterial=disPlayMainMaterial;
+        let autoHeight = $('#autoHeight').prop('checked');
+        let disPlayMainMaterial = $('#disPlayMainMaterial').prop('checked');
+        if (this.datas.autoHeight !== autoHeight || this.datas.disPlayMainMaterial !== disPlayMainMaterial) {
+            this.datas.autoHeight = autoHeight;
+            this.datas.disPlayMainMaterial = disPlayMainMaterial;
             // let updateData = {sourceType: 'properties', updateType: 'update', updateData: {ID: projectID, 'property.displaySetting':this.datas}};
             properties['property.displaySetting'] = this.datas;
         }
     }
 };
 
+let calcOptions = {
+    datas: null,//just for view
+    init: function () {
+        this.datas = projectInfoObj.projectInfo.property.calcOptions;
+        $("#calc_main").attr("checked", this.datas.calc_main);
+        $("#calc_add").attr("checked", this.datas.calc_add);
+        $("#calc_est").attr("checked", this.datas.calc_est);
+    },
+    updateChecking: function (properties) {
+        if (this.datas == null) {
+            return false;
+        }
+        let calc_main = $('#calc_main').prop('checked');
+        let calc_add = $('#calc_add').prop('checked');
+        let calc_est = $('#calc_est').prop('checked');
+        if (this.datas.calc_main !== calc_main || this.datas.calc_add !== calc_add||this.datas.calc_est !== calc_est) {
+            this.datas.calc_main = calc_main;
+            this.datas.calc_add = calc_add;
+            this.datas.calc_est = calc_est;
+            properties['property.calcOptions'] = this.datas;
+            return true
+        }
+        return false
+    }
+}
+
+
 $(document).ready(function () {
     $('#tab_display_setting').on('shown.bs.tab', function () {
         projDisplayView.init();
     });
+    $('#about-calc').on('shown.bs.tab', function () {
+        calcOptions.init();
+    });
 });

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

@@ -628,16 +628,18 @@ var projectObj = {
         let y = window.event.clientY;
 
         // 匹配数字或小数
-        const regular = /^([0-9]+[.]{1}[0-9]+)$|^([1-9]{1}\d+)$/;
+        const regular = /^([0-9]+[.]{1}[0-9]+)$|^([1-9]{1}\d*)$/;
         // 小数点最高位数
         let max = 0;
         let total = 0;
+        let counter = 0;
         for (let col = selectedArea.col; col < (selectedArea.colCount + selectedArea.col); col++) {
             for (let row = selectedArea.row; row < (selectedArea.rowCount + selectedArea.row); row++) {
-                const value = sheet.getCell(row, col).value();
+                const value = sheet.getCell(row, col).text();
                 if (!regular.test(value)) {
                     continue;
                 }
+                counter++;
                 // 获取当前数据小数位数
                 let pointPosition = value.toString().indexOf(".");
                 pointPosition = pointPosition < 0 ? pointPosition : pointPosition + 1;
@@ -647,7 +649,7 @@ var projectObj = {
             }
         }
         // 如果不为0则悬浮显示
-        if (total > 0) {
+        if (total > 0 && counter > 1) {
             const div = $('<div id="total-tips"><p>合计: <input type="text" id="total" readonly="readonly" style="border: none;"/></p><p><a href="javascript:void(0);">复制</a></p></div>');
             div.css({
                 position: "absolute",
@@ -863,7 +865,11 @@ $('#property_ok').click(function () {
         properties['property.decimal'] = updateDecimal;
     }
     // 呈现选项
-    projDisplayView.updateChecking(projectID, properties);
+    projDisplayView.updateChecking(properties);
+
+    if(calcOptions.updateChecking(properties)){
+        reCalcRations = true;
+    }
 
     // 人工系数
     if (labourCoeView.needSave()){

web/building_saas/main/js/views/std_bills_lib.js

@@ -173,9 +173,10 @@ var billsLibObj = {
             that.stdBillsSpread.unbind(GC.Spread.Sheets.Events.CellDoubleClick);
             that.stdBillsSpread.bind(GC.Spread.Sheets.Events.CellDoubleClick, function (sender, args) {
                 let selectNode = stdBillsTree.items[args.row];
+                let name = selectNode.data.name;
                 if (stdBillsTree.items[args.row].children.length === 0) {
                     //特征及内容转化
-                    pageCCOprObj.setItemContentNode(stdBillsTree.items[args.row], getBillsJobs(stdBillsTree.items[args.row]), getBillsFeatures(stdBillsTree.items[args.row]));
+                    pageCCOprObj.setItemContentNode(stdBillsTree.items[args.row], getBillsJobs(stdBillsTree.items[args.row]), getBillsFeatures(stdBillsTree.items[args.row]), name);
                     if (/\//.test(selectNode.data.unit)) {
                         let existB = projectObj.project.Bills.sameStdCodeBillsData(selectNode.data.code);
                         if (existB) {

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

@@ -101,13 +101,13 @@ $("#linkTZJNR").click(function () {
     $("#subItems").children().hide();
     $("#tzjnrCon").show();
     $("#add-rule").show();
+    $("#add-rule p").not(":first").css('margin-bottom', 4);
     pageCCOprObj.active = true;
     refreshSubSpread();
     let selectedNode = projectObj.mainController.tree.selected;
-    if (selectedNode.data.addRule !== undefined) {
-        setRule(selectedNode.data.addRule);
+    if (projectObj.project.property.addRule !== undefined) {
+        setRule(projectObj.project.property.addRule);
     }
-
     pageCCOprObj.mainActiveCell = projectObj.mainSpread.getActiveSheet().getSelections()[0];
     if(selectedNode && selectedNode.sourceType === projectObj.project.Bills.getSourceType()){
         pageCCOprObj.setCacheAndShow(selectedNode);
@@ -129,7 +129,12 @@ $("#use-to-current").click(function() {
     const self = $(this);
     self.attr('disabled', 'disabled');
     let selectedNode = projectObj.mainController.tree.selected;
+    // 获取原名称
+    const name = selectedNode.data.name.split("\r\n");
+    pageCCOprObj.nameCache = name[0] !== undefined ? name[0] : "";
+    // 操作内容
     pageCCOprObj.setCharacterBySetting(selectedNode, setting);
+
     // 防止连续点击1秒后才能再次发起请求
     setTimeout(function() {
         isSaving = false;
@@ -143,13 +148,35 @@ $("#use-to-all").click(function() {
     if (treeNode.items === undefined || treeNode.items.length <= 0) {
         return false;
     }
-    for (const item of treeNode.items) {
-        if (item.data.jobContent === undefined || item.data.jobContent.length <= 0 ||
-        item.data.itemCharacter === undefined || item.data.itemCharacter.length <= 0) {
-            continue;
-        }
-        pageCCOprObj.setCharacterBySetting(item, setting);
+    // 获取所有标准清单
+    const stdBillsLibID = $("#stdBillsLibSelect").is(":visible") ?
+        $("#stdBillsLibSelect").val() : (projectInfoObj.projectInfo.engineeringInfo.bill_lib[0] !== undefined ? projectInfoObj.projectInfo.engineeringInfo.bill_lib[0].id : 0);
+    if (stdBillsLibID <= 0) {
+        return false;
     }
+    let stdBillData = {};
+    CommonAjax.post('/stdBillsEditor/getBills', {userId: userID, billsLibId: stdBillsLibID}, function (data) {
+        if (!data instanceof Array || data.length <= 0) {
+            return false;
+        }
+        // 整理数据
+        for (const tmp of data) {
+            stdBillData[tmp.code] = tmp;
+        }
+        // 处理结果
+        for (const item of treeNode.items) {
+            if (item.data.jobContent === undefined || item.data.jobContent.length <= 0 ||
+                item.data.itemCharacter === undefined || item.data.itemCharacter.length <= 0 || item.data.code === undefined) {
+                continue;
+            }
+            const orgCode = item.data.code.substr(0, 9);
+            if (stdBillData[orgCode] === undefined) {
+                continue;
+            }
+            pageCCOprObj.nameCache = stdBillData[orgCode].name;
+            pageCCOprObj.setCharacterBySetting(item, setting);
+        }
+    });
 });
 
 // 添加位置选择
@@ -158,6 +185,7 @@ $("#add-position").change(function() {
     const addContentEle = $("#add-content");
     const displayFormatEle = $("#display-format");
     const characterFormatEle = $("#character-format");
+    const serialTypeEle = $("#serial-type");
     switch (selected) {
         case '4':
             // 分别添加到对应列
@@ -165,14 +193,14 @@ $("#add-position").change(function() {
             addContentEle.val('');
             addContentEle.attr('disabled', 'disabled');
             displayFormatEle.val(1);
-            displayFormatEle.attr('disabled', 'disabled');
             characterFormatEle.val(2);
-            characterFormatEle.attr('disabled', 'disabled');
+            serialTypeEle.val(1);
             break;
         default:
             addContentEle.removeAttr('disabled');
             displayFormatEle.removeAttr('disabled');
             characterFormatEle.removeAttr('disabled');
+            addContentEle.val(1);
             break;
     }
 });
@@ -197,6 +225,11 @@ $("#add-content").change(function() {
         case '2':
         case '3':
             characterFormatEle.removeAttr('disabled');
+            if (serialTypeEle.val() === '') {
+                serialTypeEle.val(1);
+            }
+            serialTypeEle.removeAttr('disabled');
+            childDisplayFormatEle.attr('disabled', 'disabled');
             break;
         case '4':
             // 当“添加内容”是“定额子目”或“工作内容”，则“特征生成方式”灰显，不需选择；否则有效可选。
@@ -204,6 +237,9 @@ $("#add-content").change(function() {
             characterFormatEle.val(2);
         default:
             serialTypeEle.removeAttr('disabled');
+            if (serialTypeEle.val() === '') {
+                serialTypeEle.val(1);
+            }
             childDisplayFormatEle.attr('disabled', 'disabled');
             break;
     }

web/building_saas/pm/js/pm_main.js

@@ -1726,10 +1726,12 @@ function getUsedObj(tenders, fileId, type){
     rst.usedCount = 0;
     rst.usedInfo = null;
     for(let i = 0, len = tenders.length; i < len; i++){
-        let theFile = type === fileType.unitPriceFile ? tenders[i].data.property.unitPriceFile || null : tenders[i].data.property.feeFile || null;
-        if(theFile && theFile.id == fileId){
-            usedCount ++;
-            usedInfo += tenders[i].data.name + '<br>';
+        if(tenders[i].data.property){
+            let theFile = type === fileType.unitPriceFile ? tenders[i].data.property.unitPriceFile || null : tenders[i].data.property.feeFile || null;
+            if(theFile && theFile.id == fileId){
+                usedCount ++;
+                usedInfo += tenders[i].data.name + '<br>';
+            }
         }
     }
     if(usedCount > 0){