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

# Conflicts:
#	config/config.js

config/config.js

@@ -56,19 +56,18 @@ module.exports = {
         },
         importURL:"172.18.111.231:2050"
     },
-    uat: {
-        server: "112.74.42.187",
-        port: "27017",
-        options:{
-            user:'smartcost',
-            pass:'SmartCost3850888',
-            auth: {
-                "authdb": "admin"
-            },
-            connectTimeoutMS: 100000,
-            useMongoClient: true
-        },
-        importURL:"192.168.1.184:6050"
+    pp_out:{  server: "112.74.42.187",
+      port: "27017",
+      options:{
+          user:'smartcost',
+          pass:'SmartCost3850888',
+          auth: {
+              "authdb": "admin"
+          },
+          connectTimeoutMS: 50000,
+          useMongoClient: true
+      },
+      importURL:"112.74.42.187:2050"
     },
     prod_s:{  server: "112.74.42.187",
         port: "28066",

config/gulpConfig.js

@@ -180,6 +180,7 @@ module.exports = {
         'web/building_saas/complementary_ration_lib/js/main.js',
         'web/building_saas/main/js/views/material_calc_view.js',
         'web/building_saas/main/js/views/electrovalence_view.js',
+        'web/building_saas/main/js/views/divide_view.js',
         'public/web/storageUtil.js'
     ],
     compleGlj_css: [

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

@@ -1179,6 +1179,7 @@ projectGljObject={
                         me.deleteMixRatio(row);
                     },
                     visible: function(key, opt){
+                        if(!$('#mixRatio-nav').hasClass('active')) return false;
                         let projectGLJ = projectGljObject.getProjectGLJSelected();
                         return  projectGLJ && !gljUtil.isConcreteType(projectGLJ.type);
                     }
@@ -1195,6 +1196,7 @@ projectGljObject={
                         getGLJData('addMix');
                     },
                     visible: function(key, opt){
+                        if(!$('#mixRatio-nav').hasClass('active')) return false;
                         let projectGLJ = projectGljObject.getProjectGLJSelected();
                         return  projectGLJ && !gljUtil.isConcreteType(projectGLJ.type);
                     }

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

@@ -2637,9 +2637,11 @@ $('#property_ok').click(function () {
                 }
                 if(mixDatas.options && mixDatas.options.updateData){
                     let v1 = mixDatas.options.updateData['rationQuanACToBillsQuan'],
-                        v2 = mixDatas.options.updateData['rationQuanACToRationUnit'];
+                        v2 = mixDatas.options.updateData['rationQuanACToRationUnit'],
+                        progressiveType = mixDatas.options.updateData['progressiveType']  ;
                     optionsOprObj.updateOptions(optionsOprObj.options, {type: optionsOprObj.optionsTypes.GENERALOPTS, opt: 'rationQuanACToBillsQuan', value: v1});
                     optionsOprObj.updateOptions(optionsOprObj.options, {type: optionsOprObj.optionsTypes.GENERALOPTS, opt: 'rationQuanACToRationUnit', value: v2});
+                    optionsOprObj.updateOptions(optionsOprObj.options, {type: optionsOprObj.optionsTypes.GENERALOPTS, opt: 'progressiveType', value: progressiveType});
                 }
             }
         });