update: 调整

src/views/ecm/form.vue

@@ -374,6 +374,9 @@
               <span class="ml10 mr10">:</span>
               <el-input-number :disabled="!isAdd" controls-position="right" class="w150" :min="1" v-model="analyseConfig.crowd_no_send"></el-input-number>
               <span class="ml10">参照组 (触发任务人群)</span>
+              <el-tooltip class="item" effect="dark" placement="top" content="说明：同一用户在同一计划中不会既存在实验组中，又存在参照组中。首次触发时，用户被归入到实验组中，再次被触发时，只能归入实验组。先满足此条件，再满足实验组比例。故一些重复触发的任务，最终呈现的人数比例可能和配置的比例不一致。" :open-delay="300">
+                <i style="cursor:pointer;color:#c0c4cc;font-size:14px;" class="el-icon-question"></i>
+              </el-tooltip>
             </div>
             <div class="mt20">
               <label class="w140 text-right inline-block mr10">设置营销效果时长</label>

src/views/ecm/marketing-event/components/lib-qywx.vue

@@ -67,8 +67,9 @@
               <el-divider direction="vertical"></el-divider>
               <el-button type="text" @click="openDialog('reduceLink')">压缩网址</el-button>
               <el-divider direction="vertical"></el-divider>
-              <el-popover placement="top" trigger="click" width="600" :offset="148">
-                <div style="padding:8px">
+              <el-popover v-model="showPopover" placement="top" trigger="click" width="600" :offset="148">
+                <div style="padding:8px;position:relative">
+                  <i class="el-icon-close popover-close" @click="showPopover = false"></i>
                   <div class="messsage-template-title">模板示例</div>
                   <div class="messsage-template-description">模板示列如下，其中{数字}为可插入的变量值，参照表如下：注意考虑变量值的文本长度，以免超出67字/条的文本上限。</div>
                   <div class="messsage-template-content">
@@ -126,7 +127,7 @@
       <el-button style="width:74px" :key="2" type="primary" @click="step = 0">上一步</el-button>
       <el-button style="width:74px" :key="2" type="primary" @click="addItem">确定</el-button>
     </template>
-    <template-dialog ref="template-dialog"></template-dialog>
+    <template-dialog ref="template-dialog" @sendItem="onInsertTemplate"></template-dialog>
   </el-dialog>
 </template>
 
@@ -182,7 +183,8 @@ export default {
       ],
       entepriseList: [],
       isEdit: false,
-      ecmMarketingTypeRelationId: ''
+      ecmMarketingTypeRelationId: '',
+      showPopover: false
     };
   },
   created() {
@@ -209,6 +211,12 @@ export default {
     addItem() {
       let qywx = { ...this.form };
       delete qywx.title;
+      if (qywx.smsFlag == 0) {
+        qywx.smsContent = null;
+      }
+      if (qywx.chatFlag == 0) {
+        qywx.chatContent = null;
+      }
       this.$emit('sendItem', { title: this.form.title, qywx, comName: 'qywx', ecmMarketingTypeRelationId: this.ecmMarketingTypeRelationId });
       this.close();
     },
@@ -244,6 +252,18 @@ export default {
     openDialog(type) {
       // type: reduceLink 压缩链接，transferLink 小程序链接，smsTemplate 短信模板
       this.$refs['template-dialog'][type].show = true;
+    },
+    onInsertTemplate(item) {
+      if (item.type == 1) {
+        this.form.smsContent = item.value.originalContent;
+      } else if (item.type == 2) {
+        if (this.form.smsContent) {
+          this.form.smsContent = `${this.form.smsContent} ${item.value}`;
+        } else {
+          this.form.smsContent = item.value;
+        }
+      }
+      this.form.smsFlag = 1;
     }
   },
   watch: {
@@ -346,6 +366,7 @@ export default {
     margin-top: 5px;
     /deep/ .el-textarea__inner {
       border: 0;
+      word-break: break-word;
     }
   }
 }
@@ -397,4 +418,12 @@ export default {
     }
   }
 }
+.popover-close {
+  position: absolute;
+  right: 5px;
+  top: 5px;
+  &:hover {
+    color: #1890ff;
+  }
+}
 </style>

src/views/ecm/marketing-event/components/qywx-dialog.vue

@@ -62,8 +62,13 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="false" :width="200" :min-width="200" align="left" prop="title" label="模板名称"></el-table-column>
-        <el-table-column :show-overflow-tooltip="false" :width="200" :min-width="200" align="left" prop="content" label="模板类型">
+        <el-table-column :show-overflow-tooltip="false" :width="150" :min-width="200" align="left" prop="title" label="更新日期">
+          <template slot-scope="scope">
+            <span>{{ formatDateTimeByType(scope.row.updateTime || scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :show-overflow-tooltip="false" :width="150" :min-width="200" align="left" prop="title" label="模板名称"></el-table-column>
+        <el-table-column :show-overflow-tooltip="false" :width="150" :min-width="200" align="left" prop="content" label="模板类型">
           <template slot-scope="scope">
             <p class="gray">{{ scope.row.type === 0 ? '普通短信' : scope.row.type === 1 ? '营销短信' : '验证码' }}</p>
           </template>
@@ -87,6 +92,7 @@
 import { compressLink, getTransferLink } from '@/service/api/commonApi.js';
 import Linktools from '@/components/linktools-fulls/index';
 import { LoadTempList } from '../assets/api.js';
+import { formatDateTimeByType } from '@/utils/index.js';
 export default {
   name: 'qywx-dialog',
   components: { Linktools },
@@ -125,7 +131,8 @@ export default {
       total: 0,
       smsTempList: [],
       selectedData: null,
-      loading: false
+      loading: false,
+      formatDateTimeByType
     };
   },
   methods: {