From 8bbf54d40bbd9f6682b721bbe115ecbde8c1a1c8 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Tue, 20 Aug 2024 11:16:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=AF=86=E5=93=81=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/property/propertychange/list/property.html     | 8 ++++++++
 .../system/property/propertydestory/list/property.html    | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html
index 570c94a..9b0d47d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html
@@ -47,6 +47,7 @@
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
         var listFlag = [[${@permission.hasPermi('system:change:detail')}]];
+        var sysSecretsTypeDatas = [[${@dict.getType('sys_secrets_type')}]];
         var prefix = ctx + "system/change/list";
         let datas = []
         $.ajax({
@@ -84,6 +85,13 @@
                         return getCity(datas, value)
                     }
                 },
+                {
+                    field: 'secretsType',
+                    title: '密品分类',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(sysSecretsTypeDatas, value);
+                    }
+                },
                 {
                     field: 'useDepart',
                     title: '使用部门'
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html b/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html
index 622d0c1..a149c5f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html
@@ -47,6 +47,7 @@
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
         var listFlag = [[${@permission.hasPermi('system:destory:detail')}]];
+        var sysSecretsTypeDatas = [[${@dict.getType('sys_secrets_type')}]];
         var prefix = ctx + "system/propertyDestory/list";
         let datas = []
         $.ajax({
@@ -84,6 +85,13 @@
                         return getCity(datas, value)
                     }
                 },
+                {
+                    field: 'secretsType',
+                    title: '密品分类',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(sysSecretsTypeDatas, value);
+                    }
+                },
                 {
                     field: 'useDepart',
                     title: '使用部门'