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

modules/all_models/engineering_lib.js

@@ -13,7 +13,8 @@ let taxGroupSchema = new  Schema({
     taxType: String,//计税方式
     program_lib: { type: Schema.Types.Mixed,default:{}},// 计算程序标准库
     template_lib:{ type: Schema.Types.Mixed,default:{}},//清单模板库
-    col_lib:{ type: Schema.Types.Mixed,default:{}}
+    col_lib:{ type: Schema.Types.Mixed,default:{}},//列设置
+    fee_lib:{ type: Schema.Types.Mixed,default:{}}//费率标准库
 },{_id: false});
 
 
@@ -42,11 +43,11 @@ let modelSchema = {
       type: [taxGroupSchema],
       default: []
     },
-    // 费率标准库
+   /* // 费率标准库 2018-08-28 改成放在tax_group 里了
     fee_lib: {
         type: Schema.Types.Mixed,
         default: []
-    },
+    },*/
     // 人工系数标准库
     artificial_lib: {
         type: Schema.Types.Mixed,

modules/material_replace_lib/facade/material_replace_facade.js

@@ -70,7 +70,7 @@ let materialReplaceLib = {
             if(d.type == 'update') updateList.push(d);
             if(d.type == 'delete') deleteList.push(d);
         }
-        let p = await Promise.all([addBills(addList),updateBills(updateList)]);
+        let p = await Promise.all([addBills(addList),updateBills(updateList),deleteBills(deleteList)]);
         return p;
     }
 };
@@ -126,6 +126,12 @@ async function updateBills(datas) {
 }
 
 async function deleteBills(datas) {
+    let IDList = [];
+    for(let d of datas){
+        if(d.ID) IDList.push(d.ID)
+    }
+    await replaceBillModel.deleteMany({ID:{"$in": IDList}});
+    return {type:'delete',list:IDList};
 
 }
 

modules/reports/rpt_component/jpc_flow_tab.js

