Merge branch 'feature/3月迭代' of http://git.gicdev.com/marketing-web/marketing into feature/3月迭代

src/views/ai/ai-data-detail.vue

 <template>
   <div class="data-detail">
     <dm-sub-title style="margin-bottom: 5px">客户明细</dm-sub-title>
-    <div class="page-tip">消费金额字段每天更新 1 次</div>
+    <div v-if="analyseFlag" class="page-tip">活动转化数据每天更新 1 次</div>
     <el-input v-model="search.search" @change="handleCurrentChange(1)" type="text" placeholder="请输入姓名/昵称/手机号/会员卡号" prefix-icon="el-icon-search" clearable class="search-bar"></el-input>
     <el-table :data="tableData" v-loading="loading" tooltipEffect="light">
       <el-table-column label="基本信息" min-width="200px" show-overflow-tooltip>
@@ -22,7 +22,7 @@
       <el-table-column label="通话状态" min-width="80px" prop="aiStatus" show-overflow-tooltip :formatter="(row, col, val) => formatAiStatus(val)"></el-table-column>
       <el-table-column label="通话时长" min-width="80px" prop="aiDurationSec" :formatter="(row, col, val) => (val > 0 ? `${val}s` : '0s')"></el-table-column>
       <el-table-column label="意向标签" min-width="130px" prop="aiLabel" :formatter="(row, col, val) => val || '--'"></el-table-column>
-      <el-table-column label="活动转化金额(实付)" min-width="160px" prop="orderPayAmount" :formatter="(row, col, val) => (val == null ? '--' : val)"></el-table-column>
+      <el-table-column v-if="analyseFlag" label="活动转化金额(实付)" min-width="160px" prop="orderPayAmount" :formatter="(row, col, val) => (val == null ? '--' : val)"></el-table-column>
       <el-table-column label="外呼时间" min-width="100px" prop="aiTime">
         <template slot-scope="{ row }">
           <p>{{ formatDateTimeByType(row.aiTime, 'yyyy-MM-dd') || '--' }}</p>
@@ -50,6 +50,7 @@ export default {
     return {
       formatDateTimeByType,
       showSendTime: false,
+      analyseFlag: false,
       search: {
         activityId: '',
         search: '', // 姓名、昵称 、手机号、会员卡号
@@ -64,6 +65,7 @@ export default {
   created() {
     this.search.activityId = this.$route.params.id;
     this.showSendTime = this.$route.query.flag == 1;
+    this.analyseFlag = this.$route.query.analyseFlag == 1;
     this.getData();
   },
   methods: {

src/views/ai/ai-data-report.vue

@@ -52,7 +52,7 @@ export default {
       this.filterJson = filterJson;
     },
     toDetailPage() {
-      this.$router.push(`/ai/ai-data-detail/${this.$route.params.id}?flag=${this.flags.smsFlag}`);
+      this.$router.push(`/ai/ai-data-detail/${this.$route.params.id}?flag=${this.flags.smsFlag}analyseFlag=${this.flags.analyseFlag}`);
     }
   }
 };

src/views/ai/ai-data-report/conversion.vue

@@ -148,10 +148,10 @@ export default {
   methods: {
     getPlanStatistics() {
       getPlanStatistics({ activityId: this.activityId, planId: this.planId }).then(res => {
-        if (!Array.isArray(res.result) || res.result.length == 0) {
-          return;
+        if (!Array.isArray(res.result)) {
+          res.result = [];
         }
-        const targetData = res.result[0];
+        const targetData = res.result.length > 0 ? res.result[0] : {};
         this.targetList = this.targetList.map(el => {
           return el.map(item => {
             const value = targetData[item.key];
@@ -173,6 +173,9 @@ export default {
           });
         });
 
+        if (targetData.marketingNumber == null && targetData.reachNumber == null && targetData.conversionNumber == null) {
+          return;
+        }
         let data = [
           { action: '营销人数', label: '营销率', count: targetData.marketingNumber, rate: '' },
           { action: '触达人数', label: '触达率', count: targetData.reachNumber, rate: targetData.reachRate },