修改代码

src/views/enforceflow/enforceflow.vue

@@ -489,6 +489,7 @@
                     <el-button type="primary" size="mini" v-if="scope.row.id!==null"
                                @click="addenforceRemind((scope.row))">修改
                     </el-button>
+
                     <el-button type="primary" size="mini" v-if="scope.row.id===null"
                                @click="addenforceRemind(scope.row)">确认
                     </el-button>
@@ -512,11 +513,24 @@
                 <el-table-column prop="op" label="操作">
                   <template slot-scope="scope">
                     <el-button type="primary" size="mini" @click="updateEnforceRecord(scope.row)">修改</el-button>
+                    <el-popover
+                      ref="reference"
+                      placement="top"
+                      title="运维详情"
+                      width="400"
+                      :content="enforceRecordRemark"
+                      trigger="click">
+                      <div slot="content">
+                        <span v-html="enforceRecordRemark"></span>
+                      </div>
+                      <el-button slot="reference" style="margin-left: 15px" class="underline-on-hover"  size="mini" @click="getEnforceRecord(scope.row)">查看详情</el-button>
+                    </el-popover>
                   </template>
                 </el-table-column>
               </el-table>
             </el-tab-pane>
           </el-tabs>
+
         </div>
         <div v-else>
           <el-table :data="enforceFileData" stripe style="width: 100%;margin-top: 15px;">
@@ -912,7 +926,8 @@ export default {
       showImagePreview: false,
       previewList:[],
       pdfSrc:null,
-      pdfViewShow:false
+      pdfViewShow:false,
+      enforceRecordRemark:''
 
     }
   },
@@ -1679,6 +1694,12 @@ export default {
         }
       })
     },
+    getEnforceRecord(row){
+      this.enforceRecordRemark=this.removeHtmlTags(row.remark)
+    },
+    removeHtmlTags(str) {
+      return str.replace(/<[^>]*>/g, '');
+    }
   }
 
 }

src/views/meeting/weeklyRecords.vue

@@ -77,14 +77,24 @@
         prop="userName"
         label="姓名" align="center"
         width="120">
+        <template slot-scope="scope">
+          {{scope.row.userName}}({{scope.row.weekCostWorkTime}})
+        </template>
       </el-table-column>
       <el-table-column label="本周工作总结" min-width="450">
         <el-table-column label="工作内容" prop="taskName">
           <template slot-scope="scope">
-            <div class="underline-on-hover"  @click="getTaskScheduleRemarks(scope.row)">{{ scope.row.taskName }}
+            <div class="underline-on-hover"  @click="getTaskScheduleRemarks(scope.row)">{{scope.row.taskId}}、 {{ scope.row.taskName }}
+              ({{scope.row.projectName}})&nbsp;&nbsp;&nbsp;&nbsp;花费工时:({{scope.row.taskCostWorkTime}})
             </div>
           </template>
         </el-table-column>
+        <el-table-column label="任务详情" prop="descriptions">
+          <template slot-scope="scope">
+            <div style="color: blue;float: right;display: inline-block" v-if="false" class="underline-on-hover" >任务详情</div>
+            <div v-html="scope.row.description"> </div>
+          </template>
+        </el-table-column>
 <!--        <el-table-column label="是否上周遗留" width="100" prop="lastWeekFlag" v-show="false">
           <template slot-scope="scope">
             <div v-if="scope.row.lastWeekFlag==='0'" style="color: darkred">是</div>