修改bug

src/views/meeting/weekly.vue

@@ -41,6 +41,17 @@
             <el-input size="mini" v-model="scope.row.planContent" ></el-input>
           </template>
         </el-table-column>
+        <el-table-column label="预计完成时间" prop="completionTimes">
+          <template scope="scope">
+            <el-date-picker
+              v-model="scope.row.completionTimes"
+              type="date"
+              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
+              placeholder="选择日期">
+            </el-date-picker>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" prop="op" width="150" v-if="currentWeek===weeks">
           <template slot-scope="scope">
             <el-button size="mini" type="primary" @click="addRow()">添加</el-button>
@@ -75,11 +86,14 @@ export default {
       workPlans:[{
         planContent:'请填写工作计划信息',
         id:null,
-        meetingId:null
+        meetingId:null,
+        completionTimes:null,
+        completionTime:null
       }],
       meetingStatus:null,
       weeks:null,
       currentWeek:null,
+      meetingId:null
     }
   },
   mounted() {
@@ -89,6 +103,7 @@ export default {
     getData(){
       list().then(response =>{
         this.meetingData=response.data
+        this.meetingId=this.meetingData.id
         //js 获取当前周
         const date = new Date();
         // 获取当前第几周
@@ -99,6 +114,7 @@ export default {
       })
     },
     getMeetingsAndWorkPlansByWeeksData(currentWeek){
+      let weekss=currentWeek
       getMeetingsAndWorkPlansByWeeks(currentWeek).then(response =>{
         this.workContents=response.data.workContent
         if(response.data.workPlan!=null && response.data.workPlan.length>0){
@@ -108,8 +124,13 @@ export default {
         const date = new Date();
         // 获取当前第几周
         let week = this.getYearWeek(date.getFullYear(), Number(date.getMonth()) + 1, date.getDate());
+
         let currentWeek=week+1;
-        this.currentWeek=currentWeek
+        this.currentWeek=currentWeek;
+        if(weekss!==currentWeek){
+          this.workPlans=response.data.workPlan
+        }
+        this.meetingId=response.data.meetingId
       })
     },
     getYearWeek(a, b, c) {
@@ -140,12 +161,16 @@ export default {
         return
       }
 
+      let workPlanss=this.workPlans;
+      for(let i=0;i<workPlanss.length;i++){
+        workPlanss[i].completionTime=null;
+      }
       let data={
         weeks:this.meetingWeek,
-        workPlans:this.workPlans,
-        id:this.workPlans.id
+        workPlans:workPlanss,
+        id:this.workPlans.id,
+        meetingId:this.meetingId
       }
-
       saveWorkPlans(data).then( res => {
         this.$message({
           message: '操作成功',
@@ -156,7 +181,7 @@ export default {
       });
     },
     addRow(){
-      let row={planContent: '','op':'',id:null}
+      let row={planContent: '','op':'',id:null,completionTimes:null}
       this.workPlans.push(row)
     },
     deleteRow(index,row){

src/views/meeting/weeklyRecords.vue

@@ -83,22 +83,18 @@
           </template>
         </el-table-column>
       </el-table-column>
-      <el-table-column prop="score" label="评分"  width="150" align="center">
+      <el-table-column prop="scores" label="评分"  width="150" align="center">
         <template slot-scope="scope">
-          <div v-if="scope.row.executor==scope.row.scores">
-            <el-input-number size="mini" :precision="2" :step="0.1" :max="10" min="5" v-model="scope.row.score" @change="workComment(scope.row)">0</el-input-number>
-          </div>
-          <div v-else >
             <el-input-number size="mini" :precision="2" :step="0.1" :max="10" min="5" v-model="scope.row.score"  @change="workComment(scope.row)">
               {{scope.row.score}}
             </el-input-number>
-          </div>
         </template>
       </el-table-column>
-      <el-table-column prop="remark" label="备注" >
+      <el-table-column prop="remarks" label="备注" >
         <template slot-scope="scope">
            <el-input v-model="scope.row.remark"  type="textarea"
                      :autosize="{ minRows: 4}" @change="workComment(scope.row)">
+
            </el-input>
         </template>
       </el-table-column>
@@ -143,7 +139,7 @@ export default {
         row:0
       },
       mergeObj: {}, // 用来记录需要合并行的下标
-      mergeArr: ['group','userName','planContent','score','remark'], // 表格中的列名
+      mergeArr: ['group','userName','planContent','scores','remarks'], // 表格中的列名
 
 
     }
@@ -215,7 +211,7 @@ export default {
       let score=row.score
       let remark=row.remark
       let meetingId=row.meetingId
-      let weeks=row.weeks-1;
+      let weeks=row.weeks;
       let userId=row.executor
       if(scoreId===meetingId){
         scoreId=null
@@ -233,6 +229,7 @@ export default {
           message: '操作成功!',
           type: 'info'
         });
+        this.getData()
       });
 
     },