Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/YangHuCost

modules/all_models/ration.js

@@ -16,7 +16,8 @@ var rationAssItemSchema = mongoose.Schema({
     decimal: Number,
     carryBit: String,
     minValue: String,
-    maxValue: String
+    maxValue: String,
+    isAdjust:Number //0不调整，1调整
 }, { _id: false });
 
 // 定额、量价、工料机定额 合并存储

modules/complementary_glj_lib/controllers/gljController.js

@@ -40,7 +40,7 @@ class GljController extends BaseController{
             gljLibId: gljLibId,
             compilationId: sessionCompilation._id,
             compilationName: sessionCompilation.name,
-            versionName: `纵横建筑云计价(${req.session.compilationVersion})`,
+            versionName: `纵横公路养护云版(${req.session.compilationVersion})`,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
             overWriteUrl: overWriteUrl,
         });

modules/complementary_ration_lib/controllers/compleViewController.js

@@ -48,7 +48,7 @@ class CompleViewController extends BaseController{
             redirectInstallation: redirectInstallation,
             gljLibId: gljLibId,
             compilationName: req.session.sessionCompilation.name,
-            versionName: `纵横建筑云计价(${req.session.compilationVersion})`,
+            versionName: `纵横公路养护云版(${req.session.compilationVersion})`,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         });
     }
@@ -65,7 +65,7 @@ class CompleViewController extends BaseController{
             redirectInstallation: redirectInstallation,
             gljLibId: gljLibId,
             compilationName: req.session.sessionCompilation.name,
-            versionName: `纵横建筑云计价(${req.session.compilationVersion})`,
+            versionName: `纵横公路养护云版(${req.session.compilationVersion})`,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         });
     }
@@ -82,7 +82,7 @@ class CompleViewController extends BaseController{
             redirectInstallation: redirectInstallation,
             gljLibId: gljLibId,
             compilationName: req.session.sessionCompilation.name,
-            versionName: `纵横建筑云计价(${req.session.compilationVersion})`,
+            versionName: `纵横公路养护云版(${req.session.compilationVersion})`,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         });
     }
@@ -98,7 +98,7 @@ class CompleViewController extends BaseController{
             redirectGlj: redirectGlj,
             redirectCoe: redirectCoe,
             compilationName: req.session.sessionCompilation.name,
-            versionName: `纵横建筑云计价(${req.session.compilationVersion})`,
+            versionName: `纵横公路养护云版(${req.session.compilationVersion})`,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         });
     }

modules/main/facade/ration_facade.js

@@ -602,6 +602,7 @@ function createRationAss(std) {
         for(let i=0;i<std.rationAssList.length;i++){
             let ass = std.rationAssList[i];
             ass._doc.actualValue = ass.stdValue;
+            ass._doc.isAdjust = 0;
             if(_.isString(ass._doc.assistCode)) ass._doc.assistCode = ass._doc.assistCode.replace("\n","");
             rationAssList.push(ass);
         }

modules/main/routes/main_route.js

@@ -28,7 +28,7 @@ module.exports =function (app) {
                         userID: req.session.sessionUser.id,
                         projectData: projectData,
                         compilationName: req.session.sessionCompilation.name,
-                        versionName: `纵横建筑云计价(${req.session.compilationVersion})`,
+                        versionName: `纵横公路养护云版(${req.session.compilationVersion})`,
                         projectReadOnly: projectReadOnly,
                         projectCooperate: projectCooperate,
                         LicenseKey:config.getLicenseKey(process.env.NODE_ENV),

modules/pm/controllers/pm_controller.js

@@ -274,7 +274,7 @@ module.exports = {
             rationValuation: JSON.stringify(rationValuation),
             engineeringList: JSON.stringify(engineering.List),
             compilationName: sessionCompilation.name,
-            versionName: `纵横建筑云计价(${request.session.compilationVersion})`,
+            versionName: `纵横公路养护云版(${request.session.compilationVersion})`,
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };
 

modules/ration_glj/facade/glj_calculate_facade.js

@@ -284,6 +284,7 @@ function getContent(coes) {
 }
 
 function calculateTimes(ass){
+    if(ass.isAdjust == 0) return 0;//打勾辅助定额才计算
     let times =(ass.actualValue-ass.stdValue)/ass.stepValue;
     let r = false;
     if(times<0){

modules/users/controllers/boot_controller.js

@@ -49,7 +49,7 @@ class BootController extends BaseController {
             companyScaleList: userModel.companyScale,
             compilation: request.params.compilation,
             compilationName: request.session.sessionCompilation.name,
-            versionName: `纵横建筑云计价(${request.session.compilationVersion})`,
+            versionName: `纵横公路养护云版(${request.session.compilationVersion})`,
         };
         response.render('users/html/login-infoinput', renderData);
     }

modules/users/controllers/user_controller.js

@@ -39,7 +39,7 @@ class UserController extends BaseController {
             companyTypeList: userModel.companyType,
             companyScaleList: userModel.companyScale,
             compilationName: request.session.sessionCompilation.name,
-            versionName: `纵横建筑云计价(${request.session.compilationVersion})`,
+            versionName: `纵横公路养护云版(${request.session.compilationVersion})`,
         };
         response.render('users/html/user-info', renderData);
     }
@@ -119,7 +119,7 @@ class UserController extends BaseController {
             logList: logList,
             pages: pageData,
             compilationName: request.session.sessionCompilation.name,
-            versionName: `纵横建筑云计价(${request.session.compilationVersion})`,
+            versionName: `纵横公路养护云版(${request.session.compilationVersion})`,
         };
         response.render('users/html/user-safe', renderData);
     }
@@ -162,7 +162,7 @@ class UserController extends BaseController {
             userData: userData,
             compilationList: compilationList,
             compilationName: request.session.sessionCompilation.name,
-            versionName: `纵横建筑云计价(${request.session.compilationVersion})`,
+            versionName: `纵横公路养护云版(${request.session.compilationVersion})`,
         };
         response.render('users/html/user-buy', renderData);
     }
