Merge remote-tracking branch 'origin/master'

smart-office-manager-ui/admin/src/views/notice/list.vue

@@ -39,6 +39,11 @@
             return {
                 config: {
                     search: [
+                        {
+                            name: 'title',
+                            type: 'text',
+                            label: '标题',
+                        },
                     ],
                     columns: [
                         {type: "selection", width: 60},

smart-office-manager-ui/admin/src/views/room/list.vue

@@ -80,7 +80,15 @@ export default {
             formatter: (row) => (row.roomCode ? row.roomCode : "--"),
           },
 
-          { label: "房间类型", prop: "roomType", formatter: this.formatter },
+          { label: "房间类型", prop: "roomType", formatter: (row)=>{
+            console.log(this.tableData.dict.roomType);
+              if(this.tableData.dict.roomType){
+                return (this.tableData.dict.roomType[row.roomType]?this.tableData.dict.roomType[row.roomType]:'--')
+              }else{
+                return '--'
+              }
+            } 
+          },
 
           {
             label: "绑定设备",