修复bug

src/views/custom_manage/contacts/compontents/contactsColums.js

@@ -806,6 +806,15 @@ export const organizationTableColums = (type) => {
       ]
     : type === 11
     ? [
+        {
+          label: "姓名",
+          key: "RealName",
+          // widthsty: 130,
+        },
+        {
+          label: "手机号",
+          key: "Mobile",
+        },
         {
           label: "文章标题",
           key: "Title",
@@ -841,6 +850,70 @@ export const organizationTableColums = (type) => {
           // widthsty: 300,
         },
       ]
+    : type === 12
+    ? [
+        {
+          label: "姓名",
+          key: "RealName",
+          // widthsty: 130,
+        },
+        {
+          label: "手机号",
+          key: "Mobile",
+        },
+        {
+          label: "文章标题",
+          key: "Title",
+        },
+        {
+          label: "文章类型",
+          key: "SpecialType",
+          // widthsty: 200,
+        },
+        {
+          label: "标签",
+          key: "IndustryName",
+          // widthsty: 300,
+        },
+        {
+          label: "发布时间",
+          key: "PublishDate",
+          // widthsty: 300,
+        },
+        {
+          label: "收藏时间",
+          key: "CreateTime",
+          // widthsty: 300,
+        },
+      ]
+    : type === 13
+    ? [
+        {
+          label: "姓名",
+          key: "RealName",
+        },
+        {
+          label: "手机号",
+          key: "Mobile",
+        },
+        { label: "专栏名称", key: "Title" },
+        {
+          label: "作者昵称",
+          key: "NickName",
+        },
+        {
+          label: "关注时间",
+          key: "CreateTime",
+        },
+        {
+          label: "已发布文章",
+          key: "ArticleNum",
+        },
+        {
+          label: "粉丝",
+          key: "FansNum",
+        },
+      ]
     : type === 14
     ? [
         {
@@ -1296,6 +1369,21 @@ export const wholeOrganizationTableColums = (type) => {
       ]
     : type === 11
     ? [
+        {
+          label: "公司名",
+          key: "CompanyName",
+          // widthsty: 200,
+        },
+        {
+          label: "姓名",
+          key: "RealName",
+          // widthsty: 100,
+        },
+        {
+          label: "手机号",
+          key: "Mobile",
+          // widthsty: 100,
+        },
         {
           label: "文章标题",
           key: "Title",
@@ -1333,6 +1421,21 @@ export const wholeOrganizationTableColums = (type) => {
       ]
     : type === 12
     ? [
+        {
+          label: "公司名",
+          key: "CompanyName",
+          // widthsty: 200,
+        },
+        {
+          label: "姓名",
+          key: "RealName",
+          // widthsty: 100,
+        },
+        {
+          label: "手机号",
+          key: "Mobile",
+          // widthsty: 100,
+        },
         {
           label: "文章标题",
           key: "Title",
@@ -1360,6 +1463,21 @@ export const wholeOrganizationTableColums = (type) => {
       ]
     : type === 13
     ? [
+        {
+          label: "公司名",
+          key: "CompanyName",
+          // widthsty: 200,
+        },
+        {
+          label: "姓名",
+          key: "RealName",
+          // widthsty: 100,
+        },
+        {
+          label: "手机号",
+          key: "Mobile",
+          // widthsty: 100,
+        },
         {
           label: "专栏名称",
           key: "Title",

src/views/custom_manage/contacts/organizationList.vue

@@ -24,8 +24,8 @@
             <i class="el-icon-info"></i>
           </el-tooltip>
         </div>
-        <div class="dataReport-top">
-          <template v-if="showSelectBox">
+        <div class="dataReport-top"  v-if="showSelectBox">
+          <template>
             <date-picker
               v-model="filterObj.date"
               type="date"
@@ -46,7 +46,7 @@
           <el-input v-if="activeName == 2" placeholder="活动名称" v-model="activityName" style="width: 200px" @input="handleSearchActivity" clearable>
             <i slot="prefix" class="el-input__icon el-icon-search"></i>
           </el-input>
-          <a :href="exportExcel" download v-if="activeName == 1 || activeName == 2">
+          <a :href="exportExcel" download >
             <button class="button-sty act">下载EXCEL</button>
           </a>
         </div>

src/views/custom_manage/contacts/wholeOrganization.vue

@@ -20,8 +20,8 @@
             <i class="el-icon-info"></i>
           </el-tooltip>
         </div>
-        <div class="dataReport-top">
-          <template v-if="showSelectBox">
+        <div class="dataReport-top" v-if="showSelectBox">
+          <template>
             <date-picker
               v-model="filterObj.date"
               type="date"
@@ -52,7 +52,7 @@
           <el-input v-if="activeName == 2" placeholder="活动名称" v-model="activityName" style="width: 200px" @input="handleSearchActivity" clearable>
             <i slot="prefix" class="el-input__icon el-icon-search"></i>
           </el-input>
-          <a :href="exportExcel" download v-if="activeName == 1 || activeName == 2">
+          <a :href="exportExcel" download>
             <button class="button-sty act">下载EXCEL</button>
           </a>
         </div>

src/views/ficc_manage/reportVariety.vue

@@ -54,7 +54,7 @@
         >
           <el-form-item
             prop="showType"
-            label="展示形式"
+            label="列表页展示"
             v-if="aeForm.parent_id == 0"
           >
             <el-select
@@ -67,6 +67,22 @@
               <el-option label="品种" :value="3"></el-option>
             </el-select>
           </el-form-item>
+          
+          <el-form-item
+            prop="showType"
+            label="详情页展示"
+            v-if="aeForm.isLastLevel"
+          >
+            <el-select
+              v-model="aeForm.reportDetailShowType"
+              placeholder="请选择"
+              style="width: 400px"
+            >
+              <el-option label="拼接" :value="1"></el-option>
+              <el-option label="目录" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
+
           <!-- 一级目录子目录 -->
           <el-form-item
             label="子目录"
@@ -225,7 +241,6 @@
               >
             </el-input>
           </el-form-item>
-          
 
           <!-- 二级分类配置列表背景图 -->
           <el-form-item
@@ -429,6 +444,7 @@ export default {
         YbRightBanner: '',//报告合集配图
         relate: [],
         RelateVideo:false,//关联线上路演
+        reportDetailShowType: 1,//详情展示形式
       },
       aerules: {
         abstract: [{
@@ -598,6 +614,7 @@ export default {
             MenuList:[],
             RelateTel:this.aeForm.relate.includes(1)?1:0,
             RelateVideo:this.aeForm.RelateVideo?1:0,
+            ReportDetailShowType: this.aeForm.reportDetailShowType
           }
           params.MenuList=this.ClassifyMenuList.map(item=>{
 						return {
@@ -651,7 +668,8 @@ export default {
         YbRightBanner: item.YbRightBanner || '',
         relate: [item.RelateTel == 1 ? 1 : null, item.RelateVideo == 1 ? 2 : null],
         RelateVideo:item.RelateVideo == 1?true:false,
-        isLastLevel: item.Child ? false : true
+        isLastLevel: item.Child ? false : true,
+        reportDetailShowType: item.ReportDetailShowType||1
       }
       this.ClassifyMenuList = item.ClassifyMenuList ? item.ClassifyMenuList.map(item => {
         return {