Merge branch 'feature/销售线索' into master

src/views/ecm/touch-clue.vue

@@ -173,8 +173,8 @@ export default {
           data.taskRate = (data.cplTaskTotalCnt / data.taskCnt) * 100;
           data.flag = true;
         }
-        data.touchRate = parseFloat(((data.touchMbrNum / data.planMbrNum) * 100).toFixed(2));
-        data.transformRate = parseFloat(((data.convMbrNum / data.touchMbrNum) * 100).toFixed(2));
+        data.touchRate = data.touchMbrNum * 1 && data.planMbrNum * 1 ? ((data.touchMbrNum / data.planMbrNum) * 100).toFixed(2) : 0;
+        data.transformRate = data.convMbrNum * 1 && data.touchMbrNum * 1 ? ((data.convMbrNum / data.touchMbrNum) * 100).toFixed(2) : 0;
         this.marketListData = [{ ...data }];
       });
     },

src/views/ecm/touch-effect.vue

@@ -108,11 +108,13 @@ export default {
     },
     getMarketList() {
       ecmTouchEffectTable({ ecmPlanId: this.ecmPlanId }).then(res => {
+        if (!res.result || !res.result.length) res.result = [{ isSales: 1 }, { isSales: 0 }];
         this.marketListData = res.result.map(item => {
           item.touchRate = item.touchMbrNum * 1 && item.planMbrNum * 1 ? ((item.touchMbrNum / item.planMbrNum) * 100).toFixed(2) : 0;
           item.transformRate = item.touchMbrNum * 1 && item.planMbrNum * 1 ? ((item.convMbrNum / item.planMbrNum) * 100).toFixed(2) : 0;
           return item;
         });
+        console.log(this.marketListData);
       });
     },
     getFunnelData() {