修改bug

src/api/meeting/work.js

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

src/views/meeting/weeklyRecords.vue

@@ -63,7 +63,7 @@
     </el-descriptions>
     <el-table
       style="width: 100%" border stripe :data="tableData" :highlight-current-row="true"
-      :span-method="objectSpanMethod">
+      :span-method="objectSpanMethod" @cell-click="addWorkPlanWin">
       <el-table-column prop="group" label="序号" width="60" align="center">
       </el-table-column>
       <el-table-column
@@ -90,7 +90,7 @@
       <el-table-column prop="workplan" label="下周工作计划">
         <el-table-column label="工作内容与完成时间" prop="planContent">
           <template slot-scope="scope">
-            <div v-html="scope.row.planContent">
+            <div v-html="scope.row.planContent" >
             </div>
           </template>
         </el-table-column>
@@ -105,18 +105,13 @@
       </el-table-column>
       <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 v-model="scope.row.remark" type="textarea" :autosize="{ minRows: 4}" @change="workComment(scope.row)">
           </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>
+          <el-input v-model="scope.row.workComment" type="textarea" :autosize="{ minRows: 4}" @change="workComment(scope.row)"></el-input>
         </template>
       </el-table-column>
     </el-table>
@@ -132,6 +127,20 @@
       <el-button type="primary" @click="taskFeedbackVisible = false" size="mini">确 定</el-button>
       </span>
     </el-dialog>
+
+    <el-dialog>
+      <el-table :data="workPlanDatas" stripe  style="width: 100%;margin-top: 15px;">
+        <el-table-column type="index" label="序号" width="60"></el-table-column>
+        <el-table-column prop="name" label="任务名称" width="180"></el-table-column>
+        <el-table-column prop="s" label="所属项目" width="180"></el-table-column>
+        <el-table-column prop="address" label="截止时间"></el-table-column>
+        <el-table-column prop="op" label="操作">
+          <el-button type="primary" size="mini">修改</el-button>
+          <el-button type="primary" size="mini">删除</el-button>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
   </div>
 </template>
 <script>
@@ -146,7 +155,6 @@ import {
 
 import {downloadPdf} from "@/api/meeting/meeting";
 
-
 export default {
   name: 'weeklyRecords',
   data() {
@@ -183,8 +191,7 @@ export default {
       },
       mergeObj: {}, // 用来记录需要合并行的下标
       mergeArr: ['group', 'userName', 'planContent', 'scores', 'remarks', 'workComments'], // 表格中的列名
-
-
+      workPlanDatas:[]
     }
   },
   created() {
@@ -199,10 +206,6 @@ export default {
     getData() {
       let meetingId = this.meetingId
       let weeks = this.weeks
- /*      if(meetingId===undefined || weeks===undefined){
-        this.$message.error('暂无周会会议!')
-        return
-      } */
       if (meetingId != null && weeks != null) {
         getWeeksRecordsByWeeks(meetingId, weeks).then(res => {
           this.tableData = res.data.workContent
@@ -220,7 +223,6 @@ export default {
           if (data != null) {
             this.meetingId = data.id
             this.weeks = data.weeks
-
             getWeeksRecordsByWeeks(this.meetingId, this.weeks).then(res => {
               this.tableData = res.data.workContent
               this.getSpanArr(this.tableData);
@@ -356,9 +358,16 @@ export default {
             type: 'warning'
           });
         }
-
       })
+    },
+    addWorkPlanWin(row, column, cell, event){
+      let label=column.label
+      if(label==='工作内容与完成时间'){
+        let userId=row.executor
+        console.log(JSON.stringify(row))
+      }
     }
+
   }
 
 }