Merge branch '1.0.0_online' of http://192.168.1.41:3000/SmartCost/ConstructionOperation into 1.0.0_online

modules/all_models/config_material_list.js

@@ -0,0 +1,74 @@
+/**
+ * Created by zhang on 2019/9/6.
+ */
+/**
+ * Created by zhang on 2019/3/18.
+ */
+import mongoose from "mongoose";
+
+let Schema = mongoose.Schema;
+let evaluateSchema = {
+    ID:{type:String,  index: true},
+    projectID: {type:Number,index: true},
+    is_related:{type: Number, default: 0},//关联，1关，0不关
+    projectGLJID:Number,//关联工料机ID
+    seq:String,//序号
+    code:String,
+    name:String,
+    specs:String,
+    unit:String,
+    type:Number,
+    market_price:String,
+    quantity:String,
+    locked:{type: Number, default: 0},//锁定，1锁，0不锁
+    remark:String,
+    originPlace:String,//产地
+    vender:String //厂家
+};
+mongoose.model("evaluate_list", new Schema(evaluateSchema, {versionKey: false, collection: "evaluate_list"}));
+
+let bidEvaluationSchema = {
+    ID:{type:String,  index: true},
+    projectID: {type:Number,index: true},
+    is_related:{type: Number, default: 0},//关联，1关，0不关
+    projectGLJID:Number,//关联工料机ID
+    seq:String,//序号
+    code:String,
+    name:String,
+    specs:String,
+    unit:String,
+    type:Number,
+    market_price:String,
+    quantity:String,
+    remark:String,
+    originPlace:String,//产地
+    vender:String //厂家
+};
+
+mongoose.model("bid_evaluation_list", new Schema(bidEvaluationSchema, {versionKey: false, collection: "bid_evaluation_list"}));
+
+
+let contractorSchema = {
+    ID:{type:String,  index: true},
+    projectID: {type:Number,index: true},
+    is_related:{type: Number, default: 0},//关联，1关，0不关
+    projectGLJID:Number,//关联工料机ID
+    seq:String,//序号
+    code:String,
+    name:String,
+    specs:String,
+    unit:String,
+    type:Number,
+    riskCoe:String,//风险系数
+    standardPrice:String,//基准单价
+    FO:String,//基本价格指数
+    FI:String,//现行价格指数
+    market_price:String,
+    quantity:String,
+    remark:String,
+    supply: {type: Number, default: 0},
+    originPlace:String,//产地
+    vender:String //厂家
+};
+
+mongoose.model("contractor_list", new Schema(contractorSchema, {versionKey: false, collection: "contractor_list"}));

modules/common/const/bills_fixed.js

@@ -66,7 +66,10 @@ const fixedFlag = {
     //住宅工程质量分户验收费
     HOUSE_QUALITY_ACCEPT_FEE:31,
     //组织措施费
-    ORGANIZATION:32
+    ORGANIZATION:32,
+    //其他措施费
+    OTHER_MEASURE_FEE:33
+
 };
 const fixedFlagList = [
     {name: "分部分项工程", value: fixedFlag.SUB_ENGINERRING},
@@ -101,6 +104,7 @@ const fixedFlagList = [
     {name: '建设工程竣工档案编制费', value: fixedFlag.PROJECT_COMPLETE_ARCH_FEE},
     {name: '住宅工程质量分户验收费', value: fixedFlag.HOUSE_QUALITY_ACCEPT_FEE},
     {name: '组织措施费', value: fixedFlag.ORGANIZATION},
+    {name: '其他措施费', value: fixedFlag.OTHER_MEASURE_FEE}
 ];
 
 export {fixedFlag as default, fixedFlagList as List};

modules/sys_tools/models/sys_model.js

@@ -22,7 +22,7 @@ const rationGljModel = mongoose.model('ration_glj');
 const rationCoeMolde = mongoose.model('ration_coe');
 const installationModel = mongoose.model('installation_fee');
 const rationInstallationModel = mongoose.model('ration_installation');
-const rationTemplateModel  = mongoose.model('ration_template')
+const rationTemplateModel  = mongoose.model('ration_template');
 const quantityDetailModel = mongoose.model('quantity_detail');
 const unitPriceFileModel = mongoose.model('unit_price_file');
 const unitPriceModel = mongoose.model('unit_price');
@@ -30,6 +30,10 @@ const mixRatioModel = mongoose.model('mix_ratio');
 const feeRateFileModel = mongoose.model('fee_rate_file');
 const feeRateModel = mongoose.model('fee_rates');
 const compleRationSection = mongoose.model('complementary_ration_section_tree');
+const evaluateListModel = mongoose.model("evaluate_list");
+const bidListModel = mongoose.model("bid_evaluation_list");
+const contractorListModel = mongoose.model("contractor_list");
+
 
 //删除垃圾数据
 async function clearJunkData(callback){
@@ -89,6 +93,18 @@ async function clearJunkData(callback){
         functions.push(function(cb){
             quantityDetailModel.remove({projectID: {$in: junkProjIds}}, cb);
         });
+        //清除暂估材料
+        functions.push(function(cb){
+            evaluateListModel.remove({projectID: {$in: junkProjIds}}, cb);
+        });
+        //清除评标材料
+        functions.push(function(cb){
+            bidListModel.remove({projectID: {$in: junkProjIds}}, cb);
+        });
+        //清除承包材料
+        functions.push(function(cb){
+            contractorListModel.remove({projectID: {$in: junkProjIds}}, cb);
+        });
     }
     //彻底删除了的单价文件
     let junkUFs = await unitPriceFileModel.find({'deleteInfo.deleted': true, 'deleteInfo.completeDeleted': true});