Merge branch 'feature/3月迭代' into feature/3月迭代-菜单

src/views/ecm/current-list.vue

@@ -58,7 +58,7 @@
             <span v-else>{{ scope.row[v.prop] }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="发送时间" align="left" width="120" prop="createTime">
+        <el-table-column label="发送时间" align="left" width="120" prop="createTime" v-if="effectType != 0 && effectType != 2">
           <template slot-scope="scope">
             <p class="cell-time">
               {{ formatDateTimeByType(scope.row.createTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}<br />
@@ -194,7 +194,8 @@ export default {
       projectName: 'marketing', // 当前项目名
       dialogVisible: false,
       excelUrl: '', // 下载数据的地址
-      params: {} // 传递的参数
+      params: {}, // 传递的参数
+      effectType: 0
     };
   },
   mounted() {
@@ -206,6 +207,7 @@ export default {
     }
   },
   async created() {
+    this.effectType = this.$route.query.effectType;
     await this.ecmCurrentSendInfos();
     this.$nextTick(_ => {
       this.$refs.multipleTable.toggleAllSelection();

src/views/ecm/list.vue

@@ -390,7 +390,7 @@ export default {
     // 记录
     toRecord(row) {
       const prefix = row.effectType == 1 ? 'batchlist' : row.effectType == 2 ? 'oncelist' : 'currentlist';
-      this.$router.push({ path: `/ecm/${prefix}/${row.ecmPlanId}`, query: { name: row.ecmPlanName } });
+      this.$router.push({ path: `/ecm/${prefix}/${row.ecmPlanId}`, query: { name: row.ecmPlanName, effectType: row.effectType } });
     },
     // 触达效果
     toTouch(row) {

src/views/wechat/form.vue

@@ -46,7 +46,7 @@
           <el-button size="small" @click="cancelFilter">取 消</el-button>
         </div>
       </div>
-      <vue-gic-confirm-people v-show="info.memberType === 1" sendType="wechat" @get-data="getConfirmData" :list="memberList"></vue-gic-confirm-people>
+      <vue-gic-confirm-people v-show="info.memberType === 1" sendType="wechat" @get-all-data="getConfirmData" :list="memberList"></vue-gic-confirm-people>
       <vue-gic-member-group v-bind="storeParams" v-if="info.memberType === 2" :defaltSelected="defaltSelected" :height="500" :projectName="projectName" :headerList="headerList" @handleDataTransferred="handleDataTransferred" @handleDataLeft="handleDataLeft"></vue-gic-member-group>
     </section>
     <section class="dm-form__wrap" v-if="$route.meta.type !== 'imgText'">
@@ -162,7 +162,7 @@ export default {
         sendType: 0,
         memberType: 0,
         contentType: 0,
-        openIds: '',
+        memberIdOpenIds: '',
         memberSearchDTO: '',
         memberGroupIds: '',
         imageTextId: '',
@@ -234,7 +234,6 @@ export default {
         this.info.sendType = result.sendType;
         this.info.contentType = result.contentType;
         this.info.memberType = result.memberType;
-        this.info.openIds = this.info.memberType === 1 ? res.result.openIds : '';
         this.info.imageTextId = result.imageTextId || '';
         this.info.imageTextWechatId = result.imageTextWechatId || '';
         this.info.wechatTextId = result.wechatTextId || '';
@@ -250,6 +249,16 @@ export default {
           this.info.memberSearchDTO = result.searchParams;
         } else if (this.info.memberType === 1) {
           this.memberList = res.result.memberList;
+          if (res.result.memberIdOpenIds) {
+            this.info.memberIdOpenIds = res.result.memberIdOpenIds;
+          } else {
+            // 兼容老数据，并将老数据转成memberId&openId,memberId&openId的格式
+            const openIds = typeof res.result.openIds == 'string' ? res.result.openIds.split(',') : [];
+            this.info.memberIdOpenIds = res.result.memberList
+              .filter(el => openIds.includes(el.openId))
+              .map(el => `${el.memberId}&${el.openId}`)
+              .join(',');
+          }
         } else if (this.info.memberType === 2) {
           this.defaltSelected = res.result.tagGroupList || [];
           this.handleDataTransferred(res.result.tagGroupList || []);
@@ -323,13 +332,13 @@ export default {
           this.$tips({ type: 'warning', message: '预览只能选择指定会员发送' });
           return;
         }
-        if (!this.info.openIds || this.info.openIds.split(',').length !== 1) {
+        if (!this.info.memberIdOpenIds || this.info.memberIdOpenIds.split(',').length !== 1) {
           this.$tips({ type: 'warning', message: '请选择一个指定会员发送' });
           return;
         }
       } else if (type === 2) {
         // 直接提交群发
-        if (this.info.memberType === 1 && !this.info.openIds) {
+        if (this.info.memberType === 1 && !this.info.memberIdOpenIds) {
           this.$tips({ type: 'warning', message: '指定会员不能为空' });
           return;
         }
@@ -378,7 +387,7 @@ export default {
           }
           //memberType 0：会员筛选 不传; memberType 1：指定会员, 多个会员memberId由逗号隔开
           if (this.info.memberType) {
-            params.openIds = this.info.openIds;
+            params.memberIdOpenIds = this.info.memberIdOpenIds;
           }
           if (this.info.contentType === 0) {
             params.imageTextId = this.info.imageTextId;
@@ -487,7 +496,7 @@ export default {
           }
           //memberType 0：会员筛选 不传; memberType 1：指定会员, 多个会员memberId由逗号隔开
           if (this.info.memberType) {
-            params.openIds = this.info.openIds;
+            params.memberIdOpenIds = this.info.memberIdOpenIds;
           }
           if (this.info.contentType === 0) {
             params.imageTextId = this.info.imageTextId;
@@ -565,7 +574,7 @@ export default {
     },
     //获取指定会员
     getConfirmData(val) {
-      this.info.openIds = val;
+      this.info.memberIdOpenIds = (val || []).map(el => `${el.memberId}&${el.openId}`).join(',');
     },
     handleDataTransferred(data) {
       // 会员分组 情况下 memberSearchDTO 传数组字符串