Merge remote-tracking branch 'origin/master' into master

src/api/meeting/work.js

@@ -13,3 +13,27 @@ export function saveWorkPlans(data){
     }
   )
 }
+
+/**
+ * 获取登录用户某周工作内容
+ * @param weeks
+ * @returns {*}
+ */
+export function getMeetingsAndWorkPlansByWeeks(weeks){
+  return request({
+    url: "/workPlan/getMeetingsAndWorkPlansByWeeks?weeks=" + weeks,
+    method: "GET"
+  })
+}
+
+/***
+ * 根据ID删除工作计划信息
+ * @param id
+ * @returns {*}
+ */
+export function deleteWorkPlanById(id){
+  return request({
+    url: "/workPlan/deleteWorkPlanById?id=" + id,
+    method: "GET"
+  })
+}

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"   placeholder="关联会议" clearable filterable v-model="meetingWeek">
+        <el-select size="small"   placeholder="关联会议" clearable filterable v-model="meetingWeek" @change="changeWeekData()">
           <el-option  v-for="(item,index) in meetingData" :label="item.meetingName" :key="item.id" :value="item.weeks"></el-option>
         </el-select>
 
@@ -18,10 +18,12 @@
         border
         stripe
         size="mini"
-        style="width: 65%" v-model="workContents">
+        style="width: 65%" v-model="workContents" :data="workContents">
         <el-table-column  type="index" label="序号" width="60">
         </el-table-column>
-        <el-table-column label="工作内容">
+        <el-table-column label="任务名称" prop="taskName" width="250">
+        </el-table-column>
+        <el-table-column label="工作反馈" prop="description" >
         </el-table-column>
       </el-table>
     </div>
@@ -58,7 +60,7 @@
 <script>
 
 import {list} from '@/api/meeting/meeting'
-import { saveWorkPlans } from '@/api/meeting/work'
+import { deleteWorkPlanById, getMeetingsAndWorkPlansByWeeks, saveWorkPlans } from '@/api/meeting/work'
 
 export default {
   name: 'weekly',
@@ -69,8 +71,10 @@ export default {
       workContents:[],
       workPlans:[{
         planContent:'请填写工作计划信息',
-        id:null
-      }]
+        id:null,
+        meetingId:null
+      }],
+      meetingStatus:null
     }
   },
   mounted() {
@@ -80,8 +84,27 @@ export default {
     getData(){
       list().then(response =>{
         this.meetingData=response.data
+        //js 获取当前周
+        const date = new Date();
+        // 获取当前第几周
+        let week = this.getYearWeek(date.getFullYear(), Number(date.getMonth()) + 1, date.getDate());
+        let currentWeek=week+1;
+        this.meetingWeek=currentWeek
+        this.getMeetingsAndWorkPlansByWeeksData(currentWeek)
+      })
+    },
+    getMeetingsAndWorkPlansByWeeksData(currentWeek){
+      getMeetingsAndWorkPlansByWeeks(currentWeek).then(response =>{
+        this.workContents=response.data.workContent
+        this.workPlans=response.data.workPlan
       })
     },
+    getYearWeek(a, b, 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);
+    },
     getWorkData(){
 
     },
@@ -103,6 +126,7 @@ export default {
         });
         return
       }
+
       let data={
         weeks:this.meetingWeek,
         workPlans:this.workPlans,
@@ -130,7 +154,18 @@ export default {
         return;
       }
       this.workPlans.splice(index, 1)
+      let id=row.id;
+      if(id!=null){
+        deleteWorkPlanById(id).then(res =>{
+          this.getMeetingsAndWorkPlansByWeeksData(this.meetingWeek)
+        });
+      }
+
     },
+    changeWeekData(){
+      this.getMeetingsAndWorkPlansByWeeksData(this.meetingWeek)
+
+    }
   }
 }
 </script>