Merge branch '1.0.0_online' of http://smartcost.f3322.net:3000/SmartCost/ConstructionOperation into 1.0.0_online

modules/all_models/counter.js

@@ -7,4 +7,4 @@ var counterSchema = new Schema({
     _id: String,
     sequence_value: Number
 });
-mongoose.model("counters", counterSchema);
+mongoose.model("counters_operation", counterSchema,"counters_operation");

modules/ration_repository/models/ration_item.js

@@ -915,17 +915,17 @@ rationItemDAO.prototype.exportExcelData = async function(rationRepId) {
         rationRepId: rationRepId
     };
     // @todo 限制导出的数量以防内存溢出
-    const rationDataList = await this.getRationItemByCondition(condition, ['name', 'code', 'ID', 'sectionId', 'feeType']);
+    const rationDataList = await this.getRationItemByCondition(condition, ['name', 'code', 'ID', 'sectionId', 'feeType', 'caption']);
 
     // 整理数据
     let rationData = [];
     for (const tmp of rationDataList) {
         const sectionId = tmp.sectionId <= 0 || tmp.sectionId === undefined ? null : tmp.sectionId;
         const feeType = tmp.feeType === '' || tmp.feeType === undefined ? null : tmp.feeType;
-        const ration = [sectionId, feeType, tmp.ID, tmp.code, tmp.name];
+        const ration = [sectionId, feeType, tmp.ID, tmp.code, tmp.name, tmp.caption];
         rationData.push(ration);
     }
-    const excelData = [['树ID', '取费专业', '定额ID', '定额编码', '定额名']];
+    const excelData = [['树ID', '取费专业', '定额ID', '定额编码', '定额名', '定额显示名称']];
     excelData.push.apply(excelData, rationData);
 
     return excelData;
