qinzhipeng_v@didiglobal.com 4 years ago
parent
commit
d448cfaaca

+ 1 - 1
src/views/monthlyReport/components/monthlyEards.vue

@@ -2,7 +2,7 @@
   <el-card shadow="always" class="card">
     <div class="Layout-flex report-header">
       <span>{{ data.bizName }}</span>
-      <el-button v-show="data.status === 20 || data.status === 30" type="text">{{ '查看更多' }}</el-button>
+      <el-button v-show="data.status === 20 || data.status === 30" type="text" @click="$router.push({ path: '/monthlyReport/edit', query: { pageType: 'read', reportId: data.bizNam, subActive: data.bizName }})">查看更多</el-button>
       <el-button v-show="data.status === 10" type="text">{{ '填写' }}</el-button>
     </div>
     <div class="report-title">

+ 5 - 13
src/views/monthlyReport/index.vue

@@ -6,14 +6,14 @@
         <el-select v-model="reportValue" size="small" placeholder="请选择">
           <el-option v-for="item in reportData.reportList" :key="item.id" :label="item.reportName" :value="item.id" @click.native="getReportStatus(item)">
             <span style="float: left">{{ item.reportName }}</span>
-            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.statueStr }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px; padding-left: 20px;">{{ item.statueStr }}</span>
           </el-option>
         </el-select>
       </template>
       <template slot="content">
         <div v-show="reportData.roleCode === 100 || reportData.roleCode === 0">
           <el-button type="primary" size="small" @click="createReport">新建月报</el-button>
-          <el-button type="primary" plain size="small" @click="$router.push('/monthlyReport/set')">月报设置</el-button>
+          <el-button plain size="small" @click="$router.push('/monthlyReport/set')">月报设置</el-button>
         </div>
       </template>
     </headerCom>
@@ -21,8 +21,8 @@
     <div class="content-wrapper">
       <div class="content-reportName">
         {{ reportName }}
-        <el-button v-if="reportStatus.status === 30" type="text"> 查看完整报告</el-button>
-        <el-button v-if="reportStatus.status === 20 || reportStatus.status === 10" type="text"> 发布确认</el-button>
+        <el-button v-if="reportStatus.status === 30" type="text" @click="$router.push({ path: '/monthlyReport/edit', query: { pageType: 'read', reportId: reportValue }})"> 查看完整报告</el-button>
+        <el-button v-if="reportStatus.status === 20 || reportStatus.status === 10" type="text" @click="$router.push({ path: '/monthlyReport/edit', query: { pageType: 'edit', reportId: res.data.id }})"> 发布确认</el-button>
       </div>
       <div v-if="tagData.analysisList || tagData.confirmeList" class="report-bottom">
         <i class="el-icon-warning report-icon-warning" />
@@ -90,14 +90,8 @@ export default {
   },
   data() {
     return {
-      cardData: [
-        { bizName: '两轮车', btn: '查看更多' },
-        { bizName: '工具平台', btn: '查看更多' },
-        { bizName: '硬件', btn: '查看更多' }
-      ],
       reportStatus: {},
       tagData: {}, // tagData
-      bizList: [], // ----
       createReportDialog: false, // 新建月报
       loading: false,
       setReportData: {},
@@ -153,15 +147,13 @@ export default {
               this.$router.push({ path: '/monthlyReport/edit', query: { pageType: 'edit', reportId: res.data.id }})
             }
           })
-        } else {
-          console.log('error submit!!')
-          return false
         }
       })
     },
     getReportStatus(e) {
       this.monthlyReportIndex(e.id)
       this.reportName = e.reportName
+      this.reportValue = e.id
       this.reportStatus = e
       console.log(e)
     }