合并代码

src/views/meeting/weeklyRecords.vue

@@ -1,10 +1,9 @@
 <template>
   <div class="app-container" >
     <div style="display: flex;justify-content: space-between;margin-bottom: 8px">
-      <div style="font-size: 24px">{{ title }}</div>
+      <div style="font-size: 24px">{{ m.meetingName }}</div>
       <el-button size="mini" @click="exportPdf" icon="el-icon-download" style="margin-right: 20px">导出</el-button>
     </div>
-    <h3>{{m.meetingName}}</h3>
     <el-descriptions  title="" :column="2" :size="size" border>
       <el-descriptions-item>
         <template slot="label">

src/views/task/components/taskDetail.vue

@@ -75,8 +75,10 @@ export default {
         return '完成'
       } else if (type === '3') {
         return '终止'
+      } else if (type === '4') {
+        return '评论'
       }
-      return '评论'
+      return '审批'
     }
   }
 }

src/views/task/view.vue

@@ -343,8 +343,10 @@ export default {
         return '完成'
       } else if (type === '3') {
         return '终止'
+      } else if (type === '4') {
+        return '评论'
       }
-      return '评论'
+      return '审批'
     }
   }
 }