需求池 985 ok

src/views/custom_manage/contacts/mutualList.vue

@@ -12,8 +12,8 @@
         <span :class="['item', activeName == item.Source && 'active']" v-for="item in list" :key="item.Source" @click="handleTabsClick(item)">{{ item.PermissionName }} ({{ item.TotalNum }})</span>
       </div>
       <!--  -->
-      <div class="son-box" v-if="showSelectBox">
-        <div style="display: flex; align-items: center" v-if="activeName === 2">
+      <div class="son-box" v-if="showSelectBox || activeName == 15">
+        <div style="display: flex; align-items: center" v-if="activeName === 2 && showSelectBox">
           <el-checkbox-group v-model="checkActiveList" @change="dataChangeHandler">
             <el-checkbox :label="item.key" v-for="item in screenList" :key="item.key">{{ item.name }}</el-checkbox>
           </el-checkbox-group>
@@ -30,15 +30,17 @@
             type="date"
             range
             value-type="format"
-            :placeholder="activeName === 2 ? '活动时间' : '阅读时间'"
+            :placeholder="activeName === 2 ? '活动时间' : activeName === 15 ? '路演时间' : '阅读时间'"
             :editable="false"
             @change="dateChange"
             style="width: 200px; margin-right: 20px"
           />
-          <button :class="['button-sty', { act: filterObj.month === item.label }]" v-for="item in monthLabel" @click="toggleMonth(item.label)" :key="item.label">
-            {{ item.label }}
-          </button>
-          <el-input v-if="activeName === 2" placeholder="活动名称" v-model="searchVal" style="width: 200px" @input="handleSearch" clearable>
+          <template v-if="showSelectBox">
+            <button :class="['button-sty', { act: filterObj.month === item.label }]" v-for="item in monthLabel" @click="toggleMonth(item.label)" :key="item.label">
+              {{ item.label }}
+            </button>
+          </template>
+          <el-input v-if="activeName === 2 && showSelectBox" placeholder="活动名称" v-model="searchVal" style="width: 200px" @input="handleSearch" clearable>
             <i slot="prefix" class="el-input__icon el-icon-search"></i>
           </el-input>
           <a :href="exportExcel" download>
