Merge branch 'master' of http://192.168.1.12:3000/SmartCost/ConstructionCost

modules/fee_rates/facade/fee_rates_facade.js

@@ -183,7 +183,6 @@ function getData(projectID, callback) {
 }
 
 async function getFeeRateData(projectID) {
-    // to do 需根据projectID查找对应的费率文件
     let result={
         err:null
     }
@@ -191,7 +190,8 @@ async function getFeeRateData(projectID) {
         //
         let project =  await projectsModel.findOne({ID:projectID});
         if (project&&project.property&&project.property.feeFile){
-            let feeRateData = await feeRateFileModel.findOne({'ID':project.property.feeFile,deleteInfo:null});
+            console.info(project.property.feeFile);
+            let feeRateData = await feeRateFileModel.findOne({'ID':project.property.feeFile.id,deleteInfo:null});
             if(feeRateData===null){
                 result.datas=[];
             }else {
@@ -269,12 +269,15 @@ async function newFeeRateFile(updateData){
         let feeFile = property.feeFile;
         let rootProjectID = property.rootProjectID;
         let name = updateData.name;
-        if(feeFile.indexOf("newFeeRate")!=-1){
+        let newFeeRate = {};
+        if(feeFile.id.indexOf("newFeeRate")!=-1){
             let temFee = await feeRateFileModel.findOne({rootProjectID:rootProjectID,name:name,deleteInfo:null});
             if(temFee){
-                return temFee.ID;
+                newFeeRate.id=temFee.ID;
+                newFeeRate.name = temFee.name;
+                return newFeeRate;
             }
-            let temA = feeFile.split("-");
+            let temA = feeFile.id.split("-");
             let libID = temA[1];
             let doc={
                 rootProjectID:rootProjectID,
@@ -292,7 +295,9 @@ async function newFeeRateFile(updateData){
             }
             doc.ID = uuidV1();
             await feeRateFileModel.create(doc);
-            return doc.ID;
+            newFeeRate.id = doc.ID;
+            newFeeRate.name =doc.name;
+            return newFeeRate;
         }else {
             return feeFile
         }

modules/glj/models/glj_list_model.js

@@ -20,12 +20,13 @@ import MixRatioModel from "./mix_ratio_model";
 class GLJListModel extends BaseModel {
 
     /**
-     * 材料类型id
+     * 材料、主材、设备类型id
      *
      * @var {Array}
      */
     materialIdList = [GLJTypeConst.GENERAL_MATERIAL, GLJTypeConst.CONCRETE, GLJTypeConst.MORTAR, GLJTypeConst.MIX_RATIO,
-        GLJTypeConst.COMMERCIAL_CONCRETE, GLJTypeConst.COMMERCIAL_MORTAR];
+        GLJTypeConst.COMMERCIAL_CONCRETE, GLJTypeConst.COMMERCIAL_MORTAR, GLJTypeConst.MAIN_MATERIAL,
+        GLJTypeConst.EQUIPMENT];
 
     /**
      * 拥有组成物的工料机类型id
@@ -137,7 +138,6 @@ class GLJListModel extends BaseModel {
                     }
                 }
             }
-
             // 组合单价数据
             this.combineData(gljData, unitPriceList, quantityList, mixRatioData, totalComposition);
 

modules/ration_repository/models/ration_section_tree.js

@@ -15,7 +15,8 @@ var rationChapterTreeSchema = new Schema({//章节树  //生成唯一id改为sec
     NextSiblingID:Number,
     name: String,
     explanation: String,//说明
-    ruleText: String,//计算规则
+    ruleText: String,//计算规则,
+    jobContentSituation: String,//工作内容适用情况,ALL适用本项全部定额，PARTIAL适用本项部分定额
     isDeleted: Boolean
 });
 var rationChapterTreeModel = chapterTreeDb.model("std_ration_lib_ration_chapter_trees", rationChapterTreeSchema, "std_ration_lib_ration_chapter_trees");

web/building_saas/js/global.js

@@ -14,17 +14,18 @@ function autoFlashHeight(){
     $(".main-data-not").height($(window).height()-headerHeight-1);
     $(".main-data-side-search").height($(window).height()-headerHeight-toolsbarHeight-64);
     $(".side-content").height($(window).height()-headerHeight );
-    $(".poj-list").height($(window).height()-headerHeight-ftoolsbarHeight);
+    $(".poj-list").height($(window).height()-headerHeight-toolsbarHeight);
+    $(".form-view").height($(window).height()-headerHeight-ftoolsbarHeight);
     $(".form-list").height($(window).height()-headerHeight-50 );
 };
 $(window).resize(autoFlashHeight);
 /*全局自适应高度结束*/
 $(function(){
-/*侧滑*/
-$(".open-sidebar").click(function(){
-    $(".slide-sidebar").animate({width:"800"}).addClass("open");
-});
-$("body").click(function(event){
+    /*侧滑*/
+    $(".open-sidebar").click(function(){
+        $(".slide-sidebar").animate({width:"800"}).addClass("open");
+    });
+    $("body").click(function(event){
         var e = event || window.event; //浏览器兼容性
         if(!$(event.target).is('a')) {
             var elem = event.target || e.srcElement;
@@ -38,10 +39,13 @@ $("body").click(function(event){
         }
 
     });
-/*侧滑*/
-/*工具提示*/
-$(function () {
-  $('[data-toggle="tooltip"]').tooltip()
-});
-/*工具提示*/
+    /*侧滑*/
+    /*工具提示*/
+    $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    });
+    /*工具提示*/
+    $(function () {
+        $('[data-toggle="popover"]').popover()
+    });
 });

web/building_saas/pm/js/pm_main.js

@@ -822,9 +822,10 @@ function GetUpdateData(parent, next, name, property, newId, type) {
     let data = [];
     let updateData = {};
 
-    if(type.projectType== projectType.tender){
+    let rootProjectID = -1;
+    if(type.projectType === projectType.tender){
         let rootProject = parent ? parent.parent : Tree._root;
-        let rootProjectID = rootProject ? rootProject.id() : -1;
+        rootProjectID = rootProject ? rootProject.id() : -1;
         if(property){
             property.rootProjectID=rootProjectID;
         }
@@ -841,7 +842,6 @@ function GetUpdateData(parent, next, name, property, newId, type) {
         updateData['updateData']['name'] = name;
     }
     if (property !== null && property !== undefined) {
-        property.rootProjectID = rootProjectID;
         updateData['updateData']['property'] = property;
     }
     if (type !== null && type.projectType !== null) {