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(''); }