Merge remote-tracking branch 'origin/master'

modules/all_models/ration.js

@@ -75,6 +75,7 @@ let rationSchema = new Schema({
     referenceRationID:String,//如果是通过模板关联子目生成的定额，这里记录对应的主定额ID
     // 工作内容 （选择自清单）
     jobContentText: String,
+    manageFeeRate:String,//管理费率
 
     //工料机特有属性
     projectGLJID:Number,  //项目工料机ID

modules/all_models/stdRation_ration.js

@@ -46,7 +46,7 @@ const rationItemSchema = new Schema({
     feeType: Number,
     jobContent: String,
     annotation: String,
-    manageFeeRate: String, // 管理费费率
+    manageFeeRate:String,//管理费费率
     rationGljList: [rationGljItemSchema],
     rationCoeList: Array,
     rationAssList: [rationAssItemSchema],

modules/main/facade/ration_facade.js

@@ -155,6 +155,7 @@ async function insertNewRation(newData,defaultLibID,std,calQuantity) {//插入
         }else {
             newData.programID = std.feeType;
         }
+        newData.manageFeeRate = std.manageFeeRate;
         newData.rationAssList =  createRationAss(std);
         // calculate ration Quantity
     }
@@ -544,6 +545,7 @@ async function  updateRation(std,defaultLibID,rationID,billsItemID,projectID,cal
         ration.stdID = std.ID;
     }
     ration.content = std.jobContent;
+    ration.manageFeeRate = std.manageFeeRate;
     ration.adjustState = '';
     ration.isFromDetail=0;
     ration.isSubcontract=false;

web/building_saas/main/html/tender_price.html

@@ -3,8 +3,8 @@
     <div class="btn-toolbar py-1">
         <div class="input-group input-group-sm mr-2">
             <select class="form-control form-control-sm" style="width: auto; font-size: .875rem" id="calcPriceOption">
-                <option value="coeBase">根据调整系数计算报价</option>
-                <option value="priceBase" >根据报价计算调整系数</option>
+                <option value="coeBase">按调价系数计算</option>
+                <option value="priceBase" >按目标价计算</option>
             </select>
         </div>
         <div class="input-group input-group-sm mr-2" style="width:240px">