@@ -953,10 +953,12 @@ rationItemDAO.prototype.batchUpdateSectionIdFromExcel = async function(data) {
         feeType = isNaN(feeType) || feeType <= 0 ? null : feeType;
         let name = tmp[4];
         name = name ? name : '';
+        let caption = tmp[5];
+        caption = caption ? caption : '';
         if (sectionId <= 0 || rationId <= 0) {
             continue;
         }
-        bulkOprs.push({updateOne: {filter: {ID: rationId}, update: {$set: {sectionId: sectionId, feeType: feeType, name: name, caption: name}}}});
+        bulkOprs.push({updateOne: {filter: {ID: rationId}, update: {$set: {sectionId: sectionId, feeType: feeType, name: name, caption: caption}}}});
     }
     if(bulkOprs.length <= 0){
         throw '无有效数据(树ID、定额ID不为空、且为数值)';

modules/users/models/engineering_lib_model.js

@@ -8,6 +8,7 @@
 import mongoose from "mongoose";
 import BaseModel from "../../common/base/base_model";
 import CompilationModel from "./compilation_model";
+let stdRationLibModel = mongoose.model("std_ration_lib_map");
 import {default as EngineeringConst, List as EngineeringList} from "../../common/const/engineering";
 
 class EngineeringLibModel extends BaseModel {
@@ -79,6 +80,19 @@ class EngineeringLibModel extends BaseModel {
 
     async addEngineer(data){
         data.glj_col = {showAdjustPrice:false};
+        if(data.compilationId && data.compilationId!=""){
+            data.ration_lib = [];
+            let rationList = await stdRationLibModel.find({compilationId:data.compilationId},['ID','dispName']);
+            for(let i =0;i< rationList.length;i++){
+                let tem = {
+                    id:rationList[i].ID,
+                    name:rationList[i].dispName,
+                    isDefault:false
+                };
+                if(i == 0) tem.isDefault = true;
+                data.ration_lib.push(tem);
+            }
+        }
         let result = await this.db.create(data);
         return result;
     }
@@ -129,9 +143,10 @@ class EngineeringLibModel extends BaseModel {
             console.log('1');
             throw '数据有误';
         }
-        // 检测专业工程是否合法
         data.engineering = parseInt(data.engineering);
-        let match = false;
+        //需求修改，工程专业可以随便输入了
+        //检测专业工程是否合法
+   /*     let match = false;
         for(let index in EngineeringConst) {
             if (EngineeringConst[index] === data.engineering) {
                 match = true;
@@ -140,7 +155,7 @@ class EngineeringLibModel extends BaseModel {
         }
         if (!match) {
             throw '工程专业错误';
-        }
+        }*/
 
         // 判断标准清单
         data.bill_lib = this._validLib(data.bill_lib);
@@ -148,6 +163,9 @@ class EngineeringLibModel extends BaseModel {
         // 判断定额库
         data.ration_lib = this._validLib(data.ration_lib);
 
+        //设置默认定额库
+        this.setDefaultRation(data);
+
         // 判断工料机库
         data.glj_lib = this._validLib(data.glj_lib);
 
@@ -188,6 +206,19 @@ class EngineeringLibModel extends BaseModel {
         return result;
     }
 
+    //设置默认定额库
+    setDefaultRation(data){
+        if(data.ration_lib && data.ration_lib.length>0){
+            if(data.ration_isDefault && data.ration_isDefault != ""){
+                for(let r of data.ration_lib){
+                    r.id.toString() == data.ration_isDefault?r.isDefault = true:r.isDefault=false;
+                }
+            }else {
+                data.ration_lib[0].isDefault = true;
+            }
+        }
+    }
+
 
     /**
      * 获取对应标准库数量

public/counter/counter.js

@@ -2,7 +2,7 @@
  * Created by Tony on 2017/3/21.
  */
 var mongoose = require('mongoose');
-var counterModel = mongoose.model("counters");
+var counterModel = mongoose.model("counters_operation");
 
 // All counter Must predefine in DB
 const COUNTER_MODULE_NAME = {

web/maintain/project_feature_lib/html/edit.html

@@ -13,6 +13,7 @@
             <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>
@@ -22,14 +23,13 @@
         </div>
         </div>
         <input type="hidden" id="libID" value="<%= libID %>">
+        <input type="hidden" id="originalFeature" value="<%= featureList %>">
     </div>
 </div>
 
 
 
 <script type="text/javascript">
-    //自适应高度
-    let featureList = '<%- featureList %>';
 
 </script>
 <script type="text/javascript" src="/lib/json/json2.js"></script>

web/maintain/project_feature_lib/js/project_feature_edit.js

@@ -6,7 +6,12 @@ featureObj = {
 };
 
 $(document).ready(function () {
-   $("#featureList").val(JSON.stringify(JSON.parse(featureList),null,4));
+    try {
+        $("#featureList").val(JSON.stringify(JSON.parse($("#originalFeature").val()),null,4));
+    }catch (err){
+        $("#featureList").val(featureList);
+        console.log(err);
+    }
 
    $("#format").click( function() {
        try {
@@ -22,15 +27,47 @@ $(document).ready(function () {
         try {
             let libID = $("#libID").val();
             let jsonText =  $("#featureList").val();
+            if(jsonText.indexOf("'")!=-1){
+                alert("输入的格式不能包含 ' 位于："+jsonText.substr(jsonText.indexOf("'")-15,18));
+                return;
+            }
             let newFeature = await ajaxPost("/projectFeature/saveLib",{query:{ID:libID},data:{feature:JSON.parse(jsonText)}});
-            console.log(newFeature);
         }catch (err){
             console.log(err);
             alert("保存失败，请查看输入数据");
         }
-
     })
+    $("#createNormal").click(async function() {
+        let projectFeature = [
+            {dispName: '工程专业', key: 'engineering', value: ''},//只读，用户新建单位工程时选择的值
+            {dispName: '工程类型', key: 'projType', value: '',cellType:'comboBox',options:"住宅@公共建筑@厂房@办公"},
+            {dispName: '结构类型', key: 'structureType', value: '',cellType:'comboBox',options:"排架结构@框架结构@现浇、框架结构@预制、砖混结构@外砖内模@内浇外挂@钢结构"},
+            {dispName: '基础类型', key: 'baseType', value: '',cellType:'comboBox',options:"带基@框排架柱距6m以内@框排架柱距6m以外@满基筏式@满基板式@满基箱式@独立基础"},
+            {dispName: '建筑特征', key: 'buildingFeature', value: '',cellType:'comboBox',options:"点式@凹式@凸式@Y式@其他"},
+            {dispName: '建筑面积(m2)', key: 'buildingArea', value: '',cellType:'number'},
+            {dispName: '其中地下室建筑面积(m2)', key: 'basementBuildingArea', value: '',cellType:'number'},
+            {dispName: '总层数', key: 'totalFloors', value: '',cellType:'number'},
+            {dispName: '地下室层数(+/-0.00以下)', key: 'basementFloors', value: '',cellType:'number'},
+            {dispName: '建筑层数(+/-0.00以下)', key: 'buildingFloors', value: '',cellType:'number'},
+            {dispName: '建筑物总高度(m)', key: 'buildingHeight', value: '',cellType:'number'},
+            {dispName: '地下室总高度(m)', key: 'basementHeight', value: '',cellType:'number'},
+            {dispName: '首层高度(m)', key: 'firstFloorHeight', value: '',cellType:'number'},
+            {dispName: '裙楼高度(m)', key: 'podiumBuildingHeight', value: '',cellType:'number'},
+            {dispName: '标准层高度(m)', key: 'standardFloorHeight', value: '',cellType:'number'},
+            {dispName: '基础材料及装饰', key: 'baseMaterial', value: ''},
+            {dispName: '楼地面材料及装饰', key: 'flooringMaterial', value: ''},
+            {dispName: '外墙材料及装饰', key: 'exteriorWallMaterial', value: ''},
+            {dispName: '屋面材料及装饰', key: 'roofingMaterial', value: ''},
+            {dispName: '门窗材料及装饰', key: 'doorsWindowsMaterial', value: ''}
+        ];
+        try {
+            let jsonText =  JSON.stringify(projectFeature);
+            $("#featureList").val(JSON.stringify(JSON.parse(jsonText),null,4));
+        }catch (err){
+            console.log(err);
+        }
 
+    })
 
 
 });

web/over_write/js/gansu_2013.js

@@ -0,0 +1,270 @@
+'use strict';
+
+/**
+ *
+ *
+ * @author Zhong
+ * @date 2018/8/31
+ * @version
+ */
+
+/*
+* 费用定额下priceProperties为空，则单位工程中取价取basePrice字段
+* 费用定额下consumeAmtProperties为空，则单位工程中取消耗量取consumeAmt字段
+* */
+
+//计税方式
+const taxModel = {'common': 1, 'simple': 2};
+//兰州 定西 天水 平凉 庆阳 武威 金昌 张掖 酒泉 甘矿 嘉峪关 临夏 合作 武都 白银
+//价格属性-地区+计税方式
+const pricePropertiesTemplate = [
+    {
+        region: '兰州',
+        taxModel: taxModel.common,
+        price: {
+            dataCode: 'price1',
+            dataName: '兰州单价-一般'
+        }
+    },
+    {
+        region: '兰州',
+        taxModel: taxModel.simple,
+        price: {
+            dataCode: 'price2',
+            dataName: '兰州单价-简易'
+        }
+    },
+    {
+        region: '定西',
+        taxModel: taxModel.common,
+        price: {
+            dataCode: 'price3',
+            dataName: '定西单价-一般'
+        }
+    },
+    {
+        region: '定西',
+        taxModel: taxModel.simple,
+        price: {
+            dataCode: 'price4',
+            dataName: '定西单价-简易'
+        }
+    },
+    {
+        region: '天水',
+        taxModel: taxModel.common,
+        price: {
+            dataCode: 'price5',
+            dataName: '天水单价-一般'
+        }
+    },
+    {
+        region: '天水',
+        taxModel: taxModel.simple,
+        price: {
+            dataCode: 'price6',
+            dataName: '天水单价-简易'
+        }
+    },
+    {
+        region: '平凉',
+        taxModel: taxModel.common,
+        price: {
+            dataCode: 'price7',
+            dataName: '平凉单价-一般'
+        }
+    },
+    {
+        region: '平凉',
+        taxModel: taxModel.simple,
+        price: {
+            dataCode: 'price8',
+            dataName: '平凉单价-简易'
+        }
+    },
+    {
+        region: '庆阳',
+        taxModel: taxModel.common,
+        price: {
+            dataCode: 'price9',
+            dataName: '庆阳单价-一般'
+        }
+    },
+    {
+        region: '庆阳',
+        taxModel: taxModel.simple,
+        price: {
+            dataCode: 'price10',
+            dataName: '庆阳单价-简易'
+        }
+    },
+    {
+        region: '武威',
+        taxModel: taxModel.common,
+        price: {
+            dataCode: 'price11',
+            dataName: '武威单价-一般'
+        }
+    },
+    {
+        region: '武威',
+        taxModel: taxModel.simple,
+        price: {
+            dataCode: 'price12',
+            dataName: '武威单价-简易'
+        }
+    },
+    {
+        region: '金昌',
+        taxModel: taxModel.common,
+        price: {
+            dataCode: 'price13',
+            dataName: '金昌单价-一般'
+        }
+    },
+    {
+        region: '金昌',
+        taxModel: taxModel.simple,
+        price: {
+            dataCode: 'price14',
+            dataName: '金昌单价-简易'
+        }
+    },
+    {
+        region: '张掖',
+        taxModel: taxModel.common,
+        price: {
+            dataCode: 'price15',
+            dataName: '张掖单价-一般'
+        }
+    },
+    {
+        region: '张掖',
+        taxModel: taxModel.simple,
+        price: {
+            dataCode: 'price16',
+            dataName: '张掖单价-简易'
+        }
+    },
+    {
+        region: '酒泉',
+        taxModel: taxModel.common,
+        price: {
+            dataCode: 'Price17',
+            dataName: '酒泉单价-一般'
+        }
+    },
+    {
+        region: '酒泉',
+        taxModel: taxModel.simple,
+        price: {
+            dataCode: 'price18',
+            dataName: '酒泉单价-简易'
+        }
+    },
+    {
+        region: '甘矿',
+        taxModel: taxModel.common,
+        price: {
+            dataCode: 'price19',
+            dataName: '甘矿单价-一般'
+        }
+    },
+    {
+        region: '甘矿',
+        taxModel: taxModel.simple,
+        price: {
+            dataCode: 'price20',
+            dataName: '甘矿单价-简易'
+        }
+    },
+    {
+        region: '嘉峪关',
+        taxModel: taxModel.common,
+        price: {
+            dataCode: 'price21',
+            dataName: '嘉峪关单价-一般'
+        }
+    },
+    {
+        region: '嘉峪关',
+        taxModel: taxModel.simple,
+        price: {
+            dataCode: 'price22',
+            dataName: '嘉峪关单价-简易'
+        }
+    },
+    {
+        region: '临夏',
+        taxModel: taxModel.common,
+        price: {
+            dataCode: 'price23',
+            dataName: '临夏单价-一般'
+        }
+    },
+    {
+        region: '临夏',
+        taxModel: taxModel.simple,
+        price: {
+            dataCode: 'price24',
+            dataName: '临夏单价-简易'
+        }
+    },
+    {
+        region: '合作',
+        taxModel: taxModel.common,
+        price: {
+            dataCode: 'price25',
+            dataName: '合作单价-一般'
+        }
+    },
+    {
+        region: '合作',
+        taxModel: taxModel.simple,
+        price: {
+            dataCode: 'price26',
+            dataName: '合作单价-简易'
+        }
+    },
+    {
+        region: '武都',
+        taxModel: taxModel.common,
+        price: {
+            dataCode: 'price27',
+            dataName: '武都单价-一般'
+        }
+    },
+    {
+        region: '武都',
+        taxModel: taxModel.simple,
+        price: {
+            dataCode: 'price28',
+            dataName: '武都单价-简易'
+        }
+    },
+    {
+        region: '白银',
+        taxModel: taxModel.common,
+        price: {
+            dataCode: 'price29',
+            dataName: '白银单价-一般'
+        }
+    },
+    {
+        region: '白银',
+        taxModel: taxModel.simple,
+        price: {
+            dataCode: 'price30',
+            dataName: '白银单价-简易'
+        }
+    },
+];
+
+const consumeAmtPropertiesTemplate = [];
+
+if(typeof module !== 'undefined'){
+    module.exports = {
+        pricePropertiesTemplate: pricePropertiesTemplate,
+        consumeAmtPropertiesTemplate: consumeAmtPropertiesTemplate
+    };
+}

web/over_write/js/jiangxi_2017.js

@@ -0,0 +1,60 @@
+'use strict';
+
+/**
+ *
+ *
+ * @author Zhong
+ * @date 2018/8/31
+ * @version
+ */
+
+//计税方式
+const taxModel = {'common': 1, 'simple': 2};
+//价格属性：计税方式
+const pricePropertiesTemplate = [
+    {
+        region: '全省',
+        taxModel: taxModel.common,
+        price: {
+            dataCode: 'price1',
+            dataName: '单价-一般'
+        }
+    },
+    {
+        region: '全省',
+        taxModel: taxModel.simple,
+        price: {
+            dataCode: 'price2',
+            dataName: '单价-简易'
+        }
+    }
+];
+
+//消耗量属性：计税方式
+const consumeAmtPropertiesTemplate = [
+    {
+        region: '全省',
+        taxModel: taxModel.common,
+        consumeAmt: {
+            dataCode: 'consumeAmt1',
+            dataName: '消耗量-一般',
+            refPrice: 'price1' //关联的单价字段
+        }
+    },
+    {
+        region: '全省',
+        taxModel: taxModel.simple,
+        consumeAmt: {
+            dataCode: 'consumeAmt2',
+            dataName: '消耗量-简易',
+            refPrice: 'price2' //关联的单价字段
+        }
+    }
+];
+
+if(typeof module !== 'undefined'){
+    module.exports = {
+        pricePropertiesTemplate: pricePropertiesTemplate,
+        consumeAmtPropertiesTemplate: consumeAmtPropertiesTemplate
+    };
+}

web/users/js/compilation.js

@@ -101,7 +101,7 @@ $(document).ready(function() {
                     "<td><span>"+t_name+"</span></td>" +
                     "<td><span>"+c_name+"</span></td>" +
                     "<td><span>"+f_name+"</span></td>" +
-                    "<td> <a class='btn btn-link btn-sm' style='padding: 0px' onclick='editTaxGroup(this)'> 编辑</a>/<a class='btn btn-link btn-sm ' style='padding: 0px' onclick='deleteTaxGroup(this)'>删除</a> " +
+                    "<td> <a class='btn btn-link btn-sm' style='padding: 0px' onclick='editTaxGroup(this)'> 编辑</a>/<a class='btn btn-link btn-sm ' style='padding: 0px' onclick='deleteTableTr(this,\"taxGroup_tr\")'>删除</a> " +
                     "<input type='hidden' name='tax_group' data-id ='"+groupIndex+"' value='"+JSON.stringify(groupData)+"'>"+
                     "</td>" +
                     "</tr>";
@@ -120,6 +120,36 @@ $(document).ready(function() {
         $("#addTaxGroup").modal('hide');
     });
 
+    //新增定额库
+    $("#add-ration").click(function () {
+         let rationLib = $("select[name='ration_lib']").children("option:selected").val();
+         let rationLibString = $("select[name='ration_lib']").children("option:selected").text();
+         if(rationLib == undefined || rationLib ==''){
+             alert("请选择定额库");
+             return;
+         }
+        if($("input:hidden[name=ration_lib][data-id = "+rationLib+"]").length <= 0){
+            let tem = {
+                id:rationLib,
+                name:rationLibString,
+                isDefault:false
+            };
+            let htmlString = ` 
+                <tr class='ration_tr'>
+                     <td><span>${tem.name}</span></td>
+                     <td><label class="form-check-label"> <input class="form-check-input" name="ration_isDefault"  value="${tem.id}" type="radio"></td>  
+                     <td>
+                            <a class='btn btn-link btn-sm ' style="padding: 0px" onclick='deleteTableTr(this,"ration_tr")'>删除</a>
+                            <input type="hidden" name="ration_lib" data-id="${tem.id}" value='${JSON.stringify(tem)}'>
+                      </td>
+                </tr>`
+            $("#ration_tbody").append(htmlString);
+        }else {
+            alert('已存在相同的定额库')
+        }
+        $("#addRation").modal('hide');
+    });
+
     // 新增计价规则
     $("#add-valuation").click(function() {
         try {
@@ -490,6 +520,9 @@ function getAndValidData(model) {
     if (model === 'ration' && (rationLib === '' || rationLib === undefined)) {
         throw '请选择定额库';
     }
+    if (model === 'feature' && (featureLib === '' || featureLib === undefined)) {
+        throw '请选择工程特征库';
+    }
 
     if (model === 'glj' && (gljLib === '' || gljLib === undefined)) {
         throw '请选择人材机库';
@@ -667,8 +700,6 @@ function confirmUpdate(selector,engineerID) {
 }
 
 function deleteEngineerClick(engineerID,element) {
-    console.log(engineerID);
-    console.log(element);
     hintBox.infoBox('操作确认', '是否删除所选工程专业？', 2, async function () {
         try {
             let result  = await ajaxPost('/compilation/delete-engineer',{id:engineerID});
@@ -715,8 +746,8 @@ function editTaxGroup(ele) {
     $("#addTaxGroup").modal({show:true});
 }
 
-function deleteTaxGroup(ele) {
-    let parentTr = $(ele).parents(".taxGroup_tr");
+function deleteTableTr(ele,classString) {
+    let parentTr = $(ele).parents(`.${classString}`);
     parentTr.remove();
 }
 

web/users/views/compilation/add.html

@@ -117,6 +117,7 @@
                         <small class="form-text text-danger" id="engineeringError" style="display: none">请输入定额取费专业。</small>
                     </div>
                     <input type="hidden" name="valuationID" value="<%= valuationId %>">
+                    <input type="hidden" name="compilationId" value="<%= selectedCompilation._id.toString() %>" >
                 </form>
             </div>
             <div class="modal-footer">

web/users/views/compilation/engineering.html

@@ -37,23 +37,6 @@
                                 <a class="btn btn-link btn-sm add-compilation" href="javascript:void(0)" data-model="bill">添加</a>
                             </div>
                             <div class="form-group col-md-3">
-                                <label>定额库</label>
-                                <div class="ration-list">
-                                    <% if (Object.keys(libData).length > 0 && libData.ration_lib.length > 0) { %>
-                                    <% libData.ration_lib.forEach(function (ration, index){ %>
-                                    <p class="form-control-static">
-                                        <a class="pull-right text-danger remove-lib" data-model="ration" title="移除" data-id="<%= ration.id %>">
-                                            <span class="glyphicon glyphicon-remove"></span>
-                                        </a>
-                                        <input type="hidden" name="ration_lib" data-id="<%= ration.id %>" value="<%= JSON.stringify({id: ration.id, name: ration.name}) %>">
-                                        <% if (index === 0) {%><i class="glyphicon glyphicon-flag"></i>&nbsp;<% } %><%= ration.name %>
-                                    </p>
-                                    <% }) %>
-                                    <% } %>
-                                </div>
-                                <a href="#" class="btn btn-link btn-sm add-compilation" data-model="ration">添加</a>
-                            </div>
-                            <div class="form-group col-md-3">
                                 <label>人材机库</label>
                                 <div class="glj-list">
                                     <% if (Object.keys(libData).length > 0 && libData.glj_lib.length > 0) { %>
@@ -87,8 +70,6 @@
                                 </div>
                                 <a href="#" class="btn btn-link btn-sm add-compilation" data-model="billsGuidance">添加</a>
                             </div>
-                        </div>
-                        <div class="row">
                             <div class="form-group col-md-3">
                                 <label>人工系数</label>
                                 <div class="artificial-list">
@@ -106,6 +87,8 @@
                                 </div>
                                 <a href="#" class="btn btn-link btn-sm add-compilation" data-model="artificial">添加</a>
                             </div>
+                        </div>
+                        <div class="row">
                             <div class="form-group col-md-3">
                                 <label>工程特征</label>
                                 <div class="feature-list">
@@ -180,7 +163,7 @@
                                         <span><%= tax.fee_lib.name%></span>
                                         <% } %>
                                     </td>
-                                    <td><a class='btn btn-link btn-sm ' style="padding: 0px" onclick='editTaxGroup(this)'>编辑</a>/<a class='btn btn-link btn-sm ' style="padding: 0px" onclick='deleteTaxGroup(this)'>删除</a>
+                                    <td><a class='btn btn-link btn-sm ' style="padding: 0px" onclick='editTaxGroup(this)'>编辑</a>/<a class='btn btn-link btn-sm ' style="padding: 0px" onclick='deleteTableTr(this,"taxGroup_tr")'>删除</a>
                                         <input type='hidden' name='tax_group' data-id ="<%= groupIndex%>" value="<%= JSON.stringify(tax) %>">
                                     </td>
                                 </tr>
@@ -189,6 +172,42 @@
                             </tbody>
                         </table>
                     </div>
+                    <div class="col-md-12" style="padding-top:20px">
+                            <legend>定额库</legend>
+                            <a data-toggle="modal" data-target="#addRation" class="btn btn-link btn-sm " id="addRatioBtn" style="margin-right:5px">添加</a>
+                            <table class="table engineer_table">
+                                <thead>
+                                <tr>
+                                    <th>定额库名称</th>
+                                    <th>默认</th>
+                                    <th>操作</th>
+                                </tr>
+                                </thead>
+                                <tbody id="ration_tbody">
+                                <% if (Object.keys(libData).length > 0 && libData.ration_lib.length > 0) { %>
+                                <% libData.ration_lib.forEach(function (ration, index){ %>
+                                <tr class='ration_tr'>
+                                    <td>
+                                        <span><%= ration.name%></span>
+                                    </td>
+                                    <td>
+                                        <label class="form-check-label">
+                                            <% if(ration.isDefault == true){%>
+                                                <input class="form-check-input" name="ration_isDefault"  checked value="<%= ration.id %>" type="radio">
+                                            <% }else{ %>
+                                            <input class="form-check-input" name="ration_isDefault"  value="<%= ration.id %>" type="radio">
+                                            <% } %>
+                                        </label>
+                                    </td>
+                                    <td><a class='btn btn-link btn-sm ' style="padding: 0px" onclick='deleteTableTr(this,"ration_tr")'>删除</a>
+                                        <input type="hidden" name="ration_lib" data-id="<%= ration.id %>" value="<%= JSON.stringify(ration) %>">
+                                    </td>
+                                </tr>
+                                <% }) %>
+                                <% } %>
+                                </tbody>
+                            </table>
+                        </div>
                 </div>
                 <input type="hidden" name="glj_col" value="<%= gljCol %>" id="glj_col">
                 <input type="hidden" name="isInstall" value="<%= libData.isInstall %>" id="isInstall">

web/users/views/compilation/modal.html

@@ -21,16 +21,6 @@
                         </div>
                     </div>
                 </div>
-                <div class="form-group" id="ration-area">
-                    <label>定额库</label>
-                    <div class="row">
-                        <div class="col-xs-12">
-                            <select class="form-control" name="ration_lib">
-                                <option value="">请选择定额库</option>
-                            </select>
-                        </div>
-                    </div>
-                </div>
                 <div class="form-group" id="glj-area">
                     <label>人材机库</label>
                     <div class="row">
@@ -311,4 +301,34 @@
     </div>
 </div>
 
+<!-- 弹窗新增费率 -->
+<div class="modal fade" id="addRation" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title" >添加定额库</h4>
+            </div>
+            <div class="modal-body">
+                <div class="form-group" id="ration-area">
+                    <label>定额库</label>
+                    <div class="row">
+                        <div class="col-xs-12">
+                            <select class="form-control" name="ration_lib">
+                                <option value="">请选择定额库</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary" id="add-ration">确定添加</button>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+
 <script type="text/javascript" src="/web/users/js/col_setting.js"></script>