update: 优化判断

src/mixins/selector.js

@@ -53,7 +53,7 @@ export default {
     handleXxSyspClick(visible = true) {
       this.xxSysp.visible = visible;
       // refs.selector放在modal里，初始化的时候并没有渲染
-      if (!this.xxSysp.isResign && (this.isEdit || this.isInfo)) {
+      if (!this.xxSysp.isResign && (this.isEdit || this.isInfo || this.isCopyEcm)) {
         this.$nextTick(() => {
           this.$refs.selector.conditions = this.xxSysp.conditionList;
           this.xxSysp.isResign = true;

src/views/ecm/batch-list.vue

@@ -121,7 +121,7 @@ export default {
   created() {
     getXsxsFalg().then(res => {
       if (res.result) {
-        this.typeOptions.find(el => el.value == 'qywx').visible = true;
+        // this.typeOptions.find(el => el.value == 'qywx').visible = true;
         this.typeOptions.find(el => el.value == 'qfxx').visible = true;
       }
     });

src/views/ecm/form.vue

@@ -269,10 +269,10 @@
       <section class="dm-form__wrap" v-if="form.effectType == 0 || form.effectType == 1">
         <h3 class="dm-title__label">有效时间</h3>
         <el-form-item label="有效时间" prop="endDate" :show-message="showMessage">
-          <el-radio :disabled="onlineStatus != 0 && form.expireType == 1" v-model="form.expireType" :label="0">长期有效</el-radio>
-          <el-radio :disabled="onlineStatus != 0 && form.expireType == 0" v-model="form.expireType" :label="1">固定期限</el-radio>
-          <el-date-picker class="ml10" v-if="form.expireType" v-model="form.beginDate" :disabled="onlineStatus != 0" type="datetime" placeholder="开始时间" @change="checkBeginEndTime"> </el-date-picker>
-          <el-date-picker v-if="form.expireType" v-model="form.endDate" :disabled="onlineStatus == 2" type="datetime" :picker-options="endDatePickerOptions" placeholder="结束时间" @change="checkBeginEndTime"> </el-date-picker>
+          <el-radio :disabled="isEdit && isAddonlineStatus != 0 && form.expireType == 1" v-model="form.expireType" :label="0">长期有效</el-radio>
+          <el-radio :disabled="isEdit && onlineStatus != 0 && form.expireType == 0" v-model="form.expireType" :label="1">固定期限</el-radio>
+          <el-date-picker class="ml10" v-if="form.expireType" v-model="form.beginDate" :disabled="isEdit && onlineStatus != 0" type="datetime" placeholder="开始时间" @change="checkBeginEndTime"> </el-date-picker>
+          <el-date-picker v-if="form.expireType" v-model="form.endDate" :disabled="isEdit && onlineStatus == 2" type="datetime" :picker-options="endDatePickerOptions" placeholder="结束时间" @change="checkBeginEndTime"> </el-date-picker>
         </el-form-item>
       </section>
       <!-- 人群筛选器 -->
@@ -301,7 +301,7 @@
       <section class="dm-form__wrap">
         <h3 class="dm-title__label">营销事件</h3>
         <!-- 只有实时才是单图文 -->
-        <marketing-event :readOnly="isInfo || onlineStatus == 2" :show-delete-tooltip="isEdit && analyseConfig.open_flag == 1" show-out-coupon-icon ref="marketingEvent" @has-card="hasCard" v-if="ecmPlanId" :singleFlag="form.effectType === 0" :integralMultiple="form.effectAction === 'consume'" :ecmPlanId="ecmPlanId" :isSupportVar="form.effectType === 0" :code="code" :enabledMessageState="enabledMessageState" :cardLimitType="-1" :use-stored="useStoredFlag && ['consume', 'stored'].includes(form.effectAction) && form.effectType == 0"></marketing-event>
+        <marketing-event :readOnly="isInfo || onlineStatus == 2" :show-delete-tooltip="isEdit && analyseConfig.open_flag == 1" show-out-coupon-icon ref="marketingEvent" @has-card="hasCard" v-if="ecmPlanId" :singleFlag="form.effectType === 0" :integralMultiple="form.effectAction === 'consume'" :ecmPlanId="ecmPlanId" :isSupportVar="form.effectType === 0" :code="code" :enabledMessageState="enabledMessageState" :cardLimitType="-1" :use-stored="useStoredFlag && ['consume', 'stored'].includes(form.effectAction) && form.effectType == 0" :use-qfxx="form.effectType !== 0"></marketing-event>
         <!-- 只有非实时&&选择卡券了展示提示 -->
         <div v-if="currentCard.comName && form.effectType != 0 && couponAutoGetFlag" class="fz13 regular-font-color line-height2" style="margin-left:120px;margin-top:30px;">
           * 用户在领取卡券后需要<b class="bold">同步至ERP</b>，如果关闭用户<b class="bold">手动领取</b>，卡券在<b class="bold">批量投放</b>时会需要将卡券信息批量同步至ERP。 <br />

src/views/ecm/list.vue

@@ -318,7 +318,7 @@ export default {
           this.tableHeader = arr;
         }
         if (this.xsxsFlag) {
-          this.marketingTypeOptions.find(el => el.value == 'qywx').visible = true;
+          // this.marketingTypeOptions.find(el => el.value == 'qywx').visible = true;
           this.marketingTypeOptions.find(el => el.value == 'qfxx').visible = true;
         }
       });

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

@@ -151,6 +151,7 @@ export default {
       type: Boolean,
       default: true
     },
+    useQfxx: Boolean,
     showDeleteTooltip: Boolean
   },
   data() {
@@ -189,13 +190,26 @@ export default {
       }
       if (this.useQywx) {
         this.options.forEach(item => {
-          if (item.value == 'qywx' || item.value == 'qfxx') {
+          if (item.value == 'qywx') {
             item.show = true;
           }
         });
       } else {
         this.options.forEach(item => {
-          if (item.value == 'qywx' || item.value == 'qfxx') {
+          if (item.value == 'qywx') {
+            item.show = false;
+          }
+        });
+      }
+      if (this.useQfxx) {
+        this.options.forEach(item => {
+          if (item.value == 'qfxx') {
+            item.show = true;
+          }
+        });
+      } else {
+        this.options.forEach(item => {
+          if (item.value == 'qfxx') {
             item.show = false;
           }
         });