修改周报显示错误数据bug

src/api/meeting/work.js

@@ -80,9 +80,9 @@ export function getProjects(){
 /**
  * 获取工作用户下周工作计划
  */
-export function getWorkPlanByWeeks(weeks,userId){
+export function getWorkPlanByWeeks(weeks,userId,meetingId){
   return request({
-    url: "/workPlan/getWorkPlanByWeeks?weeks="+weeks+"&userId="+userId,
+    url: "/workPlan/getWorkPlanByWeeks?weeks="+weeks+"&userId="+userId+"&meetingId="+meetingId,
     method: "GET"
   })
 }

src/views/meeting/meeting.vue

@@ -88,6 +88,11 @@
           <div v-else>已结束</div>
         </template>
       </el-table-column>
+      <el-table-column prop="status" label="确认状态" width="80">
+        <template slot-scope="scope">
+          <div v-if="scope.row.status===1 && scope.row.meetingConfirmStatus"></div>
+        </template>
+      </el-table-column>
       <!--      <el-table-column prop="createTime" label="创建时间" width="130" :v-show="false">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -448,7 +453,8 @@ export default {
         meetingEternal: '0',
         meetingName: '',
         meetingType: null,
-        status: null
+        status: null,
+        searchAuthFlag:false,
 
       },
       editFormVisible: false,
@@ -530,6 +536,7 @@ export default {
         this.userList = res.data
       });
     },
+
     // 分页插件事件
     callFather(parm) {
       this.formInline.current = parm.current
@@ -537,6 +544,14 @@ export default {
       this.getData(this.formInline)
     },
     getData(data) {
+      // 获取会议列表查询权限
+      let permissions= this.$store.getters.permissions;
+      for(let i=0;i<permissions.length;i++){
+        if(permissions[i]==='meeting:meeting:list'){
+          this.formInline.searchAuthFlag=true
+          break;
+        }
+      }
       let searchParams = data
       getMeetingsByPage(searchParams).then(response => {
         this.tableData = response.data.records;

src/views/meeting/weeklyRecords.vue

@@ -485,8 +485,9 @@ export default {
 
                 let weeks=this.weeks
                 let userId=row.executor
+                let meetingId=this.meetingId
                 this.workPlanTitle=row.userName+'下周工作计划'
-                getWorkPlanByWeeks(weeks,userId).then(res=>{
+                getWorkPlanByWeeks(weeks,userId,meetingId).then(res=>{
                   let datas=[]
                   let data=res.data
                   if(data.length>0){
@@ -554,7 +555,7 @@ export default {
       }
       addWorkPlan(data).then(res=>{
         this.$message.success("操作成功!")
-        getWorkPlanByWeeks(weeks,userId).then(res=>{
+        getWorkPlanByWeeks(weeks,userId,this.meetingId).then(res=>{
           this.workPlanDatas=res.data
         })
       })
@@ -588,7 +589,7 @@ export default {
       let weeks=row.weeks
       deleteWorkPlanById(id).then(res=>{
         this.$message.success("操作成功!")
-        getWorkPlanByWeeks(weeks,userId).then(res=>{
+        getWorkPlanByWeeks(weeks,userId,this.meetingId).then(res=>{
           this.workPlanDatas=res.data
         })
       })