@@ -195,7 +195,7 @@ class UserController extends BaseController {
             preferenceSetting: preferenceSetting,
             compilationList: compilationList,
             compilationName: request.session.sessionCompilation.name,
-            versionName: `纵横建筑云计价(${request.session.compilationVersion})`,
+            versionName: `纵横公路养护云版(${request.session.compilationVersion})`,
         };
         response.render('users/html/user-set', renderData);
     }

public/web/tools_const.js

@@ -10,8 +10,8 @@
 //允许使用的工料机类型：人工、普通材料、混凝土、砂浆、配合比、商品混凝土、商品砂浆、机械台班、机械组成物、机上人工、主材、设备
 let allowGljType = [1, 201, 202, 203, 204, 205, 206, 301, 302, 303, 4, 5];
 
-//允许含有组成物的工料机类型：混凝土、砂浆、配合比、机械台班、主材
-let allowComponent = [202, 203, 204, 301, 4];
+//允许含有组成物的工料机类型：混凝土、砂浆、配合比、机械台班、机械组成物
+let allowComponent = [202, 203, 204, 301, 302];
 //可以作为组成物的工料机类型：普通材料、机械组成物、机上人工、主材
 let componentType = [201, 302, 303, 4];
 //允许含有组成物的机械工料机类型：机械台班

web/building_saas/complementary_glj_lib/html/tools-gongliaoji.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>人材机库编辑-纵横建筑云计价</title>
+    <title>人材机库编辑-纵横公路养护云版</title>
     <!--inject:css-->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css" type="text/css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css" type="text/css">

web/building_saas/complementary_glj_lib/js/components.js

