fix:会议后台接口提交

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{

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