From ef457f5c7f2550077f4d29814ddf7af3ae81487f Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Fri, 16 May 2025 11:11:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/newdev/apply/applyList.html         | 9 +++++++++
 .../templates/system/newdev/audit/auditList.html         | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/applyList.html b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/applyList.html
index 66e42ee9..f7e41cbd 100644
--- a/ruoyi-admin/src/main/resources/templates/system/newdev/apply/applyList.html
+++ b/ruoyi-admin/src/main/resources/templates/system/newdev/apply/applyList.html
@@ -56,6 +56,7 @@
     var editFlag = [[${@permission.hasPermi('system:apply:edit')}]];
     var detailFlag = [[${@permission.hasPermi('system:apply:editFile')}]]
     var removeFlag = [[${@permission.hasPermi('system:apply:remove')}]];
+    var applyState = [[${@dict.getType('sys_user_apply_status')}]];
     var prefix = ctx + "system/applyList";
     $(function() {
         var options = {
@@ -107,6 +108,14 @@
                     field: 'smGrade',
                     title: '涉密等级',
                 },
+                {
+                    title: '状态',
+                    align: 'center',
+                    field: 'applyStatus',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(applyState, value);
+                    }
+                },
                 {
                     field: 'createTime',
                     title: '创建时间',
diff --git a/ruoyi-admin/src/main/resources/templates/system/newdev/audit/auditList.html b/ruoyi-admin/src/main/resources/templates/system/newdev/audit/auditList.html
index 088db73c..7361ac4e 100644
--- a/ruoyi-admin/src/main/resources/templates/system/newdev/audit/auditList.html
+++ b/ruoyi-admin/src/main/resources/templates/system/newdev/audit/auditList.html
@@ -45,6 +45,7 @@
 <th:block th:include="include :: footer" />
 <script th:inline="javascript">
     var detailFlag = [[${@permission.hasPermi('system:audit:editAudit')}]]
+    var applyState = [[${@dict.getType('sys_user_apply_status')}]];
     var prefix = ctx + "system/auditList";
     $(function() {
         var options = {
@@ -90,6 +91,14 @@
                     field: 'smGrade',
                     title: '涉密等级',
                 },
+                {
+                    title: '状态',
+                    align: 'center',
+                    field: 'applyStatus',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(applyState, value);
+                    }
+                },
                 {
                     field: 'createTime',
                     title: '创建时间',