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

modules/users/models/user_model.js

@@ -396,7 +396,7 @@ class UserModel extends BaseModel {
         if (!sessionVersion) {
             return true;
         }
-        return sessionVersion.indexOf('学习') >= 0;
+        return sessionVersion.indexOf('免费') >= 0;
     }
 
     /*

web/building_saas/fee_rates/fee_rate.html

@@ -12,15 +12,14 @@
         <div class="row" style="margin-left: 0px">
             <div class="col-lg-8 p-0">
                 <div class="form-inline py-1 row">
-                    <div class="col-2 form-inline">   
+                    <div class="col-12 form-inline">   
                         <label >工程所在地:</label> &nbsp;&nbsp;
                         <select class="form-control form-control-sm" id="location"></select> 
-                    </div>
-                 
-                    <div class="col-4 form-inline">
+                        &nbsp;&nbsp;&nbsp;&nbsp;
                         <label >费率标准:</label> &nbsp;&nbsp;
-                        <select class="form-control form-control-sm" id="feeRateStandard"><option value="广东">广东</option></select>   
-                    </div>  
+                        <select class="form-control form-control-sm" id="feeRateStandard" style="width: 495px;"><option value=""></option></select>   
+                    </div>
+                
 
                        <!-- <label class="mx-2" >基于&nbsp;&nbsp;<span id="feeRateLibName">重庆渝建发[2016]35号</span></label>                 
                  <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#set-lv" id="setNewFeeRate"><i class="fa fa-cog"></i> 重选标准</a> -->

web/building_saas/standard_interface/export/guangdong_zhongshan.js

@@ -933,7 +933,8 @@ INTERFACE_EXPORT = (() => {
           },
           {
             name: "Quantity",
-            value: 0//b.quantity
+            value: 0,//b.quantity
+            type: TYPE.DECIMAL
           },
           {
             name: "Total",