累进区间库

modules/all_models/engineering_lib.js

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

modules/all_models/std_progressive_lib.js

@@ -0,0 +1,32 @@
+'use strict';
+
+/**
+ *
+ *
+ * @author Zhong
+ * @date 2019/1/25
+ * @version
+ */
+
+/*
+* 累进区间库
+* 设置清单基数中金额区间与费率的对应关系，清单基数累进算法使用
+* */
+
+const mongoose = require('mongoose');
+const Schema = mongoose.Schema;
+const oprSchema = require('../all_schemas/opr_schema');
+
+const progressiveInterval = new Schema({
+    ID: String,
+    name: String,
+    creator: String,
+    createDate: Date,
+    recentOpr: [oprSchema],
+    data: {
+        type: [Schema.Types.Mixed],
+        default: []
+    },
+}, {versionKey: false});
+
+mongoose.model('std_progressive_lib', progressiveInterval, 'std_progressive_lib');

modules/progressive_interval_lib/controllers/progressive_controller.js

@@ -0,0 +1,106 @@
+'use strict';
+
+/**
+ *
+ *
+ * @author Zhong
+ * @date 2019/1/25
+ * @version
+ */
+
+import BaseController from "../../common/base/base_controller";
+import progressiveFacade from "../facade/progressive_facade";
+let config = require("../../../config/config.js");
+
+class ProgressiveController extends BaseController{
+    async main(request, response) {
+        let progressiveLib = await progressiveFacade.findByCondition({},{data:0},false);
+        let randerData = {
+            title:'累进区间库',
+            userAccount: request.session.managerData.username,
+            userID: request.session.managerData.userID,
+            progressiveLibs:progressiveLib,
+            layout: 'maintain/common/html/layout'
+        };
+        response.render("maintain/progressive_lib/html/main", randerData);
+    }
+    async addLib(request, response){
+        try {
+            await progressiveFacade.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 progressiveFacade.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 progressiveFacade.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 progressiveFacade.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 progressiveLib = await progressiveFacade.findByCondition({'ID':libID});
+        if(progressiveLib){
+            let randerData = {
+                title:'累进区间库',
+                mainURL:'/progressive/main',
+                libName:progressiveLib.name,
+                userAccount: request.session.managerData.username,
+                userID: request.session.managerData.userID,
+                progressiveList:JSON.stringify(progressiveLib.data),
+                libID:libID,
+                LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
+                layout: 'maintain/common/html/edit_layout'
+            };
+            response.render("maintain/progressive_lib/html/edit", randerData);
+        }else {
+            response.redirect(request.headers.referer);
+        }
+    }
+}
+export default ProgressiveController;

modules/progressive_interval_lib/facade/progressive_facade.js

@@ -0,0 +1,45 @@
+'use strict';
+
+/**
+ *
+ *
+ * @author Zhong
+ * @date 2019/1/25
+ * @version
+ */
+
+import mongoose from "mongoose";
+const uuidV1 = require('uuid/v1');
+let moment = require("moment");
+let progressiveModel = mongoose.model('std_progressive_lib');
+
+
+let progressiveLib = {
+    findByCondition:async function(conditions,options,single=true){
+        if(single == true){
+            return await progressiveModel.findOne(conditions,options);
+        }else {
+            return await  progressiveModel.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 progressiveModel.create(newLib);
+    },
+    saveLib:async function(param) {
+        return await progressiveModel.findOneAndUpdate(param.query,param.data,{new:true});
+    },
+    deleteLibByID:async function(ID){
+        return await progressiveModel.deleteOne({ID:ID});
+    },
+};
+
+export default progressiveLib

modules/progressive_interval_lib/routes/progressive_route.js

@@ -0,0 +1,26 @@
+'use strict';
+
+/**
+ *
+ *
+ * @author Zhong
+ * @date 2019/1/25
+ * @version
+ */
+
+let express = require("express");
+let progressiveRouter =express.Router();
+import ProgressiveController from "../controllers/progressive_controller";
+let progressiveController = new ProgressiveController();
+
+module.exports =function (app){
+
+    progressiveRouter.get("/main", progressiveController.auth, progressiveController.init, progressiveController.main);
+    progressiveRouter.post("/addLib", progressiveController.auth, progressiveController.init, progressiveController.addLib);
+    progressiveRouter.post("/findLib", progressiveController.auth, progressiveController.init, progressiveController.findLib);
+    progressiveRouter.post("/saveLib", progressiveController.auth, progressiveController.init, progressiveController.saveLib);
+    progressiveRouter.post("/deleteLibByID", progressiveController.auth, progressiveController.init, progressiveController.deleteLibByID);
+    progressiveRouter.get("/edit/:libID", progressiveController.auth, progressiveController.init, progressiveController.edit);
+    app.use("/progressive", progressiveRouter);
+};
+

modules/ration_repository/controllers/repository_views_controller.js

@@ -8,7 +8,7 @@ const compilationModel = mongoose.model('compilation');
 const rationLibModel = mongoose.model('std_ration_lib_map');
 const fs = require('fs');
 class ViewsController extends BaseController{
-    redirectMain(req, res){
+    async redirectMain(req, res){
         res.render('maintain/ration_repository/main.html',
             {
                 userAccount: req.session.managerData.username,

modules/ration_repository/models/ration_item.js

@@ -15,6 +15,27 @@ import STDGLJListModel from '../../std_glj_lib/models/gljModel';
 
 var rationItemDAO = function(){};
 
+//将消耗量为负的人材机改为正的
+rationItemDAO.prototype.toPositive = async function (rationRepId) {
+    let rations = await rationItemModel.find({rationRepId: rationRepId, 'rationGljList.consumeAmt': {$lt: 0}});
+    let task = [];
+    for (let ration of rations) {
+        let update = false;
+        for (let rGlj of ration.rationGljList) {
+            if (rGlj.consumeAmt < 0) {
+                update = true;
+                rGlj.consumeAmt = Math.abs(rGlj.consumeAmt);
+            }
+        }
+        if (update) {
+            task.push({updateOne: {filter: {ID: ration.ID}, update: {rationGljList: ration.rationGljList}}});
+        }
+    }
+    if (task.length > 0) {
+        await rationItemModel.bulkWrite(task);
+    }
+};
+
 rationItemDAO.prototype.getRationItemsByLib = async function (rationRepId, showHint = null, returnFields = '') {
     let rationLib = await stdRationLibModel.findOne({ID: rationRepId, deleted: false});
     if(!rationLib){

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 progressiveFacade from "../../progressive_interval_lib/facade/progressive_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 = [],progressiveList = [];
         let valuationData = {}, valuationList = {}, artificialCoefficientList = [], calculationList = [], billsGuidanceList = [], mainTreeColList = [];
         let billTemplateList = [];
         try {
@@ -237,6 +238,10 @@ class CompilationController extends BaseController {
             //获取工程特征库
             featureList = await projectFeatureFacade.findByCondition({},null,false);
 
+            //获取累进区间库
+            progressiveList = await progressiveFacade.findByCondition({},null,false);
+
+
         } catch (error) {
             console.log(error);
         }
@@ -262,6 +267,7 @@ class CompilationController extends BaseController {
             calculationList: JSON.stringify(calculationList),
             billsGuidanceList: JSON.stringify(billsGuidanceList),
             featureList:JSON.stringify(featureList),
+            progressiveList:JSON.stringify(progressiveList),
             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.progressive_lib = this._validLib(data.progressive_lib);
+
         //计税方式组合
         data.tax_group = this._validLib(data.tax_group);
 

web/maintain/progressive_lib/html/edit.html

@@ -0,0 +1,36 @@
+<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="progressiveList" rows="38"></textarea>
+        </div>
+        </div>
+        <input type="hidden" id="libID" value="<%= libID %>">
+        <input type="hidden" id="originalInterval" value="<%= progressiveList %>">
+    </div>
+</div>
+
+
+
+<script type="text/javascript">
+
+</script>
+<script type="text/javascript" src="/lib/json/json2.js"></script>
+<script type="text/javascript" src="/web/maintain/progressive_lib/js/progressive_interval_edit.js"></script>

web/maintain/progressive_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 progressiveLibs){ %>
+                            <tr class="libTr">
+                                <td id="<%= lib.ID%>"><a href="/progressive/edit/<%= lib.ID%>"><%= lib.name%></a></td>
+                                <td><%= moment(lib.createDate).format('YYYY-MM-DD')%></td>
+                                <td>
+                                    <a style="color: #0275d8" onclick='getProgressiveLib("<%= 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="/progressive/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/progressive_lib/js/progressive_interval.js"></script>

web/maintain/progressive_lib/js/progressive_interval.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 newFeature = await ajaxPost("/progressive/saveLib",{query:{ID:libID},data:{name:name}});
+                    $("#"+libID).children("a").text(newFeature.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("/progressive/deleteLibByID",{ID:libID});
+                    if(result.ok){
+                        $("#"+libID).parent(".libTr").remove();
+                    }
+                    $("#del").modal('hide');
+                }catch (err){
+                    console.log(err);
+                }
+            }
+        }
+    });
+});
+
+async function getProgressiveLib (ID) {
+    try {
+        let lib = await ajaxPost("/progressive/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/progressive_lib/js/progressive_interval_edit.js

@@ -0,0 +1,58 @@
+/**
+ * Created by zhang on 2018/9/3.
+ */
+
+$(document).ready(function () {
+    try {
+        let tem = sortJson(JSON.parse($("#originalInterval").val()));
+        $("#progressiveList").val(JSON.stringify(tem,null,4));
+    }catch (err){
+        console.log(err);
+    }
+
+   $("#format").click( function() {
+       try {
+           let jsonText =  $("#progressiveList").val();
+           $("#progressiveList").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 =  $("#progressiveList").val();
+            if(jsonText.indexOf("'")!=-1){
+                alert("输入的格式不能包含 ' 位于："+jsonText.substr(jsonText.indexOf("'")-15,18));
+                return;
+            }
+            await ajaxPost("/progressive/saveLib",{query:{ID:libID},data:{data:JSON.parse(jsonText)}});
+        }catch (err){
+            console.log(err);
+            alert("保存失败，请查看输入数据");
+        }
+    });
+    $("#createNormal").click(async function() {
+        let progressive = [
+            {
+                name: '施工场地建设费',
+                progression: [
+                    {feeRate: 5.570, interval: '(0,200]'},
+                    {feeRate: 4.581, interval: '(200,500]'},
+                    {feeRate: 3.627, interval: '(500,1000]'},
+                    {feeRate: 2.707, interval: '(1000,+)'},
+                    ]
+            }
+        ];
+        try {
+            let jsonText =  JSON.stringify(progressive);
+            $("#progressiveList").val(JSON.stringify(JSON.parse(jsonText),null,4));
+        }catch (err){
+            console.log(err);
+        }
+
+    })
+
+
+});

web/users/js/compilation.js

@@ -241,6 +241,10 @@ $(document).ready(function() {
                 $("#feature-area").show();
                 $("#add-compilation-title").text('添加工程特征');
                 break;
+            case 'progressive':
+                $("#progressive-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,.progressive-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 progressiveData = progressiveList == undefined?[]: JSON.parse(progressiveList);
     /*mainTreeCol = mainTreeCol !== '' ? mainTreeCol.replace(/\n/g, '\\n') : mainTreeCol;
     billsTemplateData = billsTemplateData.replace(/\n/g, '\\n');
 
@@ -545,7 +550,15 @@ function initCompilation() {
         let tmpHtml = '<option value="' + tmp.ID + '">' + tmp.name + '</option>';
         html += tmpHtml;
     }
-    $("select[name='feature_lib']").children("option").first().after(html);
+    $("select[name='feature_lib']").children("option").first().after(html);//工程特征库
+
+    //累进区间库
+    html = '';
+    for(let tmp of progressiveData){
+        let tmpHtml = '<option value="' + tmp.ID + '">' + tmp.name + '</option>';
+        html += tmpHtml;
+    }
+    $("select[name='progressive_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 progressiveLib = $("select[name='progressive_lib']").children("option:selected").val();
 
 
     if (name === '' && model === 'all') {
@@ -580,6 +594,9 @@ function getAndValidData(model) {
     if (model === 'feature' && (featureLib === '' || featureLib === undefined)) {
         throw '请选择工程特征库';
     }
+    if (model === 'progressive' && (progressiveLib === '' || progressiveLib === undefined)) {
+        throw '请选择累进区间库';
+    }
 
     if (model === 'glj' && (gljLib === '' || gljLib === undefined)) {
         throw '请选择人材机库';
@@ -605,6 +622,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 progressiveString = $("select[name='progressive_lib']").children("option:selected").text();
 
 
     let result = {
@@ -640,6 +658,10 @@ function getAndValidData(model) {
         feature:{
             id:featureLib,
             name:featrueString
+        },
+        progressive:{
+            id:progressiveLib,
+            name:progressiveString
         }
     };
     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="progressive-list">
+                                    <% if (Object.keys(libData).length > 0 && libData.progressive_lib && libData.progressive_lib.length > 0) { %>
+                                    <% libData.progressive_lib.forEach(function (progressive, index){ %>
+                                    <p class="form-control-static">
+                                        <a class="pull-right text-danger remove-lib" data-model="progressive" title="移除" data-id="<%= progressive.id %>">
+                                            <span class="glyphicon glyphicon-remove"></span>
+                                        </a>
+                                        <input type="hidden" name="progressive_lib" data-id="<%= progressive.id %>" value="<%= JSON.stringify({id: progressive.id, name: progressive.name}) %>">
+                                        <% if (index === 0) {%><i class="glyphicon glyphicon-flag"></i>&nbsp;<% } %><%= progressive.name %>
+                                    </p>
+                                    <% }) %>
+                                    <% } %>
+                                </div>
+                                <a href="#" class="btn btn-link btn-sm add-compilation" data-model="progressive">添加</a>
+                            </div>
                     </div>
 
                     <div class="col-md-12">
@@ -232,6 +249,7 @@
     let billTemplateList = '<%- billTemplateList %>';
     let mainTreeColList = '<%- mainTreeColList %>';
     let featureList = '<%- featureList %>';
+    let progressiveList = '<%- progressiveList %>';
     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="progressive-area">
+                    <label>累进区间</label>
+                    <div class="row">
+                        <div class="col-xs-12">
+                            <select class="form-control" name="progressive_lib">
+                                <option value="">请选择累进区间库</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
                 <div class="form-group" id="artificial-area">
                     <label>人工系数</label>
                     <div class="row">