update: 零散迭代

src/views/card/record-send-Info.vue

 <template>
   <section class="card-record-send">
-    <div class="page-tip">投放记录详情次日更新</div>
     <div class="pb22">
       <el-select class="vertical-middle w150" v-model="listParams.putonType" placeholder="投放状态" @change="handleStatusChange">
         <el-option label="投放成功" :value="1"></el-option>

src/views/ecm/form.js

@@ -61,7 +61,7 @@ export default {
         describe: '',
         lateDays: '',
         brithday_day: '',
-        brithday_dayval: 0,
+        brithday_dayval: -1,
         brithday_type: 1,
         attention_day: '',
         lastCost_day: '',
@@ -490,7 +490,7 @@ export default {
             this.hasSearchData = result.filterJson || '{}';
           }
           if (this.form.effectType === 1) {
-            commonScene.brithday_day == 0 ? (this.form.brithday_dayval = 0) : (this.form.brithday_dayval = 1);
+            commonScene.brithday_day == -1 ? (this.form.brithday_dayval = -1) : (this.form.brithday_dayval = 1);
             this.form.brithday_day = commonScene.brithday_day;
             this.form.brithday_type = commonScene.brithday_type || 1;
             this.form.attention_day = commonScene.attention_day;
@@ -941,7 +941,7 @@ export default {
             expireType: this.form.expireType,
             beginDate: this.form.expireType ? formatDateTimeByType(this.form.beginDate, 'yyyy-MM-dd-HH-mm-ss') : '',
             endDate: this.form.expireType ? formatDateTimeByType(this.form.endDate, 'yyyy-MM-dd-HH-mm-ss') : '',
-            brithday_day: this.form.effectType == 1 ? (this.form.brithday_dayval == 0 ? 0 : this.form.brithday_day) : undefined,
+            brithday_day: this.form.effectType == 1 ? (this.form.brithday_dayval == -1 ? -1 : this.form.brithday_day) : undefined,
             brithday_type: this.form.effectType == 1 ? this.form.brithday_type : undefined,
             attention_day: this.form.effectType == 1 ? this.form.attention_day : undefined,
             lastCost_day: this.form.effectType == 1 ? this.form.lastCost_day : undefined,

src/views/ecm/form.vue

@@ -74,7 +74,7 @@
                 <el-option label="阳历生日" :value="1"></el-option>
                 <el-option label="阴历生日" :value="2"></el-option>
               </el-select>
-              <el-radio style="margin-left:10px" :disabled="checked[0] !== 'brithday_day' || isEdit" v-model="form.brithday_dayval" :label="0">
+              <el-radio style="margin-left:10px" :disabled="checked[0] !== 'brithday_day' || isEdit" v-model="form.brithday_dayval" :label="-1">
                 <span style="line-height:32px">当天</span>
               </el-radio>
               <el-radio :disabled="checked[0] !== 'brithday_day' || isEdit" v-model="form.brithday_dayval" :label="1">

src/views/ecm/marketing-event/index.vue

@@ -245,7 +245,7 @@ export default {
           }
         });
       }
-      return this.options.filter(item => item.show == true);
+      if (this.list) return this.options.filter(item => item.show == true);
     }
   },
   watch: {
@@ -384,6 +384,8 @@ export default {
           });
           let arr = this.delList.map(item => item.ecmMarketingTypeRelationId);
           this.list = this.list.filter(item => !arr.includes(item.item.ecmMarketingTypeRelationId));
+          console.log(this.list);
+          console.log(this.list.map(item => item.comName));
           this.hasReturnCard();
         }
       });
@@ -495,6 +497,10 @@ export default {
         this.$message({ type: 'warning', message: `最多只能添加${this.maxEventCount}个营销事件` });
         return;
       }
+      if (this.isOverThreeTime(v)) {
+        this.$message({ type: 'warning', message: `受微信客服接口1分钟内最多只支持3次调用影响，图文/文本/小程序/图片事件单次计划最多3条` });
+        return;
+      }
       // if (v.value === 'grade' && this.list.some(item => item.comName === 'item-grade')) {
       //   this.$message({ type: 'warning', message: `已添加会员卡升级营销事件` });
       //   return;
