update:触达效果

src/views/ecm/list.vue

@@ -200,14 +200,14 @@ export default {
           }
         },
         {
-          label: '卡券收益', // 字段名需要更改------------------------------------------------
-          prop: 'ecmTranIncome',
+          label: '卡券收益',
+          prop: 'cardSalesAmt',
           minWidth: '120',
           align: 'left',
           formatter(row) {
             let openFlag = JSON.parse(row.analyseJson);
             if (!openFlag) openFlag = {};
-            return openFlag.open_flag == 0 || (!row.ecmTranIncome && row.ecmTranIncome != 0) ? '--' : row.ecmTranIncome.toFixed(2);
+            return openFlag.open_flag == 0 || (!row.cardSalesAmt && row.cardSalesAmt != 0) ? '--' : row.cardSalesAmt.toFixed(2);
           }
         }
       ],

src/views/ecm/touch-clue.vue

@@ -279,7 +279,6 @@ export default {
       }
       meth(params).then(res => {
         this.tableList = [];
-        console.log(res.result);
         if (!res.result.result || !res.result.result.length) return;
         // 拼接表头数据
         let resetArr = [];

src/views/ecm/touch-components/card-profit.vue

@@ -4,7 +4,7 @@
       <h2>卡券收益</h2>
       <span>计划中的卡券，计划中卡券触达的人群使用该卡券消费的收益，包含已过计划收益有效期的数据</span>
     </div>
-    <template v-if="isCardProfit">
+    <template v-if="tableData.length">
       <div class="list">
         <div class="list_left">
           <div>
@@ -35,12 +35,15 @@
           </div>
         </div>
       </div>
-      <el-table :data="tableData" v-if="tableData.length" style="margin-bottom:47px" max-height="710">
-        <el-table-column :prop="cardName" label="卡券名称" min-width="100">
+      <el-table :data="tableData" v-if="tableData.length > 1" style="margin-bottom:47px" max-height="710">
+        <el-table-column :prop="cardName" label="卡券名称" min-width="150">
           <template slot-scope="scope">
             <div class="name" v-if="scope.row.cardName">
               <div class="top">
-                {{ scope.row.cardName }}
+                <span v-if="scope.row.cardName.length <= 15">{{ scope.row.cardName }}</span>
+                <el-tooltip open-delay="100" placement="top-start" :content="scope.row.cardName" v-else>
+                  <span class="card_name">{{ scope.row.cardName }}</span>
+                </el-tooltip>
                 <span class="type">{{ scope.row.cardType == 0 ? '抵金券' : scope.row.cardType == 1 ? '折扣券' : scope.row.cardType == 2 ? '兑换券' : '--' }}</span>
               </div>
               <p>{{ scope.row.subTitle }}</p>
@@ -79,7 +82,6 @@ export default {
   },
   data() {
     return {
-      isCardProfit: true, // 是否使用卡券营销
       tableHeader: [
         { label: '触达人数', prop: 'touchMbrNum', minWidth: '160', align: 'left', fixed: 'left', formatter: row => this.formatterNum(row.touchMbrNum) },
         { label: '领取人数', prop: 'getMbrNum', minWidth: '160', align: 'left', fixed: 'left', formatter: row => this.formatterNum(row.getMbrNum) },
@@ -188,7 +190,7 @@ export default {
         display: inline-block;
         width: 42px;
         height: 16px;
-        line-height: 18px;
+        line-height: 16px;
         text-align: center;
         background: #fff1f0;
         border-radius: 2px;
@@ -197,6 +199,12 @@ export default {
         color: #f5222d;
         margin-left: 6px;
       }
+      .card_name {
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        max-width: 210px;
+      }
     }
     p {
       font-size: 12px;