Merge branch 'monthly_report_daily_bug_0.0.2' into http_mock

src/store/modules/monthlyReport/edit/index.js

@@ -720,6 +720,7 @@ export default {
       // 转换数据结构
       const res = await updateMonthlyReport(params)
       if (res.code === 200) {
+        state.pageDate.isDelete = false
         callback()
       }
     },

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

@@ -2,10 +2,8 @@
   <div v-if="subTitle" class="subTitle-wrapper">
     {{ title }}&nbsp;-&nbsp;
     <div v-for="(item, index) in subTitle" :key="index" class="item">
-      <div v-if="isShowItem(item.copywriter)">
-        {{ item.copywriter }}<div :class="{ red: isShowColor(item.copywriter, item.label) }"><span class="fontWeight">{{ item.label }}</span>
-          <div v-if="isShow(item.copywriter)">%</div>
-        </div><span v-if="item.copywriter !== '全量回滚率' && item.copywriter !== '裸奔上线率'">次</span>
+      <div v-if="isShowItem(item.copywriter)">{{ item.copywriter }}<div :class="{ red: isShowColor(item.copywriter, item.label) }"><span class="fontWeight">{{ item.label }}</span><span v-if="isShow(item.copywriter)" class="fontWeight">%</span><span v-if="item.copywriter !== '全量回滚率' && item.copywriter !== '裸奔上线率'">次</span>
+      </div>
         <div v-if="index < subTitle.length - 1">{{ item.copywriter.search(/发布次数|全量回滚率/) > -1 ? '；' : isComma(item.copywriter) }}</div>
       </div>
     </div>

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

@@ -38,7 +38,7 @@ export default {
       requireList: {},
       bugPriority: ['全部', 'P0', 'P1', 'P1以上'],
       bugPrioritys: ['全部', 'P0&P1', 'P1以上'],
-      bugHour: ['全部修复', '24小时内修复', '24小时未修复']
+      bugHour: ['全部修复', '24小时内修复', '修复时长超过24小时']
     }
   },
   watch: {

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

@@ -76,7 +76,8 @@
           :item="item"
         />
 <!--        <div v-else class="no-data">暂无数据</div>-->
-<!--        <div v-else-if="title.search(/本月优秀|持续改进/) > -1" style="margin-top: 10px;color: #666">无{{ title }}！</div>-->
+        <div v-else-if="title.search(/本月优秀|持续改进/) > -1" style="margin-top: 10px;color: #666">本月无{{ title }}！</div>
+        <div v-else class="no-data" style="padding-left: 20px">暂无数据！</div>
       </div>
       <div v-else>
         <!--        <fixedText-->

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

@@ -49,7 +49,7 @@
         v-html="headerTitle"
       />
       <span v-if="baseData.title.search(/延期|发布&回滚/) > -1">。</span><Refresh v-if="pageDate && pageDate.status < 20" slot="refresh" :title="baseData.title" :dom-key="baseData.domKey" /><span><el-button v-if="headerTitle.indexOf('线下缺陷') > -1 && pageDate.status < 20" type="text" style="margin-left: 5px;font-weight: 400;" @click.stop="marking">标记</el-button></span>
-      <span v-if="baseData.title.search(/提测打回/) > -1">。</span>
+      <span v-if="baseData.title.search(/提测打回|增发/) > -1">。</span>
     </div>
     <div
       v-if="baseData.content && baseData.content.length"
@@ -297,7 +297,7 @@ export default {
         this.baseData.content[0].type === 'RichText' &&
         !this.baseData.content[0].value
       ) {
-        return false
+        return true
       }
       return true
     },

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

@@ -17,7 +17,7 @@
         <el-button v-if="pageDate && pageDate.status < 10 && (roleCode === 100 || roleCode === 0)" size="small" @click="dialogOpen('dialogSend')">
           发送确认
         </el-button>
-        <el-button v-if="$route.query.type === 'create' && pageDate && pageDate.status < 20 && (roleCode === 100 || roleCode === 0)" slot="reference" plain size="small" @click="dialogOpen('dialogCancel')">
+        <el-button v-if="$route.query.type === 'create' && pageDate && pageDate.status < 20 && pageDate.isDelete && (roleCode === 100 || roleCode === 0)" slot="reference" plain size="small" @click="dialogOpen('dialogCancel')">
           取消
         </el-button>
         <el-button
@@ -42,7 +42,7 @@
             </el-dropdown-menu>
           </el-dropdown>
         </span>
-        <el-button v-if=" pageType.search(/All/) > -1 && (!$route.query.type || $route.query.type !== 'create') && pageDate && pageDate.status < 20 && (roleCode === 100 || roleCode === 0)" slot="reference" type="danger" size="small" @click="dialogOpen('dialogDelete')">
+        <el-button v-if=" pageType.search(/All/) > -1 && (!$route.query.type || !pageDate.isDelete || $route.query.type !== 'create') && pageDate && pageDate.status < 20 && (roleCode === 100 || roleCode === 0)" slot="reference" type="danger" size="small" @click="dialogOpen('dialogDelete')">
           删除
         </el-button>
       </template>