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

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

@@ -285,7 +285,6 @@ export default {
     TargetGroup
   },
   mounted() {
-    this.aiTransformStoreGroupSplit();
     this.getActivityDetail();
     this.aiStoreTransfer();
     this.aiStoreTransferStatistics();
@@ -342,6 +341,7 @@ export default {
       // 门店维度列表
       const head = {
         label: '门店名称',
+        width: '250',
         prop: 'storeName',
         tooltip: true,
         fixed: 'left',
@@ -393,7 +393,7 @@ export default {
       const head = {
         label: '分组名称',
         prop: 'name',
-        width: '250',
+        width: '150',
         tooltip: true,
         fixed: 'left',
         formatter: function(row) {
@@ -436,16 +436,20 @@ export default {
         this.cardLoading = false;
       }
     },
-    async aiTransformStoreGroupSplit() {
-      let res = await aiTransformStoreGroupSplit();
+    async aiTransformStoreGroupSplit(activityId, planId) {
+      let res = await aiTransformStoreGroupSplit({ activityId, planId });
       this.options.treeOptions.data = res.result || [];
     },
     async getActivityDetail() {
-      const { result } = await getActivityDetail({ activityId: this.$route.params.id });
-      if (!result) return;
-      const { startDate, endDate, activityName, activityId } = result;
-      const smsFlag = result.activityPlanList[0].activityEventList[0].smsFlag;
-      this.activityData = { startTime: startDate, endTime: endDate, smsFlag, activityName, activityId };
+      try {
+        const { result } = await getActivityDetail({ activityId: this.$route.params.id });
+        if (!result) return;
+        const { startDate, endDate, activityName, activityId } = result;
+        const smsFlag = result.activityPlanList[0].activityEventList[0].smsFlag;
+        const planId = result.activityPlanList[0].planId;
+        this.activityData = { startTime: startDate, endTime: endDate, smsFlag, activityName, activityId };
+        this.aiTransformStoreGroupSplit(activityId, planId);
+      } catch (err) {}
     },
     radioChange(data) {
       this.form = {

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

@@ -290,7 +290,7 @@ export default {
   },
   mounted() {
     this.aiStoreOutboundStatistics();
-    this.aiOutboundStoreGroupSplit();
+
     this.getActivityDetail();
   },
   computed: {
@@ -348,6 +348,7 @@ export default {
       const head = {
         label: '门店名称',
         prop: 'storeName',
+        width: '250',
         tooltip: true,
         fixed: 'left',
         formatter: function(row) {
@@ -402,7 +403,7 @@ export default {
       const head = {
         label: '分组名称',
         prop: 'name',
-        width: '250',
+        width: '150',
         tooltip: true,
         fixed: 'left',
         formatter: function(row) {
@@ -449,17 +450,21 @@ export default {
         this.cardLoading = false;
       }
     },
-    async aiOutboundStoreGroupSplit() {
-      let res = await aiOutboundStoreGroupSplit();
+    async aiOutboundStoreGroupSplit(activityId, planId) {
+      let res = await aiOutboundStoreGroupSplit({ activityId, planId });
       this.options.treeOptions.data = res.result || [];
     },
     async getActivityDetail() {
-      const { result } = await getActivityDetail({ activityId: this.$route.params.id });
-      if (!result) return;
-      const { startDate, endDate, activityName, activityId } = result;
-      const smsFlag = result.activityPlanList[0].activityEventList[0].smsFlag;
-      this.activityData = { startTime: startDate, endTime: endDate, smsFlag, activityName, activityId };
-      this.aiStoreOutboundRank();
+      try {
+        const { result } = await getActivityDetail({ activityId: this.$route.params.id });
+        if (!result) return;
+        const { startDate, endDate, activityName, activityId } = result;
+        const smsFlag = result.activityPlanList[0].activityEventList[0].smsFlag;
+        const planId = result.activityPlanList[0].planId;
+        this.activityData = { startTime: startDate, endTime: endDate, smsFlag, activityName, activityId };
+        this.aiStoreOutboundRank();
+        this.aiOutboundStoreGroupSplit(activityId, planId);
+      } catch (err) {}
     },
     radioChange(data) {
       this.form = {