修改bug

src/views/meeting/meeting.vue

@@ -376,7 +376,7 @@ export default {
         id: null,
         meetingName: '',
         external: 0,
-        meetingType: '1',
+        meetingType: null,
         projectId: null,
         meetingPlace: '',
         time: null,
@@ -461,7 +461,7 @@ export default {
         id: null,
         meetingName: '',
         external: 0,
-        meetingType: '1',
+        meetingType: null,
         projectId: null,
         meetingPlace: '',
         time: null,

src/views/meeting/weeklyRecords.vue

@@ -69,7 +69,7 @@
             <div v-else="scope.row.lastWeekFlag==='1'">否</div>
           </template>
         </el-table-column>
-        <el-table-column label="完成情况说明" prop="progressValue">
+        <el-table-column label="完成情况说明" prop="progressValue" width="150">
           <template slot-scope="scope">
             <div  style="color: darkgreen" @click="getTaskScheduleRemarks(scope.row)">{{scope.row.progressValue}}%</div>
           </template>
@@ -98,6 +98,14 @@
            </el-input>
         </template>
       </el-table-column>
+      <el-table-column prop="workComments" label="工作评论">
+        <template slot-scope="scope">
+          <el-input v-model="scope.row.workComment"  type="textarea"
+                    :autosize="{ minRows: 4}" @change="workComment(scope.row)">
+
+          </el-input>
+        </template>
+      </el-table-column>
     </el-table>
 
     <el-dialog
@@ -154,7 +162,7 @@ export default {
         row:0
       },
       mergeObj: {}, // 用来记录需要合并行的下标
-      mergeArr: ['group','userName','planContent','scores','remarks'], // 表格中的列名
+      mergeArr: ['group','userName','planContent','scores','remarks','workComments'], // 表格中的列名
 
 
     }
@@ -243,6 +251,7 @@ export default {
       let meetingId=row.meetingId
       let weeks=row.weeks;
       let userId=row.executor
+      let workComment=row.workComment
       if(scoreId===meetingId){
         scoreId=null
       }
@@ -251,7 +260,8 @@ export default {
         score:score,
         remark:remark,
         weeks:weeks,
-        userId:userId
+        userId:userId,
+        workComment:workComment
       }
 
       workComments(data).then(res => {