feat: 增加适用类型，单体结构，分部结构。增加重构公路配置

modules/all_models/compilation.js

@@ -21,7 +21,8 @@ let childrenSchema = new Schema({
     // 类型
     type: {
         type: Number
-    }
+    },
+    fileTypes:[Number]//创建项目时可用文件类型 估算，概算，预算
 },{_id: false});
 let modelSchema = {
     // 是否发布

modules/all_models/monomer_template.js

@@ -0,0 +1,20 @@
+//单体模板库
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+const oprSchema = require('../all_schemas/opr_schema');
+const monomerTemplate_lib = new Schema({
+        ID:{type:String,index:true},
+        creator: String,
+        createDate: Number,
+        recentOpr: [oprSchema],
+        name: String,
+        compilationID: String,
+        data: {
+            type: Schema.Types.Mixed,
+            default: {}
+        }
+    },
+    {versionKey: false}
+);
+
+mongoose.model("std_monomer_template", monomerTemplate_lib,"std_monomer_template");

modules/all_models/structural_segment.js

@@ -0,0 +1,20 @@
+//单体模板库
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+const oprSchema = require('../all_schemas/opr_schema');
+const monomerTemplate_lib = new Schema({
+        ID:{type:String,index:true},
+        creator: String,
+        createDate: Number,
+        recentOpr: [oprSchema],
+        name: String,
+        compilationID: String,
+        data: {
+            type: [Schema.Types.Mixed],
+            default: []
+        }
+    },
+    {versionKey: false}
+);
+
+mongoose.model("std_structural_segment", monomerTemplate_lib,"std_structural_segment");

modules/monomer_template_lib/controllers/monomer_template_controller.js

@@ -0,0 +1,119 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+import BaseController from "../../common/base/base_controller";
+import monomerTemplateFacade from "../facade/monomer_template_facade";
+let config = require("../../../config/config.js");
+let logger = require('../../../logs/log_helper').logger;
+import CompilationModel from '../../users/models/compilation_model';
+let mongoose = require('mongoose');
+let monomerTemplateModel = mongoose.model('std_monomer_template');
+
+class MonomerTemplateController extends BaseController{
+    async main(request, response) {
+     
+        let compilationModel = new CompilationModel();
+        let compilationList = await compilationModel.getCompilationList({_id: 1, name: 1});
+        compilationList.unshift({_id: 'all', name: '所有'});
+        let activeCompilation = compilationList.find(compilation => compilation._id.toString() === request.query.filter);
+        if (activeCompilation) {
+            activeCompilation.active = 'active';
+        } else {
+            compilationList[0].active = 'active'
+        }
+        let filter = request.query.filter ? {compilationID: request.query.filter} : {};
+        let templateLibs = await monomerTemplateFacade.findByCondition(filter,{feature:0},false);
+        let renderData = {
+            title:'单体模板库',
+            userAccount: request.session.managerData.username,
+            userID: request.session.managerData.userID,
+            templateLibs:templateLibs,
+            compilationList: compilationList,
+            layout: 'maintain/common/html/layout'
+        };
+        response.render("maintain/monomer_template_lib/html/main", renderData);
+    }
+    async addLib(request, response){
+        try {
+            await monomerTemplateFacade.addLib(request.body);
+        }catch (error) {
+            console.log(error);
+        }
+        response.redirect(request.headers.referer);
+    }
+    async findLib(request, response){
+        let result={
+            error:0
+        };
+        try {
+            let data = request.body.data;
+            data = JSON.parse(data);
+            let conditions={'ID' : data.ID};
+            let resultData = await monomerTemplateFacade.findByCondition(conditions);
+            result.data=resultData;
+        }catch (err){
+            console.log(err);
+            result.error=1;
+            result.message = err.message;
+        }
+        response.json(result);
+    }
+    async saveLib(request, response){
+        let result={
+            error:0
+        };
+        try {
+            let data = request.body.data;
+            data = JSON.parse(data);
+            console.log(data.data);
+            let resultData= await monomerTemplateFacade.saveLib(data);
+            result.data=resultData;
+        }catch (err){
+            console.log(err);
+            result.error=1;
+            result.message = err.message;
+        }
+        response.json(result);
+    }
+    async deleteLibByID(request,response){
+        logger.info(`delete projectFeatureLib ${request.ip}`);
+        let result={
+            error:0
+        };
+        try {
+            let data = request.body.data;
+            data = JSON.parse(data);
+            let resultData= await monomerTemplateFacade.deleteLibByID(data.ID);
+            result.data=resultData;
+        }catch (err){
+            console.log(err);
+            result.error=1;
+            result.message = err.message;
+        }
+        response.json(result);
+    }
+    async edit(request,response){
+        //先取出替换库信息：
+        let libID = request.params.libID;
+       
+        let monomerTemplate = await monomerTemplateFacade.findByCondition({'ID':libID});
+        
+        if(monomerTemplate){
+            let randerData = {
+                title:'单体模板库',
+                mainURL:'/monomerTemplate/main',
+                libName:monomerTemplate.name,
+                userAccount: request.session.managerData.username,
+                userID: request.session.managerData.userID,
+                templateLibs:JSON.stringify(monomerTemplate),
+                libID:libID,
+                LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
+                layout: 'maintain/common/html/edit_layout'
+            };
+            response.render("maintain/monomer_template_lib/html/edit", randerData);
+        }else {
+            response.redirect(request.headers.referer);
+        }
+    }
+}
+export default MonomerTemplateController;

modules/monomer_template_lib/facade/monomer_template_facade.js

@@ -0,0 +1,49 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+import mongoose from "mongoose";
+const uuidV1 = require('uuid/v1');
+let moment = require("moment");
+let monomerTemplateModel = mongoose.model('std_monomer_template');
+let compilationModel = mongoose.model('compilation');
+
+
+let monomerTemplateLib = {
+    findByCondition:async function(conditions,options,single=true){
+        if(single == true){
+            return await monomerTemplateModel.findOne(conditions,options);
+        }else {
+            return await  monomerTemplateModel.find(conditions,options);
+        }
+    },
+    addLib : async function (data){
+        let now = new Date().getTime();
+        let dateStr = moment(now).format('YYYY-MM-DD HH:mm:ss');
+        //取编办信息
+        let compilation = await compilationModel.findOne({_id:data.compilationId});
+        if(compilation){
+            let newLib = {
+                creator: data.userAccount,
+                createDate: now,
+                recentOpr: [{operator: data.userAccount, operateDate: dateStr}],
+                name: data.name,
+                compilationID: data.compilationId,
+                compilationName: compilation.name,
+            };
+            newLib.ID = uuidV1();
+            return await monomerTemplateModel.create(newLib);
+        }else {
+            throw  new Error("没有找到该编办！");
+        }
+    },
+    saveLib:async function(param) {
+        console.log('par===============================')
+        console.log(param)
+        return await monomerTemplateModel.findOneAndUpdate(param.query,param.data);
+    },
+    deleteLibByID:async function(ID){
+        return await monomerTemplateModel.deleteOne({ID:ID});
+    },
+};
+
+export default monomerTemplateLib

modules/monomer_template_lib/routes/monomer_template_routes.js

@@ -0,0 +1,21 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+
+let express = require("express");
+let monomerTemplateRouter =express.Router();
+import  MonomerTemplateController from "../controllers/monomer_template_controller";
+let monomerTemplateController = new MonomerTemplateController();
+
+module.exports =function (app){
+
+    monomerTemplateRouter.get("/main", monomerTemplateController.auth, monomerTemplateController.init, monomerTemplateController.main);
+    monomerTemplateRouter.post("/addLib", monomerTemplateController.auth, monomerTemplateController.init, monomerTemplateController.addLib);
+    monomerTemplateRouter.post("/findLib", monomerTemplateController.auth, monomerTemplateController.init, monomerTemplateController.findLib);
+    monomerTemplateRouter.post("/saveLib", monomerTemplateController.auth, monomerTemplateController.init, monomerTemplateController.saveLib);
+    monomerTemplateRouter.post("/deleteLibByID", monomerTemplateController.auth, monomerTemplateController.init, monomerTemplateController.deleteLibByID);
+    monomerTemplateRouter.get("/edit/:libID", monomerTemplateController.auth, monomerTemplateController.init, monomerTemplateController.edit);
+    app.use("/monomerTemplate", monomerTemplateRouter);
+};
+
+

modules/structural_segment_lib/controllers/structural_segment_controller.js

@@ -0,0 +1,116 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+import BaseController from "../../common/base/base_controller";
+import structuralSegmentFacade from "../facade/structural_segment_facade";
+let config = require("../../../config/config.js");
+let logger = require('../../../logs/log_helper').logger;
+import CompilationModel from '../../users/models/compilation_model';
+
+class StructuralSegmentController extends BaseController{
+    async main(request, response) {
+     
+        let compilationModel = new CompilationModel();
+        let compilationList = await compilationModel.getCompilationList({_id: 1, name: 1});
+        compilationList.unshift({_id: 'all', name: '所有'});
+        let activeCompilation = compilationList.find(compilation => compilation._id.toString() === request.query.filter);
+        if (activeCompilation) {
+            activeCompilation.active = 'active';
+        } else {
+            compilationList[0].active = 'active'
+        }
+        let filter = request.query.filter ? {compilationID: request.query.filter} : {};
+        let templateLibs = await structuralSegmentFacade.findByCondition(filter,{feature:0},false);
+        let renderData = {
+            title:'结构分部库',
+            userAccount: request.session.managerData.username,
+            userID: request.session.managerData.userID,
+            templateLibs:templateLibs,
+            compilationList: compilationList,
+            layout: 'maintain/common/html/layout'
+        };
+        response.render("maintain/structural_segment_lib/html/main", renderData);
+    }
+    async addLib(request, response){
+        try {
+            await structuralSegmentFacade.addLib(request.body);
+        }catch (error) {
+            console.log(error);
+        }
+        response.redirect(request.headers.referer);
+    }
+    async findLib(request, response){
+        let result={
+            error:0
+        };
+        try {
+            let data = request.body.data;
+            data = JSON.parse(data);
+            let conditions={'ID' : data.ID};
+            let resultData = await structuralSegmentFacade.findByCondition(conditions);
+            result.data=resultData;
+        }catch (err){
+            console.log(err);
+            result.error=1;
+            result.message = err.message;
+        }
+        response.json(result);
+    }
+    async saveLib(request, response){
+        let result={
+            error:0
+        };
+        try {
+            let data = request.body.data;
+            data = JSON.parse(data);
+            console.log(data.data);
+            let resultData= await structuralSegmentFacade.saveLib(data);
+            result.data=resultData;
+        }catch (err){
+            console.log(err);
+            result.error=1;
+            result.message = err.message;
+        }
+        response.json(result);
+    }
+    async deleteLibByID(request,response){
+        logger.info(`delete projectFeatureLib ${request.ip}`);
+        let result={
+            error:0
+        };
+        try {
+            let data = request.body.data;
+            data = JSON.parse(data);
+            let resultData= await structuralSegmentFacade.deleteLibByID(data.ID);
+            result.data=resultData;
+        }catch (err){
+            console.log(err);
+            result.error=1;
+            result.message = err.message;
+        }
+        response.json(result);
+    }
+    async edit(request,response){
+        //先取出替换库信息：
+        let libID = request.params.libID;
+       
+        let structuralSegment = await structuralSegmentFacade.findByCondition({'ID':libID});
+        if(structuralSegment){
+            let randerData = {
+                title:'结构分部库',
+                mainURL:'/structuralSegment/main',
+                libName:structuralSegment.name,
+                userAccount: request.session.managerData.username,
+                userID: request.session.managerData.userID,
+                templateLibs:JSON.stringify(structuralSegment),
+                libID:libID,
+                LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
+                layout: 'maintain/common/html/edit_layout'
+            };
+            response.render("maintain/structural_segment_lib/html/edit", randerData);
+        }else {
+            response.redirect(request.headers.referer);
+        }
+    }
+}
+export default StructuralSegmentController;

modules/structural_segment_lib/facade/structural_segment_facade.js

@@ -0,0 +1,47 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+import mongoose from "mongoose";
+const uuidV1 = require('uuid/v1');
+let moment = require("moment");
+let structuralSegmentModel = mongoose.model('std_structural_segment');
+let compilationModel = mongoose.model('compilation');
+
+
+let structuralSegmentLib = {
+    findByCondition:async function(conditions,options,single=true){
+        if(single == true){
+            return await structuralSegmentModel.findOne(conditions,options);
+        }else {
+            return await  structuralSegmentModel.find(conditions,options);
+        }
+    },
+    addLib : async function (data){
+        let now = new Date().getTime();
+        let dateStr = moment(now).format('YYYY-MM-DD HH:mm:ss');
+        //取编办信息
+        let compilation = await compilationModel.findOne({_id:data.compilationId});
+        if(compilation){
+            let newLib = {
+                creator: data.userAccount,
+                createDate: now,
+                recentOpr: [{operator: data.userAccount, operateDate: dateStr}],
+                name: data.name,
+                compilationID: data.compilationId,
+                compilationName: compilation.name,
+            };
+            newLib.ID = uuidV1();
+            return await structuralSegmentModel.create(newLib);
+        }else {
+            throw  new Error("没有找到该编办！");
+        }
+    },
+    saveLib:async function(param) {
+        return await structuralSegmentModel.findOneAndUpdate(param.query,param.data);
+    },
+    deleteLibByID:async function(ID){
+        return await structuralSegmentModel.deleteOne({ID:ID});
+    },
+};
+
+export default structuralSegmentLib

modules/structural_segment_lib/routes/structural_segment_routes.js

@@ -0,0 +1,21 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+
+let express = require("express");
+let structuralSegmentRouter =express.Router();
+import  StructuralSegmentController from "../controllers/structural_segment_controller";
+let structuralSegmentController = new StructuralSegmentController();
+
+module.exports =function (app){
+
+    structuralSegmentRouter.get("/main", structuralSegmentController.auth, structuralSegmentController.init, structuralSegmentController.main);
+    structuralSegmentRouter.post("/addLib", structuralSegmentController.auth, structuralSegmentController.init, structuralSegmentController.addLib);
+    structuralSegmentRouter.post("/findLib", structuralSegmentController.auth, structuralSegmentController.init, structuralSegmentController.findLib);
+    structuralSegmentRouter.post("/saveLib", structuralSegmentController.auth, structuralSegmentController.init, structuralSegmentController.saveLib);
+    structuralSegmentRouter.post("/deleteLibByID", structuralSegmentController.auth, structuralSegmentController.init, structuralSegmentController.deleteLibByID);
+    structuralSegmentRouter.get("/edit/:libID", structuralSegmentController.auth, structuralSegmentController.init, structuralSegmentController.edit);
+    app.use("/structuralSegment", structuralSegmentRouter);
+};
+
+

modules/users/controllers/compilation_controller.js

@@ -479,6 +479,40 @@ class CompilationController extends BaseController {
         response.json(responseData);
     }
 
+
+    /**
+     * 设置计价规则适用类型
+     *
+     * @param {object} request
+     * @param {object} response
+     * @return {void}
+     */
+     async setFileTypes(request, response) {
+        let id = request.body.id;
+        let section = request.params.section;
+        let fileTypes = request.body.fileTypes;
+
+        let responseData = {
+            err: 0,
+            msg: ''
+        };
+        try {
+            let compilationModel = new CompilationModel();
+            let result = await compilationModel.setFileTypes(id, section, fileTypes);
+
+            if (!result) {
+                throw '设置类型失败';
+            }
+        } catch (error) {
+            console.log(error);
+            responseData.err = 1;
+            responseData.msg = error;
+        }
+
+        response.json(responseData);
+    }
+
+
     /**
      * 发布/取消编办
      *

modules/users/models/compilation_model.js

@@ -42,7 +42,8 @@ class CompilationModel extends BaseModel {
             "feasibility_valuation.id": 1, "feasibility_valuation.name": 1, "feasibility_valuation.enable": 1,
             "rough_valuation.id": 1, "rough_valuation.name": 1, "rough_valuation.enable": 1,
             "bill_valuation.id": 1, "bill_valuation.name": 1, "bill_valuation.enable": 1,
-            "estimation_valuation.id": 1, "estimation_valuation.name": 1, "estimation_valuation.enable": 1
+            "estimation_valuation.id": 1, "estimation_valuation.name": 1, "estimation_valuation.enable": 1,
+            "bill_valuation.fileTypes": 1
             } : fields;
         let compilationData = await this.findDataByCondition({name: {$ne: ''}}, field, false);
 
@@ -239,6 +240,29 @@ class CompilationModel extends BaseModel {
         return result !== null && result.ok === 1;
     }
 
+ 
+    /**
+     * 设置计价规则适用类型
+     *
+     * @param {String} valuationId
+     * @param {String} section
+     * @param {String} setFileTypes
+     * @return {Promise}
+     */
+     async setFileTypes(valuationId, section, fileTypes) {
+        let sectionString = section + "_valuation";
+        let condition = {};
+        condition[sectionString + ".id"] = valuationId;
+
+        let updateData = {};
+        updateData[sectionString + ".$.fileTypes"] = fileTypes;
+
+        let result = await this.db.update(condition, updateData);
+
+        return result !== null && result.ok === 1;
+    }
+
+
     /**
      * 过滤计价数据
      *

modules/users/routes/compilation_route.js

@@ -29,6 +29,7 @@ module.exports = function (app) {
     router.post('/delete-engineer', compilationController.auth, compilationController.init, compilationController.deleteEngineer);
     router.post('/save-lib', compilationController.auth, compilationController.init, compilationController.saveEngineering);
     router.post('/valuation/:section/enable', compilationController.auth, compilationController.init, compilationController.enableSwitch);
+    router.post('/valuation/:section/fileTypes', compilationController.auth, compilationController.init, compilationController.setFileTypes);
     router.post('/template/:section/:id/:engineering/update', compilationController.auth, compilationController.init, compilationController.updateBillsTemplate);
     router.post('/addEngineer', compilationController.auth, compilationController.init, compilationController.addEngineer);
     router.post('/copyRationLibs', compilationController.auth, compilationController.init, compilationController.copyRationLibs);

web/maintain/monomer_template_lib/html/edit.html

@@ -0,0 +1,32 @@
+<nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0 second_header">
+    <ul class="nav nav-tabs" role="tablist">
+        <li class="nav-item">
+            <a class="nav-link active px-3" href="javascript: void(0);">单体模板</a>
+        </li>
+    </ul>
+</nav>
+
+<div class="main">
+    <div class="content" >
+        <div class="container-fluid" >
+        <div class=" col-lg-12 p-0">
+            <nav class="navbar sticky-top navbar-toggleable-md navbar-light bg-faded tools-bar">
+                <div class="collapse navbar-collapse" id="navbarNav">
+                    <div class="tools-btn btn-group align-top">
+                        <a href="javascript:void(0)" class="btn btn-sm lock-btn-control" id="createNormal"><i class="fa fa-list-alt" aria-hidden="true"></i> 生成默认</a>
+                        <a href="javascript:void(0)" class="btn btn-sm lock-btn-control" id="format"><i class="fa fa-list-alt" aria-hidden="true"></i> 校验格式</a>
+                        <a href="javascript:void(0)" class="btn btn-sm lock-btn-control" id="save"><i class="fa fa-floppy-o" aria-hidden="true"></i> 保存</a>
+                    </div>
+                </div>
+            </nav>
+            <textarea class="form-control lock-text-control" id="templateLibs" rows="38"></textarea>
+        </div>
+        </div>
+        <input type="hidden" id="libID" value="<%= libID %>">
+        <input type="hidden" id="originalFeature" value="<%= templateLibs %>">
+    </div>
+</div>
+
+<script type="text/javascript" src="/lib/json/json2.js"></script>
+<script src="/public/web/lock_util.js"></script>
+<script type="text/javascript" src="/web/maintain/monomer_template_lib/js/monomer_template_edit.js"></script>

web/maintain/monomer_template_lib/html/main.html

@@ -0,0 +1,147 @@
+<div class="main">
+    <div class="content">
+        <div class="container-fluid">
+            <div class="row">
+                <div class="col-md-2">
+                    <div class="list-group mt-3">
+                        <% for (let compilation of compilationList) { %>
+                        <% if (compilation._id === 'all') { %>
+                        <a href="/monomerTemplate/main" class="list-group-item list-group-item-action <%= compilation.active %>">
+                            所有
+                        </a>
+                        <% } else { %>
+                        <a id="<%= compilation._id %>" href="/monomerTemplate/main/?filter=<%= compilation._id %>" class="list-group-item list-group-item-action <%= compilation.active %>">
+                            <%= compilation.name %>
+                        </a>
+                        <% }} %>
+                    </div>
+                </div>
+                <div class="col-md-10">
+                    <div class="warp-p2 mt-3">
+                        <table class="table table-hover table-bordered">
+                            <thead>
+                                <tr>
+                                    <th>单体模板名称</th>
+                                    <th width="160">编办</th>
+                                    <th width="160">添加时间</th>
+                                    <th width="70">操作</th>
+                                </tr>
+                            </thead>
+                            <tbody id="showArea">
+                                <% for(let lib of templateLibs){ %>
+                                <tr class="libTr">
+                                    <td id="<%= lib.ID%>"><a href="/monomerTemplate/edit/<%= lib.ID%>?locked=true"><%= lib.name%></a></td>
+                                    <td><%= lib.compilationName%></td>
+                                    <td><%= moment(lib.createDate).format('YYYY-MM-DD')%></td>
+                                    <td>
+                                        <a class="lock-btn-control disabled" href="javascript:void(0);"
+                                            style="color: #0275d8" onclick='getFeatureLib("<%= lib.ID%>")' title="编辑"><i
+                                                class="fa fa-pencil-square-o"></i></a>
+                                        <a class="text-danger lock-btn-control disabled" href="javascript:void(0);"
+                                            onclick='showDeleteModal("<%= lib.ID%>")' title="删除"><i
+                                                class="fa fa-remove"></i></a>
+                                        <a class="lock" data-locked="true" href="javascript:void(0);" title="解锁"><i
+                                                class="fa fa-unlock-alt"></i></a>
+                                    </td>
+                                </tr>
+                                <% } %>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!--弹出添加-->
+<div class="modal fade" id="add" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">添加单体模板</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form id="addLibForm" method="post" action="/monomerTemplate/addLib"
+                    enctype="application/x-www-form-urlencoded21">
+                    <div class="form-group">
+                        <label>单体模板名称</label>
+                        <input id="name" name="name" class="form-control" placeholder="输入单体模板名称" type="text">
+                        <small class="form-text text-danger" id="nameError" style="display: none">请输入模板名称。</small>
+                    </div>
+                    <div class="form-group">
+                        <label>编办名称</label>
+                        <select class="form-control" name="compilationId">
+                            <% for (let compilation of compilationList) { %>
+                            <% if (compilation.name !== '所有') { %>
+                            <option value="<%= compilation._id %>"><%= compilation.name %></option>
+                            <% }} %>
+                        </select>
+                    </div>
+                    <input type="hidden" name="userAccount" value="<%= userAccount%>">
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button id="addLibs" class="btn btn-primary">新建</button>
+                <button type="button" id="cancelBtn" class="btn btn-secondary" data-dismiss="modal">取消</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!--弹出编辑-->
+<div class="modal fade" id="edit" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">编辑单体模板</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form>
+                    <div class="form-group">
+                        <label>单体模板名称</label>
+                        <input id="renameText" class="form-control" placeholder="输入名称" type="text" value="">
+                        <small class="form-text text-danger" id="renameError" style="display: none">请输入名称。</small>
+                        <input id="libID" type="hidden">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <a id="rename" href="javascript: void(0);" class="btn btn-primary">确定</a>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!--弹出删除-->
+<div class="modal fade" id="del" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">删除确认</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <h5 class="text-danger">删除后无法恢复，确认是否删除？</h5>
+                <input type="hidden" id="libID_del">
+                <input type="hidden" id="delCount">
+            </div>
+            <div class="modal-footer">
+                <a id="delete" href="javascript:void(0);" class="btn btn-danger">确认</a>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script src="/public/web/lock_util.js"></script>
+<script type="text/javascript" src="/web/maintain/monomer_template_lib/js/monomer_template.js"></script>

web/maintain/monomer_template_lib/js/monomer_template.js

@@ -0,0 +1,81 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+$(document).ready(function() {
+    // 保存按钮
+    $("#addLibs").click(async function() {
+        let name = $('#name').val();
+        if(name==''){
+            $("#nameError").show();
+            return;
+        }else {
+            $("#addLibs").attr("disabled",true);//防止重复提交
+            $("#addLibForm").submit();
+        }
+    });
+
+    $("#rename").click(async function() {
+        let libID = $("#libID").val();
+        let name = $('#renameText').val();
+        if(libID!=''){
+            if(name ==''){
+                $("#renameError").show();
+                return;
+            }else {
+                try {
+                    let newFeature = await ajaxPost("/monomerTemplate/saveLib",{query:{ID:libID},data:{name:name}});
+                    $("#"+libID).children("a").text(name);
+                    $("#edit").modal('hide');
+                }catch(err) {
+                    console.log(err);
+                }
+            }
+        }
+    });
+
+    $("#delete").click(async function() {
+        let libID = $("#libID_del").val();
+        let delCount = parseInt($("#delCount").val());
+        delCount = delCount+1;
+        $("#delCount").val(delCount);
+        if(delCount == 3){
+            if(libID!=""){
+                try {
+                    let result = await ajaxPost("/monomerTemplate/deleteLibByID",{ID:libID});
+                    if(result.ok){
+                        $("#"+libID).parent(".libTr").remove();
+                    }
+                    $("#del").modal('hide');
+                }catch (err){
+                    console.log(err);
+                }
+            }
+        }
+    });
+
+    // 锁定、解锁
+    $('.lock').click(function () {
+        lockUtil.handleLockClick($(this));
+    });
+});
+
+async function getFeatureLib (ID) {
+    try {
+        const lib = await ajaxPost("/monomerTemplate/findLib",{ID});
+        if(lib){
+            $("#renameText").val(lib.name);
+            $("#libID").val(ID);
+            $("#edit").modal({show:true});
+        }else {
+            alert("没有找到该单体模板");
+        }
+    }catch (err){
+        console.log(err);
+    }
+}
+
+function showDeleteModal(ID){
+    $("#libID_del").val(ID);
+    $("#delCount").val(0);
+    $("#del").modal({show:true});
+}

web/maintain/monomer_template_lib/js/monomer_template_edit.js

@@ -0,0 +1,136 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+
+$(document).ready(function () {
+    const locked = lockUtil.getLocked();
+    lockUtil.lockTools($(document.body), locked);
+    try {
+        let tem = sortJson(JSON.parse($("#originalFeature").val()));
+        $("#templateLibs").val(JSON.stringify(tem.data,null,4));
+    }catch (err){
+        console.log(err);
+    }
+
+   $("#format").click( function() {
+       try {
+           let jsonText =  $("#templateLibs").val();
+           $("#templateLibs").val(JSON.stringify(JSON.parse(jsonText),null,4));
+       }catch (err){
+           console.log(err);
+           alert("输入的JSON格式有误，请重新输入！");
+       }
+   });
+    $("#save").click(async function() {
+        try {
+            let libID = $("#libID").val();
+            let jsonText =  $("#templateLibs").val();
+            if(jsonText.indexOf("'")!=-1){
+                alert("输入的格式不能包含 ' 位于："+jsonText.substr(jsonText.indexOf("'")-15,18));
+                return;
+            }
+            let newFeature = await ajaxPost("/monomerTemplate/saveLib",{query:{ID:libID},data:{data:JSON.parse(jsonText)}});
+        }catch (err){
+            console.log(err);
+            alert("保存失败，请查看输入数据");
+        }
+    });
+    $("#createNormal").click(()=>{
+        $("#createNormal").click(async function() {
+            let explorer =[
+                {
+                    "dispName": "学校",
+                    "items": [
+                        {
+                            "dispName": "教学楼",
+                            "isHaveStructuralSegment": "true",
+                            "key": "academicBuilding",
+                            "monomerType": "building"
+                        },
+                        {
+                            "dispName": "体育馆",
+                            "isHaveStructuralSegment": "true",
+                            "key": "gymnasium",
+                            "monomerType": "building"
+                        },
+                        {
+                            "dispName": "食堂",
+                            "isHaveStructuralSegment": "true",
+                            "key": "Canteen",
+                            "monomerType": "building"
+                        },
+                        {
+                            "dispName": "集体宿舍",
+                            "isHaveStructuralSegment": "true",
+                            "key": "collectiveDormitory",
+                            "monomerType": "building"
+                        }
+                    ],
+                    "key": "school"
+                },
+                {
+                    "dispName": "医院",
+                    "items": [
+                        {
+                            "dispName": "门诊楼",
+                            "isHaveStructuralSegment": "true",
+                            "key": "outpatientBuilding",
+                            "monomerType": "building"
+                        },
+                        {
+                            "dispName": "住院楼",
+                            "isHaveStructuralSegment": "true",
+                            "key": "inpatientBuilding",
+                            "monomerType": "building"
+                        },
+                        {
+                            "dispName": "集体宿舍",
+                            "isHaveStructuralSegment": "true",
+                            "key": "collectiveDormitory",
+                            "monomerType": "building"
+                        }
+                    ],
+                    "key": "hospital"
+                },
+                {
+                    "dispName": "市政工程",
+                    "items": [
+                        {
+                            "dispName": "新建改建扩建",
+                            "isHaveStructuralSegment": "true",
+                            "key": "newConstruction",
+                            "monomerType": "civil"
+                        },
+                        {
+                            "dispName": "景观提升",
+                            "isHaveStructuralSegment": "true",
+                            "key": "landscapeImprovement",
+                            "monomerType": "civil"
+                        },
+                        {
+                            "dispName": "养护大中修",
+                            "isHaveStructuralSegment": "true",
+                            "key": "curing",
+                            "monomerType": "civil"
+                        },
+                        {
+                            "dispName": "小修保养",
+                            "isHaveStructuralSegment": "true",
+                            "key": "routineMaintenance",
+                            "monomerType": "civil"
+                        }
+                    ],
+                    "key": "municipalConstruction"
+                }
+            ];
+            try {
+                let jsonText =  JSON.stringify(explorer);
+                $("#templateLibs").val(JSON.stringify(JSON.parse(jsonText),null,4));
+            }catch (err){
+                console.log(err);
+            }
+        })
+    })
+
+
+});

web/maintain/structural_segment_lib/html/edit.html

@@ -0,0 +1,32 @@
+<nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0 second_header">
+    <ul class="nav nav-tabs" role="tablist">
+        <li class="nav-item">
+            <a class="nav-link active px-3" href="javascript: void(0);">结构分部</a>
+        </li>
+    </ul>
+</nav>
+
+<div class="main">
+    <div class="content" >
+        <div class="container-fluid" >
+        <div class=" col-lg-12 p-0">
+            <nav class="navbar sticky-top navbar-toggleable-md navbar-light bg-faded tools-bar">
+                <div class="collapse navbar-collapse" id="navbarNav">
+                    <div class="tools-btn btn-group align-top">
+                        <a href="javascript:void(0)" class="btn btn-sm lock-btn-control" id="createNormal"><i class="fa fa-list-alt" aria-hidden="true"></i> 生成默认</a>
+                        <a href="javascript:void(0)" class="btn btn-sm lock-btn-control" id="format"><i class="fa fa-list-alt" aria-hidden="true"></i> 校验格式</a>
+                        <a href="javascript:void(0)" class="btn btn-sm lock-btn-control" id="save"><i class="fa fa-floppy-o" aria-hidden="true"></i> 保存</a>
+                    </div>
+                </div>
+            </nav>
+            <textarea class="form-control lock-text-control" id="templateLibs" rows="38"></textarea>
+        </div>
+        </div>
+        <input type="hidden" id="libID" value="<%= libID %>">
+        <input type="hidden" id="originalFeature" value="<%= templateLibs %>">
+    </div>
+</div>
+
+<script type="text/javascript" src="/lib/json/json2.js"></script>
+<script src="/public/web/lock_util.js"></script>
+<script type="text/javascript" src="/web/maintain/structural_segment_lib/js/structural_segment_edit.js"></script>

web/maintain/structural_segment_lib/html/main.html

@@ -0,0 +1,147 @@
+<div class="main">
+    <div class="content">
+        <div class="container-fluid">
+            <div class="row">
+                <div class="col-md-2">
+                    <div class="list-group mt-3">
+                        <% for (let compilation of compilationList) { %>
+                        <% if (compilation._id === 'all') { %>
+                        <a href="/structuralSegment/main" class="list-group-item list-group-item-action <%= compilation.active %>">
+                            所有
+                        </a>
+                        <% } else { %>
+                        <a id="<%= compilation._id %>" href="/structuralSegment/main/?filter=<%= compilation._id %>" class="list-group-item list-group-item-action <%= compilation.active %>">
+                            <%= compilation.name %>
+                        </a>
+                        <% }} %>
+                    </div>
+                </div>
+                <div class="col-md-10">
+                    <div class="warp-p2 mt-3">
+                        <table class="table table-hover table-bordered">
+                            <thead>
+                                <tr>
+                                    <th>结构分部名称</th>
+                                    <th width="160">编办</th>
+                                    <th width="160">添加时间</th>
+                                    <th width="70">操作</th>
+                                </tr>
+                            </thead>
+                            <tbody id="showArea">
+                                <% for(let lib of templateLibs){ %>
+                                <tr class="libTr">
+                                    <td id="<%= lib.ID%>"><a href="/structuralSegment/edit/<%= lib.ID%>?locked=true"><%= lib.name%></a></td>
+                                    <td><%= lib.compilationName%></td>
+                                    <td><%= moment(lib.createDate).format('YYYY-MM-DD')%></td>
+                                    <td>
+                                        <a class="lock-btn-control disabled" href="javascript:void(0);"
+                                            style="color: #0275d8" onclick='getFeatureLib("<%= lib.ID%>")' title="编辑"><i
+                                                class="fa fa-pencil-square-o"></i></a>
+                                        <a class="text-danger lock-btn-control disabled" href="javascript:void(0);"
+                                            onclick='showDeleteModal("<%= lib.ID%>")' title="删除"><i
+                                                class="fa fa-remove"></i></a>
+                                        <a class="lock" data-locked="true" href="javascript:void(0);" title="解锁"><i
+                                                class="fa fa-unlock-alt"></i></a>
+                                    </td>
+                                </tr>
+                                <% } %>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!--弹出添加-->
+<div class="modal fade" id="add" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">添加结构分部</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form id="addLibForm" method="post" action="/structuralSegment/addLib"
+                    enctype="application/x-www-form-urlencoded21">
+                    <div class="form-group">
+                        <label>结构分部名称</label>
+                        <input id="name" name="name" class="form-control" placeholder="输入结构分部名称" type="text">
+                        <small class="form-text text-danger" id="nameError" style="display: none">请输入模板名称。</small>
+                    </div>
+                    <div class="form-group">
+                        <label>编办名称</label>
+                        <select class="form-control" name="compilationId">
+                            <% for (let compilation of compilationList) { %>
+                            <% if (compilation.name !== '所有') { %>
+                            <option value="<%= compilation._id %>"><%= compilation.name %></option>
+                            <% }} %>
+                        </select>
+                    </div>
+                    <input type="hidden" name="userAccount" value="<%= userAccount%>">
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button id="addLibs" class="btn btn-primary">新建</button>
+                <button type="button" id="cancelBtn" class="btn btn-secondary" data-dismiss="modal">取消</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!--弹出编辑-->
+<div class="modal fade" id="edit" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">编辑结构分部</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <form>
+                    <div class="form-group">
+                        <label>结构分部名称</label>
+                        <input id="renameText" class="form-control" placeholder="输入名称" type="text" value="">
+                        <small class="form-text text-danger" id="renameError" style="display: none">请输入名称。</small>
+                        <input id="libID" type="hidden">
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <a id="rename" href="javascript: void(0);" class="btn btn-primary">确定</a>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!--弹出删除-->
+<div class="modal fade" id="del" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">删除确认</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <h5 class="text-danger">删除后无法恢复，确认是否删除？</h5>
+                <input type="hidden" id="libID_del">
+                <input type="hidden" id="delCount">
+            </div>
+            <div class="modal-footer">
+                <a id="delete" href="javascript:void(0);" class="btn btn-danger">确认</a>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script src="/public/web/lock_util.js"></script>
+<script type="text/javascript" src="/web/maintain/structural_segment_lib/js/structural_segment.js"></script>

web/maintain/structural_segment_lib/js/structural_segment.js

@@ -0,0 +1,81 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+$(document).ready(function() {
+    // 保存按钮
+    $("#addLibs").click(async function() {
+        let name = $('#name').val();
+        if(name==''){
+            $("#nameError").show();
+            return;
+        }else {
+            $("#addLibs").attr("disabled",true);//防止重复提交
+            $("#addLibForm").submit();
+        }
+    });
+
+    $("#rename").click(async function() {
+        let libID = $("#libID").val();
+        let name = $('#renameText').val();
+        if(libID!=''){
+            if(name ==''){
+                $("#renameError").show();
+                return;
+            }else {
+                try {
+                    await ajaxPost("/structuralSegment/saveLib",{query:{ID:libID},data:{name:name}});
+                    $("#"+libID).children("a").text(name);
+                    $("#edit").modal('hide');
+                }catch(err) {
+                    console.log(err);
+                }
+            }
+        }
+    });
+
+    $("#delete").click(async function() {
+        let libID = $("#libID_del").val();
+        let delCount = parseInt($("#delCount").val());
+        delCount = delCount+1;
+        $("#delCount").val(delCount);
+        if(delCount == 3){
+            if(libID!=""){
+                try {
+                    let result = await ajaxPost("/structuralSegment/deleteLibByID",{ID:libID});
+                    if(result.ok){
+                        $("#"+libID).parent(".libTr").remove();
+                    }
+                    $("#del").modal('hide');
+                }catch (err){
+                    console.log(err);
+                }
+            }
+        }
+    });
+
+    // 锁定、解锁
+    $('.lock').click(function () {
+        lockUtil.handleLockClick($(this));
+    });
+});
+
+async function getFeatureLib (ID) {
+    try {
+        const lib = await ajaxPost("/structuralSegment/findLib",{ID});
+        if(lib){
+            $("#renameText").val(lib.name);
+            $("#libID").val(ID);
+            $("#edit").modal({show:true});
+        }else {
+            alert("没有找到该结构分部");
+        }
+    }catch (err){
+        console.log(err);
+    }
+}
+
+function showDeleteModal(ID){
+    $("#libID_del").val(ID);
+    $("#delCount").val(0);
+    $("#del").modal({show:true});
+}

web/maintain/structural_segment_lib/js/structural_segment_edit.js

@@ -0,0 +1,73 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+
+$(document).ready(function () {
+    const locked = lockUtil.getLocked();
+    lockUtil.lockTools($(document.body), locked);
+    try {
+        let tem = sortJson(JSON.parse($("#originalFeature").val()));
+        $("#templateLibs").val(JSON.stringify(tem.data,null,4));
+    }catch (err){
+        console.log(err);
+    }
+
+   $("#format").click( function() {
+       try {
+           let jsonText =  $("#templateLibs").val();
+           $("#templateLibs").val(JSON.stringify(JSON.parse(jsonText),null,4));
+       }catch (err){
+           console.log(err);
+           alert("输入的JSON格式有误，请重新输入！");
+       }
+   });
+    $("#save").click(async function() {
+        try {
+            let libID = $("#libID").val();
+            let jsonText =  $("#templateLibs").val();
+            if(jsonText.indexOf("'")!=-1){
+                alert("输入的格式不能包含 ' 位于："+jsonText.substr(jsonText.indexOf("'")-15,18));
+                return;
+            }
+            let newFeature = await ajaxPost("/structuralSegment/saveLib",{query:{ID:libID},data:{data:JSON.parse(jsonText)}});
+        }catch (err){
+            console.log(err);
+            alert("保存失败，请查看输入数据");
+        }
+    });
+    $("#createNormal").click(()=>{
+        $("#createNormal").click(async function() {
+            let explorer = [ 
+                {
+                    "valuationName" : "粤建市[2019]6号",
+                    "monomerType" : "building",
+                    "items" : [ 
+                        {
+                            "type" : "单项工程",
+                            "key" : "basicEngineering",
+                            "dispName" : "基础工程",
+                            "subItems" : [ 
+                                {
+                                    "type" : "单位工程",
+                                    "key" : "foundationTreatment",
+                                    "feeType" : "建筑工程",
+                                    "engineering" : "房屋建筑与装饰工程",
+                                    "dispName" : "基础处理与基坑支护工程",
+                                    "calcProgram" : "计算程序2018一般/简易计税(标准)-粤建市[2019]6号",
+                                    "IndicatorSegment" : "基础工程"
+                                }
+                            ],
+                            
+                        }
+                    ]
+                }
+            ];
+            try {
+                let jsonText =  JSON.stringify(explorer);
+                $("#templateLibs").val(JSON.stringify(JSON.parse(jsonText),null,4));
+            }catch (err){
+                console.log(err);
+            }
+        })
+    })
+});

web/users/js/compilation.js

@@ -443,6 +443,54 @@ $(document).ready(function() {
         });
     });
 
+
+    // 设置适用类型
+    $(".fileType").change(function() {
+       
+        let id = $(this).data('id');
+        if (id === undefined || id === '' || isAdding) {
+            return false;
+        }
+        let fileTypes = [];
+        let oldVal = $(this).attr("checked");
+        if(oldVal){
+            $(this).removeAttr("checked") 
+        }else{
+           $(this).attr("checked","checked")
+        }
+
+        if($('#'+id+'_suggest_gusuan').attr("checked")) fileTypes.push(16);
+        if($('#'+id+'_gusuan').attr("checked")) fileTypes.push(15);
+        if($('#'+id+'_estimate').attr("checked")) fileTypes.push(5);
+        if($('#'+id+'_submission').attr("checked")) fileTypes.push(1);
+        if($('#'+id+'_quantity_bill').attr("checked")) fileTypes.push(18);
+        let current = $(this);
+
+        console.log(id,this);
+        $.ajax({
+            url: '/compilation/valuation/' + section + '/fileTypes',
+            type: 'post',
+            dataType: "json",
+            data: {id: id, fileTypes: fileTypes},
+            error: function() {
+                //恢复原值
+               if(oldVal){
+                current.attr("checked","checked")
+               }else{
+                current.removeAttr("checked") 
+               }
+            },
+            success: function(response) {
+                if (response.err !== 0) {
+                    switchChange($(this));
+                    alert('更改失败');
+                }
+            }
+        });
+    });
+
+
+
     //计价规则删除
     $('#delete-confirm').click(function () {
         let id = $('#del').attr('selectedId');

web/users/views/compilation/index.html

@@ -21,11 +21,16 @@
                 <li role="presentation"><a href="#feasibility" aria-controls="feasibility" role="tab" data-toggle="tab">可行性估算</a></li>
                 <li role="presentation"><a href="#rough" aria-controls="rough" role="tab" data-toggle="tab">概算</a></li>
                 <% } %>
-                <li role="presentation" class=<%= selectedCompilation.name.includes('公路造价') ? '' : 'active' %>><a href="#bill" aria-controls="bill" role="tab" data-toggle="tab">预算</a></li>
+                <li role="presentation" class=<%= selectedCompilation.name.includes('公路造价') ? '' : 'active' %>><a href="#bill" aria-controls="bill" role="tab" data-toggle="tab">
+                    <% if(title === '公路2.0') { %>    
+                    清单计价
+                    <% } else { %>
+                        预算
+                    <% } %>
+                </a></li>
                 <li role="presentation"><a href="#ration" aria-controls="ration" role="tab" data-toggle="tab">工程量清单</a></li>
-                <!--
-                -->
                 <li role="presentation"><a href="#estimation" aria-controls="estimation" role="tab" data-toggle="tab">估算</a></li>
+                
             </ul>
         </div>
         <div class="c-body tab-content">
@@ -153,6 +158,9 @@
                     <tr>
                         <th>计价规则</th>
                         <th>启用/禁用</th>
+                        <% if(title === '公路2.0') { %>
+                            <th>适用类型</th>
+                        <% } %>
                         <th>操作</th>
                     </tr>
                     </thead>
@@ -174,6 +182,15 @@
                             </div>
                             <% } %>
                         </td>
+                        <% if(title === '公路2.0') { %>
+                        <td>
+                             <input type="checkbox" data-id="<%= bill.id %>" class="fileType" id="<%= bill.id %>_suggest_gusuan" <% if (bill.fileTypes && bill.fileTypes.includes(16)) { %> checked <% } %> /> 建议估算  
+                             <input type="checkbox" data-id="<%= bill.id %>" class="fileType" id="<%= bill.id %>_gusuan" <% if (bill.fileTypes && bill.fileTypes.includes(15)) { %> checked <% } %> /> 估算  
+                             <input type="checkbox" data-id="<%= bill.id %>" class="fileType" id="<%= bill.id %>_estimate"  <% if (bill.fileTypes && bill.fileTypes.includes(5)) { %> checked <% } %>  /> 概算    
+                             <input type="checkbox" data-id="<%= bill.id %>" class="fileType" id="<%= bill.id %>_submission" <% if (bill.fileTypes && bill.fileTypes.includes(1)) { %> checked <% } %>  /> 预算      
+                             <input type="checkbox" data-id="<%= bill.id %>" class="fileType" id="<%= bill.id %>_quantity_bill" <% if (bill.fileTypes && bill.fileTypes.includes(18)) { %> checked <% } %>  /> 工程量清单   
+                         </td>
+                        <% } %>
                         <td>
                             <a href="/compilation/valuation/bill/<%= bill.id %>" class="btn btn-sm">编辑</a>
                             <a onclick="$('#del').attr('selectedId', '<%= bill.id %>')" href="#" data-id="<%= bill.id %>" data-toggle="modal" data-target="#del" class="btn btn-sm text-danger">删除</a>