From 67e03b179e1a257622cf2b5b21ec0610115c3bf9 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 28 五月 2024 17:48:40 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 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 27e3e93..0293f9e 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
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
- <th:block th:include="include :: header('椤圭洰鍒楄〃')" />
+ <th:block th:include="include :: header('鍦哄湴鍒楄〃')" />
</head>
<body class="gray-bg">
<div class="container-div">
@@ -12,12 +12,19 @@
<ul>
<li>
- <p>椤圭洰鍚嶇О锛�</p>
+ <p>鍦哄湴鍚嶇О锛�</p>
<input type="text" name="fullName"/>
</li>
<li>
- <p>椤圭洰缂栧彿锛�</p>
+ <p>鍦哄湴缂栧彿锛�</p>
<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> 鎼滅储</a>
@@ -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() {
@@ -57,18 +65,24 @@
updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove",
exportUrl: prefix + "/export",
- modalName: "椤圭洰",
+ modalName: "鍦哄湴",
+ pageSize:50,
columns: [{
checkbox: true
},
+ {
+ field : 'ids',
+ title : '涓婚敭',
+ visible: false
+ },
{
field : 'code',
- title : '椤圭洰缂栧彿',
+ title : '鍦哄湴缂栧彿',
sortable:true
},
{
field : 'fullName',
- title : '椤圭洰鍚嶇О',
+ title : '鍦哄湴鍚嶇О',
formatter: function(value, row, index) {
return '<a onclick="navigate(\'' + row.ids + '\')">'+row.fullName+'</a>'
},
@@ -76,31 +90,28 @@
},
{
field : 'laborUnit',
- title : '鍔冲姟鍗曚綅'
+ title : '鍔冲姟鍗曚綅',
+ visible: false
},
{
field : 'district',
title : '鍖哄幙',
},
{
- field : 'leaderName',
- title : '椤圭洰璐熻矗浜�'
+ field : 'leader',
+ title : '鍦哄湴璐熻矗浜�'
},
{
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',
@@ -118,7 +129,7 @@
function navigate(id){
- $.modal.openTab("椤圭洰瀵艰埅",ctx+"/geo/project/navigate?ids="+id);
+ $.modal.openTab("鍦哄湴瀵艰埅",ctx+"/geo/project/navigate?ids="+id);
}
</script>
</body>
--
Gitblit v1.9.1