Merge branch 'feature/3月迭代' into dev

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

@@ -2,7 +2,7 @@
   <div class="data-detail">
     <dm-sub-title style="margin-bottom: 5px">客户明细</dm-sub-title>
     <div class="page-tip">消费金额字段每天更新 1 次</div>
-    <el-input v-model="search.search" @change="handleCurrentChange" type="text" placeholder="请输入姓名/昵称/手机号/会员卡号" prefix-icon="el-icon-search" clearable class="search-bar"></el-input>
+    <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>
         <div slot-scope="{ row }" class="member-info">
@@ -79,6 +79,7 @@ export default {
     },
     handleCurrentChange(pageNum) {
       this.search.pageNum = pageNum;
+      this.getData();
     },
     handleSizeChange(pageSize) {
       this.search.pageSize = pageSize;
@@ -103,7 +104,7 @@ export default {
   padding: 20px;
   .search-bar {
     margin-bottom: 20px;
-    width: 260px;
+    width: 290px;
   }
   .member-info {
     display: flex;

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

@@ -199,8 +199,8 @@ export default {
                 break;
             }
             // 活动不发送挂机短信时，数据指标不展示短信发送总数的字段
-            // 活动未开启活动分析时，数据指标不展示活动费用
-            return !((this.aiDataShow.smsFlag == 0 && item.key == 'sentMessagesNumber') || (this.aiDataShow.analyseFlag == 0 && item.key == 'activityCost'));
+            // 活动未开启活动分析时，数据指标展示活动费用
+            return !((this.aiDataShow.smsFlag == 0 && item.key == 'sentSuccessfullyNumber') || (this.aiDataShow.analyseFlag != 0 && item.key == 'activityCost'));
           });
         })
         .filter(el => el.length > 0);

src/views/ai/logs-unrun.vue

@@ -91,7 +91,7 @@ export default {
       }
     },
     handleSelectionChange(val) {
-      this.exportData.logIdList = val.map(v => v.planId).join(',');
+      this.exportData.logIdList = val.map(v => v.eventExecLogId).join(',');
     }
   }
 };

src/views/ai/task/components/activeTime.vue

@@ -10,7 +10,7 @@
       </div>
       <defineTime v-show="form.callFlag == 1" ref="defineTime" :data="form.callTime" />
     </el-form-item>
-    <el-form-item label="活动有效期" required>
+    <el-form-item label="活动有效期" required prop="activeTime">
       <el-date-picker value-format="timestamp" format="yyyy-MM-dd" :picker-options="pickerOptions" @blur="minTime = maxTime = null" v-model="form.activeTime" @change="handleDateChange" type="daterange" placeholder="请选择生日范围" range-separator="~" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
       <span class="tips">由于外呼线路有限，为保证外呼触达率，建议外呼时间周期不小于5天</span>
     </el-form-item>
@@ -51,7 +51,9 @@ export default {
           }
         }
       },
-      rules: {}
+      rules: {
+        activeTime: { required: true, message: '活动有效期不能为空' }
+      }
     };
   },
   props: {
@@ -97,6 +99,7 @@ export default {
           });
         }
         this.$refs.form.validate(val => {
+          console.log(val);
           if (val) {
             const { callFlag, callTime, activeTime } = this.form;
             const obj = {

src/views/ai/task/components/defineTime.vue

@@ -117,7 +117,7 @@ export default {
       return (rule, value, callback) => {
         if (!endTime) {
           callback(new Error(' '));
-        } else if (endTime < startTime) {
+        } else if (endTime <= startTime) {
           callback(new Error('结束时间要大于开始时间'));
         } else {
           this.$refs.defineTime.clearValidate('timeRangeList.' + i + '.startTime');

src/views/ai/task/components/holidayActiveTime.vue

@@ -102,61 +102,7 @@ export default {
         holiday_date1: { validator: holiday_date1 },
         holiday_date2: { validator: holiday_date2 }
       },
-      holidayData: [
-        {
-          id: 'S', //节日分类ID
-          name: '', //节日分类名称
-          holidaysList: [
-            {
-              id: '1', // 节日配置ID
-              name: '妇女节', //节日配置名称
-              date: '2020-03-08' //节日配置日期
-            },
-            {
-              id: '2', // 节日配置ID
-              name: '618', //节日配置名称
-              date: '2020-06-18' //节日配置日期
-            },
-            {
-              id: '3', // 节日配置ID
-              name: '端午节端午节端午', //节日配置名称
-              date: '2020-10-01' //节日配置日期
-            }
-          ]
-        },
-        {
-          id: 'A', //节日分类ID
-          name: '', //节日分类名称
-          holidaysList: [
-            {
-              id: '4', // 节日配置ID
-              name: '端午节', //节日配置名称
-              date: '2020-05-05' //节日配置日期
-            },
-            {
-              id: '5', // 节日配置ID
-              name: '中秋节', //节日配置名称
-              date: '2020-07-15' //节日配置日期
-            },
-            {
-              id: '6', // 节日配置ID
-              name: '愚人节', //节日配置名称
-              date: '2020-04-01' //节日配置日期
-            }
-          ]
-        },
-        {
-          id: 'B', //节日分类ID
-          name: '', //节日分类名称
-          holidaysList: [
-            {
-              id: '7', // 节日配置ID
-              name: '元宵节', //节日配置名称
-              date: '2020-01-01' //节日配置日期
-            }
-          ]
-        }
-      ],
+      holidayData: [],
       selectedData: '',
       visible: false,
       pickerOptions: {

src/views/ai/task/form.vue

@@ -32,7 +32,7 @@
             <el-radio :label="1">客户分组</el-radio>
           </el-radio-group>
           <div>
-            <div class="tips" style="margin:0 0 12px 0; " v-if="form.memberType == 0">{{ this.form.sence == 3 ? '默认为全部未添加企微好友的客户' : '默认为权限范围内的全部客户' }}</div>
+            <div class="tips" style="margin:0 0 12px 0; " v-if="form.memberType == 0">{{ this.form.scene == 3 ? '默认为全部未添加企微好友的客户' : '默认为权限范围内的全部客户' }}</div>
             <el-button v-if="form.memberType == 0 && !memberCrowdWidgetId && form.scene != 4" size="small" @click="ruleVisible = true">添加其他条件</el-button>
             <ruleFilter v-show="form.memberType == 0 && form.scene != 4" :visiable.sync="ruleVisible" @save="handleRuleFilterSave" :memberCrowdWidgetId="memberCrowdWidgetId" />
             <el-button v-if="form.memberType == 1 && !selectedGroupIds" size="small" @click="groupVisible = true">添加分组</el-button>
@@ -386,7 +386,7 @@ export default {
       templateOptions: [], //话术模板下拉
       rules: {
         activityName: { required: true, message: '活动名称不能为空' },
-        aiTemplateId: { required: true, message: '活动名称不能为空' },
+        aiTemplateId: { required: true, message: '话术模板不能为空' },
         analyseDays: { required: true, message: '分析天数不能为空' },
         analyseAmount: { required: true, message: '活动目标不能为空' },
         memberType: { required: true, validator: memberType }
@@ -581,6 +581,7 @@ export default {
     },
     async submit() {
       const activeTimeData = await this.$refs[`activeTime${[1, 2].includes(this.form.scene) ? this.form.scene : ''}`].submit();
+      console.log(activeTimeData);
       if (!activeTimeData) return;
       const { startDate, endDate, callFlag, callTime, birth_type, birth_days, holiday_date, holiday_type, holiday_name } = activeTimeData;