浏览代码

月报分析反馈改造

洪海涛 4 年之前
父节点
当前提交
76e18b0b75

+ 3 - 3
src/views/monthlyReport/childrenPage/editReport/components/MrTable/index.vue

@@ -44,7 +44,7 @@
                 @upAnalyticFeedback="setAnalyticFeedback"
               />
               <TableExpandRow
-                v-else
+                v-if="scope.row.analyticFeedback && !scope.row.analyticFeedbackList"
                 :columns="columns"
                 :row="scope.row"
                 :analytic-feedback="scope.row.analyticFeedback"
@@ -576,7 +576,7 @@ export default {
       console.log(rowIndex, analyticFeedbackList, isReplaceTheFeedbackPerson)
       analyticFeedbackList.forEach(elm => {
         // if (elm.feedbackCharge === feedbackCharge && isReplaceTheFeedbackPerson) {
-        if (elm.feedbackCharge === feedbackCharge) {
+        if (elm.feedbackCharge === feedbackCharge && feedbackCharge !== localStorage.getItem('username')) {
           elm.feedbackBy = localStorage.getItem('username')
         }
       })
@@ -759,7 +759,7 @@ export default {
         return false
       }
       // 新版分析反馈控制显示隐藏
-      if (row.analyticFeedbackList) {
+      if (row.analyticFeedbackList && this.title === '重点问题') {
         let peopleKey = ''
         // let peoples = ''
         // 找到 责任人 的 headerKey

+ 0 - 1
src/views/monthlyReport/childrenPage/editReport/components/core.vue

@@ -279,7 +279,6 @@ export default {
       // this.$store.commit('monthlyReportEdit/SUB_TABS_ACTIVE', this.baseData.children[0].domKey, this.activeName)
     },
     setHeader() {
-      console.log(281)
       let title = `${this.baseData.title}`
       // if (title === '发布&回滚') {
       //   this.pushAndBanckheadle()