Merge branch 'feature/ai营销二期' into dev

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

@@ -153,6 +153,10 @@ export default {
     return {
       numFormat,
       form: {
+        search: '',
+        storeGroupId: '',
+        storeGroupLevel: '',
+        orderBy: '',
         activityId: this.$route.params.id,
         pageNum: 1,
         pageSize: 20
@@ -255,6 +259,7 @@ export default {
           {
             label: '销售额',
             value: '',
+            unit: '元',
             key: 'actualSale',
             type: 'moneyNum'
           }
@@ -264,7 +269,8 @@ export default {
             label: '客单价',
             value: '',
             key: 'perCustomerTransaction',
-            type: 'moneyNum'
+            type: 'moneyNum',
+            unit: '元'
           },
           {
             label: '连带率',
@@ -308,7 +314,7 @@ export default {
                 }
                 break;
               case 'moneyNum':
-                item.value = numFormat(value) + '元';
+                item.value = numFormat(value);
                 break;
               case 'rate':
                 item.value = !isNaN(value) ? value + '%' : '- -';
@@ -320,8 +326,19 @@ export default {
         .filter(el => el.length > 0);
     },
     exportParams() {
-      const { search, storeGroupId, storeGroupLevel } = this.form;
-      return { ...this.activityData, search, storeGroupId, storeGroupLevel };
+      const { search, storeGroupId, storeGroupLevel, orderBy } = this.form;
+      let params = {};
+      if (this.dimension == '分组维度') {
+        if (this.selectVal == 1) {
+          params = { ...this.activityData, storeGroupLevel, orderBy };
+        } else {
+          params = { ...this.activityData, storeGroupId, orderBy };
+        }
+      } else {
+        params = { ...this.activityData, search, storeGroupId, orderBy };
+      }
+      console.log(params);
+      return { ...this.activityData, ...params };
     }
   },
   methods: {
@@ -435,9 +452,13 @@ export default {
     },
     radioChange(data) {
       this.form = {
+        search: '',
+        storeGroupId: '',
+        storeGroupLevel: '',
         activityId: this.$route.params.id,
         pageNum: 1,
-        pageSize: 20
+        pageSize: 20,
+        orderBy: ''
       };
       if (data == '分组维度') {
         this.form.storeGroupLevel = 1;

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

@@ -119,7 +119,7 @@ let tableHead = [
     minWidth: '160',
     sortable: 'custom',
     formatter: function(row) {
-      return `<span>${!isNaN(row.customerIntentionsNumber) ? row.customerIntentionsNumber + '%' : '- -'}</span>`;
+      return `<span>${!isNaN(row.customerIntentionsNumber) ? row.sentMessagesNumber.toLocaleString() : '- -'}</span>`;
     }
   },
   {
@@ -161,6 +161,7 @@ export default {
         search: '',
         storeGroupId: '',
         storeGroupLevel: '',
+        orderBy: '',
         activityId: this.$route.params.id,
         pageNum: 1,
         pageSize: 20
@@ -330,9 +331,19 @@ export default {
         .filter(el => el.length > 0);
     },
     exportParams() {
-      const { search, storeGroupId, storeGroupLevel } = this.form;
-      console.log(search, storeGroupId, storeGroupLevel);
-      return { ...this.activityData, search, storeGroupId, storeGroupLevel };
+      const { search, storeGroupId, storeGroupLevel, orderBy } = this.form;
+      let params = {};
+      if (this.dimension == '分组维度') {
+        if (this.selectVal == 1) {
+          params = { ...this.activityData, storeGroupLevel, orderBy };
+        } else {
+          params = { ...this.activityData, storeGroupId, orderBy };
+        }
+      } else {
+        params = { ...this.activityData, search, storeGroupId, orderBy };
+      }
+      console.log(params);
+      return { ...this.activityData, ...params };
     }
   },
   methods: {
@@ -455,6 +466,10 @@ export default {
     },
     radioChange(data) {
       this.form = {
+        search: '',
+        storeGroupId: '',
+        storeGroupLevel: '',
+        orderBy: '',
         activityId: this.$route.params.id,
         pageNum: 1,
         pageSize: 20

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

@@ -69,8 +69,3 @@ export default {
   }
 }
 </style>
-<style lang="scss">
-.el-tooltip__popper.target-tooltip {
-  max-width: 475px !important;
-}
-</style>