Merge branch '20210406-maqv2' into 20210412-youhua

linzhijie

2021-04-12 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd

 src/main/resources/templates/exam/template/template.html

@@ -44,13 +44,15 @@
                <a class="btn btn-success" onclick="$.operate.addTab()" shiro:hasPermission="exam:template:add">
                    <i class="fa fa-plus"></i> [[#{dict.ic18}]]
                </a>
                <a class="btn btn-primary single disabled" onclick="$.operate.editTab()" shiro:hasPermission="exam:template:edit">
                <a style="background-color: #7b76b7;border-color: #7b76b7;color: #FFFFFF"
                   class="btn single disabled" onclick="$.operate.editTab()" shiro:hasPermission="exam:template:edit">
                    <i class="fa fa-edit"></i> [[#{dict.ic19}]]
                </a>
                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="exam:template:remove">
                    <i class="fa fa-remove"></i> [[#{dict.ic20}]]
                </a>
                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="exam:template:export">
                <a style="background-color: #a87242;border-color: #a87242;color: #FFFFFF"
                   class="btn" onclick="$.table.exportExcel()" shiro:hasPermission="exam:template:export">
                    <i class="fa fa-download"></i> [[#{dict.ic22}]]
                </a>
                <a class="btn btn-danger+" onclick="emailEdit()" shiro:hasPermission="exam:email:edit">
@@ -116,16 +118,17 @@
                    field : 'remark', 
                    title : [[#{basis.remark}]]
                },
                {
                    title: [[#{operating.operating}]],
                    align: 'center',
                    formatter: function(value, row, index) {
                        var actions = [];
                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.id + '\')"><i class="fa fa-edit"></i>[[#{menu.exam.distributor.edit}]]</a> ');
                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>[[#{dict.ic20}]]</a>');
                        return actions.join('');
                    }
                }]
                // {
                //     title: [[#{operating.operating}]],
                //     align: 'center',
                //     formatter: function(value, row, index) {
                //         var actions = [];
                //         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.id + '\')"><i class="fa fa-edit"></i>[[#{menu.exam.distributor.edit}]]</a> ');
                //         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>[[#{dict.ic20}]]</a>');
                //         return actions.join('');
                //     }
                // }
                ]
            };
            $.table.init(options);
        });