From 2a2ef881160064d840d946f572abbac92b450ae2 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Tue, 6 Aug 2024 14:35:48 +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 | 8 ++++----
1 file 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 e386313..f7e2e78 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,12 +93,12 @@
align: 'center',
formatter: function(value, row, index) {
var actions = [];
- if (row.destoryState !== ''){
- actions.push('变更 ');
- actions.push('报废');
- }else{
+ if (row.destoryState || row.destoryState===null){
actions.push('变更 ');
actions.push('报废');
+ }else{
+ actions.push('变更 ');
+ actions.push('报废');
}
return actions.join('');
}