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 587be9b..e386313 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('变更 '); - actions.push('报废'); + if (row.destoryState !== ''){ + actions.push('变更 '); + actions.push('报废'); + }else{ + actions.push('变更 '); + actions.push('报废'); + } return actions.join(''); } }] @@ -115,4 +120,4 @@ } - \ No newline at end of file + 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 770c00b..bb11da3 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('报废 '); + actions.push('销毁 '); return actions.join(''); } }]