feat:工程专业增加基本信息配置

modules/all_models/engineering_lib.js

@@ -58,6 +58,11 @@ let modelSchema = {
         type: Schema.Types.Mixed,
         default: []
     },
+    // 基本信息库
+    info_lib: {
+        type: Schema.Types.Mixed,
+        default: []
+    },
     //累进区间库
     progressive_lib: {
         type: Schema.Types.Mixed,

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 progressiveFacade from "../../progressive_interval_lib/facade/progressive_facade";
 import vvTaxFacade from "../../vehicleVessel_lib/facade/vvTax_facade";
 import {default as category, List as categoryList} from "../../common/const/category_const.js";
@@ -189,6 +190,7 @@ class CompilationController extends BaseController {
             rationList = [],
             gljList = [],
             feeRateList = [],
+            infoList = [],
             libData = {},
             billsTemplateData = [],
             featureList = [],
@@ -251,6 +253,9 @@ class CompilationController extends BaseController {
             //获取工程特征库
             featureList = await projectFeatureFacade.findByCondition({compilationId: selectedCompilation._id},null,false);
 
+            //获取基本信息库
+            infoList = await basicInfoFacade.findByCondition({},null,false);
+
             //获取累进区间库
             progressiveList = await progressiveFacade.findByCondition({},null,false);
 
@@ -282,6 +287,7 @@ class CompilationController extends BaseController {
             calculationList: JSON.stringify(calculationList),
             billsGuidanceList: JSON.stringify(billsGuidanceList),
             featureList:JSON.stringify(featureList),
+            infoList: JSON.stringify(infoList),
             progressiveList:JSON.stringify(progressiveList),
             vvTaxList: JSON.stringify(vvTaxList),
             title : config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:'养护云版',

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.progressive_lib = this._validLib(data.progressive_lib);
 

web/users/js/compilation.js

@@ -322,6 +322,10 @@ $(document).ready(function() {
                 $("#feature-area").show();
                 $("#add-compilation-title").text('添加工程特征');
                 break;
+            case 'info':
+                $('#info-area').show();
+                $('#add-compilation-title').text('添加基本信息');
+                break;
             case 'progressive':
                 $("#progressive-area").show();
                 $("#add-compilation-title").text('添加累进区间');
@@ -346,7 +350,7 @@ $(document).ready(function() {
     });
 
     // 移除操作
-    $(".bill-list, .ration-list, .glj-list, .fee-list, .artificial-list, .program-list, .billsGuidance-list,.feature-list,.progressive-list,.vvTax-list").on("click", ".remove-lib", function() {
+    $(".bill-list, .ration-list, .glj-list, .fee-list, .artificial-list, .program-list, .billsGuidance-list,.feature-list,.info-list,.progressive-list,.vvTax-list").on("click", ".remove-lib", function() {
         $(this).parent().remove();
     });
 
@@ -537,6 +541,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);
     let progressiveData = progressiveList == undefined?[]: JSON.parse(progressiveList);
     let vvTaxData = vvTaxList == undefined?[]: JSON.parse(vvTaxList);
     /*mainTreeCol = mainTreeCol !== '' ? mainTreeCol.replace(/\n/g, '\\n') : mainTreeCol;
@@ -637,6 +642,14 @@ function initCompilation() {
     }
     $("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);
+    
     //累进区间库
     html = '';
     for(let tmp of progressiveData){
@@ -670,6 +683,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();
     let progressiveLib = $("select[name='progressive_lib']").children("option:selected").val();
     let vvTaxLib = $("select[name='vvTax_lib']").children("option:selected").val();
 
@@ -719,6 +733,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 progressiveString = $("select[name='progressive_lib']").children("option:selected").text();
     let vvTaxString = $("select[name='vvTax_lib']").children("option:selected").text();
 
@@ -757,6 +772,10 @@ function getAndValidData(model) {
             id:featureLib,
             name:featrueString
         },
+        info: {
+            id: infoLib,
+            name: infoString
+        },
         progressive:{
             id:progressiveLib,
             name:progressiveString

web/users/views/compilation/engineering.html

@@ -107,6 +107,23 @@
                                 <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 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) { %>
@@ -268,6 +285,7 @@
     let billTemplateList = '<%- billTemplateList %>';
     let mainTreeColList = '<%- mainTreeColList %>';
     let featureList = '<%- featureList %>';
+    let infoList = '<%- infoList %>';
     let progressiveList = '<%- progressiveList %>';
     let vvTaxList = '<%- vvTaxList %>';
     let colSpread = null;

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="progressive-area">
                     <label>累进区间</label>
                     <div class="row">