From 28e168f05d3eb48223e69064188c6fce786442d4 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期三, 22 五月 2024 12:02:38 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

---
 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html b/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
index 3384ce3..1e158f1 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html
+++ b/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',

--
Gitblit v1.9.1