Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

modules/all_models/system_setting.js

@@ -0,0 +1,25 @@
+/**
+ * Created by zhang on 2020/1/2.
+ */
+let mongoose = require("mongoose");
+
+let Schema = mongoose.Schema;
+let collectionName = 'system_setting';
+let modelSchema = {
+    // ID
+    ID: {
+        type: String,
+        index: true
+    },
+    // 专业用户
+    professional: {
+        project: Number,
+        ration:Number
+    },
+    // 免费用户
+    normal: {
+        project: Number,
+        ration:Number
+    },
+};
+mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));

modules/glj/controllers/glj_controller.js

@@ -230,6 +230,11 @@ class GLJController extends BaseController {
 
             let mixRatioModel = new MixRatioModel();
             let result = await mixRatioModel.deleteById(id);
+            if(request.body.unitPrice){
+                let unitPrice = JSON.parse(request.body.unitPrice);
+                let unitPriceModel = new UnitPriceModel();
+                await unitPriceModel.model.update(unitPrice.query,unitPrice.doc);
+            }
             if (!result) {
                 throw '删除失败';
             }
@@ -773,38 +778,22 @@ class GLJController extends BaseController {
         try {
             let data = req.body.data;
             data = JSON.parse(data);
-            let mixTasks = [],parent = null;
+            let mixTasks = [],unitPriceTask=[];
             for(let d of data){
                 if(d.type == 'mix_ratio'){
                     let task = {updateOne:{filter:d.query, update :d.doc}};
                     mixTasks.push(task);
-                }else if(d.type =='parent'){
-                    parent = d;
+                }else if(d.type == 'unitPrice'){
+                    let utask = {updateOne:{filter:d.query, update :d.doc}};
+                    unitPriceTask.push(utask);
                 }
             }
             if(mixTasks.length > 0){
                 let mixRatioModel = new MixRatioModel().model;
                 await mixRatioModel.bulkWrite(mixTasks);
             }
-            if(parent){
-                let indexList = ['code','name','specs','unit','type'];
-                let keyList = parent.connect_key.split("|-|");
-                let condition = {unit_price_file_id: parent.unit_price_file_id};
-                for(let i = 1;i<keyList.length;i++){
-                    if(keyList[i]!='null'){
-                        condition[indexList[i]]=keyList[i];
-                    }
-                }
-                let unitPriceUpdate = {
-                    base_price: parent.base_price,
-                    market_price: parent.market_price
-                };
-                let unitPriceModel = new UnitPriceModel();
-                let unitPriceResult = await unitPriceModel.updatePrice(condition, unitPriceUpdate);
-                if (!unitPriceResult) {
-                    throw '更新单价数据失败';
-                }
-            }
+            let unitPriceModel = new UnitPriceModel();
+            if(unitPriceTask.length > 0)await unitPriceModel.model.bulkWrite(unitPriceTask);
             result.data = "ok";
         }catch (err){
             logger.err(err);

modules/glj/models/unit_price_model.js

@@ -275,7 +275,14 @@ class UnitPriceModel extends BaseModel {
         if(!unitPrice){
             throw "没有找到对应的单价";
         }
-        let rList= this.checkAndUpdateParent(unitPrice,data.field,data.project_id,newValueMap);
+        let rList=await this.checkAndUpdateParent(unitPrice,data.field,data.project_id,newValueMap);
+        if(data.ext){
+            let elecPrice = await this.db.findAndModify({id:data.ext.id,unit_price_file_id:data.ext.unit_price_file_id},data.ext.doc);
+            let nm = {};
+            nm[data.ext.id] = data.ext.doc;
+            let erList=await this.checkAndUpdateParent(elecPrice,"market_price",data.project_id,nm);
+            rList = rList.concat(erList);
+        }
         return rList;
     }
 

modules/main/middleware/system_setting.js

@@ -0,0 +1,52 @@
+/**
+ * Created by zhang on 2020/1/8.
+ */
+
+module.exports={
+    getSystemSetting,
+    rationNumberChecking:rationNumberChecking,
+    tenderNumberChecking
+};
+
+let mongoose = require("mongoose");
+let rationModel = mongoose.model("ration");
+const systemSettingModel = mongoose.model('system_setting');
+const pmFacade = require('../../pm/facade/pm_facade');
+
+// 获取系统设置，这个系统设置正常情况下有存在session中
+async function getSystemSetting() {
+    return await systemSettingModel.findOne({}).lean();
+}
+
+async function rationNumberChecking(req, res, next) {
+    if(req.session.systemSetting){
+        let type = req.session.compilationVersion.indexOf("免费") == -1?"professional":"normal";
+        let data = req.body.data;
+        if(typeof data === 'object'){
+            data = JSON.stringify(data);
+        }
+        data = JSON.parse(data);
+        let projectID = data.projectID;
+        let no = await rationModel.find({projectID:projectID}).count();
+        if(no >= req.session.systemSetting[type].ration){
+            let  result = {error:1,message:"您套用定额个数超限，请联系我们的客服人员。"};
+            return  res.json(result);
+        }
+    }
+    next();
+}
+
+async function tenderNumberChecking(req, res, next) {
+    const data = JSON.parse(req.body.data);
+    const tenderCount = data.tenderCount;
+    if (tenderCount) {
+        const tenderOverrun = await pmFacade.isTenderOverrun(tenderCount, req.session);
+        if (tenderOverrun) {
+            return res.json({
+                error: 1,
+                message: '您创建的项目个数超限，请联系我们的客服人员，或者导出建设项目保存到本地备份，删除云上数据。'
+            });
+        }
+    }
+    next();
+}

modules/main/routes/ration_route.js

@@ -2,6 +2,7 @@
  * Created by jimiz on 2017/4/7.
  */
 let express = require('express');
+let ss_middleware = require("../middleware/system_setting");
 
 module.exports = function (app) {
     let rationRouter = express.Router();
@@ -11,8 +12,8 @@ module.exports = function (app) {
     rationRouter.post('/allocIDs', rationController.allocIDs);
     rationRouter.post('/insertGLJAsRation', rationController.action);
     rationRouter.post('/replaceRations', rationController.action);
-    rationRouter.post('/addNewRation', rationController.action);
-    rationRouter.post('/updateMaterialRation', rationController.action);
+    rationRouter.post('/addNewRation', ss_middleware.rationNumberChecking,rationController.action);
+    rationRouter.post('/updateMaterialRation', ss_middleware.rationNumberChecking,rationController.action);
     rationRouter.post('/addMultiRation', rationController.action);
     rationRouter.post('/getSameSectionRations', rationController.action);
     rationRouter.post('/getDefaultProgramID', rationController.action);

modules/pm/facade/pm_facade.js

@@ -32,7 +32,8 @@ module.exports={
     importProject:importProject,
     uploadToken:uploadToken,
     downLoadProjectFile:downLoadProjectFile,
-    importProcessChecking:importProcessChecking
+    importProcessChecking:importProcessChecking,
+    isTenderOverrun
 };
 
 
@@ -87,6 +88,7 @@ let qiniu = require("qiniu");
 let fs = require("fs");
 let path = require("path");
 let request = require("request");
+const systemSettingMiddleware = require('../../main/middleware/system_setting');
 
 let qiniu_config = {
     "AccessKey": "_gR1ed4vi1vT2G2YITGSf4_H0fJu_nRS9Tzk3T4z",
@@ -1218,6 +1220,12 @@ async function importProject(data,req,updateData) {
              result.error = 1;
              result.msg = `导入失败：您要导入的文件是由“${fileCompilationName}”导出，当前软件是“${curCompilationName}”，请选择正确的编制办法再进行操作！`;
          }else {
+            const tenders = mainData.projects.filter(item => item.projType === projectType.tender);
+            const tenderOverrun = await isTenderOverrun(tenders.length, req.session);
+            if (tenderOverrun) {
+                result.error = 1;
+                result.msg = `您创建的项目个数超限，请联系我们的客服人员，或者导出建设项目保存到本地备份，删除云上数据。`;
+            }
             let [projectIDMap,labourCoeFileIDMap,calcProgramFileIDMap] = await handleMainProjectDatas(mainData,updateData,req.session.sessionUser.id);
             if(datas.length > 1 ){
                 for(let i = 1;i<datas.length;i++){
@@ -1532,4 +1540,23 @@ function uploadToken() {
             domain: qiniu_config.Domain
         }
     return result
+}
+
+// 有些方法无法通过中间件就检查单位工程数量是否超限
+// 需要到具体的业务代码中进行判断
+// 这个方法就是具体业务代码中，需要检查单位工程数量是否超限用
+async function isTenderOverrun(tenderCount, session) {
+    const userID = session.sessionUser.id;
+    const compilation = session.sessionCompilation._id;
+    const compilationVersion = session.compilationVersion || '免费';
+    let systemSetting = session.systemSetting;
+    // 这种情况只有在刚上线此功能时会出现，不考虑时间差
+    if (!systemSetting) {
+        systemSetting = await systemSettingMiddleware.getSystemSetting();
+        session.systemSetting = systemSetting;
+    }
+    const type = compilationVersion.includes('免费') ? 'normal' : 'professional';
+    const limit = systemSetting[type].project;
+    const curTenderCount = await projectModel.count({userID, compilation, projType: 'Tender', '$or':[{deleteInfo: null}, {'deleteInfo.completeDeleted': false}]});
+    return tenderCount + curTenderCount > limit;
 }

modules/pm/routes/pm_route.js

@@ -6,6 +6,7 @@ import BaseController from "../../common/base/base_controller";
 let express = require('express');
 let pmController = require('./../controllers/pm_controller');
 const baseController = new BaseController();
+const systemMiddleware = require('../../main/middleware/system_setting');
 
 module.exports = function (app) {
 
@@ -34,7 +35,7 @@ module.exports = function (app) {
      req.body = {data: '{user_id: user_id, updateData: [{updateType, updateData}]}'}
      data.updateData.updateType: 1 of ['new', 'update', 'delete']
      */
-    pmRouter.post('/updateProjects', pmController.updateProjects);
+    pmRouter.post('/updateProjects', systemMiddleware.tenderNumberChecking, pmController.updateProjects);
     pmRouter.post('/updateMixDatas', pmController.updateMixDatas);
     pmRouter.post('/moveProject', pmController.moveProject);
 
@@ -43,7 +44,7 @@ module.exports = function (app) {
      data.updateData.updateType: 1 of ['update', 'copy']
      */
     pmRouter.post('/getProjectsByQuery', pmController.getProjectsByQuery);
-    pmRouter.post('/copyProjects', pmController.copyProjects);
+    pmRouter.post('/copyProjects', systemMiddleware.tenderNumberChecking, pmController.copyProjects);
     pmRouter.post('/renameProject', pmController.rename);
     pmRouter.post('/beforeOpenProject', pmController.beforeOpenProject);
     pmRouter.post('/getProject', pmController.getProject);

modules/users/controllers/login_controller.js

@@ -14,6 +14,8 @@ const SMS = require('../models/sms');
 const moment = require('moment');
 // 验证码
 const Captcha = require("../models/captcha");
+let mongoose = require("mongoose");
+let systemSettingModel = mongoose.model("system_setting");
 
 class LoginController {
 
@@ -99,6 +101,8 @@ class LoginController {
                     request.session.sessionCompilation = compilationData;
                     if(request.session.sessionUser.latest_used !== preferenceSetting.select_version) await userModel.updateLatestUsed(request.session.sessionUser.id,preferenceSetting.select_version);
                 }
+                let systemSetting = await systemSettingModel.findOne({}).lean();
+                request.session.systemSetting = systemSetting;
                 request.session.online_start_time = +new Date();
                 console.log(`${request.session.sessionUser.real_name}--id:${request.session.sessionUser.id}--登录了系统`);
                 if (preferenceSetting.login_ask === 1 || preferenceSetting.select_version === '') {
@@ -300,6 +304,8 @@ class LoginController {
             console.log(error);
             return response.json({error: 1, msg: error});
         }
+        let systemSetting = await systemSettingModel.findOne({}).lean();
+        request.session.systemSetting = systemSetting;
         request.session.online_start_time = +new Date();
         console.log(`${request.session.sessionUser.real_name}--id:${request.session.sessionUser.id}--登录了系统`);
         response.json({

modules/users/controllers/user_controller.js

@@ -57,9 +57,9 @@ class UserController extends BaseController {
                 real_name: request.body.real_name,
                 province: request.body.province,
                 company: request.body.company,
-                version: request.body.version,
-                company_type: request.body.company_type,
-                company_scale: request.body.company_scale,
+                version: request.body.version ? request.body.version : null,
+                company_type: request.body.company_type ? request.body.company_type : null,
+                company_scale: request.body.company_scale ? request.body.company_scale : null,
             };
             let sessionUser = request.session.sessionUser;
             // 切换验证场景

public/web/common_ajax.js

@@ -6,21 +6,21 @@ var CommonAjax = {
     get:function (url,data,cb,dataType) {
         $.get(url,data,cb,dataType)
     },
-    post: function (url, data, successCallback, errorCallback) {
+    post: function (url, data, successCallback, errorCallback, timeout = 50000) {
         $.ajax({
             type:"POST",
             url: url,
             data: {'data': JSON.stringify(data)},
             dataType: 'json',
             cache: false,
-            timeout: 50000,
+            timeout: timeout,
             success: function(result){
                 if (result.error === 0) {
                     if (successCallback) {
                         successCallback(result.data);
                     }
                 } else {
-                    alert('error: ' + result.message);
+                    alert(result.message);
                     if (errorCallback) {
                         errorCallback();
                     }

public/web/gljUtil.js

@@ -243,9 +243,9 @@ let gljUtil = {
     getFlag:function (b) {
         return _.find(b.flags,{"fieldName":"fixed"});
     },
-    getGLJPrice:function (glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil) {
+    getGLJPrice:function (glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil,ext) {
         let result = {};
-        result.marketPrice = this.getMarketPrice(glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil);
+        result.marketPrice = this.getMarketPrice(glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil,null,ext);
         if(this.calcPriceDiff(glj,calcOptions)==true){//计取价差
             result.basePrice = this.getBasePrice(glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil);
             result.adjustPrice = this.getAdjustPrice(glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil);
@@ -253,9 +253,10 @@ let gljUtil = {
             result.basePrice = result.marketPrice;
             result.adjustPrice = result.marketPrice;
         }
+
         return result;
     },
-    getMarketPrice:function (glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil,tenderCoe) {
+    getMarketPrice:function (glj,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil,tenderCoe,ext) {
         let price_decimal = decimalObj.glj.unitPrice;
         let price_hasM_decimal = decimalObj.glj.unitPriceHasMix?decimalObj.glj.unitPriceHasMix:decimalObj.glj.unitPrice;
         let quantity_decimal = decimalObj.glj.quantity;
@@ -273,6 +274,9 @@ let gljUtil = {
                 });
                 if(tem){
                     let priceData=this.getGLJPrice(tem,projectGLJDatas,calcOptions,labourCoeDatas,decimalObj,true,_,scMathUtil);
+                    if(ext && ext[tem.id] && this.isDef(ext[tem.id].marketPrice)){//在修改组成物的价格或消耗量时，影响了父工料机的价格，这时以父工料机的价格应当用组成物的新值来记算
+                        priceData.marketPrice = ext[tem.id].marketPrice;
+                    }
                     let temP = scMathUtil.roundForObj(priceData.marketPrice* priceCoe * scMathUtil.roundForObj(ratio.consumption,quantity_decimal),process_decimal);
                     p = scMathUtil.roundForObj(temP + p,process_decimal);
                 }
@@ -497,6 +501,15 @@ let gljUtil = {
     getElecCode:function () {
         return '3005002';
     },
+    setProperty:function(Obj,updateData) {
+        for(let ukey in updateData){
+            if(_.isObject(updateData[ukey]) && _.isObject(Obj[ukey])){
+                setProperty(Obj[ukey],updateData[ukey]);
+            }else {
+                Obj[ukey] = updateData[ukey];
+            }
+        }
+    },
     fixedFlag : {
         // 分部分项工程
         SUB_ENGINERRING: 1,

public/web/ration_glj_units.js

@@ -31,14 +31,14 @@ const rationAndGljUnits =[
     '部',
     '10t',
     '10m',
-    '10 m2',
-    '10 m3',
+    '10m2',
+    '10m3',
     '100m',
-    '100 m2',
-    '100 m3',
+    '100m2',
+    '100m3',
     '1000m',
-    '1000 m2',
-    '1000 m3',
+    '1000m2',
+    '1000m3',
     '10000块',
     '立方米',
     '平方米',

public/web/sheet/sheet_common.js

@@ -1235,5 +1235,11 @@ var sheetCommonObj = {
             return datas[srow];
         }
         return null;
+    },
+    // 延迟一段时间刷新表格，因为有的弹窗里面有表格，马上刷新可能会造成，弹窗界面还未完全显示完就完成了表格刷新，导致表格显示不完整
+    refreshWorkbookDelDefer(workbook, time) {
+    if (workbook) {
+        setTimeout(() => workbook.refresh(), time);
     }
 }
+}

web/building_saas/css/custom.css

@@ -392,6 +392,9 @@ input.text-right{
     color:#ECE0F5 !important;
     -webkit-text-stroke:.5px #ced4da;
 }
+.z-index-3000 {
+    z-index: 3000;
+}
 .text-ellipsis {
     overflow: hidden;
     white-space: nowrap;
@@ -408,3 +411,18 @@ input.text-right{
     padding-left: 0;
     padding-right: 0;
 }
+.middle-modal-width {
+    max-width: 650px;
+}
+.middle-modal-height {
+    height: 500px;
+}
+
+@media screen and (max-width: 1366px), (max-height: 768px) {
+    .middle-modal-width {
+        max-width: 500px;
+    }
+    .middle-modal-height {
+        height: 350px;
+    }
+}

web/building_saas/main/html/main.html

@@ -1094,7 +1094,8 @@
                             </div>
                         </div>
                 </div>
-                <div class="modal-footer">
+                <div class="modal-footer" style="position: relative;">
+                    <a href="/complementaryGlj" target="_blank" class="btn btn-primary" style="position: absolute; left: 20px">新增人材机</a>
                     <a href="javascript:void(0);" id="glj_selected_conf" class="btn btn-primary">确定</a>
                     <a href="javascript:void(0);" id="replace_next_btn" class="btn btn-primary">下一步</a>
                     <button type="button" id="componentsCacnel" class="btn btn-secondary" data-dismiss="modal">取消</button>

web/building_saas/main/js/models/composition.js

@@ -90,7 +90,7 @@ Composition.prototype.getCompositionByGLJ = function (glj) {
 Composition.prototype.deleteComposition = function (updateData,recode,pid,callback) {
     let me = this;
     $.bootstrapLoading.start();
-    CommonAjax.specialPost( '/glj/delete-ratio',{id: updateData.id},function (result){
+    CommonAjax.specialPost( '/glj/delete-ratio',{id: updateData.id,unitPrice:JSON.stringify(updateData.unitPrice)},function (result){
         me.updateConsumptionInCache(pid,recode,updateData,"delete");
         if(callback){
             callback();
@@ -117,9 +117,13 @@ Composition.prototype.updateConsumptionInCache = function (pid,recode,updateData
         projectObj.project.projectGLJ.quantityChangeMap[mglj.id] = mglj.quantity;
         let p_key = gljOprObj.getIndex(parentGlj,gljKeyArray);
         let m_list = projectObj.project.projectGLJ.datas.mixRatioMap[p_key];
+        let p_list = projectObj.project.projectGLJ.datas.mixRatioConnectData[con_key];
         if(operation == 'delete'){//如果是删除
             _.remove(parentGlj.ratio_data,{"id":updateData.id});
             _.remove(m_list,{"id":updateData.id});
+            _.remove(p_list,function (n) {
+                return n == p_key;
+            })
         }else {
             let subData = _.find(parentGlj.ratio_data,{"id":updateData.id});
             if(subData){
@@ -131,6 +135,11 @@ Composition.prototype.updateConsumptionInCache = function (pid,recode,updateData
                 m_ratioData.consumption = updateData.value;
             }
         }
+        if(updateData.unitPrice){
+            let elec  = projectObj.project.projectGLJ.getByID(updateData.unitPrice.projectGLJID);//得到电的数据
+            if(elec) gljUtil.updateProperty(elec.unit_price,updateData.unitPrice.doc);
+        }
+
         // 设置父级3个价格
         parentGlj.unit_price.market_price =  updateData.market_price;
        // parentGlj.unit_price.base_price =  updateData.base_price;

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

@@ -392,6 +392,13 @@ ProjectGLJ.prototype.calcAllMaterial = function (unitPriecs) {//当材料发生
     let sumUpdateMap = {};
     if(!_.isEmpty(sumFreightUpdateMap))sumUpdateMap["freight"] = {update:sumFreightUpdateMap};
     if(!_.isEmpty(sumOriginalUpdateMap))sumUpdateMap["price"] = {update:sumOriginalUpdateMap};
+    let ext = {};
+    for(let u of unitPriecs){//计算受影响的综合电价
+        ext[u.projectGLJID] = {marketPrice:u.doc.market_price}; //priceMap[unitPrice.projectGLJID] = unitPrice.doc.market_price;
+    }
+    let elecu = electrovalenceObj.clacNewElecPrice(ext);
+    if(elecu) unitPriecs.push(elecu);
+
     return [unitPriecs,sumUpdateMap];
 
 
@@ -583,8 +590,6 @@ ProjectGLJ.prototype.m_updateUnitPrice = function (datas) {//批量更新
 
     //刷新定额工料机
     gljOprObj.refreshView();
-    //项目单价文件修改标记
-    projectObj.project.projectInfo.changeMark = 'unitFile';
     //socket推送更新信息
     projectGljObject.onUnitFileChange(true);
 
@@ -1041,23 +1046,37 @@ ProjectGLJ.prototype.updatePrice = function (recode, updateField, newval,from,cb
         }
         newval = scMathUtil.roundForObj(newval,this.getPriceDecimal(glj));
         let data = {id: glj.unit_price.id, field: updateField, newval: newval,project_id:glj.project_id,unit_price_file_id:glj.unit_price.unit_price_file_id};
-        let callback = function (data) {
+
+        if(updateField == 'market_price' && (this.datas.mixRatioConnectData[gljUtil.getIndex(glj)] || glj.name == "电网电")){//计算是否有受影响的综合电价
+            let uobj = {};
+            uobj[glj.id] = {marketPrice:newval};
+            let ext =electrovalenceObj.clacNewElecPrice(uobj);
+            if(ext) data.ext = ext;
+        }
+        let callback = function (result) {
             if (updateField == 'base_price') {
                 glj.unit_price.base_price = newval;
                 me.setAdjustPrice(glj);
             } else {
                 glj.unit_price.market_price = newval;
             }
+            let elec_glj = null;
+            if(data.ext){
+                 elec_glj = _.find(projectGljs, {'id': data.ext.projectGLJID});
+                if(elec_glj) elec_glj.unit_price.market_price = data.ext.doc.market_price;
+            }
             //更新回传的父节点项目工料机价格
-           let gljs = me.getProjectGLJs(data);
+           let gljs = me.getProjectGLJs(result);
           //  me.refreshRationGLJPrice(glj);//刷新定额工料机列表的记录
-            projectObj.project.projectGLJ.loadCacheData();//更新工料机汇总缓存和显示
+            projectGljObject.refreshDataSheet();//更新工料机汇总缓存和显示
+            //projectObj.project.projectGLJ.loadCacheData();
             gljOprObj.showRationGLJSheetData();
             me.refreshTreeNodePriceIfNeed(glj);//刷新造价书中主树上的定额工料机;
             gljs.push(glj);
+            if(elec_glj) gljs.push(elec_glj);
             let nodes = me.getImpactRationNodes(gljs);//取到因为改变工料机价格而受影响的定额
             projectObj.project.calcProgram.calcNodesAndSave(nodes);//触发计算程序
-            projectGljObject.onUnitFileChange(data);
+            projectGljObject.onUnitFileChange(result);
             if(cb){
                 cb(gljs);
             }
@@ -1182,25 +1201,23 @@ ProjectGLJ.prototype.batchUpdateConsumption = function (updateData,updateMap,cal
     let me = this;
     $.bootstrapLoading.start();
     CommonAjax.post("/glj/batchUpdateConsumption", updateData, function (result) {
-        let parent = updateData[updateData.length - 1];
-        let parentGlj = me.getByConKey(parent.connect_key);
+        let unitPriceMap = {}, mu=null, parentID   = null;
         for(let u of updateData){
             if(u.type == 'mix_ratio'){
-                let tem = updateMap[u.query.id];
-                tem.record.consumption = u.doc.consumption;//更新组成物表格的缓存
-                let subData = _.find(parentGlj.ratio_data,{"id":u.query.id});
-                if(subData){
-                    subData.consumption = u.doc.consumption;
-                }
-                let m_list = me.datas.mixRatioMap[parent.connect_key];
-                let m_ratioData = _.find(m_list,{"id":u.query.id});
-                if(m_ratioData){
-                    m_ratioData.consumption = u.doc.consumption;
+                mu = u;
+            }else if(u.type == 'unitPrice'){
+                unitPriceMap[u.projectGLJID] = u.doc;
+                if(u.isParent) parentID = u.projectGLJID;
+            }
+        }
+        if(!_.isEmpty(unitPriceMap)){
+            for(let g of me.datas.gljList) {
+                if(unitPriceMap[g.id]){
+                    gljUtil.setProperty(g.unit_price,unitPriceMap[g.id]);
                 }
+                if(parentID == g.id) updateMixRatio(g,mu,me);
             }
         }
-        parentGlj.unit_price.market_price =  parent.market_price;
-        parentGlj.unit_price.base_price =  parent.base_price;
         me.calcQuantity();
 
         if(callback){
@@ -1211,7 +1228,19 @@ ProjectGLJ.prototype.batchUpdateConsumption = function (updateData,updateMap,cal
         $.bootstrapLoading.end();
     })
 
-
+   function updateMixRatio(parent,u,me) {
+       let tem = updateMap[u.query.id];
+       tem.record.consumption = u.doc.consumption;//更新组成物表格的缓存
+       let subData = _.find(parent.ratio_data,{"id":u.query.id});
+       if(subData){
+           subData.consumption = u.doc.consumption;
+       }
+       let m_list = me.datas.mixRatioMap[gljUtil.getIndex(parent)];
+       let m_ratioData = _.find(m_list,{"id":u.query.id});
+       if(m_ratioData){
+           m_ratioData.consumption = u.doc.consumption;
+       }
+   }
 };
 
 ProjectGLJ.prototype.pGljUpdate= function (data,callback) {

web/building_saas/main/js/models/ration.js

@@ -507,7 +507,7 @@ var Ration = {
                         clearInterval(interval);
                     }
                 }, 100);
-                CommonAjax.post("/ration/addMultiRation",{newDatas: newDatas},function (rstData) {
+                CommonAjax.post("/ration/addMultiRation",{projectID:me.project.ID(),newDatas: newDatas},function (rstData) {
                     let newNodes = [];
                     //更新缓存
                     for(let data of rstData){
@@ -604,7 +604,7 @@ var Ration = {
                     needInstall = project.Bills.isFBFX(billsNode);//在分部分项插入的定额才需要定额安装增加费
                 }
                 $.bootstrapLoading.start();
-                CommonAjax.post("/ration/addNewRation",{itemQuery:itemQuery,newData:newData,defaultLibID: rationLibObj.getDefaultStdRationLibID(),calQuantity:calQuantity,brUpdate:brUpdate,needInstall:needInstall},function (data) {
+                CommonAjax.post("/ration/addNewRation",{projectID:me.project.ID(),itemQuery:itemQuery,newData:newData,defaultLibID: rationLibObj.getDefaultStdRationLibID(),calQuantity:calQuantity,brUpdate:brUpdate,needInstall:needInstall},function (data) {
                     //更新缓存
                     me.datas.push(data.ration);
                     me.addSubListOfRation(data);

web/building_saas/main/js/views/calc_base_view.js

@@ -366,14 +366,10 @@ $(document).ready(function () {
         if(toggle === 'calcBase'){
             $('#tabCalcBase').tab('show');
         }
-        if(calcBaseView.workBook){
-            calcBaseView.workBook.refresh();
-        }
+        sheetCommonObj.refreshWorkbookDelDefer(calcBaseView.workBook, 100);
     });
     $('#tabCalcBase').on('shown.bs.tab', function () {
-        if(calcBaseView.workBook){
-            calcBaseView.workBook.refresh();
-        }
+        sheetCommonObj.refreshWorkbookDelDefer(calcBaseView.workBook, 100);
     });
 
     /*$('#qd-jsjs').on('hidden.bs.modal', function () {

web/building_saas/main/js/views/electrovalence_view.js

@@ -64,7 +64,7 @@ let electrovalenceObj = {
         sel.row =  oldData?_.findIndex(this.datas,{'ID':oldData.ID}):sel.row ;
         this.sheet.setSelection(sel.row==-1?0:sel.row,sel.col,sel.rowCount,sel.colCount);
     },
-    getElectrovalenceDatas:function () {
+    getElectrovalenceDatas:function (ext) {
         let datas = [];
         let pgljMap = {};
         let com_electrovalence = projectObj.project.projectGLJ.datas.com_electrovalence;
@@ -75,7 +75,7 @@ let electrovalenceObj = {
             for (let g of com_electrovalence.gljList){
                 let t = this.createNewElectrovalenceData(g);
                 let tg = pgljMap[gljUtil.getIndex(g)];
-                if(tg) gljOprObj.setGLJPrice(t,tg);
+                if(tg) gljOprObj.setGLJPrice(t,tg,false,ext);
                 datas.push(t);
             }
         }
@@ -98,9 +98,10 @@ let electrovalenceObj = {
         return t;
     },
 
-    calcPertElectrovalenceMarketPrice:function (datas) {
+    calcPertElectrovalenceMarketPrice:function (datas,ext) {
         let total = 0;
         for(let d of datas){
+            if(ext && ext[d.projectGLJID] && gljUtil.isDef(ext[d.projectGLJID].marketPrice)) d.marketPrice = ext[d.projectGLJID].marketPrice;
             if(d.name == "电网电"){
                 d.electPrice = d.marketPrice;
             }else {
@@ -114,6 +115,19 @@ let electrovalenceObj = {
         }
         this.total = scMathUtil.roundForObj(total,getDecimal("glj.unitPrice"));
         $("#electrovalenceLabel").text(`综合电价：${this.total}`);
+        return this.total;
+    },
+    clacNewElecPrice:function (ext) {
+        for(let g of projectObj.project.projectGLJ.datas.gljList){
+            if(g.code == gljUtil.getElecCode() && g.name == "电" && g.unit == "kW·h"){//更新电价
+                let datas  = this.getElectrovalenceDatas(ext);
+                if(datas.length > 0){
+                    let marketPrice = this.calcPertElectrovalenceMarketPrice(datas,ext);
+                    if(marketPrice && g.unit_price.market_price != marketPrice+'') return {projectGLJID:g.id,id:g.unit_price.id,'unit_price_file_id':g.unit_price.unit_price_file_id,doc:{'market_price':marketPrice+''}}
+                }
+            }
+        }
+        return null;
     },
     getElectrovalenceOptions:function () {
         return _.map(this.options,"name")

web/building_saas/main/js/views/fee_rate_view.js

@@ -145,6 +145,7 @@ var feeRateObject={
         let visibleMap = {};
         sheet.suspendPaint();
         sheet.suspendEvent();
+        sheet.setRowCount(data.length);
         for (let col = 0; col < setting.header.length; col++) {
             let hAlign = "left", vAlign = "center";
             if (setting.header[col].hAlign) {

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

@@ -733,14 +733,14 @@ var gljOprObj = {
         }
         return ration_gljs;
     },
-    setGLJPrice:function (data,glj,isRadio = false) {//isRadio 标记是否算组成物的价格
+    setGLJPrice:function (data,glj,isRadio = false,ext) {//isRadio 标记是否算组成物的价格
         let proGLJ =  projectObj.project.projectGLJ;
         let calcOptions=projectObj.project.projectInfo.property.calcOptions;
         let decimalObj = projectObj.project.projectInfo.property.decimal;
         let labourCoeDatas =  projectObj.project.labourCoe.datas;
         glj = glj?glj:_.find(proGLJ.datas.gljList, {'id': data.projectGLJID});
         if(glj){
-            let result = gljUtil.getGLJPrice(glj,proGLJ.datas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil);
+            let result = gljUtil.getGLJPrice(glj,proGLJ.datas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil,ext);
             data.marketPrice = result.marketPrice;
             data.basePrice =  result.basePrice;
             data.adjustPrice = result.adjustPrice;

web/building_saas/main/js/views/main_tree_col.js

@@ -676,7 +676,5 @@ $('#poj-set').on('hidden.bs.modal', function (e) {
 });
 
 $('#tab_display_setting').on('shown.bs.tab', function () {
-    if(colSettingObj.settingSpread){
-        colSettingObj.settingSpread.refresh();
-    }
+    sheetCommonObj.refreshWorkbookDelDefer(colSettingObj.settingSpread, 100);
 });

web/building_saas/main/js/views/project_glj_view.js

@@ -173,23 +173,31 @@ projectGljObject={
             });
         });
     },
-    showMixRatioData:function () {
-        let me = this,gljId = null,gljType = null;
+    getSelectedProjectGLJ:function () {
+        let me = this,data = null;
         let sheet = me.projectGljSpread.getActiveSheet();
-        let oldSel = me.mixRatioSheet.getSelections()[0];
         if(sheet.name() == 'projectGljSheet'){//projectGljSheet/materialSheet 工料机汇总和三材汇总表
             let sel = me.projectGljSheet.getSelections()[0];
             let srow = sel.row == -1||sel.row == ""?0:sel.row;
             if(me.projectGljSheetData.length>srow){
-                gljId = me.projectGljSheetData[srow].id;
-                gljType = me.projectGljSheetData[srow].type;
+                data = me.projectGljSheetData[srow];
             }
         }else if(sheet.name() == 'materialTreeSheet'){
             if(this.materialTree.selected){
-                gljId = this.materialTree.selected.data.id;
-                gljType = this.materialTree.selected.data.type;
+                data = this.materialTree.selected.data;
             }
         }
+        return data;
+    },
+
+    showMixRatioData:function () {
+        let me = this,gljId = null,gljType = null;
+        let oldSel = me.mixRatioSheet.getSelections()[0];
+        let projectGLJData = me.getSelectedProjectGLJ();
+        if(projectGLJData){
+            gljId = projectGLJData.id;
+            gljType = projectGLJData.type;
+        }
         if(compositionTypes.indexOf(gljType)==-1){//如果不是有组成物的类型，工料机id设置为空，组成物表设置为空
             gljId = null
         }
@@ -489,19 +497,28 @@ projectGljObject={
                 let basePrice = scMathUtil.roundForObj(sub.unit_price.base_price,getDecimal("process"));
                 let consumption =  updateMap[sub.mix_ratio_id]?updateMap[sub.mix_ratio_id].consumption:scMathUtil.roundForObj(sub.consumption,getDecimal("glj.quantity"));
                 parentMarketPrice = scMathUtil.roundForObj(marketPrice*consumption + parentMarketPrice,getDecimal("process"));
-                parentBasePrice = scMathUtil.roundForObj(basePrice*consumption + parentBasePrice,getDecimal("process"));
+               // parentBasePrice = scMathUtil.roundForObj(basePrice*consumption + parentBasePrice,getDecimal("process"));
             }
         }
-        parentBasePrice = scMathUtil.roundForObj(parentBasePrice,getDecimal("glj.unitPrice"));
+       // parentBasePrice = scMathUtil.roundForObj(parentBasePrice,getDecimal("glj.unitPrice"));
         parentMarketPrice = scMathUtil.roundForObj(parentMarketPrice,getDecimal("glj.unitPrice"));
-        updateData.push({type:'parent',connect_key:parentKey,base_price:parentBasePrice,market_price:parentMarketPrice,unit_price_file_id:unit_price_file_id});
+        let parentData = me.getSelectedProjectGLJ();
+        if(parentData){  //计算受影响的综合电价
+            let ext = {};
+            ext[parentData.id] = {marketPrice:parentMarketPrice};
+            let elecP = electrovalenceObj.clacNewElecPrice(ext);
+            if(elecP){
+                updateData.push({type:'unitPrice',projectGLJID:elecP.projectGLJID,query:{id:elecP.id},doc:elecP.doc});
+            }
+            updateData.push({type:'unitPrice',isParent:true,projectGLJID:parentData.id,query:{id:parentData.unit_price.id},doc:{market_price:parentMarketPrice}});//base_price:parentBasePrice,
+        }
+
+       // updateData.push({type:'parent',connect_key:parentKey,base_price:parentBasePrice,market_price:parentMarketPrice,unit_price_file_id:unit_price_file_id});
         projectGLJ.batchUpdateConsumption(updateData,updateMap,function () {
             //更新人材机汇总表
-            let parentSheet =  me.projectGljSpread.getActiveSheet();//三材汇总表和工料机汇总表
-            let prow = parentSheet.getActiveRowIndex();//取父机械或组成物的下标
-            let prowData = parentSheet.name() == 'projectGljSheet'?me.projectGljSheetData[prow]:me.materialTree.items[prow].data;
-            me.refreshParentData(prow,prowData.id);
-            me.onUnitFileChange(updateData);
+            me.refreshDataSheet();
+            me.onUnitFileChange(true);
+            gljOprObj.refreshView();
         });
 
     },
@@ -697,6 +714,7 @@ projectGljObject={
             delivery_address:glj.delivery_address,
             is_adjust_price:glj.is_adjust_price,
             ratio_data:glj.ratio_data,
+            unit_price:glj.unit_price,
             calcMaterial:glj.unit_price.calcMaterial,
             is_add:glj.unit_price.is_add,
             bgColour:'white',
@@ -776,67 +794,23 @@ projectGljObject={
             return false;
         }
         value = scMathUtil.roundToString(value,getDecimal("glj.quantity"));
-        let [parentMarketPrice, parentBasePrice] = me.getCompositionSumPrice('modify', row, value);
+        me.batchUpdateConsumption([{row:row,col:col,value}]);
+        //changeInfo.push({row:c.row,col:c.col,value:value});
+      /*  let [parentMarketPrice, parentBasePrice] = me.getCompositionSumPrice('modify', row, value);
         let updateData ={id: recode.mix_ratio_id, field: 'mix_ratio.' + dataCode, value: value, market_price: parentMarketPrice};//, base_price: parentBasePrice ---20190218 修改机械台班的组成物，仅重新计算机械预算价，定额价保持不变。
         let prow = parentSheet.getActiveRowIndex();//取父机械或组成物的下标
         let prowData = parentSheet.name() == 'projectGljSheet'?me.projectGljSheetData[prow]:me.materialTree.items[prow].data;
         composition.updateConsumption(updateData,recode,prowData.id,function (sid) {
-            /* if(parentSheet.name() == 'projectGljSheet'){ 之前是单行刷新，父工料机与组成物对应的工料机分开刷，发现这样比整个刷新慢所以先整个刷新，当以后数据量大的时候再测试
+            /!* if(parentSheet.name() == 'projectGljSheet'){ 之前是单行刷新，父工料机与组成物对应的工料机分开刷，发现这样比整个刷新慢所以先整个刷新，当以后数据量大的时候再测试
              me.refreshProjectGljRowByID(sid);
-             }*/
+             }*!/
             projectObj.project.projectGLJ.calcQuantity();
             me.refreshParentData(prow,prowData.id,sid);
             me.onUnitFileChange(recode);
-        });
+        });*/
     },
-    refreshParentData:function (row,pid,sid) {
-        let me = this;
-        let sheet = me.projectGljSpread.getActiveSheet();
-        let parantData = null;
-        if(sheet.name() == 'projectGljSheet'){
-            me.showProjectGljData();// me.refreshProjectGljRow(row)  这里原来是分开刷新的，现在整个统一刷新，先留着
-            //parantData = _.find();  //me.projectGljSheetData[row];
-        }else {
-            me.showMaterialTreeData();
-            //parantData = me.materialTree.items[row].data;
-        }
-        let pglj =  _.find(projectObj.project.projectGLJ.datas.gljList,{'id':pid});
-        parantData = pglj?me.getSheetDataByGLJ(pglj):null;
-        //projectObj.project.projectGLJ.datas.gljList
-
-        // 更新组成物缓存
-        projectObj.project.composition.loadData();
-        //先查找使用了父项目工料机的定额工料机
-        let updateNodes=[];
-        let ration_gljs = _.filter(projectObj.project.ration_glj.datas,{'projectGLJID':pid});
-        for(let rg of ration_gljs){
-            let node = projectObj.project.mainTree.getNodeByID(rg.rationID);
-            if(node){
-                updateNodes.push(node);
-            }
-        }
-        //或者是使用了父项目工料机的工料机类型的定额
-        let rations = _.filter(projectObj.project.Ration.datas,{'type':3,'projectGLJID':pid});
-        for(let r of rations){
-            let r_node = projectObj.project.mainTree.getNodeByID(r.ID);
-            if(r_node){
-                r_node.data.marketUnitFee = parantData?parantData.marketPrice:'';//parentMarketPrice;//这里用显示的价格
-                updateNodes.push(r_node);
-            }
-        }
-        if(sid){
-            let subRations = calcTools.getRationsByProjectGLJ(sid);
-            updateNodes = updateNodes.concat(subRations);
-        }
-        if(updateNodes.length>0){
-            projectObj.project.calcProgram.calcNodesAndSave(updateNodes,function () {
-                projectObj.mainController.refreshTreeNode(projectObj.project.mainTree.roots);
-                installationFeeObj.calcInstallationFee();//计算安装增加费
-            });
-        }
-        gljOprObj.refreshView();
-    },
-    onUnitFileChange:function (isInclude) { //include用来标计是否排除本身， true时，不排除本身
+    onUnitFileChange:function (isInclude,changeMark = 'unitFile') { //include用来标计是否排除本身， true时，不排除本身
+        if(isInclude == true) projectObj.project.projectInfo.changeMark = changeMark; //项目单价文件修改标记
         projectObj.project.markUpdateProject({projectID:projectObj.project.ID(),'unitFileID':socketObject.getUnitFileRoomID(),isInclude:isInclude},"unitFile",function(){
             //socket.emit('unitFileChangeNotify', JSON.stringify(data));
             socket.emit('unitFileChangeNotify', {projectID:projectObj.project.ID(),userID:userID,'unitFileID':socketObject.getUnitFileRoomID()});
@@ -846,15 +820,20 @@ projectGljObject={
         let me = this, deleteRecode = me.mixRatioData[row];
         let consumption = deleteRecode.consumption;
         let [parentMarketPrice, parentBasePrice] = me.getCompositionSumPrice('delete', row);
-        let parentSheet =  me.projectGljSpread.getActiveSheet();//三材汇总表和工料机汇总表
-        let prow= parentSheet.getActiveRowIndex();//取父机械或组成物的下标
-        let prowData = parentSheet.name() == 'projectGljSheet'?me.projectGljSheetData[prow]:me.materialTree.items[prow].data;
+        let prowData =  me.getSelectedProjectGLJ();
         let updateData = {id: deleteRecode.mix_ratio_id, field: 'mix_ratio.consumption' , value: 0, market_price: parentMarketPrice, base_price: parentBasePrice};
+        let ext = {};
+        ext[prowData.id] = {marketPrice:parentMarketPrice};
+        let elecP = electrovalenceObj.clacNewElecPrice(ext);
+        if(elecP){
+            updateData.unitPrice = {projectGLJID:elecP.projectGLJID,query:{id:elecP.id},doc:elecP.doc};
+        }
         projectObj.project.composition.deleteComposition(updateData,deleteRecode,prowData.id,function () {
             _.remove(me.mixRatioData,{"mix_ratio_id":deleteRecode.mix_ratio_id});
-            me.refreshParentData(prow,prowData.id);
+            //me.refreshParentData(prow,prowData.id);
+            me.refreshDataSheet();
             me.mixRatioSheet.deleteRows(row,1);
-            me.onUnitFileChange(deleteRecode);
+            me.onUnitFileChange(true);
         });
     },
     getCompositionSumPrice : function(scene, affectRow, newValue = 0) {

web/building_saas/main/js/views/project_property_bills_quantity_decimal.js

@@ -367,7 +367,7 @@ $(document).ready(function () {
     });
 
     $('#tab_poj-settings-bqDecimal').on('shown.bs.tab', function () {
-        billsDecimalView.workBook.refresh();
+        sheetCommonObj.refreshWorkbookDelDefer(billsDecimalView.workBook, 100);
     });
 
  /*   $('#property_ok').bind('click', function () {

web/building_saas/main/js/views/project_property_projFeature.js

@@ -473,6 +473,6 @@ $(document).ready(function () {
     });
 
     $('#tab_poj-settings-projFeature').on('shown.bs.tab', function () {
-        projFeatureView.workBook.refresh();
+        sheetCommonObj.refreshWorkbookDelDefer(projFeatureView.workBook, 100);
     });
 });

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

@@ -2141,7 +2141,9 @@ $('#downLevel').click(function () {
 $('#insertRation').click(function () {
     // projectObj.project.Ration.addNewRation(null,rationType.ration);
     // 连续点工具栏的插入定额按钮，显示树结构画线有问题。
-    projectObj.project.Ration.addNewRationFast(rationType.ration,projectObj.selectColAndFocus);
+   // projectObj.project.Ration.addNewRationFast(rationType.ration,projectObj.selectColAndFocus);
+    //2020-01-08  要限制定额数量，所以还是要用等回传信息的方式插入定额
+    projectObj.project.Ration.addNewRation(null,rationType.ration,projectObj.selectColAndFocus,false);
 });
 $('#upMove').click(function () {
     var controller = projectObj.mainController, project = projectObj.project;

web/building_saas/pm/html/project-management.html

@@ -382,7 +382,7 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <a href="javascript:void(0);" class="btn btn-primary" id="add-tender-confirm">确定</a>
+                <a href="javascript:void(0);" class="btn btn-primary" data-dismiss="modal" id="add-tender-confirm">确定</a>
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
             </div>
         </div>
@@ -484,7 +484,7 @@
 </div>
 <!--弹出复制到-->
 <div class="modal fade" id="copy-to-dialog" data-backdrop="static">
-    <div class="modal-dialog" style="max-width: 650px" role="document">
+    <div class="modal-dialog middle-modal-width" role="document">
         <div class="modal-content">
             <div class="modal-header">
                 <h5 class="modal-title">复制到...</h5>
@@ -494,7 +494,7 @@
             </div>
             <div class="modal-body">
                <!-- <ul id="treeDemo2" class="ztree"></ul>-->
-                <div style="height: 500px" id="copyToSpread"><!--sjs ID设置此div--->
+                <div class="middle-modal-height" id="copyToSpread"><!--sjs ID设置此div--->
                 </div>
             </div>
             <div class="modal-footer">
@@ -541,7 +541,6 @@
                             </div>
                         </div>
                         <!--从本建设项目中选择-->
-                        <label id="project_name">9.21<!--本建设项目名称--></label>
                         <div class="form-group" id = "fromProject">
                             <select class="form-control" id="currentOptions">
                                 <option>测试5单价文件</option><!--单价文件-->

web/building_saas/pm/js/pm_ajax.js

@@ -25,10 +25,11 @@ var GetAllProjectData = function (callback) {
 }
 // 更新数据到服务器
 var UpdateProjectData = function (updateData, callback, errCB) {
+    const tenderCount = updateData.filter(item => item.updateType === 'new' && item.updateData.projType === projectType.tender).length;
     $.ajax({
         type:"POST",
         url: '/pm/api/updateProjects',
-        data: {'data': JSON.stringify({"user_id": userID, "updateData": updateData})},
+        data: {'data': JSON.stringify({"user_id": userID, "updateData": updateData, tenderCount})},
         dataType: 'json',
         cache: false,
         timeout: 50000,
@@ -39,7 +40,7 @@ var UpdateProjectData = function (updateData, callback, errCB) {
                 if (errCB) {
                     errCB();
                 }
-                alert('error: ' + result.message);
+                alert(result.message);
             }
         },
         error: function(jqXHR, textStatus, errorThrown){

web/building_saas/pm/js/pm_newMain.js

@@ -364,7 +364,7 @@ const projTreeObj = {
             }
         },
         refreshSummary: {
-            name: "刷新当前项目造价",
+            name: "刷新项目造价",
             icon: 'fa-refresh',
             disabled: function () {
                 let selectedItem = projTreeObj.tree.selected;
@@ -400,6 +400,8 @@ const projTreeObj = {
                             if(selectedItem.children[0] .projType === projectType.project ) return false;//如果文件夹有子项，并且是建设项目，可用
                         }
                     }
+                } else {
+                    return false;
                 }
                 return true;
             },
@@ -643,7 +645,6 @@ const projTreeObj = {
         if(args.sheet.name() == "projectSheet"){
             await projTreeObj.initFileChangePage(projTreeObj.setting.header[args.col].dataCode);
             $("#mr_from").val(projTreeObj.setting.header[args.col].dataCode);
-            $("#project_name").text(projTreeObj.tree.selected.data.name);
             $('#m_replace_file').modal('show');
         }else if(args.sheet.name() == "replaceSheet"){
             let cellType = args.sheet.getCellType(args.row, args.col);
@@ -1295,6 +1296,7 @@ const projTreeObj = {
             datas.push(i.data);
         }
         me.copyTree  = pmTree.createNew(projTreeObj.setting, datas);
+        initNodesVisibility(me.copyTree.items, false);
         me.showTreeData(me.copyTree.items, me.copyToSetting, sheet);
         me.copySelected = null;
         let initSel = sheet.getSelections()[0] ? sheet.getSelections()[0] : {row: 0, rowCount: 1};
@@ -1588,6 +1590,9 @@ const projTreeObj = {
             parent = selectNode.parent;
             next = selectNode.nextSibling;
             updateData["update"] = {query:{ID:selectNode.id()}}
+        } else if (!selectNode) { // 默认在第一位
+            parent = selectNode ? selectNode.parent : projTreeObj.tree._root;
+            next = selectNode ? selectNode.nextSibling : projTreeObj.tree.firstNode();
         }
         updateData["self"] ={ParentID:parent.id(),NextSiblingID:next?next.id():-1};
         return updateData;
@@ -1601,6 +1606,13 @@ const projTreeObj = {
 };
 
 $(document).ready(function() {
+    // 单位工程超限提示后，弹出客服列表
+    $('#hintBox_form').on('hide.bs.modal', function () {
+        const text = $('#hintBox_caption').text();
+        if (text === '您创建的项目个数超限，请联系我们的客服人员，或者导出建设项目保存到本地备份，删除云上数据。') {
+            $('#customerService').click();
+        } 
+    });
     //绑定项目管理的升降级、上下移按钮事件
     projTreeObj.loadBtn();
     $('#sideTab').find('li').click(function () {
@@ -2013,12 +2025,12 @@ $(document).ready(function() {
         projectMap['copy'] = {document:projectData};
         $("#copy-to-dialog").modal('hide');
         $.bootstrapLoading.start();
-        CommonAjax.post('/pm/api/copyProjects',{projectMap:projectMap,user_id: userID},function (result) {
+        CommonAjax.post('/pm/api/copyProjects',{projectMap:projectMap,user_id: userID, tenderCount: 1},function (result) {
             let newNode = projTreeObj.insert(result['copy'].document,parent,next);
             let refreshNodes = projTreeObj.calEngineeringCost(newNode);
             projTreeObj.refreshNodeData(refreshNodes);
             $.bootstrapLoading.end();
-        })
+        }, null, 1000 * 60 * 5);
 
     });
     $('#selectSameTypeProject').click(function(){
@@ -2163,7 +2175,7 @@ function prepareInitialTimer() {
 }
 
 // 初始化节点可见性，默认收起至建设项目层
-function initNodesVisibility(sheet, nodes, visible) {
+function initNodesVisibility(nodes, visible) {
     function recurSetVisible(nodes, visible) {
         nodes.forEach(node => {
             node.visible = visible;
@@ -2199,7 +2211,7 @@ function initProjects(callback) {
             sheet.name('projectSheet');
             sheetCommonObj.spreadDefaultStyle(projTreeObj.workBook);
             projTreeObj.sumEngineeringCost();
-            initNodesVisibility(sheet, projTreeObj.tree.items, false);
+            initNodesVisibility(projTreeObj.tree.items, false);
             projTreeObj.showTreeData(projTreeObj.tree.items, projTreeObj.setting, sheet);
             //初始选择
             const initSel = sheet.getSelections()[0] ? sheet.getSelections()[0] : {row: 0, rowCount: 1};

web/building_saas/pm/js/pm_share.js

@@ -954,11 +954,11 @@ const pmShare = (function () {
             copyMap.copy = {document: copyData};
             $('#copyShare').modal('hide');
             $.bootstrapLoading.start();
-            CommonAjax.post('/pm/api/copyProjects', {projectMap: copyMap, user_id: userID}, function (rstData) {
+            CommonAjax.post('/pm/api/copyProjects', {projectMap: copyMap, user_id: userID, tenderCount: 1}, function (rstData) {
                 $.bootstrapLoading.end();
             }, function () {
                 $.bootstrapLoading.end();
-            });
+            },  1000 * 60 * 5);
         });
 
     }

web/common/html/header.html

@@ -3,7 +3,7 @@
     <% if(controller === 'boot' || controller === 'pm'){ %>
     <!--<a style="text-decoration: none" href="javascript:void(0);" class="header-logo">-->
     <% }else { %>
-    <div class="mx-2"><a href="/pm" class="btn btn-sm" data-toggle="tooltip" title="返回项目管理"><i class="fa fa-angle-left" style="font-size:24px"></i></a></div>
+    <div class="mx-2"><a href="/pm" class="btn btn-sm text-white" data-toggle="tooltip" title="返回项目管理"><i class="fa fa-angle-left" style="font-size:24px"></i></a></div>
         <!--<a style="text-decoration: none" href="/pm" class="header-logo">-->
     <% } %>
     <div class="header-logo">
@@ -18,7 +18,7 @@
         <!--大屏菜单-->
         <ul class="nav navbar-nav" id="fluid-menu">
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" id="link_userName"><%= sessionUser.company ? sessionUser.company : sessionUser.real_name ? sessionUser.real_name : sessionUser.mobile %></a>
+                <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" id="link_userName"><%= (sessionUser.company && sessionUser.real_name) ? (sessionUser.company + '（' + sessionUser.real_name + '）') : sessionUser.company ? sessionUser.company : sessionUser.real_name ? sessionUser.real_name : sessionUser.mobile %></a>
                 <div class="dropdown-menu dropdown-menu-right">
                     <a class="dropdown-item" href="/user/info" target="_blank">企业资料</a>
                     <a class="dropdown-item" href="/user/safe" target="_blank">账号安全</a>
@@ -67,7 +67,7 @@
                 </a>
                 <div class="dropdown-menu dropdown-menu-right">
                     <div class="dropdown dropleft dropdown-submenu">
-                        <button class="dropdown-item dropdown-toggle" type="button" data-toggle="dropdown"><%= sessionUser.company ? sessionUser.company : sessionUser.real_name ? sessionUser.real_name : sessionUser.mobile %></button>
+                        <button class="dropdown-item dropdown-toggle" type="button" data-toggle="dropdown"><%= (sessionUser.company && sessionUser.real_name) ? (sessionUser.company + '（' + sessionUser.real_name + '）') : sessionUser.company ? sessionUser.company : sessionUser.real_name ? sessionUser.real_name : sessionUser.mobile %></button>
                         <div class="dropdown-menu">
                             <a class="dropdown-item" href="/user/info" target="_blank">企业资料</a>
                             <a class="dropdown-item" href="/user/safe" target="_blank">账号安全</a>
@@ -171,7 +171,7 @@
 </div>
 <!--激活产品 & 售后服务 & 联系客服-->
 <!--办事处客服列表-->
-<div class="modal fade" id="activ" data-backdrop="static" style="display: none;" aria-hidden="true">
+<div class="modal fade z-index-3000" id="activ" data-backdrop="static" style="display: none;" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
@@ -288,4 +288,4 @@
 <script type="text/javascript" src="/public/web/headerOpr.js"></script>
 <script type="text/javascript" src="/public/common_util.js"></script>
 <script type="text/javascript" src="/lib/jquery-editable-select/jquery.editable-select.min.js"></script>
-<!-- endinject -->
+<!-- endinject -->

web/users/html/user-buy.html

@@ -51,7 +51,7 @@
                             <div class="col-sm-4 mb-5">
                                 <div class="card free-version">
                                   <div class=" card-body">
-                                    <h3 class="card-title">免费版 </h3>
+                                    <h3 class="card-title text-white">免费版 </h3>
                                       <p class="card-text">
                                     <!--  <ul class="pl-3">
                                           <li>只可创建 50 个单位工程</li>
@@ -76,7 +76,7 @@
                             <div class="col-sm-4 mb-5">
                                 <div class="card pro-version">
                                   <div class=" card-body">
-                                    <h3 class="card-title">专业版</h3>
+                                    <h3 class="card-title text-white">专业版</h3>
                                       <p class="card-text">
                                       <!--<ul class="pl-3">
                                           <li>创建单位工程无限制</li>