bding 1 year ago
parent
commit
bb79867512

+ 1 - 0
src/views/rai_manage/activityManage/activityManage.vue

@@ -71,6 +71,7 @@
               
             <span class="deletesty" v-if="row.PublishStatus == 0 && tabsPitchon == 0" @click="operationBtn(row.ActivityId, '删除')">删除</span>
             <span class="editsty" v-if="row.IsShowSigninButton" @click="handleDownLoadImg(row)">下载签到码</span>
+            <span v-if="row.ActivityTypeId === 8" class="editsty" @click="editBtn(row.ActivityId, row.PublishStatus)">取消置顶</span>
           </template>
         </el-table-column>
       </el-table>

+ 1 - 1
src/views/rai_manage/activityManage/components/addActivity.vue

@@ -138,7 +138,7 @@
               <div class="is-visible">
                 <el-radio-group v-model="radioVisibleActivity">
                   <el-radio :label="1">仅本组客户可见</el-radio>
-                  <el-radio :label="2">全部客户可见</el-radio>
+                  <el-radio :label="2">所有组客户可见</el-radio>
                 </el-radio-group>
                 <el-checkbox v-model="decisionChecked">仅决策人可见</el-checkbox>
               </div>

+ 4 - 3
src/views/rai_manage/activityManage/components/addComopnents/ResearchDeduct.vue

@@ -6,7 +6,7 @@
         <i class="el-icon-info" />
       </el-tooltip>
     </el-checkbox>
-    <el-checkbox v-if="isResearch && [1,3,5].includes(cactivityType)" v-model="isShowHz"> 同时在弘则活动页展示 </el-checkbox>
+    <el-checkbox v-if="isResearch && [1, 3, 5].includes(cactivityType)" v-model="isShowHz"> 同时在弘则活动页展示 </el-checkbox>
     <el-checkbox v-if="cactivityType == 3" v-model="isExternalLabel"> 外部资源 </el-checkbox>
     <template v-if="cactivityType == 7 || cactivityType == 2">
       <el-checkbox v-model="isYidongConduct">
@@ -23,6 +23,7 @@
       </el-checkbox>
       <el-checkbox v-if="isYidongConduct && cactivityType == 2" v-model="isBClass"> B类非公开会议 </el-checkbox>
     </template>
+    <el-checkbox v-if="cactivityType === 8" v-model="isDeduct" style="margin-right: 20px"> 同时在弘则活动页展示 </el-checkbox>
     <template v-if="optionFormregion.includes('研选')">
       <el-checkbox v-model="isDeduct" style="margin-right: 20px"> 研选扣点 </el-checkbox>
       <el-select clearable @change="ObjectChangeHandler" v-model="PointsSet.PointsObject" placeholder="请选择扣点对象" v-if="isDeduct" style="width: 160px">
@@ -87,7 +88,7 @@ export default {
       default: "",
     },
     isResearch: {
-      type:Boolean,
+      type: Boolean,
       default: false,
     },
   },
@@ -114,7 +115,7 @@ export default {
         CancelDeadlineType: "", //截至报名时间
       },
       dataDeadlineSet: [],
-      isShowHz:false
+      isShowHz: false,
     };
   },
   computed: {