Merge branch 'feature/11月迭代' of git.gicdev.com:marketing-web/marketing into feature/11月迭代

src/components/layout/index.vue

@@ -61,6 +61,7 @@ export default {
       return this.$store.state.marketing.breadcrumb;
     },
     layoutTips() {
+      console.log(this.$store.state.marketing.layoutTips);
       return this.$store.state.marketing.layoutTips;
     },
     showDescription() {

src/views/ecm/touch-effect.vue

@@ -70,6 +70,9 @@ export default {
     // this.getCardLeadTable();
     this.getTouchTypeList();
   },
+  beforeDestroy() {
+    this.$store.commit('mutations_layoutTips', '');
+  },
   methods: {
     toClue(type) {
       let planName = this.$route.query.name;

src/views/message/detail.vue

@@ -8,7 +8,7 @@
           <span class="regular-font-color">{{ formatDateTimeByType(info.sendTime, 'yyyy-MM-dd-HH-mm-ss') }}</span>
         </el-col>
         <el-col :span="8">
-          <span class="primary-font-color">发送人数：</span>
+          <span class="primary-font-color">计划人数：</span>
           <span class="regular-font-color">{{ info.sendCount }}</span>
         </el-col>
         <el-col :span="8">

src/views/message/form.vue

@@ -23,7 +23,7 @@
       <vue-gic-member-group v-if="info.memberType === 2" :defaltSelected="defaltSelected" :height="500" :projectName="projectName" :headerList="headerList" @handleDataTransferred="handleDataTransferred" @handleDataLeft="handleDataLeft"></vue-gic-member-group>
       <div class="mb20" style="margin-top: 40px">
         <span class="dm-input_label">短信类型：</span>
-        <el-radio-group v-model="smsType" @change="info.gicSmsTemplateId = ''">
+        <el-radio-group v-model="smsType" @change="changeSmsType">
           <el-radio :label="1">营销短信</el-radio>
           <el-radio :label="0">普通短信</el-radio>
         </el-radio-group>
@@ -34,7 +34,7 @@
       <div class="mb20" style="margin-top: 40px;">
         <p class="mb10">
           发送时间
-          <span v-show="smsType && info.sendType" style="color:#909399;font-size:12px;margin-left: 10px">因运营商限制，营销短信发送时间为每日8:00-22:00，尽量避免夜间发送，减少用户投诉。</span>
+          <span v-show="smsType" style="color:#909399;font-size:12px;margin-left: 10px">因运营商限制，营销短信发送时间为每日8:00-22:00，尽量避免夜间发送，减少用户投诉。</span>
         </p>
         <el-radio-group v-model="info.sendType" style="padding-left: 68px">
           <el-radio class="radio" v-for="(v, i) in sendTypeOptions" :key="i" :label="v.value">{{ v.label }}</el-radio>
@@ -82,9 +82,6 @@ export default {
           return Date.now() >= val.getTime() + 24 * 60 * 60 * 1000;
         }
       },
-      pickerHourOptions: {
-        selectableRange: ['8:01:00 - 21:59:59']
-      },
       // 人群筛选器可传参数
       sceneValue: 'member', // 场景值
       useId: '', // 模板id
@@ -122,6 +119,9 @@ export default {
       const time = formatDateTimeByType(this.info.sendHourTime, 'yyyy-MM-dd-HH-mm-ss', true).h;
       const date = formatDateTimeByType(this.info.sendTime, 'yyyy-MM-dd-HH-mm-ss', true).y;
       return date + time;
+    },
+    pickerHourOptions() {
+      return { selectableRange: this.smsType ? ['8:01:00 - 21:59:59'] : [] };
     }
   },
   created() {
@@ -317,6 +317,11 @@ export default {
     },
     handleDataLeft(selectedData, selectionToRemove) {
       console.log(selectedData, selectionToRemove);
+    },
+    changeSmsType() {
+      this.info.gicSmsTemplateId = '';
+      this.info.sendTime = '';
+      this.info.sendHourTime = '';
     }
   }
 };

src/views/message/record.vue

@@ -25,7 +25,7 @@
           </p>
         </template>
       </el-table-column>
-      <el-table-column v-for="(v, i) in recordHeader" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter" :fixed="v.fixed"></el-table-column>
+      <el-table-column v-for="(v, i) in recordHeader" :show-overflow-tooltip="v.tooltip" :width="v.width" :min-width="v.minWidth" :align="v.align" :key="i" :prop="v.prop" :label="v.label" :formatter="v.formatter" :fixed="v.fixed" :render-header="onRenderHeader"></el-table-column>
       <el-table-column label="状态" prop="sendStatus" align="left" width="140px">
         <template slot-scope="scope">
           <span v-if="scope.row.sendStatus === 5"><span class="dm-status--primary--flash"></span>执行中</span>
@@ -56,10 +56,12 @@ import { getSign } from '@/service/api/commonApi.js';
 import { formatDateTimeByType } from '@/utils/index.js';
 import timeCounts from '@/components/timeCount/index.vue';
 import tableMethods from '@/mixins/tableMethods.js';
+import tip from '@/components/tip';
 export default {
   name: 'sms-record',
   components: {
-    timeCounts
+    timeCounts,
+    tip
   },
   mixins: [tableMethods],
   data() {
@@ -116,7 +118,7 @@ export default {
           }
         },
         { label: '计划人数', prop: 'sendCount', width: '100', align: 'left' },
-        { label: '送达人数', prop: 'sendSuccess', width: '100', align: 'left' },
+        { label: { name: '送达人数', tipText: '提交成功的人数' }, prop: 'sendSuccess', width: '100', align: 'left' },
         { label: '计费条数', prop: 'countNum', width: '100', align: 'left' }
       ],
       listParams: {
@@ -134,11 +136,22 @@ export default {
       quantity: 0
     };
   },
+  mounted() {
+    this.$store.commit(
+      'mutations_layoutTips',
+      `<div class="layout--tips">
+          <i class="el-icon-info"></i>送达人数、计费条数会在提交完成后5分钟更新，点击详情可查看实时数据。
+      </div>`
+    );
+  },
   created() {
     this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '短信营销', path: '' }, { name: '短信群发', path: '' }]); // eslint-disable-line
     this.getTableList();
     this.getQuantity();
   },
+  beforeDestroy() {
+    this.$store.commit('mutations_layoutTips', '');
+  },
   methods: {
     formatDateTimeByType,
     async getTableList() {
@@ -185,6 +198,9 @@ export default {
       getSign().then(res => {
         this.quantity = res.result.quantity || 0;
       });
+    },
+    onRenderHeader(h, { column: { label } }) {
+      return h('span', [h('span', label.name || label), h(label.name && tip, { props: { text: label.tipText } })]);
     }
   }
 };