@@ -107,7 +109,7 @@ export default {
   props: {},
   computed: {
     exportExcel() {
-      let baseUrl = process.env.API_ROOT + "/cygx/user/export/interaction";
+      let baseUrl = process.env.API_ROOT + "/cygx/user/interaction/detail";
       let token = localStorage.getItem("auth") || "";
       let paramStr = "";
       let params = {
@@ -119,6 +121,7 @@ export default {
         StartDate: this.start_date,
         KeyWord: this.searchVal,
         ClassType: this.activeTypeName,
+        IsExport:true
       };
       for (let key in params) {
         paramStr = `${paramStr}&${key}=${params[key]}`;

src/views/custom_manage/contacts/organizationList.vue

@@ -24,14 +24,14 @@
             <i class="el-icon-info"></i>
           </el-tooltip>
         </div>
-        <div class="dataReport-top"  v-if="showSelectBox">
+        <div class="dataReport-top" v-if="showSelectBox || activeName == 15">
           <template>
             <date-picker
               v-model="filterObj.date"
               type="date"
               range
               value-type="format"
-              :placeholder="activeName == 2 ? '活动时间' : '阅读时间'"
+              :placeholder="activeName == 2 ? '活动时间' : activeName === 15 ? '路演时间' : '阅读时间'"
               :editable="false"
               @change="dateChange"
               style="width: 200px; margin-right: 20px"
@@ -40,13 +40,15 @@
               {{ item.label }}
             </button>
           </template>
-          <el-input placeholder="手机号/邮箱/姓名" v-model="searchVal" style="width: 200px; margin-right: 20px" @input="handleSearchActivity" clearable>
-            <i slot="prefix" class="el-input__icon el-icon-search"></i>
-          </el-input>
-          <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 >
+          <template v-if="showSelectBox">
+            <el-input placeholder="手机号/邮箱/姓名" v-model="searchVal" style="width: 200px; margin-right: 20px" @input="handleSearchActivity" clearable>
+              <i slot="prefix" class="el-input__icon el-icon-search"></i>
+            </el-input>
+            <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>
+          </template>
+          <a :href="exportExcel" download>
             <button class="button-sty act">下载EXCEL</button>
           </a>
         </div>
@@ -112,7 +114,7 @@ export default {
   mixins: [mutualMixin],
   computed: {
     exportExcel() {
-      let baseUrl = process.env.API_ROOT + "/cygx/user/company/export/interaction";
+      let baseUrl = process.env.API_ROOT + "/cygx/user/company/interaction/detail";
       let token = localStorage.getItem("auth") || "";
       let paramStr = "";
       let params = {
@@ -125,6 +127,7 @@ export default {
         KeyWord: this.searchVal,
         ActivityName: this.activityName,
         ClassType: this.activeTypeName,
+        IsExport:true
       };
       for (let key in params) {
         paramStr = `${paramStr}&${key}=${params[key]}`;

src/views/custom_manage/contacts/wholeOrganization.vue

@@ -20,38 +20,40 @@
             <i class="el-icon-info"></i>
           </el-tooltip>
         </div>
-        <div class="dataReport-top" v-if="showSelectBox">
+        <div class="dataReport-top" v-if="showSelectBox || activeName == 15">
           <template>
             <date-picker
               v-model="filterObj.date"
               type="date"
               range
               value-type="format"
-              :placeholder="activeName == 2 ? '活动时间' : '阅读时间'"
+              :placeholder="activeName == 2 ? '活动时间' : activeName === 15 ? '路演时间' : '阅读时间'"
               :editable="false"
               @change="dateChange"
               style="width: 200px; margin-right: 20px"
             />
           </template>
-          <el-cascader
-            v-model="sales"
-            placeholder="所属销售"
-            style="width: 200px; margin-right: 20px"
-            :options="salesArr"
-            :props="defaultSalesProps"
-            :show-all-levels="false"
-            collapse-tags
-            clearable
-            filterable
-            @change="handleSearchActivity"
-          >
-          </el-cascader>
-          <el-input placeholder="手机号/邮箱/姓名/公司名" v-model="searchVal" style="width: 220px; margin-right: 20px" @input="handleSearchActivity" clearable>
-            <i slot="prefix" class="el-input__icon el-icon-search"></i>
-          </el-input>
-          <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>
+          <template v-if="showSelectBox">
+            <el-cascader
+              v-model="sales"
+              placeholder="所属销售"
+              style="width: 200px; margin-right: 20px"
+              :options="salesArr"
+              :props="defaultSalesProps"
+              :show-all-levels="false"
+              collapse-tags
+              clearable
+              filterable
+              @change="handleSearchActivity"
+            >
+            </el-cascader>
+            <el-input placeholder="手机号/邮箱/姓名/公司名" v-model="searchVal" style="width: 220px; margin-right: 20px" @input="handleSearchActivity" clearable>
+              <i slot="prefix" class="el-input__icon el-icon-search"></i>
+            </el-input>
+            <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>
+          </template>
           <a :href="exportExcel" download>
             <button class="button-sty act">下载EXCEL</button>
           </a>
@@ -121,7 +123,7 @@ export default {
   mixins: [mutualMixin],
   computed: {
     exportExcel() {
-      let baseUrl = process.env.API_ROOT + "/cygx/user/companyList/export/interaction";
+      let baseUrl = process.env.API_ROOT + "/cygx/user/company/list";
       let token = localStorage.getItem("auth") || "";
       let salesArr = [];
       if (this.sales.length) {
@@ -140,6 +142,7 @@ export default {
         ActivityName: this.activityName,
         AdminId: salesArr.join(","),
         ClassType: this.activeTypeName,
+        IsExport:true
       };
       for (let key in params) {
         paramStr = `${paramStr}&${key}=${params[key]}`;