@@ -77,8 +77,8 @@ let componentOprObj = {
         let that = repositoryGljObj, me = componentOprObj;
             for(let i = 0; i < gljList.length; i++){
                 if(machineAllowComponent.includes(that.currentGlj.gljType) && machineComponent.includes(gljList[i].gljType) ||
-                    materialAllowComponent.includes(that.currentGlj.gljType) && gljList[i].gljType === 201 ||
-                    that.currentGlj.gljType === 4 && gljList[i].gljType === 4 && (!gljList[i].component || gljList[i].component.length === 0) && gljList[i].ID !== that.currentGlj.ID){
+                    materialAllowComponent.includes(that.currentGlj.gljType) && gljList[i].gljType === 201||
+                    that.currentGlj.gljType === 302 && gljList[i].gljType === 201){//机械组成物，应可选择无组成物的普通材料
                     //去除与已添加的组成物重复的条目
                     let isExist = false;
                     for(let j = 0; j < that.currentComponent.length; j++){

web/building_saas/complementary_glj_lib/js/gljComponent.js

@@ -81,10 +81,11 @@ let gljComponentOprObj = {
                     //控制按钮是否可用
                     let insertDis = false,
                         delDis = false;
-                    if(!(that.currentGlj && allowComponent.includes(that.currentGlj.gljType)) || (that.currentGlj.gljType === 4 && that.isComponent(that.currentGlj.ID, that.stdGljList.concat(that.complementaryGljList)))){
+                    if(!(that.currentGlj && allowComponent.includes(that.currentGlj.gljType))){
                         insertDis = true;
                     }
-                    if(!that.currentGlj || typeof that.currentComponent === 'undefined' || (typeof that.currentComponent !== 'undefined' && target.row >= that.currentComponent.length)){//右键定位在有组成物的行，删除键才显示可用
+                    if(!that.currentGlj || typeof that.currentComponent === 'undefined' ||
+                        (typeof that.currentComponent !== 'undefined' && target.row >= that.currentComponent.length)){//右键定位在有组成物的行，删除键才显示可用
                         delDis = true;
                     }
                     return {

web/building_saas/complementary_ration_lib/html/anzhuang.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>定额库编辑器-纵横建筑云计价</title>
+    <title>定额库编辑器-纵横公路养护云版</title>
     <!--inject:css-->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/lib/spreadjs/sheets/css/gc.spread.sheets.sc.css" type="text/css">

web/building_saas/complementary_ration_lib/html/dinge.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>定额库编辑器-纵横建筑云计价</title>
+    <title>定额库编辑器-纵横公路养护云版</title>
     <!--inject:css-->
     <link rel="stylesheet" href="/lib/jquery-ui/jquery-ui.css" type="text/css">
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">

web/building_saas/complementary_ration_lib/html/fuzhu.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>定额库编辑器-纵横建筑云计价</title>
+    <title>定额库编辑器-纵横公路养护云版</title>
     <!--inject:css-->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">

web/building_saas/complementary_ration_lib/html/gongliao.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>定额库编辑器-纵横建筑云计价</title>
+    <title>定额库编辑器-纵横公路养护云版</title>
     <!--inject:css-->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">

web/building_saas/complementary_ration_lib/html/main.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>定额库编辑器-纵横建筑云计价</title>
+    <title>定额库编辑器-纵横公路养护云版</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
    <!-- <link rel="stylesheet" href="css/bootstrap/themes.css">-->
     <link rel="stylesheet" href="/web/building_saas/css/main.css">

web/building_saas/css/custom.css

@@ -54,7 +54,7 @@ legend.legend{
 }
 
 .filterType ul{
-    width: 110px;
+    width: 98px;
 }
 .a_color{
     color: #007bff;

web/building_saas/glj/html/project_glj.html

@@ -26,7 +26,7 @@
             </ul>
         </div>
         <div class="main-content col p-0 " id="project-glj-main" style="overflow: hidden">
-            <div class="top-content" id="projectGljTop">
+            <div class="top-content" id="projectGljTop" style="overflow: hidden;">
                 <div class="main-data-top" style="width: 100% " id="project_glj_sheet">
                 </div>
             </div>

web/building_saas/main/html/main.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title><%= projectData.name !== undefined ? projectData.name : '造价书' %>-纵横建筑云计价</title>
+    <title><%= projectData.name !== undefined ? projectData.name : '造价书' %>-纵横公路养护云版</title>
 
 
     <link rel="stylesheet" href="/lib/jquery-ui/jquery-ui.css" type="text/css">

web/building_saas/main/js/models/ration_ass.js

@@ -98,33 +98,36 @@ var ration_ass = {
             updateData.push(newobj);
             return updateData;
         };
-        ration_ass.prototype.updateActualValue=function(assList,index,newVal){
+        ration_ass.prototype.updateActualValue=function(assList,index,newVal,isAdjust = 1){//修改实际值默认打勾
             let me = this;
             var selected = projectObj.project.mainTree.selected;
-            assList[index].actualValue=newVal;
+            let newList = _.cloneDeep(assList);
+            if(gljUtil.isDef(newVal))newList[index].actualValue=newVal;
+            newList[index].isAdjust = isAdjust;
             var rationname = selected.data.name;
             if(selected.data.hasOwnProperty('caption')){
-                 rationname = selected.data.caption.replace('%s',newVal);
+                if(isAdjust == 1) newVal =  newList[index].stdValue;//如果是取消打勾，名字恢复成实际值
+                rationname =  selected.data.caption.replace('%s',newVal);
             }
             var query = {
-                'ration':selected.data,
-                'editAss':assList[index],
+                'ration':{projectID:selected.data.projectID,ID:selected.data.ID},
+                'editAss':newList[index],
                 'editIndex':index
             };
             var doc ={
-                rationAssList:assList,
+                rationAssList:newList,
                 name:rationname
             };
 
             var updateData = this.getUpdateData('ut_update',query,doc);
             $.bootstrapLoading.start();
             CommonAjax.post("/ration/updateRationAss",updateData[0],function (result) {
+                //更新缓存
+                selected.data.rationAssList = newList;
                 $.bootstrapLoading.end();
                 zmhs_obj.refreshAfterUpdate(result);
-                zmhs_obj.showAssData();
+                zmhs_obj.showDatas();
             })
-           // project.pushNow('updateRationAss',[this.getSourceType()],updateData);
-
         };
         return new ration_ass(project);
     }

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

@@ -600,11 +600,14 @@ var feeRateObject={
                          }
                          if(gljUtil.isDef(ltRate)&&gljUtil.isDef(gtRate)){//已经找到前后的值了
                              let step = scMathUtil.roundForObj(gtRate.value - ltRate.value,getDecimal("process"))
-                             let total =  parseInt(gtRate.ID) - parseInt(ltRate.ID)
-                             doc.rate =getRateByStep(ltRate.value,total,parseFloat(value) - parseInt(ltRate.ID),step);
+                             let total =  parseFloat(gtRate.ID) - parseFloat(ltRate.ID)
+                             doc.rate =getRateByStep(ltRate.value,total,parseFloat(value) - parseFloat(ltRate.ID),step);
                          }else if(gljUtil.isDef(ltRate)&&gtRate == null){//说明是超出了选项的最大值
-                             let share = parseFloat(value) - parseInt(ltRate.ID);//超出了多少
+                             let share = parseFloat(value) - parseFloat(ltRate.ID);//超出了多少
                              doc.rate = getRateByStep(ltRate.value,temP.step,share,temP.amount)
+                         }else if(gljUtil.isDef(gtRate)&&ltRate==null){//说明是只有一个选项，且这个选项比输入的值大
+                             let step =  parseFloat(gtRate.value)- 0;
+                             doc.rate = getRateByStep(0,gtRate.value,value,step)
                          }
                      }
                      if(isDef(doc.rate)){
@@ -628,7 +631,7 @@ var feeRateObject={
                 $.bootstrapLoading.end();
             })
         }
-        function getRateByStep(ltValue,total,share,step) {
+        function getRateByStep(ltValue,total,share,step) { //min值 ，计算值的总区间， 区间中占比，步长
             let p = scMathUtil.roundForObj(share/total,getDecimal("process"));
             let a = scMathUtil.roundForObj(step * p,getDecimal("process")) ;
             return scMathUtil.roundForObj(ltValue + a,getDecimal("feeRate"))

web/building_saas/main/js/views/sub_fee_rate_views.js

@@ -98,13 +98,11 @@ var subRateObject={
         let options=[];
         if(subRate.isSub == true) return;//是树节点的子节点;
         for(let op of subRate.optionList){
-            //options.push({text:op.name,value:op.value});
-            options.push(op.name);
+           options.push(op.name);
         }
         let dynamicCombo = sheetCommonObj.getDynamicCombo();//new GC.Spread.Sheets.CellTypes.ComboBox();
         dynamicCombo.items(options);
         if(subRate.editable == true) dynamicCombo.editable(true);
-        //dynamicCombo.editorValueType(GC.Spread.Sheets.CellTypes.EditorValueType.value);
         sheet.setCellType(row, col, dynamicCombo, GC.Spread.Sheets.SheetArea.viewport);
     },
     addComboboxOption:function (datas) {

web/building_saas/main/js/views/zmhs_view.js

@@ -19,11 +19,13 @@ let zmhs_obj = {
         },
         getText:{
             forContent:function (item) {//所选人材机，内容和条件互换位置
-               if(gljUtil.isDef(item.option_codes)&&item.option_codes!=""){
-                   return item.name;
-               }else {
-                   return item.content;
-               }
+                if(gljUtil.isDef(item.option_codes)&&item.option_codes!=""){
+                    return item.name;
+                }else if(item.assistCode &&item.assistCode!="" ){//是辅助定额行，显示实际值
+                    return item.actualValue;
+                } else {
+                    return item.content;
+                }
             },
             forName:function (item) {
                 if(gljUtil.isDef(item.select_code)&&item.select_code!=""){
@@ -55,6 +57,7 @@ let zmhs_obj = {
     assSpread:null,
     assSheet:null,
     assSheetData: [],
+    assFirstIndex:0,
     assSetting: {
         header: [
             {headerName: "调整名称", headerWidth: 100, dataCode: "name", dataType: "String"},
@@ -78,7 +81,7 @@ let zmhs_obj = {
             this.coeSheet = this.coeSpread.getSheet(0);
             sheetCommonObj.initSheet(this.coeSheet, this.coeSetting, 30);
             this.coeSheet.name('ration_coe');
-            this.coeSheet.bind(GC.Spread.Sheets.Events.CellClick, this.onCoeCellClick);
+            //this.coeSheet.bind(GC.Spread.Sheets.Events.CellClick, this.onCoeCellClick);  配合自定义系数使用，现在自定义系数不在这显示了
             this.coeSpread.bind(GC.Spread.Sheets.Events.ButtonClicked, this.onButtonClick);
             this.coeSheet.bind(GC.Spread.Sheets.Events.ValueChanged,this.onCoeValueChange);
             this.coeSheet.bind(GC.Spread.Sheets.Events.SelectionChanged, function (e,args) {
@@ -120,6 +123,8 @@ let zmhs_obj = {
             let ration = selected.data;
             coeList = ration_coe.getCoeByRationID(ration.ID);
             _.remove(coeList,{"coeID":-1})//2018-12-24 新需求，把自定义乘系数分离出来，这里排除自定义乘系数行
+            this.assFirstIndex = coeList.length;//辅助定额的起始下标
+            coeList = coeList.concat(this.getAssList(node))  //2019-01-23 新需求，将辅助定额合并到一个表显示
         }
         this.coeSheet.setRowCount(0);
         sheetCommonObj.showData(this.coeSheet, this.coeSetting,coeList);
@@ -130,6 +135,8 @@ let zmhs_obj = {
                 if(gljUtil.isDef(coeList[i].option_codes)&&coeList[i].option_codes!=""){
                     this.getComboBoxForCodes(coeList[i],i);//设置可选类型的下拉框
                     //  sheet.setValue(row, col, val, ch);
+                } else if(coeList[i].assistCode && coeList[i].assistCode !=''){//是辅助定额列
+                    this.coeSheet.getCell(i, 2, GC.Spread.Sheets.SheetArea.viewport).locked(false);
                 } else if(coeList[i].coeID == -1){ //自定义系数列
                     this.coeSheet.getCell(i, 1, GC.Spread.Sheets.SheetArea.viewport).locked(false);
                     this.coeSheet.setCellType(i, 1, sheetCommonObj.getCustomerCoeCellType(this.generateHtmlString,this.bindCusEditorValue,this.updateCusCoeAfterEditor), GC.Spread.Sheets.SheetArea.viewport);
@@ -189,6 +196,12 @@ let zmhs_obj = {
             disableSpread(this.assSpread);
         }
     },
+    getAssList:function (node) {
+        let selected = node?node:projectObj.project.mainTree.selected;
+        let assList = selected&&selected.data.rationAssList ? selected.data.rationAssList : [];
+        this.assSheetData = assList;
+        return assList;
+    },
     refreshAfterUpdate:function(result,reload){
         let ration_glj = projectObj.project.ration_glj;
         let calcInstall = false;//是否记录安装增加费
@@ -374,7 +387,7 @@ let zmhs_obj = {
             args.sheet.getCell(args.row, args.col).value(newval);
         }
         let recode = me.coeSheetData[args.row];
-        projectObj.project.ration_coe.adjustCoeClick(recode, newval);
+        recode.assistCode && recode.assistCode != "" ? me.adjustAssClick(args,newval) : projectObj.project.ration_coe.adjustCoeClick(recode, newval);
     },
     generateHtmlString: function (context,cellRect,$editor) {//这里要改成动态的了，根据自定义系数内容生成对应的输入框
         let me = zmhs_obj;
@@ -412,6 +425,8 @@ let zmhs_obj = {
         let recode = zmhs_obj.coeSheetData[args.row];
         if(gljUtil.isDef(recode.option_codes)&&recode.option_codes!=""&& fieldID == 'name'){//说明是选择了下拉框
             projectObj.project.ration_coe.adjustCoeClick(recode, 1,{'select_code':args.newValue});
+        }else if(recode.assistCode &&recode.assistCode!=""){//编辑的是辅助定额
+            zmhs_obj.updateRationAss({editingText:args.newValue,row:args.row - zmhs_obj.assFirstIndex})//转换一下
         }
     },
     onCusValueChange:function (e,args) {
@@ -484,6 +499,10 @@ let zmhs_obj = {
             me.updateRationAss(args);
         }
     },
+    adjustAssClick:function (args,newval) {
+        let me = zmhs_obj, row = args.row - me.assFirstIndex;
+        projectObj.project.ration_ass.updateActualValue(me.assSheetData, row,null,newval);
+    },
     updateRationAss: function (args) {
         var me = zmhs_obj;
         var newval;
@@ -500,8 +519,7 @@ let zmhs_obj = {
             newval = scMathUtil.roundTo(newval, -2);
             projectObj.project.ration_ass.updateActualValue(me.assSheetData, args.row, newval);
         } else {
-            newval = recode.actualValue;
-            me.assSheet.getCell(args.row, args.col).value(newval);
+            me.showDatas();
         }
     },
     checkingActualValue(record, newval){

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

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>项目管理-纵横建筑云计价</title>
+    <title>项目管理-纵横公路养护云版</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
     <link rel="stylesheet" href="/web/building_saas/css/custom.css">
@@ -344,7 +344,7 @@
                         </div>
                     </div>
                     <span class="form-text text-danger" id="engineering-info" style="display: none;">请选择养护类别</span>
-                    <div class="form-group row" style="display: none;">
+                    <div class="form-group row">
                         <label for="staticEmail" class="col-auto col-form-label col-form-label-sm">费用标准</label>
                         <div class="col">
                             <select class="form-control  form-control-sm" id="tender-feeStandard"></select>
@@ -634,7 +634,7 @@
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title">欢迎使用纵横建筑计价</h5>
+                <h5 class="modal-title">欢迎使用纵横公路养护云版</h5>
             </div>
             <div class="modal-body">
                 <h5 class="my-3">首次加载例题，请稍候……</h5>

web/building_saas/pm/js/pm_newMain.js

@@ -2535,7 +2535,7 @@ function AddTender() {
             return false;
         }*/
         /*
-        * 计价规则、费用标准只是隐藏显示了，工程专业id还是要通过养护类别、费用标准确定，因为后台结构没有变化
+        * 计价规则只是隐藏显示了，工程专业id还是要通过养护类别、费用标准确定，因为后台结构没有变化
         * */
         let engineeringName = $("#tender-engineering").val();
         if (!engineeringName || engineeringName === '') {
@@ -2544,7 +2544,7 @@ function AddTender() {
         }
         let feeName = $('#tender-feeStandard').val();
         if(!feeName || feeName === ''){
-            //setDangerInfo($('#feeStandard-info'), '请选择费用标准');
+            setDangerInfo($('#feeStandard-info'), '请选择费用标准');
             return false;
         }
 

web/users/html/login-infoinput.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>用户信息填写-纵横建筑云计价</title>
+    <title>用户信息填写-纵横公路养护云版</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">

web/users/html/login.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>用户登录-纵横建筑云计价</title>
+    <title>用户登录-纵横公路养护云版</title>
     <!-- inject:css -->
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
@@ -16,7 +16,7 @@
 <body>
     <div class="container">
         <form class="form-signin" method="post" onsubmit="return false">
-            <h1 class="d-flex justify-content-center mb-5">纵横建筑云计价</h1>
+            <h1 class="d-flex justify-content-center mb-5">纵横公路养护云版</h1>
             <div class="form-group">
                 <input id="inputEmail" class="form-control " name="inputEmail" placeholder="通行账号 邮箱/手机" autofocus="" />
             </div>

web/users/html/user-buy.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>产品激活-纵横建筑云计价</title>
+    <title>产品激活-纵横公路养护云版</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">

web/users/html/user-info.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>账号资料-纵横建筑云计价</title>
+    <title>账号资料-纵横公路养护云版</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">

web/users/html/user-safe.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>账号安全-纵横建筑云计价</title>
+    <title>账号安全-纵横公路养护云版</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">

web/users/html/user-set.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>登录设置-纵横建筑云计价</title>
+    <title>登录设置-纵横公路养护云版</title>
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
     <link rel="stylesheet" href="/web/building_saas/css/main.css">
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">