update: dist

src/components/dm-drop-down/dm-drop-down.vue

@@ -69,7 +69,7 @@ export default {
 <style lang="scss" scoped>
 .el-dropdown-link {
   cursor: pointer;
-  color: #1890ff;
+  color: #2f54eb;
 }
 .el-button--text + .el-dropdown {
   margin-left: 8px;

src/components/dm-new-member-group/index.vue

@@ -137,7 +137,7 @@ export default {
   mounted() {
     document.addEventListener('visibilitychange', () => {
       if (!document.hidden) {
-        this.$refs[`table${this.activeName}`] && this.$refs[`table${this.activeName}`].getGroupList();
+        this && this.$refs[`table${this.activeName}`] && this.$refs[`table${this.activeName}`][0].getGroupList();
       }
     });
   },

src/components/dm-new-member-group/table.vue

@@ -131,7 +131,8 @@ export default {
       return row.readyStatus == 1 && this.realTimeType.includes(row.isRealTime);
     },
     addGroup() {
-      window.open('http://gicdev.demogic.com/member-tag/#/memberGroupEdit?refresh', '_blank');
+      let str = window.location.host.includes('localhost') ? 'http://gicdev.demogic.com' : window.location.host;
+      window.open(`${str}/member-tag/#/memberGroupEdit?refresh`, '_blank');
     },
     selectRow(row) {
       if (this.realTimeType.some(el => el == row.isRealTime) && row.readyStatus == 1) {

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

@@ -49,7 +49,7 @@ export default {
       }
       if (this.form.birth_type == 3 && value) {
         if (this.currentTime + this.form.birth_days * 24 * 60 * 60 * 1000 > value[0]) {
-          return callback(new Error('生日范围开始日期 - 生日前X天不能早于当前日期'));
+          return callback(new Error(`生日范围开始日期减去生日前${this.form.birth_days || 'X'}天不能早于当前日期`));
         }
       }
       callback();
@@ -131,7 +131,6 @@ export default {
   },
   watch: {
     data(val) {
-      console.log('--->data');
       if (val) {
         this.form = JSON.parse(JSON.stringify(val));
       }

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

@@ -23,7 +23,7 @@
     <el-form-item label="节日日期" prop="holiday_date2" v-show="form.holiday_type == 2">
       <el-date-picker v-model="form.holiday_date2" value-format="yyyy-MM-dd" :picker-options="pickerOptions" @change="handleDateChange" type="date" placeholder="选择日期"> </el-date-picker>
     </el-form-item>
-    <el-form-item label="外呼时间" prop="holiday_day" required>
+    <el-form-item label="外呼时间" prop="holiday_day" :rules="[{ required: true, message: '请输入外呼时间' }]">
       节日前
       <el-input-number class="w100" style="margin:0 5px;" v-model="form.holiday_day" @change="hanldeHolidayDay" controls-position="right" :max="30" :min="1" size="small" />
       天内外呼完成

src/views/ai/task/form.vue

 <template>
   <div>
     <el-form class="content" ref="form" :model="form" label-width="100px" :rules="rules" v-loading="loading" element-loading-text="拼命加载中">
-      <dm-sub-title line>基本信息</dm-sub-title>
+      <dm-sub-title type="line">基本信息</dm-sub-title>
       <div class="section">
         <el-form-item label="活动场景">
           {{ form.scene | sceneFilter }}
@@ -17,13 +17,13 @@
           <span class="tips">仅支持选择已上线的话术，若需要增加话术，请联系运营经理</span>
         </el-form-item>
       </div>
-      <dm-sub-title line>活动时间</dm-sub-title>
+      <dm-sub-title type="line">活动时间</dm-sub-title>
       <div class="section">
         <birthSense ref="activeTime1" :data="birthTimeData" v-show="form.scene == 1" @change="getMemberCount" />
         <holidaySense ref="activeTime2" :data="holidayTimeData" v-show="form.scene == 2" @change="getMemberCount" />
         <activeTime ref="activeTime" :data="activeTimeData" v-show="form.scene == 3 || form.scene == 4 || form.scene == 0" :scene="scene" @change="getMemberCount" />
       </div>
-      <dm-sub-title line>人群规则<span class="tips">针对选择的客户仅会执行一次外呼任务。</span></dm-sub-title>
+      <dm-sub-title type="line">人群规则<span class="tips">针对选择的客户仅会执行一次外呼任务。</span></dm-sub-title>
       <div class="section">
         <el-form-item label="参与人群" prop="memberType" required>
           <el-radio-group v-model="form.memberType" @change="getMemberCount">
@@ -41,7 +41,7 @@
           <gic-new-member-group v-show="form.memberType == 1" :visiable.sync="groupVisible" :selectedIds="selectedGroupIds" @change="confirmGroupDialog" />
         </el-form-item>
 
-        <el-form-item label="消费条件" v-if="form.scene == 4 && form.memberType == 0">
+        <el-form-item v-if="form.scene == 4 && form.memberType == 0">
           <div class="consumeLine">
             <el-checkbox v-model="form.consume_days_flag" :true-label="1" :false-label="0" :disabled="disabledCheck" @change="handleLastconsume">最近消费间隔</el-checkbox>
             <el-input-number v-model="form.consume_days" @change="handleChangeNum(form.consume_days_flag)" controls-position="right" :max="730" :min="30" :precision="0" size="small" style="margin:0 10px;" />天
@@ -72,13 +72,12 @@
             <el-input-number v-model="form.consume_amount1" @change="handleChangeNum(form.consume_amount1)" controls-position="right" :max="100000" :precision="0" :min="1" size="small" style="margin:0 10px;" /> 元
           </div>
         </el-form-item> -->
-
         <el-form-item label="预计覆盖人数">
           <span class="bold">{{ form.planMemberCount }}</span>
           <span class="tips">不包含无手机号的客户，以最终活动覆盖人数为准</span>
         </el-form-item>
       </div>
-      <dm-sub-title line>外呼规则配置</dm-sub-title>
+      <dm-sub-title type="line">外呼规则配置</dm-sub-title>
       <div class="section">
         <!--根据客户意向打标签 -->
         <div class="card">
@@ -229,7 +228,7 @@
           </div>
         </div>
       </div>
-      <dm-sub-title line>活动分析设置</dm-sub-title>
+      <dm-sub-title type="line">活动分析设置</dm-sub-title>
       <div class="section">
         <el-form-item label="活动分析" required>
           <el-radio v-model="form.analyseFlag" :label="1" @change="onChangeEffectType">开启</el-radio>
@@ -739,6 +738,7 @@ export default {
         filterJson = this.selectedGroupIds;
       }
       const data = {
+        scene,
         memberType,
         sceneJson,
         endDate: formatDateTimeByType(endDate, 'yyyy-MM-dd'),

src/views/ai/task/info.vue

 <template>
   <div class="detail" v-loading="loading">
-    <dm-sub-title line>基本信息</dm-sub-title>
+    <dm-sub-title type="line">基本信息</dm-sub-title>
     <div class="section">
       <el-descriptions column="4">
         <el-descriptions-item label="活动场景"> {{ form.scene | sceneFilter }}</el-descriptions-item>
@@ -10,7 +10,7 @@
         <el-descriptions-item label="节日日期" v-if="form.scene == 2">{{ holidayTimeData.holiday_date }}</el-descriptions-item>
       </el-descriptions>
     </div>
-    <dm-sub-title line>活动时间</dm-sub-title>
+    <dm-sub-title type="line">活动时间</dm-sub-title>
     <div class="section" v-if="form.scene == 1">
       <el-descriptions column="4">
         <el-descriptions-item label="外呼时间" v-if="birthTimeData.birth_type == 3"> 生日前{{ birthTimeData.birth_days }}天</el-descriptions-item>
@@ -35,7 +35,7 @@
         <el-descriptions-item label="外呼周期">{{ activeTimeData.activeTime }}</el-descriptions-item>
       </el-descriptions>
     </div>
-    <dm-sub-title line>人群规则</dm-sub-title>
+    <dm-sub-title type="line">人群规则</dm-sub-title>
     <div class="section">
       <el-descriptions column="4">
         <el-descriptions-item label="参与人群">{{ form.memberType == 0 && !memberCrowdWidgetId ? '全部客户' : '' }} </el-descriptions-item>
@@ -44,7 +44,7 @@
       <ruleFilter v-show="form.memberType == 0 && memberCrowdWidgetId" :memberCrowdWidgetId="memberCrowdWidgetId" onlyRead style="width:100%" />
       <gic-new-member-group v-show="form.memberType == 1" :selectedIds="selectedGroupIds" onlyRead style="width:100%" />
     </div>
-    <dm-sub-title line>外呼规则配置</dm-sub-title>
+    <dm-sub-title type="line">外呼规则配置</dm-sub-title>
     <div class="section">
       <!--根据客户意向打标标签-->
       <div class="card">
@@ -126,7 +126,7 @@
         </div>
       </div>
     </div>
-    <dm-sub-title line>活动分析设置</dm-sub-title>
+    <dm-sub-title type="line">活动分析设置</dm-sub-title>
     <div class="section">
       <el-descriptions>
         <el-descriptions-item label="活动分析"> {{ form.analyseFlag ? '开启' : '未开启' }}</el-descriptions-item>

src/views/ai/task/task.vue

@@ -13,7 +13,10 @@
       </div>
     </div>
     <div class="account">
-      <span>账户可用余额:{{ (money / 100) | amount }} </span><el-button type="text" @click="recharge">立即充值</el-button>
+      <span>
+        账户可用余额：<span style="font-size:16px;">{{ (money / 100) | amount }}</span>
+      </span>
+      <el-button type="text" @click="recharge">立即充值</el-button>
     </div>
     <div class="searchWarp">
       <el-form inline="true" class="table-page-search-wrapper" size="small">
@@ -55,9 +58,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="activityPlanStatus" label="活动状态" show-overflow-tooltip>
-        <template slot-scope="{ row }">
-          {{ row.activityPlanStatus | activePlanStatusFilter }}
-        </template>
+        <template slot-scope="{ row }"> <span :class="statusPoint[row.activityPlanStatus]"></span> {{ row.activityPlanStatus | activePlanStatusFilter }} </template>
       </el-table-column>
       <el-table-column prop="marketingNumber" label="营销人数" show-overflow-tooltip />
       <el-table-column prop="outboundNumber" label="已外呼数" show-overflow-tooltip />
@@ -67,8 +68,8 @@
       <el-table-column prop="beginDate" label="外呼周期" show-overflow-tooltip width="160">
         <template slot-scope="{ row }">
           <p class="cell-time">
-            {{ formatDateTimeByType(row.beginDate) }}<br />
-            {{ formatDateTimeByType(row.endDate) }}
+            {{ formatDateTimeByType(row.beginDate, 'yyyy-MM-dd') }}<br />
+            {{ formatDateTimeByType(row.endDate, 'yyyy-MM-dd') }}
           </p>
         </template>
       </el-table-column>
@@ -265,7 +266,14 @@ export default {
         }
       ],
       money: 0,
-      canCreate: 0
+      canCreate: 0,
+      statusPoint: {
+        1: 'dm-status--info',
+        2: 'dm-status--primary',
+        3: 'dm-status--error',
+        4: 'dm-status--info',
+        5: 'dm-status--warning'
+      }
     };
   },
   mounted() {