浏览代码

修改周会填报:关联会议默认显示“13”的错误信息,修改为默认显示 请选择会议

humingbo 1 年之前
父节点
当前提交
103d09f90a
共有 1 个文件被更改,包括 14 次插入6 次删除
  1. 14 6
      src/views/meeting/weekly.vue

+ 14 - 6
src/views/meeting/weekly.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form size="mini" :inline="true">
       <el-form-item label="关联会议">
-        <el-select size="small" style="width: 350px" placeholder="关联会议" clearable filterable v-model="meetingWeek" @change="changeWeekData()">
+        <el-select size="small" style="width: 350px" placeholder="请选择会议" clearable filterable v-model="meetingWeek" @change="changeWeekData()">
           <el-option v-for="(item,index) in meetingData" :label="item.meetingName" :key="item.id" :value="item.id"></el-option>
         </el-select>
       </el-form-item>
@@ -219,7 +219,14 @@ export default {
         // 获取当前第几周
         let week = this.getYearWeek(date.getFullYear(), Number(date.getMonth()) + 1, date.getDate());
         let currentWeek = week ;
-        this.meetingWeek = currentWeek
+        //this.meetingWeek = currentWeek
+        //默认选择当前周的周会议
+        for(let i=0;i<this.meetingData.length;i++){
+          if(this.meetingData[i].week===week){
+            this.meetingWeek=this.meetingData[i].id
+            break;
+          }
+        }
         this.getMeetingsAndWorkPlansByWeeksData(currentWeek)
       })
       getProjects().then(res=>{
@@ -256,16 +263,18 @@ export default {
         }
         let obj = {};
         obj = this.meetingData.find(item => {
-          return item.weeks === currentWeek;
+          return item.id === response.data.meetingId;
         });
+
         this.meetingId =obj.id
+        this.meetingWeek=this.meetingId
       })
     },
     getYearWeek(a, b, c) {
-      let date1 = new Date(a, parseInt(b) - 1, c),
+        let date1 = new Date(a, parseInt(b) - 1, c),
         date2 = new Date(a, 0, 1),
         d = Math.round((date1.valueOf() - date2.valueOf()) / 86400000);
-      return Math.ceil((d + (date2.getDay() + 1 - 1)) / 7);
+        return Math.ceil((d + (date2.getDay() + 1 - 1)) / 7);
     },
     getWorkData() {
 
@@ -414,7 +423,6 @@ export default {
     },
     changeWeekData() {
       this.getMeetingsAndWorkPlansByWeeksData(this.meetingWeek)
-
     },
     /** 查看任务详情*/
     rowClick(row, column, event) {