feat: 费用定额工程专业配置增加项目汇总勾选项

modules/all_models/engineering_lib.js

@@ -9,14 +9,14 @@ import mongoose from "mongoose";
 
 let Schema = mongoose.Schema;
 let collectionName = 'engineering_lib';
-let taxGroupSchema = new  Schema({
+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:{}},//列设置
-    fee_lib:{ type: Schema.Types.Mixed,default:{}},//费率标准库
-    norm_lib:String//指标分部
-},{_id: false});
+    program_lib: { type: Schema.Types.Mixed, default: {} },// 计算程序标准库
+    template_lib: { type: Schema.Types.Mixed, default: {} },//清单模板库
+    col_lib: { type: Schema.Types.Mixed, default: {} },//列设置
+    fee_lib: { type: Schema.Types.Mixed, default: {} },//费率标准库
+    norm_lib: String//指标分部
+}, { _id: false });
 
 
 let modelSchema = {
@@ -40,22 +40,22 @@ let modelSchema = {
         type: Schema.Types.Mixed,
         default: []
     },
-    tax_group :{
-      type: [taxGroupSchema],
-      default: []
-    },
-   /* // 费率标准库 2018-08-28 改成放在tax_group 里了
-    fee_lib: {
-        type: Schema.Types.Mixed,
+    tax_group: {
+        type: [taxGroupSchema],
         default: []
-    },*/
+    },
+    /* // 费率标准库 2018-08-28 改成放在tax_group 里了
+     fee_lib: {
+         type: Schema.Types.Mixed,
+         default: []
+     },*/
     // 人工系数标准库
     artificial_lib: {
         type: Schema.Types.Mixed,
         default: []
     },
     //工程特征库
-    feature_lib:{
+    feature_lib: {
         type: Schema.Types.Mixed,
         default: []
     },
@@ -98,29 +98,31 @@ let modelSchema = {
         default: []
     },
     //设置人材机显示列
-    glj_col:{
-        showAdjustPrice:Boolean//是否显示调整价列
+    glj_col: {
+        showAdjustPrice: Boolean//是否显示调整价列
     },
     //清单或定额计价规则ID
-    valuationID:{type:String,index: true},
+    valuationID: { type: String, index: true },
     //工程专业名称
-    name:String,
+    name: String,
     //费用标准
-    feeName:String,
+    feeName: String,
     //前端是否显示
-    visible:{type: Boolean, default: false},
+    visible: { type: Boolean, default: false },
+    // 是否是项目汇总
+    isSummary: { type: Boolean, default: false },
     //取费专业
-    engineering:Number,
+    engineering: Number,
     //单位工程取费专业
-    projectEngineering:Number,
+    projectEngineering: Number,
     //是否计算安装增加费
-    isInstall:{type: Boolean, default: false},
+    isInstall: { type: Boolean, default: false },
     //是否计算子目增加费
-    isItemIncrease:{type: Boolean, default: false},
+    isItemIncrease: { type: Boolean, default: false },
     //是否计算面积增加费
-    isAreaIncrease:{type: Boolean, default: false},
-    indexName:String,//指标专业名称
-    seq:Number//序列号
+    isAreaIncrease: { type: Boolean, default: false },
+    indexName: String,//指标专业名称
+    seq: Number//序列号
 };
-mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));
+mongoose.model(collectionName, new Schema(modelSchema, { versionKey: false, collection: collectionName }));
 

web/users/js/compilation.js

@@ -1478,6 +1478,12 @@ function engineerVisibleChange(checkBox, engineerID) {
   }
 }
 
+function engineerSummaryChange(checkBox, engineerID) {
+  if (engineerID) {
+    updateEngineer(engineerID, { isSummary: checkBox.checked });
+  }
+}
+
 function updateEngineer(engineerID, data, callback) {
   CommonAjax.post(
     "/compilation/update-engineer",

web/users/views/compilation/add.html

@@ -43,6 +43,7 @@
                                 <th>标准清单</th>
                                 <th>定额库</th>
                                 <th>人材机库</th>
+                                <th>项目汇总</th>
                                 <th>前台显示</th>
                                 <th>操作</th>
                             </tr>
@@ -113,6 +114,7 @@
                                     <td><%= engineering.bill_lib.length %></td>
                                     <td><%= engineering.ration_lib.length %></td>
                                     <td><%= engineering.glj_lib.length %></td>
+                                    <td><label><input type="checkbox"  <% if (engineering.isSummary) { %>checked<% } %>  onclick='engineerSummaryChange(this,"<%= engineering._id.toString()%>")'> 项目汇总</label></td>
                                     <td><label><input type="checkbox"  <% if (engineering.visible) { %>checked<% } %>  onclick='engineerVisibleChange(this,"<%= engineering._id.toString()%>")'> 显示</label></td>
                                     <td>
                                         <a class="btn-link" href="/compilation/<%= section %>/<%= valuationId %>/<%= engineering._id.toString()%>">编辑</a>/<a onclick="deleteEngineerClick('<%= engineering._id.toString()%>',this)" class='btn btn-link btn-sm' style="padding: 0px">删除</a>/<a onclick="copyEngineerClick('<%= engineering._id.toString()%>')" class='btn btn-link btn-sm' style="padding: 0px">拷贝</a>