From a4a654d4c91536af578eed50c75bf42ec16880af Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Tue, 6 Aug 2024 11:03:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/propertychange/changeproperty.html       | 11 ++++++++---
 .../property/propertydestory/list/property.html       |  2 +-
 2 files changed, 9 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 587be9b1..e3863132 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,8 +93,13 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        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>');
+                        if (row.destoryState !== ''){
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" disabled><i class="fa fa-edit"></i>变更</a> ');
+                            actions.push('<a class="btn btn-danger btn-xs ' + destoryFlag + '" href="javascript:void(0)" disabled><i class="fa fa-remove"></i>报废</a>');
+                        }else{
+                            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>');
+                        }
                         return actions.join('');
                     }
                 }]
@@ -115,4 +120,4 @@
     }
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
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 770c00b8..bb11da30 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
@@ -105,7 +105,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-info btn-xs ' + listFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.useId + '\')"><i class="fa fa-list-ul"></i>报废</a> ');
+                        actions.push('<a class="btn btn-info btn-xs ' + listFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.useId + '\')"><i class="fa fa-list-ul"></i>销毁</a> ');
                         return actions.join('');
                     }
                 }]