From 8fac5179cd5d2c0621a63b5a121a098f4e0ed3c0 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Tue, 6 Aug 2024 14:42:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=9A=E8=AE=AE=E5=90=8E=E5=8F=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/property/propertychange/changeproperty.html      | 2 +-
 .../system/property/propertydestory/destoryproperty.html    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html
index f7e2e78..7f4f0ef 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html
@@ -93,7 +93,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        if (row.destoryState || row.destoryState===null){
+                        if (row.destoryState===null){
                             actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>变更</a> ');
                             actions.push('<a class="btn btn-danger btn-xs ' + destoryFlag + '" href="javascript:void(0)" onclick="destory(\'' + row.id + '\')"><i class="fa fa-remove"></i>报废</a>');
                         }else{
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/destoryproperty.html b/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/destoryproperty.html
index 67f09de..d4c96e7 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/destoryproperty.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/destoryproperty.html
@@ -47,7 +47,7 @@
     var destoryFlag = [[${@permission.hasPermi('system:destoryproperty:destory')}]];
     var removeFlag = [[${@permission.hasPermi('system:destoryproperty:remove')}]];
     var propertyTypeDatas = [[${@dict.getType('sys_sm_property')}]];
-    var destoryTypeDatas = [[${@dict.getType('sys_baofei_type')}]];
+    var destoryTypeDatas = [[${@dict.getType('sys_property_destory')}]];
     var prefix = ctx + "system/propertyDestory";
 
     $(function() {
@@ -82,8 +82,8 @@
                     title: '资产SN码'
                 },
                 {
-                    field: 'destoryType',
-                    title: '报废状态',
+                    field: 'destoryState',
+                    title: '销毁状态',
                     formatter: function(value, row, index) {
                         return $.table.selectDictLabel(destoryTypeDatas, value);
                     }