月报：历史记录

src/store/modules/monthlyReport/baseMixin/actions.js

@@ -35,7 +35,7 @@ export default {
   // 月报数据获取
   async initPageData(
     { commit, state, dispatch },
-    { id, subReportId, subActive, windowHref }
+    { id, subReportId, subActive, windowHref, historyId }
   ) {
     dispatch('setSubReportInfo', id)
     const { pageType } = state
@@ -49,7 +49,8 @@ export default {
         id,
         subReportId,
         tabsActive: `tab_${subActive || '上月问题跟进'}`,
-        windowHref
+        windowHref,
+        historyId
       })
     } else {
       const res = await getMonthlyReport(id)
@@ -76,7 +77,7 @@ export default {
     }
   },
   // 获取查看月报数据
-  async getSubReportData({ dispatch, commit, state }, { id, subReportId, tabsActive, windowHref }) {
+  async getSubReportData({ dispatch, commit, state }, { id, subReportId, tabsActive, windowHref, historyId }) {
     const { pageType } = state
     let params = {}
     let method = pageType === 'readAll' ? getAllSubReportCatalog : getSubReport
@@ -97,7 +98,7 @@ export default {
     if (windowHref.indexOf('isHistory=new') > -1) {
       method = getHistoryDetail
       params = {
-        historyId: subReportId
+        historyId: historyId
       }
     }
     const res = await method(params)
@@ -106,7 +107,7 @@ export default {
     if (res.code === 200) {
       // 单个月报与完整月报数据梳理
       if (pageType === 'read' || pageType === 'edit') {
-        commit('SET_CLIENT_TYPE_LIST', res.data.dependence.clientType)
+        // commit('SET_CLIENT_TYPE_LIST', res.data.dependence.clientType)
         // commit('SET_SELECT_ENUM', res.data.dependence.deptArch.children)
         commit('SET_PAGE_DATA', res.data)
       }

src/store/modules/monthlyReport/baseMixin/mutations.js

@@ -353,6 +353,13 @@ export default {
     // console.log(state.selectEnum)
     // setDeptArch(state.selectEnum)
   },
+  // 获取isHistory数据
+  SETISHISTORY(state, isHistory) {
+    // console.log(params)
+    state.isHistory = isHistory
+    // console.log(state.selectEnum)
+    // setDeptArch(state.selectEnum)
+  },
   // 标记为本月重点问题
   MARK_ISSUES(state, { cascaderValue, normalAreaName, multiplePeople }) {
     let isAdd = true

src/store/modules/monthlyReport/baseMixin/state.js

@@ -19,6 +19,7 @@ export default {
   peopleLists: [], // 人员账号数据
   subTitle: '新建月报',
   subReportName: '',
+  isHistory: '',
   version: '', // 月报版本
   subReportInfo: null, // 为回退时，当前页面为查看完整时，无法获取子月报数据情况设置
   timeout: null, // 函数防抖/节流

src/views/monthlyReport/childrenPage/editReport/components/MrTable/index.vue

@@ -35,7 +35,7 @@
           <template slot-scope="scope">
             <!--    展开    -->
             <div v-if="item.type === 'expand'">
-<!--              <div @click="showItem(item, scope)">item</div>-->
+              <!-- <div @click="showItem(item, scope)">item</div>-->
               <TableExpandRowList
                 v-if="scope.row.analyticFeedbackList"
                 :columns="columns"
@@ -87,7 +87,7 @@
                     </el-dropdown>
                   </span>
                   <!--链接-->
-                  <span v-else-if="btnItem.value === '链接' && isShowButton(scope.row, item)" @click.stop>
+                  <span v-else-if="btnItem.value === '链接' && isShowButton(scope.row, item) && pageType.search(/edit/) > -1" @click.stop>
                     <el-popover v-if="scope.row.operationTarget" placement="bottom-start" trigger="hover">
                       <el-button-group>
                         <el-button
@@ -261,7 +261,7 @@
     </span>
 
     <div class="plus-table-data" :style="{ marginBottom: plusTableDataBottom }" @click.stop>
-      <el-button v-if="pageDate && pageDate.status < 20" type="text" @click.stop="addTableData">
+      <el-button v-if="pageDate && pageDate.status < 20 && !isHistory" type="text" @click.stop="addTableData">
         <svg-icon icon-class="data-plus" class="icon" />
         新增
       </el-button>
@@ -424,6 +424,9 @@ export default {
     },
     version() {
       return this.$store.state.monthlyReportEdit.version
+    },
+    isHistory() {
+      return this.$store.state.monthlyReportEdit.isHistory
     }
   },
   watch: {
@@ -655,8 +658,9 @@ export default {
         }
       })
       // if (this.pageDate.status > 10 && this.tabsActive.indexOf('本月重点问题') < 0) {
+      const { isHistory } = this.$route.query
       // 非编辑状态，并且不是·本月重点问题·，删除操作按钮
-      if (this.pageDate && this.pageDate.status > 10 && !this.isExpand) {
+      if (this.pageDate && this.pageDate.status > 10 && !this.isExpand || isHistory) {
         newColumns.splice(newColumns.length - 1, 1)
       }
       return newColumns
@@ -806,6 +810,7 @@ export default {
       ) {
         return true
       }
+
       if (row.analyticFeedback && row.analyticFeedback.isCommitted) {
         return false
       }

src/views/monthlyReport/childrenPage/editReport/components/VarText.vue

@@ -6,15 +6,15 @@
       </div>
       <div class="value">
         <el-input
-          v-if="pageDate.status < 20"
+          v-if="pageDate.status < 20 && !isHistory"
           v-model="textValue"
           type="textarea"
           :placeholder="headerTitleType === 'Head2' ? `请针对${headerTitle}进行分析` : '请输入'"
           show-word-limit
         />
         <span
-          v-if="pageDate.status > 10 && textValue"
-          style="display: inline-block;line-height: 1.65;    background-color: #f7f7f7; padding: 10px; border-radius: 5px;"
+          v-if="pageDate.status > 10 && textValue || isHistory && textValue"
+          style="display: inline-block;line-height: 1.65;background-color: #f7f7f7; padding: 10px; border-radius: 5px;"
           v-html="textValue.replace(/\n/g, '<br />')"
           />
       </div>
@@ -62,7 +62,7 @@ export default {
     }
   },
   computed: {
-    ...mapState('monthlyReportEdit', ['pageType', 'pageDate'])
+    ...mapState('monthlyReportEdit', ['pageType', 'pageDate', 'isHistory'])
     // pageType() {
     //   return this.$store.state.monthlyReportEditV2.pageType
     // },

src/views/monthlyReport/childrenPage/editReport/components/core.vue

@@ -7,7 +7,7 @@
         @click.native.stop="baseDataShow"
       >
         <Refresh
-          v-if="pageDate && pageDate.status < 20"
+          v-if="pageDate && pageDate.status < 20 && !isHistory"
           slot="refresh"
           :title="baseData.title"
           :tab-key="tabKey"
@@ -48,7 +48,7 @@
         style="margin-bottom: 10px"
       />
       <PushAndBanck
-        v-else-if="baseData.title.indexOf('发布&回滚') > -1"
+        v-else-if="baseData.title.indexOf('发布&回滚') > -1 && !isHistory"
         :title="baseData.title"
         :sub-title="baseData.subTitles"
         style="margin-bottom: 5px"
@@ -69,13 +69,13 @@
         :sub-title="baseData.subTitles"
         style="margin-bottom: 10px" /><span v-if="baseData.title.search(/提测打回|增发/) > -1">。</span>
       <Refresh
-        v-if="pageDate && pageDate.status < 20"
+        v-if="pageDate && pageDate.status < 20 && !isHistory"
         slot="refresh"
         :title="baseData.title"
         :dom-key="baseData.domKey"
         :style="{marginLeft: baseData.title.search(/线上问题/) > -1 ? '5px' : '5px'}" />
       <span><el-button
-        v-if="headerTitle.indexOf('线下缺陷') > -1 && pageDate.status < 20"
+        v-if="headerTitle.indexOf('线下缺陷') > -1 && pageDate.status < 20 && !isHistory"
         type="text"
         style="margin-left: 15px;font-weight: 400;"
         @click.stop="marking">标记</el-button></span>
@@ -212,6 +212,9 @@ export default {
     },
     pageDate() {
       return this.$store.state.monthlyReportEdit.pageDate
+    },
+    isHistory() {
+      return this.$store.state.monthlyReportEdit.isHistory
     }
   },
   watch: {

src/views/monthlyReport/childrenPage/editReport/components/historyRecord.vue

@@ -35,7 +35,6 @@
 <script>
 import { getHistory } from '@/api/qualityMonthlyReport/edit'
 import commentsAndChanges from '@/components/commentsAndChanges/index.vue'
-import { locale } from 'dayjs'
 
 export default {
   name: 'History',
@@ -87,7 +86,7 @@ export default {
     },
     // 查看历史月报详情
     showHistory(item) {
-      const url = `${location.origin}/#/monthlyReport/edit?pageType=read&reportId=334&subReportId=${item.historyId}&isHistory=new`
+      const url = `${location.origin}/#/monthlyReport/edit?pageType=read&reportId=334&subReportId=${this.$route.query.subReportId}&isHistory=new&historyId=${item.historyId}`
       window.open(url, '_blank')
     }
   }

src/views/monthlyReport/childrenPage/editReport/index.vue

@@ -7,7 +7,7 @@
     @click.stop="$store.commit('monthlyReportEdit/INIT_EDIT_KEYS')"
   >
     <headerCom :key="subTitle" title="月报" :sub-title="subTitle" :address="address">
-      <template v-if="pageDate" slot="content">
+      <template v-if="pageDate && !isHistory" slot="content">
         <el-button
           v-if="pageDate && pageDate.status < 20 && (roleCode === 100 || roleCode === 50 || roleCode === 0)"
           type="primary"
@@ -264,7 +264,7 @@ export default {
       return pathName
     },
     ...mapState('monthlyReportEdit',
-      ['pageDate', 'tabPageData', 'subTitle', 'tabsList', 'tabsActive', 'treeData', 'subTabsActive', 'domKeys', 'offsetList', 'pageType', 'subReportInfo', 'roleCode', 'loading', 'version']
+      ['pageDate', 'tabPageData', 'subTitle', 'tabsList', 'tabsActive', 'treeData', 'subTabsActive', 'domKeys', 'offsetList', 'pageType', 'subReportInfo', 'roleCode', 'loading', 'version', 'isHistory']
     )
   },
   watch: {
@@ -273,6 +273,7 @@ export default {
     }
   },
   created() {
+    this.SETISHISTORY(this.$route.query.isHistory)
     this.INIT_STATE_DATA()
     this.SET_LOADING(true)
     this.indexShow = true
@@ -301,6 +302,7 @@ export default {
         id: this.$route.query.reportId,
         subActive: this.$route.query.subActive,
         subReportId: this.$route.query.subReportId,
+        historyId: this.$route.query.historyId,
         windowHref: window.location.href
       })
     }
@@ -328,7 +330,7 @@ export default {
   },
   methods: {
     ...mapMutations('monthlyReportEdit',
-      ['INIT_STATE_DATA', 'SET_LOADING', 'SET_PAGE_TYPE', 'SET_SUB_TITLE']
+      ['INIT_STATE_DATA', 'SET_LOADING', 'SET_PAGE_TYPE', 'SET_SUB_TITLE', 'SETISHISTORY']
     ),
     ...mapActions('monthlyReportEdit',
       ['getUserPermission', 'deleteReport', 'setSelectEnum', 'initPageData', 'upDateReport', 'upDateSubReport', 'confirmReport']