基本信息库相关

modules/all_models/basic_info_lib.js

@@ -0,0 +1,25 @@
+'use strict';
+
+/**
+ *
+ *
+ * @author Zhong
+ * @date 2019/3/5
+ * @version
+ */
+//建设项目基本信息库
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+const oprSchema = require('../all_schemas/opr_schema');
+const basicInfoLib = new Schema({
+    ID: {type: String, index: true},
+    name: String,
+    creator: String,
+    createDate: Number,
+    recentOpr: [oprSchema],
+    info: {
+        type: Schema.Types.Mixed,
+        default: []
+    }
+}, {versionKey: false});
+mongoose.model('std_basic_info_lib', basicInfoLib, 'std_basic_info_lib');

modules/all_models/engineering_lib.js

@@ -58,6 +58,10 @@ let modelSchema = {
         type: Schema.Types.Mixed,
         default: []
     },
+    info_lib: {
+        type: Schema.Types.Mixed,
+        default: []
+    },
     //设置人材机显示列
     glj_col:{
         showAdjustPrice:Boolean//是否显示调整价列

modules/basic_info_lib/controllers/basic_info_controller.js

@@ -0,0 +1,99 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+import BaseController from "../../common/base/base_controller";
+import basicInfoFacade from "../facade/basic_info_facade";
+let config = require("../../../config/config.js");
+
+class BasicInfoController extends BaseController{
+    async main(request, response) {
+        let baiscInfoLibs = await basicInfoFacade.findByCondition({},{feature:0},false);
+        let randerData = {
+            title:'基本信息库',
+            userAccount: request.session.managerData.username,
+            userID: request.session.managerData.userID,
+            basicInfoLibs:baiscInfoLibs,
+            layout: 'maintain/common/html/layout'
+        };
+        response.render("maintain/basic_info_lib/html/main", randerData);
+    }
+    async addLib(request, response){
+        try {
+            await basicInfoFacade.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 basicInfoFacade.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);
+            let resultData= await basicInfoFacade.saveLib(data);
+            result.data=resultData;
+        }catch (err){
+            console.log(err);
+            result.error=1;
+            result.message = err.message;
+        }
+        response.json(result);
+    }
+    async deleteLibByID(request,response){
+        let result={
+            error:0
+        };
+        try {
+            let data = request.body.data;
+            data = JSON.parse(data);
+            let resultData= await basicInfoFacade.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 basicInfoLib = await basicInfoFacade.findByCondition({'ID':libID});
+        if(basicInfoLib){
+            let randerData = {
+                title:'基本信息库',
+                mainURL:'/basicInfo/main',
+                libName:basicInfoLib.name,
+                userAccount: request.session.managerData.username,
+                userID: request.session.managerData.userID,
+                basicInfoList:JSON.stringify(basicInfoLib.info),
+                libID:libID,
+                LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
+                layout: 'maintain/common/html/edit_layout'
+            };
+            response.render("maintain/basic_info_lib/html/edit", randerData);
+        }else {
+            response.redirect(request.headers.referer);
+        }
+    }
+}
+export default BasicInfoController;

modules/basic_info_lib/facade/basic_info_facade.js

@@ -0,0 +1,38 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+import mongoose from "mongoose";
+const uuidV1 = require('uuid/v1');
+let moment = require("moment");
+let basicInfoModel = mongoose.model('std_basic_info_lib');
+
+
+let basicInfoLib = {
+    findByCondition:async function(conditions,options,single=true){
+        if(single == true){
+            return await basicInfoModel.findOne(conditions,options);
+        }else {
+            return await  basicInfoModel.find(conditions,options);
+        }
+    },
+    addLib : async function (data){
+        let now = new Date().getTime();
+        let dateStr = moment(now).format('YYYY-MM-DD HH:mm:ss');
+        let newLib = {
+            creator: data.userAccount,
+            createDate: now,
+            recentOpr: [{operator: data.userAccount, operateDate: dateStr}],
+            name: data.name,
+        };
+        newLib.ID = uuidV1();
+        return await basicInfoModel.create(newLib);
+    },
+    saveLib:async function(param) {
+        return await basicInfoModel.findOneAndUpdate(param.query,param.data,{new:true});
+    },
+    deleteLibByID:async function(ID){
+        return await basicInfoModel.deleteOne({ID:ID});
+    },
+};
+
+export default basicInfoLib

modules/basic_info_lib/routes/project_feature_router.js

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

modules/users/controllers/compilation_controller.js

@@ -22,6 +22,7 @@ const billsGuidanceFc = require('../../std_billsGuidance_lib/facade/facades');
 import mainColFacade from "../../main_col_lib/facade/main_col_facade";
 import billTemplateFacade from "../../bills_template_lib/facade/bills_template_facade";
 import projectFeatureFacade from "../../project_feature_lib/facade/project_feature_facade";
+import basicInfoFacade from "../../basic_info_lib/facade/basic_info_facade";
 import {default as category, List as categoryList} from "../../common/const/category_const.js";
 let config = require("../../../config/config.js");
 const fs = require('fs');
@@ -180,7 +181,7 @@ class CompilationController extends BaseController {
         let section = request.params.section;
         let selectedCompilation = request.session.selectedCompilation;
 
-        let compilationList = [],billList = [], rationList = [], gljList = [],feeRateList = [], libData = {}, billsTemplateData = [],featureList = [];
+        let compilationList = [],billList = [], rationList = [], gljList = [],feeRateList = [], libData = {}, billsTemplateData = [],featureList = [],infoList = [];
         let valuationData = {}, valuationList = {}, artificialCoefficientList = [], calculationList = [], billsGuidanceList = [], mainTreeColList = [];
         let billTemplateList = [];
         try {
@@ -237,6 +238,9 @@ class CompilationController extends BaseController {
             //获取工程特征库
             featureList = await projectFeatureFacade.findByCondition({},null,false);
 
+            //获取基本信息库
+            infoList = await basicInfoFacade.findByCondition({},null,false);
+
         } catch (error) {
             console.log(error);
         }
@@ -262,6 +266,7 @@ class CompilationController extends BaseController {
             calculationList: JSON.stringify(calculationList),
             billsGuidanceList: JSON.stringify(billsGuidanceList),
             featureList:JSON.stringify(featureList),
+            infoList: JSON.stringify(infoList),
             layout: 'users/views/layout/layout',
             LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
         };

modules/users/models/engineering_lib_model.js

@@ -181,6 +181,9 @@ class EngineeringLibModel extends BaseModel {
         //判断工程特征库
         data.feature_lib = this._validLib(data.feature_lib);
 
+        //判断基本信息
+        data.info_lib = this._validLib(data.info_lib);
+
         //计税方式组合
         data.tax_group = this._validLib(data.tax_group);
 

web/maintain/basic_info_lib/html/edit.html

@@ -0,0 +1,37 @@
+<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" id="createNormal"><i class="fa fa-list-alt" aria-hidden="true"></i> 生成默认</a>
+                        <a href="javascript:void(0)" class="btn btn-sm" id="format"><i class="fa fa-list-alt" aria-hidden="true"></i> 校验格式</a>
+                        <a href="javascript:void(0)" class="btn btn-sm" id="save"><i class="fa fa-floppy-o" aria-hidden="true"></i> 保存</a>
+                    </div>
+                </div>
+            </nav>
+            <textarea class="form-control" id="basicInfoList" rows="38"></textarea>
+        </div>
+        </div>
+        <input type="hidden" id="libID" value="<%= libID %>">
+        <input type="hidden" id="originalInfo" value="<%= basicInfoList %>">
+    </div>
+</div>
+
+
+
+<script type="text/javascript">
+
+</script>
+<script type="text/javascript" src="/public/web/PerfectLoad.js"></script>
+<script type="text/javascript" src="/lib/json/json2.js"></script>
+<script type="text/javascript" src="/web/maintain/basic_info_lib/js/basic_info_edit.js"></script>

web/maintain/basic_info_lib/html/main.html

@@ -0,0 +1,108 @@
+<div class="main">
+    <div class="content">
+        <div class="container-fluid">
+            <div class="row">
+                <div class="col-md-5">
+                    <div class="warp-p2 mt-3">
+                        <table class="table table-hover table-bordered">
+                            <thead><tr><th >库名称</th><th width="160">添加时间</th><th width="120">操作</th></tr></thead>
+                            <tbody id="showArea">
+                            <% for(let lib of basicInfoLibs){ %>
+                            <tr class="libTr">
+                                <td id="<%= lib.ID%>"><a href="/basicInfo/edit/<%= lib.ID%>"><%= lib.name%></a></td>
+                                <td><%= moment(lib.createDate).format('YYYY-MM-DD')%></td>
+                                <td>
+                                    <a style="color: #0275d8" onclick='getBasicInfoLib("<%= lib.ID%>")' title="编辑"><i class="fa fa-pencil-square-o"></i></a>
+                                    <a style="color: #0275d8" onclick='showDeleteModal("<%= lib.ID%>")' class="text-danger" title="删除"><i class="fa fa-remove"></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="/basicInfo/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>
+                    <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 type="text/javascript" src="/web/maintain/basic_info_lib/js/basic_info.js"></script>

web/maintain/basic_info_lib/js/basic_info.js

@@ -0,0 +1,76 @@
+/**
+ * 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 newInfo = await ajaxPost("/basicInfo/saveLib",{query:{ID:libID},data:{name:name}});
+                    $("#"+libID).children("a").text(newInfo.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("/basicInfo/deleteLibByID",{ID:libID});
+                    if(result.ok){
+                        $("#"+libID).parent(".libTr").remove();
+                    }
+                    $("#del").modal('hide');
+                }catch (err){
+                    console.log(err);
+                }
+            }
+        }
+    });
+});
+
+async function getBasicInfoLib (ID) {
+    try {
+        let lib = await ajaxPost("/basicInfo/findLib",{ID: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/basic_info_lib/js/basic_info_edit.js

@@ -0,0 +1,102 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+
+$(document).ready(function () {
+    try {
+        let tem = sortJson(JSON.parse($("#originalInfo").val()), compareInfo);
+        $("#basicInfoList").val(JSON.stringify(tem,null,4));
+    }catch (err){
+        console.log(err);
+    }
+
+   $("#format").click( function() {
+       try {
+           let jsonText =  $("#basicInfoList").val();
+           $("#basicInfoList").val(JSON.stringify(JSON.parse(jsonText),null,4));
+       }catch (err){
+           console.log(err);
+           alert("输入的JSON格式有误，请重新输入！");
+       }
+   });
+    $("#save").click(async function() {
+        try {
+            $.bootstrapLoading.start();
+            let libID = $("#libID").val();
+            let jsonText =  $("#basicInfoList").val();
+            if(jsonText.indexOf("'")!=-1){
+                alert("输入的格式不能包含 ' 位于："+jsonText.substr(jsonText.indexOf("'")-15,18));
+                return;
+            }
+            await ajaxPost("/basicInfo/saveLib",{query:{ID:libID},data:{info:JSON.parse(jsonText)}});
+            $.bootstrapLoading.end();
+        }catch (err){
+            $.bootstrapLoading.end();
+            console.log(err);
+            alert("保存失败，请查看输入数据");
+        }
+    });
+    $("#createNormal").click(async function() {
+        let basicInfo = [
+            {dispName: '基本信息', key: 'basicInfo', readOnly: true, items: [
+                {dispName: '合同号', key: 'contractNum', value: ''},
+                {dispName: '建设地点', key: 'constructionPlace', value: ''},
+                {dispName: '质量标准', key: 'qualityStandard', value: ''},
+                {dispName: '工程类别', key: 'projectCategory', value: ''},
+                {dispName: '建设日期', key: 'constructionDate', cellType: 'date', value: ''},
+                {dispName: '工程规模', key: 'projectScale', value: ''},
+                {dispName: '总建筑面积(m2)', key: 'grossArea', cellType: 'number', value: ''},
+                {dispName: '建设单位', key: 'constructionUnit', value: ''},
+                {dispName: '设计单位', key: 'designUnit', value: ''},
+                {dispName: '施工单位', key: 'buildingUnit', value: ''},
+                {dispName: '监理单位', key: 'supervisingUnit', value: ''},
+                {dispName: '审核单位', key: 'auditUnit', value: ''},
+                {dispName: '建设单位审核人', key: 'constructionUnitAudit', value: ''},
+                {dispName: '设计单位负责人', key: 'designUnitPrincipal', value: ''},
+                {dispName: '施工单位编制人', key: 'buildingUnitAuthor', value: ''},
+                {dispName: '监理单位审核人', key: 'supervisingUnitAuditor', value: ''},
+                {dispName: '审核单位审核人', key: 'auditUnitAuditor', value: ''},
+                {dispName: '编制时间', key: 'establishDate', cellType: 'date', value: ''}
+            ]},
+            {dispName: '招标信息', key: 'biddingInfo', readOnly: true, items: [
+                {dispName: '招标人', key: 'bidInviter', value: ''},
+                {dispName: '法定代表人或其他授权人', key: 'representative', value: ''},
+                {dispName: '造价工程师', key: 'costEngineer', value: ''}
+            ]},
+            {dispName: '投标信息', key: 'bidInfo', readOnly: true, items: [
+                {dispName: '投标人', key: 'bidder', value: ''},
+                {dispName: '法定代表人或其授权人', key: 'representative', value: ''},
+                {dispName: '造价工程师', key: 'costEngineer', value: ''}
+            ]},
+            {dispName: '工程造价咨询信息', key: 'engineeringCostConsultationInfo', readOnly: true, items: [
+                {dispName: '工程造价咨询人', key: 'consultant', value: ''},
+                {dispName: '法定代表人或其授权人', key: 'representative', value: ''},
+                {dispName: '造价工程师', key: 'costEngineer', value: ''}
+            ]}
+        ];
+        try {
+            let jsonText =  JSON.stringify(basicInfo);
+            $("#basicInfoList").val(JSON.stringify(JSON.parse(jsonText),null,4));
+        }catch (err){
+            console.log(err);
+        }
+
+    })
+
+
+});
+function compareInfo(a, b) {
+    let mapping = {
+        dispName: 1,
+        key: 2,
+        cellType: 3,
+        readOnly: 4,
+        required: 5,
+        value: 6,
+        options: 7,
+        items: 8
+    };
+    let aV = mapping[a] ? mapping[a] : 0,
+        bV = mapping[b] ? mapping[b] : 0;
+    return aV - bV;
+}

web/maintain/common/js/util.js

@@ -19,13 +19,13 @@ async function initCompilationSelect() {
 }
 
 //对JSON对象排序，按属性key的顺序显示
-function sortJson(obj) {
+function sortJson(obj, compare) {
     if(obj === null){
         return null;
     }
     if(obj instanceof Array){
         for(let o in obj){
-            obj[o] = sortJson(obj[o]);
+            obj[o] = sortJson(obj[o], compare);
         }
         return obj;
     }else if(typeof obj == 'object'){
@@ -34,9 +34,13 @@ function sortJson(obj) {
         for(let key in obj){
             arr.push(key);
         }
-        arr.sort();
+        if (compare) {
+            arr.sort(compare);
+        } else {
+            arr.sort();
+        }
         for(let a of arr){
-            newOjb[a]= sortJson(obj[a]);
+            newOjb[a]= sortJson(obj[a], compare);
         }
         return newOjb;
     }else {

web/users/js/compilation.js

@@ -241,6 +241,10 @@ $(document).ready(function() {
                 $("#feature-area").show();
                 $("#add-compilation-title").text('添加工程特征');
                 break;
+            case 'info':
+                $('#info-area').show();
+                $('#add-compilation-title').text('添加基本信息');
+                break;
         }
         $("#addcompilation").modal('show');
     });
@@ -257,7 +261,7 @@ $(document).ready(function() {
     });
 
     // 移除操作
-    $(".bill-list, .ration-list, .glj-list, .fee-list, .artificial-list, .program-list, .billsGuidance-list,.feature-list").on("click", ".remove-lib", function() {
+    $(".bill-list, .ration-list, .glj-list, .fee-list, .artificial-list, .program-list, .billsGuidance-list,.feature-list,.info-list").on("click", ".remove-lib", function() {
         $(this).parent().remove();
     });
 
@@ -448,6 +452,7 @@ function initCompilation() {
     let billTemplateData = billTemplateList == undefined ? [] : JSON.parse(billTemplateList);
     let mainTreeColData= mainTreeColList == undefined ? [] : JSON.parse(mainTreeColList);
     let featureData = featureList == undefined?[]: JSON.parse(featureList);
+    let infoData = infoList == undefined ? [] : JSON.parse(infoList);
     /*mainTreeCol = mainTreeCol !== '' ? mainTreeCol.replace(/\n/g, '\\n') : mainTreeCol;
     billsTemplateData = billsTemplateData.replace(/\n/g, '\\n');
 
@@ -546,6 +551,14 @@ function initCompilation() {
         html += tmpHtml;
     }
     $("select[name='feature_lib']").children("option").first().after(html);
+
+    //基本信息库
+    html = '';
+    for(let tmp of infoData){
+        let tmpHtml = '<option value="' + tmp.ID + '">' + tmp.name + '</option>';
+        html += tmpHtml;
+    }
+    $("select[name='info_lib']").children("option").first().after(html);
 }
 
 /**
@@ -564,6 +577,7 @@ function getAndValidData(model) {
     let programLib = $("select[name='program_lib']").children("option:selected").val();
     let billsGuidanceLib = $("select[name='billsGuidance_lib']").children("option:selected").val();
     let featureLib = $("select[name='feature_lib']").children("option:selected").val();
+    let infoLib = $("select[name='info_lib']").children("option:selected").val();
 
 
     if (name === '' && model === 'all') {
@@ -605,6 +619,7 @@ function getAndValidData(model) {
     let programString = $("select[name='program_lib']").children("option:selected").text();
     let billsGuidanceString = $("select[name='billsGuidance_lib']").children("option:selected").text();
     let featrueString = $("select[name='feature_lib']").children("option:selected").text();
+    let infoString = $("select[name='info_lib']").children("option:selected").text();
 
 
     let result = {
@@ -640,6 +655,10 @@ function getAndValidData(model) {
         feature:{
             id:featureLib,
             name:featrueString
+        },
+        info: {
+            id: infoLib,
+            name: infoString
         }
     };
     return result;

web/users/views/compilation/engineering.html

@@ -106,6 +106,23 @@
                                 </div>
                                 <a href="#" class="btn btn-link btn-sm add-compilation" data-model="feature">添加</a>
                             </div>
+                            <div class="form-group col-md-3">
+                                <label>基本信息</label>
+                                <div class="info-list">
+                                    <% if (Object.keys(libData).length > 0 && libData.info_lib && libData.info_lib.length > 0) { %>
+                                    <% libData.info_lib.forEach(function (info, index){ %>
+                                    <p class="form-control-static">
+                                        <a class="pull-right text-danger remove-lib" data-model="info" title="移除" data-id="<%= info.id %>">
+                                            <span class="glyphicon glyphicon-remove"></span>
+                                        </a>
+                                        <input type="hidden" name="info_lib" data-id="<%= info.id %>" value="<%= JSON.stringify({id: info.id, name: info.name}) %>">
+                                        <% if (index === 0) {%><i class="glyphicon glyphicon-flag"></i>&nbsp;<% } %><%= info.name %>
+                                    </p>
+                                    <% }) %>
+                                    <% } %>
+                                </div>
+                                <a href="#" class="btn btn-link btn-sm add-compilation" data-model="info">添加</a>
+                            </div>
                     </div>
 
                     <div class="col-md-12">
@@ -232,6 +249,7 @@
     let billTemplateList = '<%- billTemplateList %>';
     let mainTreeColList = '<%- mainTreeColList %>';
     let featureList = '<%- featureList %>';
+    let infoList = '<%- infoList %>';
     let colSpread = null;
     let colEditSpread = null;
 </script>

web/users/views/compilation/modal.html

@@ -51,6 +51,16 @@
                         </div>
                     </div>
                 </div>
+                <div class="form-group" id="info-area">
+                    <label>基本信息</label>
+                    <div class="row">
+                        <div class="col-xs-12">
+                            <select class="form-control" name="info_lib">
+                                <option value="">请选择基本信息库</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
                 <div class="form-group" id="artificial-area">
                     <label>人工系数</label>
                     <div class="row">