Merge branch 'feature/1月迭代-年前' into dev

# Conflicts: # dist/index.html # dist/static/css/main.36c74c499a8018ba8702924db197ac99.css # dist/static/css/main.3e90c087828760acae6c684d38d714dc.css # dist/static/css/main.5f9ba65555b78c95a4d2b47b5bcb3aab.css # dist/static/js/manifest.5f9235a116c3ceb21d1d.js # dist/static/js/message.b09438d3598ee3c5991e.js # package-lock.json

Merge branch 'feature/1月迭代-年前' into dev
# Conflicts: # dist/index.html # dist/static/css/main.36c74c499a8018ba8702924db197ac99.css # dist/static/css/main.3e90c087828760acae6c684d38d714dc.css # dist/static/css/main.5f9ba65555b78c95a4d2b47b5bcb3aab.css # dist/static/js/manifest.5f9235a116c3ceb21d1d.js # dist/static/js/message.b09438d3598ee3c5991e.js # package-lock.json
467e1b1d · caoyanzhi · 65c53f6f · 70f02ded · 467e1b1d · 467e1b1d
Commit 467e1b1d authored Jan 11, 2022 by caoyanzhi
24 changed files
--- a/dist/index.html
+++ b/dist/index.html
+<<<<<<< HEAD
 <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_93aeeozj35q.css><link href=/marketing/static/css/main.3e90c087828760acae6c684d38d714dc.css rel=stylesheet></head><body><div id=app></div><script>(function() {
+=======
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/fonts/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link rel=stylesheet href=//at.alicdn.com/t/font_2996579_93aeeozj35q.css><link href=/marketing/static/css/main.5f9ba65555b78c95a4d2b47b5bcb3aab.css rel=stylesheet></head><body><div id=app></div><script>(function() {
+>>>>>>> feature/1月迭代-年前
        var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
        var host = window.location.host;
        host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
        document.write('<script src="//' + host + src + '"><\/script>');
-      })();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.5f9235a116c3ceb21d1d.js></script><script type=text/javascript src=/marketing/static/js/vendor.bac18526ddfc3a146f33.js></script><script type=text/javascript src=/marketing/static/js/main.0409bd4012057ddd870f.js></script></body></html>
\ No newline at end of file
+<<<<<<< HEAD
+      })();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.5f9235a116c3ceb21d1d.js></script><script type=text/javascript src=/marketing/static/js/vendor.bac18526ddfc3a146f33.js></script><script type=text/javascript src=/marketing/static/js/main.0409bd4012057ddd870f.js></script></body></html>
+=======
+      })();</script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script src=//web-1251519181.file.myqcloud.com/components/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js></script><script src=//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js></script><script type=text/javascript src=/marketing/static/js/manifest.2e64ea3825cbdade34e7.js></script><script type=text/javascript src=/marketing/static/js/vendor.1c03aae9e4acbbf086ce.js></script><script type=text/javascript src=/marketing/static/js/main.4c2e853496cbfe27c994.js></script></body></html>
+>>>>>>> feature/1月迭代-年前
--- a/dist/static/css/main.3e90c087828760acae6c684d38d714dc.css
+++ b/dist/static/css/main.3e90c087828760acae6c684d38d714dc.css
--- a/dist/static/css/main.5f9ba65555b78c95a4d2b47b5bcb3aab.css
+++ b/dist/static/css/main.5f9ba65555b78c95a4d2b47b5bcb3aab.css
--- a/dist/static/js/calllog.2c3686115829ba023ea1.js
+++ b/dist/static/js/calllog.2c3686115829ba023ea1.js
--- a/dist/static/js/card.b203c413dfa518f89c58.js
+++ b/dist/static/js/card.b203c413dfa518f89c58.js
--- a/dist/static/js/ecm.3b98c86f4da8190023e4.js
+++ b/dist/static/js/ecm.3b98c86f4da8190023e4.js
--- a/dist/static/js/evaluation.7f6636ae60d3eda39960.js
+++ b/dist/static/js/evaluation.7f6636ae60d3eda39960.js
--- a/dist/static/js/ewash.2c2121ada4f3863521e4.js
+++ b/dist/static/js/ewash.2c2121ada4f3863521e4.js
--- a/dist/static/js/game.6eb628d4c7a2841cd453.js
+++ b/dist/static/js/game.6eb628d4c7a2841cd453.js
--- a/dist/static/js/manifest.2e64ea3825cbdade34e7.js
+++ b/dist/static/js/manifest.2e64ea3825cbdade34e7.js
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,c){for(var f,i,u,d=0,s=[];d<r.length;d++)i=r[d],t[i]&&s.push(t[i][0]),t[i]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,c);s.length;)s.shift()();if(c)for(d=0;d<c.length;d++)u=a(a.s=c[d]);return u};var r={},t={17:0};function a(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,a){n=t[e]=[r,a]});n[2]=r;var o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,a.nc&&c.setAttribute("nonce",a.nc),c.src=a.p+"static/js/"+({0:"card",1:"game",2:"wechat",3:"ecm",4:"message",5:"ewash",6:"scan",7:"evaluation",8:"recharge",9:"activity",10:"signIn",11:"cdKey",12:"popup",13:"msg",14:"calllog"}[e]||e)+"."+{0:"b203c413dfa518f89c58",1:"6eb628d4c7a2841cd453",2:"9cf200a6d8fb373f4c1d",3:"3b98c86f4da8190023e4",4:"b09438d3598ee3c5991e",5:"2c2121ada4f3863521e4",6:"ebde3abba719ecd00e48",7:"7f6636ae60d3eda39960",8:"13fde4a11cf179885420",9:"7df670599b2f4e2eb861",10:"abe49fffc2f372f23708",11:"aeb00fcde81507fa4885",12:"904b5a302f41c02f8b89",13:"5fced6e9caaad4365e60",14:"2c3686115829ba023ea1"}[e]+".js";var f=setTimeout(i,12e4);function i(){c.onerror=c.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=i,o.appendChild(c),r},a.m=e,a.c=r,a.d=function(e,n,r){a.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},a.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(n,"a",n),n},a.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},a.p="/marketing/",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/dist/static/js/message.b09438d3598ee3c5991e.js
+++ b/dist/static/js/message.b09438d3598ee3c5991e.js
--- a/dist/static/js/msg.5fced6e9caaad4365e60.js
+++ b/dist/static/js/msg.5fced6e9caaad4365e60.js
--- a/dist/static/js/popup.904b5a302f41c02f8b89.js
+++ b/dist/static/js/popup.904b5a302f41c02f8b89.js
--- a/dist/static/js/recharge.13fde4a11cf179885420.js
+++ b/dist/static/js/recharge.13fde4a11cf179885420.js
--- a/dist/static/js/scan.ebde3abba719ecd00e48.js
+++ b/dist/static/js/scan.ebde3abba719ecd00e48.js
--- a/package-lock.json
+++ b/package-lock.json
--- a/src/views/card/group-send.vue
+++ b/src/views/card/group-send.vue
@@ -563,7 +563,7 @@ export default {
          dangerouslyUseHTMLString: true
        })
          .then(() => {
-            this.saveUpdatePutonCard();
+            this.saveUpdatePutonCard(sumPerson);
          })
          .catch(() => {});
      } else {
@@ -572,7 +572,7 @@ export default {
      console.log(res);
    },
    // 保存操作
-    async saveUpdatePutonCard() {
+    async saveUpdatePutonCard(forecastMemberCount) {
      let params = {
        putOnName: this.form.putOnName, // 1.活动名称
        cardId: this.form.cardId, // 2.投放卡券,卡券主键ID
@@ -582,7 +582,8 @@ export default {
        memberSearchDTO: this.form.memberType ? this.form.memberGroupIds : this.form.memberSearchDTO,
        putOnType: this.form.putOnType, // 发送时间, 0:立即发送; 1:定时发送(定时必须选择时间)
        searchJson: this.getSaveData,
-        noticeType: this.form.noticeType
+        noticeType: this.form.noticeType,
+        forecastMemberCount
      };

      /*  模板消息的处理 */

--- a/src/views/ecm/form.js
+++ b/src/views/ecm/form.js
@@ -313,7 +313,7 @@ export default {
            }
          )
            .then(() => {
-              resolve();
+              resolve(res.result);
            })
            .catch(() => {
              this.$tips({ type: 'info', message: '已取消发送' });
@@ -991,7 +991,8 @@ export default {
        return false;
      }
      if (this.form.effectType != 0) {
-        await this.checkMessageSendCount();
+        let count = await this.checkMessageSendCount();
+        params.forecastMemberCount = count;
      }
      this.loading = true;
      saveEcmInfo(params)

--- a/src/views/ecm/marketing-event/components/item-qfxx.vue
+++ b/src/views/ecm/marketing-event/components/item-qfxx.vue
@@ -2,14 +2,12 @@
  <div class="dm-qywx__item__wrap">
    <div class="fz16">
      {{ qfxx.qfxxEnterpriseName }}
+      <span style="margin-left: 16px">{{ item.qfxx.consumerStoreType ? '按门店条件' : '固定门店' }}</span>
    </div>
    <div class="divider"></div>
    <div>{{ item.title }}</div>
    <div style="margin-top:12px;color:#606266;white-space:pre-wrap;word-break:break-word">{{ qfxx.remark }}</div>
    <p style="margin-top:12px;color:#606266">
-      <span>选择门店： {{ item.qfxx.consumerStoreType ? '按门店条件' : '固定门店' }}</span>
-    </p>
-    <p style="margin-top:12px;color:#606266">
      <span>群发内容：</span>
      <span v-for="(el, index) in materials" :key="el">
        <template v-if="index !== 0"> / </template>

--- a/src/views/ecm/marketing-event/components/item-teltask.vue
+++ b/src/views/ecm/marketing-event/components/item-teltask.vue
@@ -2,7 +2,7 @@
  <span class="dm-teltask__item__wrap">
    <div class="dm-teltask__item">
      <p class="dm-teltask__item--title">
-        {{ item.title }} <span class="fz13 gray-color">任务开始{{ item.lateDays }}天逾期，逾期{{ item.invalidDay }}天后失效，失效后不可操作</span>
+        {{ item.title }} <span class="fz13 gray-color">任务逾期判定{{ item.lateDays }}天之后</span>
      </p>
      <p class="dm-teltask__item--content">{{ item.content }}</p>
    </div>

--- a/src/views/ecm/marketing-event/components/lib-qfxx.vue
+++ b/src/views/ecm/marketing-event/components/lib-qfxx.vue
@@ -46,11 +46,6 @@
          <el-input-number v-model="form.expireDays" :min="0" controls-position="right" :disabled="readOnly"></el-input-number>
          <span>天之后</span>
        </el-form-item>
-        <el-form-item label="任务逾期" prop="invalidDay">
-          <el-input-number v-model="form.invalidDay" :min="0" controls-position="right" :disabled="readOnly"></el-input-number>
-          <span>天之后失效</span>
-          <i style="color:#FA8C16;font-size:14px;margin: 0 5px 0 10px;" class="el-icon-warning" /><span class="gray fz12">逾期任务失效后不可再操作</span>
-        </el-form-item>
        <el-form-item class="is-required" label="添加群发内容" prop="">
          <template slot="label">
            <span>添加群发内容</span>
@@ -154,7 +149,6 @@ export default {
        remark: '',
        title: '',
        expireDays: 0,
-        invalidDay: 90,
        failSetting: '',
        gicSmsTemplateId: '',
        telFlag: 0,
@@ -171,7 +165,6 @@ export default {
        title: { required: true, message: '请填写任务标题', trigger: 'blur' },
        remark: { required: true, message: '请填写任务描述', trigger: 'blur' },
        expireDays: { required: true, message: '请填写', trigger: 'blur' },
-        invalidDay: { required: true, message: '请填写', trigger: 'blur' },
        consumerStoreType: { required: true, message: '请选择门店' }
      },
      entepriseList: [],
@@ -225,7 +218,6 @@ export default {
        remark: '',
        title: '',
        expireDays: 0,
-        invalidDay: 90,
        failSetting: '',
        gicSmsTemplateId: '',
        telFlag: 0,

--- a/src/views/ecm/marketing-event/components/lib-teltask.vue
+++ b/src/views/ecm/marketing-event/components/lib-teltask.vue
 <template>
-  <el-dialog title="编辑话务" :visible.sync="show" width="600px" :before-close="close">
-    <el-form ref="form" :model="form" label-width="125px" :rules="rules" v-loading="loading">
+  <el-dialog title="编辑话务" :visible.sync="show" width="620px" :before-close="close">
+    <el-form ref="form" :model="form" label-width="130px" :rules="rules" v-loading="loading">
      <el-form-item label="话务任务标题" class="pb10" prop="title">
        <template slot="label">
          <span>话务任务标题</span>
@@ -21,8 +21,7 @@
        </template>
        <dm-input class="w400" :rows="4" type="textarea" v-model="form.content" placeholder="限制200个字符" :maxlength="200"></dm-input>
      </el-form-item>
-      <el-form-item label="任务逾期判定" prop="lateDays"> <el-input-number controls-position="right" :min="0" v-model="form.lateDays"></el-input-number> 天之后 </el-form-item>
-      <el-form-item prop="invalidDay" label="任务逾期"> <el-input-number controls-position="right" :min="0" v-model="form.invalidDay"></el-input-number> 天之后失效 <i style="color:#FA8C16;font-size:14px;margin: 0 5px 0 10px;" class="el-icon-warning" /><span class="gray fz12">逾期任务失效后不可再操作</span> </el-form-item>
+      <el-form-item label="任务逾期判定" prop="lateDays"> <el-input-number controls-position="right" :min="0" class="w400" v-model="form.lateDays"></el-input-number> 天之后 </el-form-item>
    </el-form>
    <span slot="footer" class="dialog-footer">
      <el-button @click="close">关 闭</el-button>
@@ -55,14 +54,12 @@ export default {
      form: {
        title: '',
        lateDays: '',
-        content: '',
-        invalidDay: 90
+        content: ''
      },
      rules: {
        title: { required: true, type: 'string', message: '话务任务标题不能为空', trigger: 'blur' },
        content: { required: true, type: 'string', message: '话务任务内容不能为空', trigger: 'blur' },
-        lateDays: { required: true, type: 'number', message: '任务逾期判定不能为空', trigger: 'blur' },
-        invalidDay: { required: true, type: 'number', message: '任务逾期不能为空', trigger: 'blur' }
+        lateDays: { required: true, type: 'number', message: '任务逾期判定不能为空', trigger: 'blur' }
      },
      loading: false
    };
@@ -73,8 +70,7 @@ export default {
      this.form = {
        title: '',
        lateDays: '',
-        content: '',
-        invalidDay: 90
+        content: ''
      };
      if (val && this.item.ecmMarketingTypeRelationId) {
        console.log('编辑');
@@ -89,14 +85,12 @@ export default {
    },
    addItem() {
      this.form.comName = 'teltask';
-      this.$refs.form.validate(val => {
-        console.log(val);
-        if (val) {
-          console.log(val);
-          this.$emit('sendItem', this.form);
-          this.close();
-        }
-      });
+      if (!this.form.title || !this.form.content) {
+        this.$message({ type: 'warning', message: '话务未填写完整' });
+        return;
+      }
+      this.$emit('sendItem', this.form);
+      this.close();
    }
  }
 };

--- a/src/views/ecm/marketing-event/index.vue
+++ b/src/views/ecm/marketing-event/index.vue
@@ -353,7 +353,6 @@ export default {
                this.list.push({ name: '短信', comName: 'item-message', item: { title: v.title, ...sms, ecmMarketingTypeRelationId: v.ecmMarketingTypeRelationId, relationId: v.relationId, ecmPlanId: v.ecmPlanId, status: v.status } });
                break;
              case 'teltask': // 7 话务
-                v.teltask.invalidDay ? '' : (v.teltask.invalidDay = 90);
                this.list.push({ name: '话务', comName: 'item-teltask', item: { ...v.teltask, ecmMarketingTypeRelationId: v.ecmMarketingTypeRelationId, relationId: v.relationId, ecmPlanId: v.ecmPlanId } });
                break;
              case 'integral': // 8 积分
@@ -367,7 +366,6 @@ export default {
                this.list.push({ name: '企微任务', comName: 'item-qywx', item: { title: v.title, qywx: v.qywx, ecmMarketingTypeRelationId: v.ecmMarketingTypeRelationId, relationId: v.relationId, ecmPlanId: v.ecmPlanId } });
                break;
              case 'qfxx': // 11 群发任务
-                v.qfxx.invalidDay ? '' : (v.qfxx.invalidDay = 90);
                this.list.push({ name: '群发任务', comName: 'item-qfxx', item: { title: v.title, qfxx: v.qfxx, ecmMarketingTypeRelationId: v.ecmMarketingTypeRelationId, relationId: v.relationId, ecmPlanId: v.ecmPlanId } });
                break;
            }
@@ -397,8 +395,7 @@ export default {
          // ecm话务对象
          title: val.title,
          content: val.content,
-          lateDays: val.lateDays,
-          invalidDay: val.invalidDay
+          lateDays: val.lateDays
        };
      }
      // 2.文本

--- a/src/views/message/form.vue
+++ b/src/views/message/form.vue
@@ -165,7 +165,7 @@ export default {
            }
          )
            .then(() => {
-              this.saveSendSmsService();
+              this.saveSendSmsService(res.result);
            })
            .catch(() => {
              this.$tips({ type: 'info', message: '已取消发送' });
@@ -176,7 +176,7 @@ export default {
      }
    },
    //提交接口
-    saveSendSmsService() {
+    saveSendSmsService(forecastMemberCount) {
      this.$confirm('是否发送短信?', '提示', {
        confirmButtonText: '确定',
        cancelBUttonText: '取消',
@@ -191,7 +191,8 @@ export default {
            sendType: this.info.sendType,
            memberSearchDTO: this.info.memberSearchDTO,
            searchJson: this.getSaveData,
-            type: this.smsType
+            type: this.smsType,
+            forecastMemberCount
          };
          // return;
          if (this.info.memberType === 1) {