Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-05-22 28e168f05d3eb48223e69064188c6fce786442d4

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html

@@ -20,6 +20,13 @@
                                <input type="text" name="code"/>
                            </li>
                            <li>
                                <p>项目状态：</p>
                                <select name="status" th:with="type=${@dict.getType('project_status')}">
                                    <option value="">所有</option>
                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                </select>
                            </li>
                            <li>
                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
                            </li>
@@ -48,6 +55,7 @@
    <script th:inline="javascript">
        var editFlag = [[${@permission.hasPermi('geo:project:edit')}]];
        var removeFlag = [[${@permission.hasPermi('geo:project:remove')}]];
        var statusDatas = [[${@dict.getType('project_status')}]];
        var prefix = ctx + "geo/project";

        $(function() {
@@ -96,17 +104,13 @@
                    field : 'createTime', 
                    title : '创建时间'
                },
                {
                    field : 'status', 
                    title : '场地状态',
                    formatter: function(value, row, index) {
                       if(row.status =='0'){
                           return "未验收";
                       }else{
                           return "验收";
                       }
                    }
                },
                    {
                        field : 'status',
                        title : '项目状态',
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(statusDatas, value);
                        }
                    },
                {
                    title: '操作',
                    align: 'center',