@@ -946,7 +946,7 @@ JpcFlowTabSrv.prototype.createNew = function(){
             if (pageStatus[band[JV.BAND_PROP_DISPLAY_TYPE]]) {
                 let tab_fields = me.page_sum_tab_fields;
                 for (let i = 0; i < tab_fields.length; i++) {
-                    let cellItem = JpcCommonOutputHelper.createCommonOutput(tab_fields[i], me.pageSumValLst[page - 1], controls);
+                    let cellItem = JpcCommonOutputHelper.createCommonOutput(tab_fields[i], me.pageSumValLst[page - 1][i], controls);
                     cellItem[JV.PROP_AREA] = JpcAreaHelper.outputArea(tab_fields[i][JV.PROP_AREA], band, unitFactor, 1, 0, 1, 0, me.multiCols, 0, true, false);
                     rst.push(cellItem);
                 }

modules/reports/util/rpt_construct_data_util.js

@@ -1235,7 +1235,7 @@ function pri_getFee(dItem, feeKey, dtlFeeKey) {
         }
     } else if (dItem[feeKey]) {
         hasValue = true;
-        rst = dItem[feeKey];
+        rst = parseFloat(dItem[feeKey]);
     } else {
         hasValue = true;
         rst = 0;

modules/users/models/engineering_lib_model.js

@@ -154,8 +154,8 @@ class EngineeringLibModel extends BaseModel {
         // 判断清单指引库
         data.billsGuidance_lib = this._validLib(data.billsGuidance_lib);
 
-        // 判断费率标准
-        data.fee_lib = this._validLib(data.fee_lib);
+        /*// 判断费率标准
+        data.fee_lib = this._validLib(data.fee_lib);*/
 
         // 判断人工系数
         data.artificial_lib = this._validLib(data.artificial_lib);

web/maintain/material_replace_lib/js/material_replace_edit.js

@@ -6,6 +6,7 @@ let materialOjb = {
     billsSpread:null,
     materialSpread:null,
     billsList:JSON.parse(billsList),
+    materialList:[],
     billsSetting:{
         header: [
             {headerName: "清单编号", headerWidth: 180, dataCode: "code", dataType: "String",formatter: "@"},
@@ -51,17 +52,31 @@ let materialOjb = {
 
     },
     canDelete : function (sheet) {
+        let me = this;
         let sel =  sheet.getSelections()[0];
-        console.log(sel);
+        let datas = sheet.name() == 'billsSheet'?me.billsList:me.materialList;
         if(sel.row === undefined || sel.row < 0) return false ;//一行都没选中时，不能删除
-
-        //选中空行时，不能删除
-        // to do
+        if((sel.row + sel.rowCount) > datas.length) return false;//选中了空行，不能删除
         return true;
     },
+    deleteBills : async function(sheet){
+        let me = this,deleteList = [];
+        let sel = sheet.getSelections()[0];
+        for(let i = 0;i<sel.rowCount;i++){
+            if(me.billsList[sel.row + i]) deleteList.push(getDeleteDatas(me.billsList[sel.row + i]));
+        }
+        if(deleteList.length > 0) await me.saveBills(deleteList);
+
+
+        function getDeleteDatas(tem) {
+            return {type:'delete', ID:tem.ID}
+        }
+
+    },
 
     initRightClick : function(id,spread) {
         let me = this;
+        let sheet = spread.getActiveSheet();
         $.contextMenu({
             selector: '#'+id,
             build: function ($trigger, e) {
@@ -74,10 +89,11 @@ let materialOjb = {
                     name: "删除",
                     icon: 'fa-trash-o',
                     disabled: function () {
-                        return !me.canDelete(spread.getActiveSheet());
+                        return !me.canDelete(sheet);
                     },
                     callback: function (key, opt) {
-                       console.log();
+                        sheet.name() == 'billsSheet' ? me.deleteBills(sheet):"";
+                       console.log( me.rightClickTarget);
                     }
                 }
             }
@@ -163,7 +179,9 @@ let materialOjb = {
                         this.updateCache(l.code,l.updateData)
                     }
                 }if(r.type == 'delete'){
-
+                     _.remove(this.billsList,function (item) {
+                        return _.includes(r.list,item.ID)
+                    })
                 }
             }
             if(missCodes.length > 0) alert(`没有找到清单：${missCodes.join("、")}`);

web/maintain/report/js/cfg_const.js

@@ -26,7 +26,9 @@ let setting = {
             leaf:true
         },
         key: {
-            children: "items"
+            children: "items",
+            name: "name",
+            title: "refId"
         },
         simpleData: {
             enable: true,

web/maintain/report/js/rpt_tpl_data_map.js

@@ -463,7 +463,9 @@ let dataInfoMapTreeOprObj = {
     onBeforeRemove: function(treeId, treeNode){
         let rst = true;
         if (treeNode.isParent) {
-            rst = false;
+            if (!(treeNode.Name === `子项` && treeNode.getParentNode() !== null && treeNode.getParentNode().Name === `离散信息` && confirm(`确认要删除此离散子项？`))) {
+                rst = false;
+            }
         } else {
             //
         }

web/maintain/report/js/rpt_tpl_field_location.js

@@ -28,6 +28,11 @@ let fieldLocationOprObj = {
         me.columnParentNode = columnParentNode;
         me.contentParentNode = contentParentNode;
     },
+    restore: function () {
+        let me = this;
+        let rptTpl = (zTreeOprObj.currentNode)?zTreeOprObj.currentNode.rptTpl:null;
+        me.setupColumn(rptTpl, me.columnParentNode, me.contentParentNode);
+    },
     setupColumn: function (rptTpl, columnParentNode, contentParentNode) {
         let me = this, yPos = [], xPos = [];
         me.columnFieldCtrls = [];
@@ -594,7 +599,7 @@ let fieldLocationOprObj = {
     applyBack: function () {
         let me = this;
         let rptTpl = (zTreeOprObj.currentNode)?zTreeOprObj.currentNode.rptTpl:null;
-        if (rptTpl && me.columnParentNode && me.contentParentNode) {
+        if (rptTpl && me.columnParentNode && me.contentParentNode && confirm(`请确认提交应用！`)) {
             let sheet = me.columnWorkBook.getActiveSheet();
             if (sheet.getRowCount() > 1 && sheet.getColumnCount() > 0) {
                 let spans= sheet.getSpans();
@@ -679,6 +684,9 @@ let fieldLocationOprObj = {
                     }
                 }
                 dataInfoMapTreeOprObj.treeObj.addNodes(me.contentParentNode, -1, contentNodes, true);
+                displayMessage("应用提交成功！", "green", 2000, "id_column_setup_lbl");
+            } else {
+                displayMessage("模板行列数量不足！", "red", 2000, "id_column_setup_lbl");
             }
         }
     }

web/maintain/report/js/rpt_tpl_main.js

@@ -530,10 +530,10 @@ let zTreeOprObj = {
                 return rst;
             });
             let allTopUserIdNodes = ["-100"];
-            let allTopTplNodes = [{userId: "-100", name: "公共模板", items:[], isParent: true}];
+            let allTopTplNodes = [{userId: "-100", name: "公共模板", items:[], isParent: true, refId: ""}];
             for (let user of userListObj.foundedUserList) {
                 allTopUserIdNodes.push(user.userId);
-                allTopTplNodes.push({userId: user.userId, name: user.real_name, items: [], isParent: true});
+                allTopTplNodes.push({userId: user.userId, name: user.real_name, items: [], isParent: true, refId: ""});
             }
             for (let item of result) {
                 let uidx = allTopUserIdNodes.indexOf(item.userId);
@@ -633,11 +633,17 @@ let zTreeOprObj = {
             });
             // me.chkAndSetDupRefTplIds(result);
             // console.log(dupRefIds);
-            let allTopTplNodes = [{userId: "-100", name: "公共模板", items:[], isParent: true}];
+            let allTopTplNodes = [{userId: "-100", name: "公共模板", items:[], isParent: true, refId: ""}];
+            if (!result[0].hasOwnProperty("refId")) {
+                result[0].refId = "";
+            }
             allTopTplNodes[0].items.push(result[0]);
             let userIds = [];
             for (let idx = 1; idx < result.length; idx++) {
                 let item = result[idx];
+                if (!item.hasOwnProperty("refId")) {
+                    item.refId = "";
+                }
                 userIds.push(item.userId);
             }
             userListObj.findUsersByIds(userIds, function (userObjs) {
@@ -645,7 +651,7 @@ let zTreeOprObj = {
                     for (let itemIdx = 1; itemIdx < result.length; itemIdx++) {
                         let item = result[itemIdx];
                         if (item.userId === user._id) {
-                            allTopTplNodes.push({userId: user.userId, name: user.real_name, items: [], isParent: true});
+                            allTopTplNodes.push({userId: user.userId, name: user.real_name, items: [], isParent: true, refId: ""});
                             allTopTplNodes[allTopTplNodes.length - 1].items.push(result[itemIdx]);
                             break;
                         }

web/maintain/report/rpt_tpl_detail_field_location.html

@@ -181,6 +181,7 @@
                     <div style="width:97%; height: 300px;">
                         <h5>表栏</h5>
                         <button class="btn btn-primary btn-sm" onclick="fieldLocationOprObj.applyBack()">应用</button>
+                        <button class="btn btn-primary btn-sm" onclick="fieldLocationOprObj.restore()">恢复</button>
                         <button class="btn btn-primary btn-sm" onclick="fieldLocationOprObj.addCol((zTreeOprObj.currentNode)?zTreeOprObj.currentNode.rptTpl:null)">新增列</button>
                         <button class="btn btn-primary btn-sm" onclick="fieldLocationOprObj.deleteCol()">删除列</button>
                         <button class="btn btn-primary btn-sm" onclick="fieldLocationOprObj.addRow()">新增行</button>
@@ -190,25 +191,25 @@
                         <button class="btn btn-primary btn-sm" onclick="fieldLocationOprObj.fitTheWidth(1.0)">X 1.0</button>
                         <button class="btn btn-primary btn-sm" onclick="fieldLocationOprObj.fitTheWidth(1.5)">X 1.5</button>
                         <button class="btn btn-primary btn-sm" onclick="fieldLocationOprObj.fitTheWidth(2.0)">X 2.0</button>
-                        <div class='row p-3' id="fieldControlDiv" style="cursor: not-allowed">
-                            <div class="form-group col-md-2">
-                                <label ><input type="radio" name="horizonOptions" id="hOptionLeft" onchange="fieldLocationOprObj.changeCtrl(this)" checked="true" disabled>左</label>&nbsp&nbsp
-                                <label ><input type="radio" name="horizonOptions" id="hOptionCenter" onchange="fieldLocationOprObj.changeCtrl(this)" disabled>中</label>&nbsp&nbsp
-                                <label ><input type="radio" name="horizonOptions" id="hOptionRight" onchange="fieldLocationOprObj.changeCtrl(this)" disabled>右</label>
-                            </div>
-                            <div class="form-group col-md-2">
-                                <label style="display:none" ><input type="radio" name="verticalOptions" id="vOptionUp" onchange="fieldLocationOprObj.changeCtrl(this)" disabled>上</label>&nbsp&nbsp
-                                <label ><input type="radio" name="verticalOptions" id="vOptionCenter" onchange="fieldLocationOprObj.changeCtrl(this)" checked="true" disabled>中</label>&nbsp&nbsp
+                        <label id="id_column_setup_lbl" style="color:yellowgreen;font-weight:bold">...</label>
+                        <div style="height: 5px"></div>
+                        <div class='row' id="fieldControlDiv" style="cursor: not-allowed">
+                            <div class="form-group col-md-3">
+                                <label ><input type="radio" name="horizonOptions" id="hOptionLeft" onchange="fieldLocationOprObj.changeCtrl(this)" checked="true" disabled>左</label>&nbsp
+                                <label ><input type="radio" name="horizonOptions" id="hOptionCenter" onchange="fieldLocationOprObj.changeCtrl(this)" disabled>中</label>&nbsp
+                                <label ><input type="radio" name="horizonOptions" id="hOptionRight" onchange="fieldLocationOprObj.changeCtrl(this)" disabled>右</label>&nbsp&nbsp
+                                <label>|</label>&nbsp&nbsp
+                                <label style="display:none" ><input type="radio" name="verticalOptions" id="vOptionUp" onchange="fieldLocationOprObj.changeCtrl(this)" disabled>上</label>
+                                <label ><input type="radio" name="verticalOptions" id="vOptionCenter" onchange="fieldLocationOprObj.changeCtrl(this)" checked="true" disabled>中</label>&nbsp
                                 <label ><input type="radio" name="verticalOptions" id="vOptionDown" onchange="fieldLocationOprObj.changeCtrl(this)" disabled>下</label>
                             </div>
-                            <div class="form-group col-md-4">
-                                <label style="display:none" class="form-check-label"><input type="checkbox" class="form-check-input" id="eleShrinkEx" onchange="fieldLocationOprObj.changeCtrl(this)" disabled>自动缩放</label>&nbsp&nbsp
-                                <label style="display:none" class="form-check-label"><input type="checkbox" class="form-check-input" id="eleShowZeroEx" onchange="fieldLocationOprObj.changeCtrl(this)" disabled>显示0</label>&nbsp&nbsp
-                                <label style="display:none" class="form-check-label"><input type="checkbox" class="form-check-input" id="eleAutoWrapEx" onchange="fieldLocationOprObj.changeCtrl(this)" disabled>自动折行</label>&nbsp&nbsp
-                                <label class="form-check-label"><input type="checkbox" class="form-check-input" id="eleIsNarrowEx" onchange="fieldLocationOprObj.changeCtrl(this)" disabled>窄体</label>
+                            <div class="form-group col-md-2">
+                                <label style="display:none" class="form-check-label"><input type="checkbox" class="form-check-input" id="eleShrinkEx" onchange="fieldLocationOprObj.changeCtrl(this)" disabled>自动缩放</label>
+                                <label style="display:none" class="form-check-label"><input type="checkbox" class="form-check-input" id="eleShowZeroEx" onchange="fieldLocationOprObj.changeCtrl(this)" disabled>显示0</label>
+                                <label style="display:none" class="form-check-label"><input type="checkbox" class="form-check-input" id="eleAutoWrapEx" onchange="fieldLocationOprObj.changeCtrl(this)" disabled>自动折行</label>
+                                <label class="form-check-label"><input type="checkbox" class="form-check-input" id="eleIsNarrowEx" onchange="fieldLocationOprObj.changeCtrl(this)" disabled>窄体</label>&nbsp&nbsp
                                 <label class="form-check-label"><input type="checkbox" class="form-check-input" id="eleIsAutoHeightEx" onchange="fieldLocationOprObj.changeCtrl(this)" disabled>自动行高</label>
                             </div>
-
                         </div>
                         <div id="rptTplColumnWorkbook"></div>
                     </div>

web/users/js/compilation.js

@@ -79,6 +79,7 @@ $(document).ready(function() {
         $("#program_lib").val("");
         $("#template_lib").val("");
         $("#col_lib").val("");
+        $("#fee_lib").val("");
     });
 
     //新增计税组合
@@ -94,10 +95,12 @@ $(document).ready(function() {
                 let p_name = groupData.program_lib?groupData.program_lib.displayName:"";
                 let t_name = groupData.template_lib?groupData.template_lib.name:"";
                 let c_name = groupData.col_lib?groupData.col_lib.name:"";
+                let f_name = groupData.fee_lib?groupData.fee_lib.name:"";
                 let htmlString = "<tr class='taxGroup_tr'><td><span>"+taxName+"</span></td>" +
                     "<td><span>"+p_name+"</span></td>" +
                     "<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> " +
                     "<input type='hidden' name='tax_group' data-id ='"+groupIndex+"' value='"+JSON.stringify(groupData)+"'>"+
                     "</td>" +
@@ -404,13 +407,6 @@ function initCompilation() {
     }
     $("select[name='billsGuidance_lib']").children("option").first().after(html);
 
-    // 费率标准库
-    html = '';
-    for(let tmp of feeLibData) {
-        let tmpHtml = '<option value="' + tmp.id + '">' + tmp.name + '</option>';
-        html += tmpHtml;
-    }
-    $("select[name='fee_lib']").children("option").first().after(html);
 
     // 人工系数标准库
     html = '';
@@ -442,6 +438,14 @@ function initCompilation() {
         html += tmpHtml;
     }
     $("select[name='col_lib']").children("option").first().after(html);
+
+    // 费率标准库
+    html = '';
+    for(let tmp of feeLibData) {
+        let tmpHtml = '<option value="' + tmp.id + '">' + tmp.name + '</option>';
+        html += tmpHtml;
+    }
+    $("select[name='fee_lib']").children("option").first().after(html);
 }
 
 /**
@@ -682,11 +686,13 @@ function editTaxGroup(ele) {
         $("#program_lib").val(groupData.program_lib?groupData.program_lib.id:"");
         $("#template_lib").val(groupData.template_lib?groupData.template_lib.id:"");
         $("#col_lib").val(groupData.col_lib?groupData.col_lib.id:"");
+        $("#fee_lib").val(groupData.fee_lib?groupData.fee_lib.id:"");
     }else {
         $("#taxType").val("");
         $("#program_lib").val("");
         $("#template_lib").val("");
         $("#col_lib").val("");
+        $("#fee_lib").val("");
     }
     $("#groupIndex").val(getGroupIndex(groupData));
     $("#addTaxGroup").modal({show:true});
@@ -704,6 +710,7 @@ function getGroupIndex(groupData) {//用来做唯一标识
         if(groupData.program_lib) index = index + groupData.program_lib.id;
         if(groupData.template_lib) index = index + groupData.template_lib.id;
         if(groupData.col_lib) index = index + groupData.col_lib.id;
+        if(groupData.fee_lib) index = index + groupData.fee_lib.id;
     }
     return index;
 }
@@ -711,6 +718,7 @@ function getTaxGroupData() {
     let programData = programList === undefined ? [] : _.indexBy(JSON.parse(programList), 'id');
     let billTemplateData = billTemplateList == undefined ? [] : _.indexBy(JSON.parse(billTemplateList),'ID');
     let mainTreeColData= mainTreeColList == undefined ? [] :  _.indexBy(JSON.parse(mainTreeColList),'ID');
+    let feeLibData = feeRateList === undefined ? [] : _.indexBy(JSON.parse(feeRateList),'id');
     let groupData = {};
     if($("#taxType").val() !==""){
         groupData.taxType = $("#taxType").val();
@@ -743,5 +751,14 @@ function getTaxGroupData() {
             }
         }
     }
+    if($("#fee_lib").val() !==""){
+        let feeRate =  feeLibData[$("#fee_lib").val()];
+        if(feeRate){
+            groupData.fee_lib = {
+                id:feeRate.id,
+                name:feeRate.name
+            }
+        }
+    }
     return groupData;
 }

web/users/views/compilation/engineering.html

@@ -90,23 +90,6 @@
                         </div>
                         <div class="row">
                             <div class="form-group col-md-3">
-                                <label>费率标准</label>
-                                <div class="fee-list">
-                                    <% if (Object.keys(libData).length > 0 && libData.fee_lib.length > 0) { %>
-                                    <% libData.fee_lib.forEach(function (fee, index){ %>
-                                    <p class="form-control-static">
-                                        <a class="pull-right text-danger remove-lib" data-model="fee" title="移除" data-id="<%= fee.id %>">
-                                            <span class="glyphicon glyphicon-remove"></span>
-                                        </a>
-                                        <input type="hidden" name="fee_lib" data-id="<%= fee.id %>" value="<%= JSON.stringify({id: fee.id, name: fee.name}) %>">
-                                        <% if (index === 0) {%><i class="glyphicon glyphicon-flag"></i>&nbsp;<% } %><%= fee.name %>
-                                    </p>
-                                    <% }) %>
-                                    <% } %>
-                                </div>
-                                <a href="#" class="btn btn-link btn-sm add-compilation" data-model="fee">添加</a>
-                            </div>
-                            <div class="form-group col-md-3">
                                 <label>人工系数</label>
                                 <div class="artificial-list">
                                     <% if (Object.keys(libData).length > 0 && libData.artificial_lib.length > 0) { %>
@@ -128,7 +111,7 @@
                         <a data-toggle="modal" data-target="#other_setting" class="btn btn-primary btn-sm " style="margin-right:5px">显示设置</a>
                     </div>
                     <div class="col-md-12" style="padding-top:20px">
-                        <legend>计算程序/清单模板/列设置</legend>
+                        <legend>计算程序/清单模板/列设置/费率标准</legend>
                         <a data-toggle="modal" data-target="#addTaxGroup" class="btn btn-link btn-sm " id="addTaxGroupBtn" style="margin-right:5px">添加</a>
                         <table class="table engineer_table">
                             <thead>
@@ -137,46 +120,53 @@
                                 <th>计算程序</th>
                                 <th>清单模板</th>
                                 <th>列设置</th>
+                                <th>费率标准</th>
                                 <th>操作</th>
                             </tr>
                             </thead>
                             <tbody id="tax_group_tbody">
                             <% if (Object.keys(libData).length > 0 && libData.tax_group.length > 0) { %>
-                            <% for(let tax of libData.tax_group) {%>
-                            <% let groupIndex = "";%>
-                            <tr class='taxGroup_tr'>
-                                <td>
-                                    <% if(tax.taxType === "1") { %>
-                                    <%  groupIndex = groupIndex + tax.taxType;%>
-                                    <span>一般计税</span>
-                                    <% } else if(tax.taxType === "2"){%>
-                                    <%  groupIndex = groupIndex + tax.taxType;%>
-                                    <span>简易计税</span>
-                                    <% } %>
-                                </td>
-                                <td>
-                                    <% if(tax.program_lib) { %>
-                                    <%  groupIndex = groupIndex + tax.program_lib.id;%>
-                                        <span><%= tax.program_lib.displayName%></span>
-                                    <% } %>
-                                </td>
-                                <td>
-                                    <% if(tax.template_lib) { %>
-                                    <%  groupIndex = groupIndex + tax.template_lib.id;%>
-                                    <span><%= tax.template_lib.name%></span>
-                                    <% } %>
-                                </td>
-                                <td>
-                                    <% if(tax.col_lib) { %>
-                                    <%  groupIndex = groupIndex + tax.col_lib.id;%>
-                                    <span><%= tax.col_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>
-                                    <input type='hidden' name='tax_group' data-id ="<%= groupIndex%>" value="<%= JSON.stringify(tax) %>">
-                                </td>
-                            </tr>
-                            <% } %>
+                                <% for(let tax of libData.tax_group) {%>
+                                <% let groupIndex = "";%>
+                                <tr class='taxGroup_tr'>
+                                    <td>
+                                        <% if(tax.taxType === "1") { %>
+                                        <%  groupIndex = groupIndex + tax.taxType;%>
+                                        <span>一般计税</span>
+                                        <% } else if(tax.taxType === "2"){%>
+                                        <%  groupIndex = groupIndex + tax.taxType;%>
+                                        <span>简易计税</span>
+                                        <% } %>
+                                    </td>
+                                    <td>
+                                        <% if(tax.program_lib && tax.program_lib.id) { %>
+                                        <%  groupIndex = groupIndex + tax.program_lib.id;%>
+                                            <span><%= tax.program_lib.displayName%></span>
+                                        <% } %>
+                                    </td>
+                                    <td>
+                                        <% if(tax.template_lib && tax.template_lib.id) { %>
+                                        <%  groupIndex = groupIndex + tax.template_lib.id;%>
+                                        <span><%= tax.template_lib.name%></span>
+                                        <% } %>
+                                    </td>
+                                    <td>
+                                        <% if(tax.col_lib && tax.col_lib.id) { %>
+                                        <%  groupIndex = groupIndex + tax.col_lib.id;%>
+                                        <span><%= tax.col_lib.name%></span>
+                                        <% } %>
+                                    </td>
+                                    <td>
+                                        <% if(tax.fee_lib && tax.fee_lib.id) { %>
+                                        <%  groupIndex = groupIndex + tax.fee_lib.id;%>
+                                        <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>
+                                        <input type='hidden' name='tax_group' data-id ="<%= groupIndex%>" value="<%= JSON.stringify(tax) %>">
+                                    </td>
+                                </tr>
+                                <% } %>
                             <% } %>
                             </tbody>
                         </table>

web/users/views/compilation/modal.html

@@ -51,7 +51,7 @@
                         </div>
                     </div>
                 </div>
-                <div class="form-group" id="fee-area">
+         <!--       <div class="form-group" id="fee-area">
                     <label>费率标准</label>
                     <div class="row">
                         <div class="col-xs-12">
@@ -60,7 +60,7 @@
                             </select>
                         </div>
                     </div>
-                </div>
+                </div>-->
                 <div class="form-group" id="artificial-area">
                     <label>人工系数</label>
                     <div class="row">
@@ -292,6 +292,16 @@
                         </div>
                     </div>
                 </div>
+                <div class="form-group" id="feeRate-area">
+                    <label>费率标准</label>
+                    <div class="row">
+                        <div class="col-xs-12">
+                            <select class="form-control" name="fee_lib" id = "fee_lib">
+                                <option value="">请选择费率库</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>