@@ -600,6 +606,20 @@ export default {
     isOverMaxCount() {
       return this.list.length >= this.maxEventCount;
     },
+    // 营销事件为“图文/文本/小程序/图片时，添加内容大于3条时无法创建
+    isOverThreeTime(v) {
+      let arr = ['图文', '文本', '小程序', '图片'];
+      let i = 0;
+      this.list.forEach(item => {
+        if (arr.includes(item.name)) {
+          i++;
+        }
+      });
+      if (i >= 3 && arr.includes(v.name)) {
+        return true;
+      }
+      return false;
+    },
     //判断营销列表里是否有短信 提供给父级使用
     hasMessageInList() {
       return this.list.some(v => v.comName === 'item-message' && v.item.type === 1);

src/views/message/delDialog.vue

+<template>
+  <el-dialog title="提示" width="520px" top="30vh" custom-class="cre-dialog" :modal-append-to-body="false" :visible.sync="dialogVisible" :before-close="close">
+    <div v-loading="loading" class="flex">
+      <div class="el-message-box__status el-icon-warning"></div>
+      <div class="batch-content">
+        <p class="batch-txt">{{ tips }}</p>
+        <ul class="batch-ul">
+          <li v-for="item in list" :key="item.id" class="batch-li" @click="handleClickItem(item)">
+            <span class="relationName"> {{ item.busiObjRelationName }}</span> <span class="relationCreater">{{ item.busiObjRelationCreater }}创建</span>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <span class="footer" slot="footer">
+      <el-button type="primary" @click="close">关闭</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  props: {
+    dialogVisible: {
+      type: Boolean,
+      default: false
+    },
+    tips: {
+      type: String,
+      default: '当前短信模板已被以下活动引用，删除后引用该模板的活动短信将无法发送，慎重操作！如需删除模板，需要先暂停引用活动，才可删除'
+    },
+    list: {
+      type: Array,
+      default: () => []
+    },
+    loading: false
+  },
+  methods: {
+    close() {
+      this.$emit('update:dialogVisible', false);
+    },
+    handleClickItem(item) {
+      console.log(item);
+      //   智能营销 marketing/#/ecm/edit/id
+      //   AI营销   marketing/#/ai/info/id
+      //   短信营销 marketing/#/message/record/detail/id
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.cre-dialog {
+  .batch-content {
+    margin-left: 38px;
+    .batch-txt {
+      font-size: 14px;
+
+      color: #303133;
+      line-height: 20px;
+    }
+    .batch-ul {
+      margin-top: 16px;
+      li {
+        display: flex;
+        justify-content: space-around;
+      }
+      .relationName,
+      .relationCreater {
+        font-size: 14px;
+        line-height: 20px;
+        color: #303133;
+      }
+      .relationName {
+        color: #2f54eb;
+        cursor: pointer;
+      }
+    }
+  }
+  .footer {
+    display: flex;
+    justify-content: center;
+  }
+}
+</style>

src/views/message/temp.vue

@@ -46,12 +46,14 @@
       <img class="block block-center pt100" width="60" height="60" src="../../assets/img/no-data_icon.png" alt="" />
       <el-button class="block block-center mt10" type="text" @click="$router.push('/message/temp/add')">新建短信模板</el-button>
     </div>
+    <del-dialog :dialogVisible.sync="dialogVisible" :list="delList" />
     <dm-pagination v-show="smsTempList.length" background class="dm-pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="listParams.currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="listParams.pageSize" layout="total, sizes, prev, pager, next" :total="total"></dm-pagination>
   </section>
 </template>
 <script>
 import { formatDateTimeByType } from '@/utils/index.js';
 import { LoadLibList, delTempService } from '@/service/api/messageApi.js';
+import delDialog from './delDialog.vue';
 export default {
   name: 'sms-lib',
   data() {
@@ -75,14 +77,41 @@ export default {
       total: 0,
       allUsableCount: 0,
       usedCount: 0,
-      dateTime: []
+      dateTime: [],
+      delObj: {
+        isCandele: false,
+        list: [
+          {
+            id: 1,
+            busiType: 1,
+            busiName: '',
+            busiObjId: '1',
+            busiObjName: '过年短信模板',
+            busiObjRelationId: '1',
+            busiObjRelationName: 'ai智能营销',
+            busiObjRelationCreaterId: '1',
+            busiObjRelationCreater: 'afeng',
+            busiObjRelationUrl: 'www.bai.com',
+            status: 1,
+            createTime: 1655872198000,
+            updateTime: 1655872202000
+          }
+        ]
+      },
+      dialogVisible: false,
+      delList: []
     };
   },
   created() {
     this.LoadLibList();
   },
+  components: {
+    delDialog
+  },
   methods: {
     onDeleteData(v) {
+      // this.dialogVisible = true;
+      // this.delList = this.delObj.list;
       this.$confirm('确认删除该模板？删除后，所有引用此模板的短信都会停止发送。', '提示', {
         confirmButtonText: '确认',
         cancelBUttonText: '取消',