修改新建项目时的标准费率文件获位置

modules/all_models/engineering_lib.js

@@ -13,7 +13,8 @@ let taxGroupSchema = new  Schema({
     taxType: String,//计税方式
     program_lib: { type: Schema.Types.Mixed,default:{}},// 计算程序标准库
     template_lib:{ type: Schema.Types.Mixed,default:{}},//清单模板库
-    col_lib:{ type: Schema.Types.Mixed,default:{}}
+    col_lib:{ type: Schema.Types.Mixed,default:{}},
+    fee_lib:{ type: Schema.Types.Mixed,default:{}}//费率标准库
 },{_id: false});
 
 let modelSchema = {
@@ -41,11 +42,11 @@ let modelSchema = {
         type: [taxGroupSchema],
         default: []
     },
-    // 费率标准库
+   /* // 费率标准库
     fee_lib: {
         type: Schema.Types.Mixed,
         default: []
-    },
+    },*/
     // 人工系数标准库
     artificial_lib: {
         type: Schema.Types.Mixed,

modules/fee_rates/facade/fee_rates_facade.js

@@ -235,7 +235,9 @@ async function getFeeRateStandardsByProjectID(projectID) {
     logger.info("get feeRate standard, projectID:"+projectID)
     let feeRateStandards=[];
     let project =  await projectsModel.findOne({ID:projectID});
-    let engineeringLibModel = new EngineeringLibModel();
+    let temFee = await feeRateFileModel.findOne({ID:project.property.feeFile.id});
+    feeRateStandards.push({ID:temFee.libID,libName:temFee.libName});
+   /* let engineeringLibModel = new EngineeringLibModel();
     let engineeringInfo = project !== null && project.property.engineering_id !== undefined ?
         await engineeringLibModel.getEngineering(project.property.engineering_id) : null;
     if(engineeringInfo!=null){
@@ -243,7 +245,7 @@ async function getFeeRateStandardsByProjectID(projectID) {
         for(let lib of fee_lib){
             feeRateStandards.push({ID:lib.id,libName:lib.name});
         }
-    }
+    }*/
     return feeRateStandards;
 }
 

web/building_saas/pm/js/pm_newMain.js

@@ -1525,9 +1525,12 @@ $(document).ready(function() {
 
     function changeFeeRate(engLib) {
         if(engLib){
-            if (engLib.fee_lib !== undefined && engLib.fee_lib.length > 0) {
+           /*
+             if (engLib.fee_lib !== undefined && engLib.fee_lib.length > 0) {
                 $("#tender-fee-rate").children("option").first().val("newFeeRate-"+engLib.fee_lib[0].id);
-            }
+            }*/
+           //2018-08-29  费率改为和计税方式绑定在一起 所以在这里还不能确定标准费率库ID
+            $("#tender-fee-rate").children("option").first().val("newFeeRate-");
             $("#tender-engineering").parent().siblings('.hidden-area').slideDown('fast');
         }
         else {
@@ -1598,7 +1601,8 @@ $(document).ready(function() {
                 let p_id = group.program_lib?group.program_lib.id:"";
                 let t_id = group.template_lib?group.template_lib.id:"";
                 let c_id = group.col_lib?group.col_lib.id:"";
-                groupString = p_id + "|-|" +t_id+"|-|"+c_id;
+                let f_id = group.fee_lib?group.fee_lib.id:"";
+                groupString = p_id + "|-|" +t_id+"|-|"+c_id+"|-|"+f_id;
                 result += '<option value='+ groupString +'>'+ group.program_lib.name +'</option>';
             };
             return result;
@@ -2353,11 +2357,13 @@ function AddTender() {
         let calcProgram = isNaN(parseInt(IDGroup[0]))?IDGroup[0]:parseInt(IDGroup[0]);//转换成整数
         let templateLibID = IDGroup[1];
         let colLibID = IDGroup[2];
-        if(templateLibID == ''|| colLibID ==''){
+        let feeLibID = IDGroup[3];
+        if(templateLibID == ''|| colLibID ==''||feeLibID==''){
             alert("工程专业配置有误！");
             return false;
         }
-
+        //如果是新建费率的情况
+        if(feeFileObj.id.indexOf("newFeeRate")!=-1) feeFileObj.id +=feeLibID;
         let valuationName = $("#valuation").children("option:selected").text();
         let valuationType = $("input[name='valuation_type']:checked").val();