Merge branch 'feature/ai营销文案' into master

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

@@ -164,7 +164,7 @@ export default {
       this.loading = true;
       this.tableData = [];
       this.totalCount = 0;
-      let url = `${this.baseUrl}/gic-member-tag-web/member-tag-group/findList.json?requestProject=${this.projectName}&fixedType=${this.fixedType}&creatorId=${this.creatorId}&pageSize=${this.pageSize}&pageNum=${this.currentPage}&groupName=${this.dataSearch}&effectiveStatus=1`;
+      let url = `${this.baseUrl}/gic-member-tag-web/member-tag-group/findList.json?requestProject=${this.projectName}&fixedType=${this.fixedType}&creatorId=${this.creatorId}&pageSize=${this.pageSize}&pageNum=${this.currentPage}&groupName=${this.dataSearch}&effectiveStatus=1&permissionType=1`;
       if (this.activeName == '2') {
         url = `${this.baseUrl}/gic-member-tag-web/memberTagGrade/gradeGroupListV2?requestProject=${this.projectName}&pageSize=${this.pageSize}&pageNum=${this.currentPage}&groupName=${this.dataSearch}`;
       }

src/views/ai/task/form.vue

@@ -717,8 +717,22 @@ export default {
             }).then(() => {
               this.submit(data);
             });
-          } else {
-            this.$confirm(`本次外呼费用预计需要消费 ${totalCount}元，当前账户余额不足，请充值`, '提示', {
+          }
+          if (totalCount > this.money && this.money > 0) {
+            this.$confirm(`本次外呼费用预计需要消费 ${totalCount} 元，当前账户余额为${this.money}元可能会存在部分客户拨打失败，是否继续创建活动？`, '提示', {
+              confirmButtonText: '去充值',
+              cancelButtonText: '继续保存',
+              type: 'warning'
+            })
+              .then(() => {
+                window.open(`${window.location.origin}/marketing/#/recharge/do`, '_blank');
+              })
+              .catch(() => {
+                this.submit(data);
+              });
+          }
+          if (this.money <= 0) {
+            this.$confirm(`本次外呼费用预计需要消费 ${totalCount}元，当前账户余额为${this.money}元，请先充值后再创建活动？`, '提示', {
               confirmButtonText: '去充值',
               cancelButtonText: '取消',
               type: 'warning'