소스 검색

修改bug

humingbo 2 년 전
부모
커밋
d9b7076c02
2개의 변경된 파일47개의 추가작업 그리고 2개의 파일을 삭제
  1. 12 0
      src/api/meeting/meeting.js
  2. 35 2
      src/views/meeting/weeklyRecords.vue

+ 12 - 0
src/api/meeting/meeting.js

@@ -150,3 +150,15 @@ export function getMeetingByWeekss(){
     method: 'get'
   })
 }
+
+/**
+ * 根据任务id 获取任务反馈备注
+ * @param id
+ * @returns {*}
+ */
+export function getTaskScheduleRemark(id){
+  return request({
+    url: '/workPlan/getTaskScheduleRemark?taskId='+id,
+    method: 'get'
+  })
+}

+ 35 - 2
src/views/meeting/weeklyRecords.vue

@@ -71,7 +71,7 @@
         </el-table-column>
         <el-table-column label="完成情况说明" prop="progressValue">
           <template slot-scope="scope">
-            {{scope.row.progressValue}}%
+            <div  style="color: darkgreen" @click="getTaskScheduleRemarks(scope.row)">{{scope.row.progressValue}}%</div>
           </template>
         </el-table-column>
       </el-table-column>
@@ -99,11 +99,23 @@
         </template>
       </el-table-column>
     </el-table>
+
+    <el-dialog
+      :title="taskFeedbackTitle"
+      :visible.sync="taskFeedbackVisible"
+      width="30%"
+        >
+        <div v-html="taskFeedbackContent"></div>
+      <span slot="footer" class="dialog-footer">
+      <el-button @click="taskFeedbackVisible = false" size="mini">取 消</el-button>
+      <el-button type="primary" @click="taskFeedbackVisible = false" size="mini">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
 
-import { getMeetingByWeekss, getWeeksRecordsByWeeks, workComments } from '@/api/meeting/meeting'
+import { getMeetingByWeekss, getTaskScheduleRemark, getWeeksRecordsByWeeks, workComments } from '@/api/meeting/meeting'
 
 import {downloadPdf} from "@/api/meeting/meeting";
 
@@ -112,6 +124,9 @@ export default {
   name: 'weeklyRecords',
   data() {
     return {
+      taskFeedbackTitle:'',
+      taskFeedbackVisible:false,
+      taskFeedbackContent:'',
       title : '技术部周会',
       size: '',
       tableData:[],
@@ -248,6 +263,24 @@ export default {
       });
 
     },
+    getTaskScheduleRemarks(row){
+      this.taskFeedbackTitle=row.userName+":"+row.taskName
+
+      getTaskScheduleRemark(row.taskId).then(res =>{
+        let content=res.data;
+        let feedbackContent='';
+        let j=1;
+        for(let i=0;i<content.length;i++){
+          feedbackContent+=j+":"+ content[i].description+"&nbsp;&nbsp;&nbsp;&nbsp;"+content[i].value+"%"+"&nbsp;&nbsp;&nbsp"+'</br>'
+          j++;
+        }
+        if(content.length===0){
+          feedbackContent='暂无反馈'
+        }
+       this.taskFeedbackContent=feedbackContent
+      });
+      this.taskFeedbackVisible=true
+    },
     exportPdf() {
       downloadPdf(this.meetingId,this.weeks)
     },