merge 14.1 zoom 活动

src/views/dataReport_manage/equityCustomStatistics.vue

@@ -71,7 +71,7 @@
         </div>
       </div>
       <div class="tabs-box">
-        <div class="tabs-box-confirm"  v-if="filterObj.data_type == '续约客户'">
+        <div class="tabs-box-confirm" v-if="filterObj.data_type =='续约客户'">
           <div style="margin-bottom: 0px" class="tabs-box-confirm" v-for="(item, index) in packageTypeList" :key="item">
             <div :class="['confirm-box-li', PackageDifference == item && 'active']" @click="notPackageDifferenceChange(item)">{{ item }}</div>
             <div v-if="index != 2" class="center-line"></div>
@@ -420,7 +420,7 @@ export default {
       this.page_no = 1;
       this.getTableData();
     },
-    notPackageDifferenceChange(type) {
+    notPackageDifferenceChange(type) {      
       if (this.PackageDifference == type) {
         this.PackageDifference = "";
       } else {
@@ -498,6 +498,8 @@ export default {
     },
     /* 切换数据类型 */
     toggleType(label) {
+      console.log(this.filterObj.data_type);
+      
       this.filterObj.data_type = label;
       this.incrementTableColums = equityTableColums(this.filterObj.data_type);
       this.noRenewalReasonId = "";

src/views/rai_manage/activityManage/components/addActivity.vue

@@ -562,6 +562,7 @@ export default {
           RefPage.isCanAppointmentMinutes = Data.IsCanAppointmentMinutes == 1 ? true : false;
           RefPage.isYidongConduct = Data.IsYidongConduct == 1 ? true : false;
           RefPage.isExternalLabel = Data.IsExternalLabel == 1 ? true : false;
+          RefPage.isZoom = Data.IsExternalLabel == 1 ? true : false;
           RefPage.isCanOutboundCall = Data.IsCanOutboundCall == 1 ? true : false;
           RefPage.isDeduct = Data.IsResearchPoints == 1 ? true : false;
           RefPage.provideEmail = Data.IsNeedEmail == 1 ? true : false;
@@ -694,6 +695,7 @@ export default {
         VideoDetail,
         IsYidongConduct: RefPage.isYidongConduct ? 1 : 0,
         IsExternalLabel: RefPage.isExternalLabel ? 1 : 0,
+        IsZoom: RefPage.isZoom ? 1 : 0,
         IsCanOutboundCall: RefPage.isCanOutboundCall ? 1 : 0,
         IsResearchPoints: RefPage.isDeduct ? 1 : 0,
         IsNeedEmail: RefPage.provideEmail ? 1 : 0,

src/views/rai_manage/activityManage/components/addComopnents/ResearchDeduct.vue

@@ -8,6 +8,7 @@
     </el-checkbox>
     <el-checkbox v-if="isResearch && [1, 3, 5, 8].includes(cactivityType)" v-model="isShowHz"> 同时在弘则活动页展示 </el-checkbox>
     <el-checkbox v-if="cactivityType == 3" v-model="isExternalLabel"> 外部资源 </el-checkbox>
+    <el-checkbox v-if="cactivityType == 3" v-model="isZoom"> zoom办会（请用zoom模板建会） </el-checkbox>
     <template v-if="cactivityType == 7 || cactivityType == 2">
       <el-checkbox v-model="isYidongConduct">
         易董办会
@@ -97,6 +98,7 @@ export default {
       isYidongConduct: false, // 易懂办会
       isCanOutboundCall: false, // 可提供外呼
       isExternalLabel: false, //外部资源
+      isZoom:false, //是否是Zoom模版
       institutionName: "", //机构名称
       isDeduct: false, // 研选扣点
       isBClass: false, // B类非公开