Merge branch 'master' into yx_3.6

src/components/calendar.vue

@@ -199,7 +199,7 @@ export default {
       return Number(localStorage.getItem("AdminId"));
     },
     isSeller() {
-      return ['ficc_seller', 'rai_seller', 'ficc_group', 'rai_group'].includes(localStorage.getItem('Role'))
+      return ['ficc_seller', 'rai_seller', 'ficc_group', 'rai_group','rai_admin'].includes(localStorage.getItem('Role'))
     }
   },
   data() {

src/views/dataReport_manage/equityServiceStatistics.vue

@@ -14,9 +14,22 @@
         @change="changeFilter"
       >
       </el-cascader>
-      <el-select clearable multiple v-model="filterObj.serveTypeId" placeholder="请选择咨询销售" style="width: 230px; margin-right: 10px" @change="changeFilter">
+      <el-cascader
+        v-model="filterObj.serveTypeId"
+        placeholder="请选择销售"
+        style="width: 230px; margin-right: 10px"
+        :options="customSellerList"
+        :props="defaultSalesProps"
+        :show-all-levels="false"
+        collapse-tags
+        clearable
+        filterable
+        @change="changeFilter"
+      >
+      </el-cascader>
+      <!-- <el-select clearable multiple v-model="filterObj.serveTypeId" placeholder="请选择咨询销售" style="width: 230px; margin-right: 10px" @change="changeFilter">
         <el-option v-for="item in customSellerList" :key="item.AdminId" :label="item.RealName" :value="item.AdminId"> </el-option>
-      </el-select>
+      </el-select> -->
       <el-select clearable v-model="filterObj.status" placeholder="客户状态" style="width: 230px; margin-right: 10px" @change="changeFilter">
         <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
       </el-select>
@@ -36,6 +49,9 @@
       >
         <el-option v-for="item in lableOptions" :key="item.Md5Key" :label="item.TagName" :value="item.Md5Key"> </el-option>
       </el-select>
+      <el-input placeholder="请输入客户名称" v-model="searchVal" style="width: 230px; margin-right: 10px" @input="handleSearch" clearable>
+        <i slot="prefix" class="el-input__icon el-icon-search"></i>
+      </el-input>
       <a :href="exportExcel" download>
         <el-button type="primary">下载</el-button>
       </a>
@@ -174,6 +190,7 @@ export default {
       tagId: "",
       whatWeek: "",
       customSellerList: [],
+      searchVal: "", //客户名称
     };
   },
   computed: {
@@ -184,18 +201,27 @@ export default {
           return item[item.length - 1];
         });
       }
+      let SellerIds = [];
+      if (this.filterObj.serveTypeId && this.filterObj.serveTypeId.length) {
+        console.log(this.filterObj.serveTypeId);
+
+        SellerIds = this.filterObj.serveTypeId.map((item) => {
+          return item[item.length - 1];
+        });
+      }
       let baseUrl = process.env.API_ROOT + "/cygx/rai_serve/list";
       let token = localStorage.getItem("auth") || "";
       let paramStr = "";
       let parmsa = {
         SellerId: salesArr.join(","),
-        ShareSellerId: this.filterObj.serveTypeId ? this.filterObj.serveTypeId.join(",") : "", //共享小时id
+        ShareSellerId: SellerIds.join(","), //共享小时id
         ServeTypeId: this.filterObj.serviceType,
         TagType: this.tagType,
         TagId: this.tagId,
         Status: this.filterObj.status,
         SortType: this.sortType,
         IsExport: true,
+        KeyWord: this.searchVal,
       };
       for (let key in parmsa) {
         paramStr = `${paramStr}&${key}=${parmsa[key]}`;
@@ -212,6 +238,10 @@ export default {
     this.getRaiServeCustomSellerList();
   },
   methods: {
+    handleSearch() {
+      this.page_no = 1;
+      this.getDataList();
+    },
     /* 获取销售 */
     getSale() {
       customInterence.getSalesRaiData().then((res) => {
@@ -254,16 +284,25 @@ export default {
           return item[item.length - 1];
         });
       }
+      let SellerIds = [];
+      if (this.filterObj.serveTypeId && this.filterObj.serveTypeId.length) {
+        console.log(this.filterObj.serveTypeId);
+
+        SellerIds = this.filterObj.serveTypeId.map((item) => {
+          return item[item.length - 1];
+        });
+      }
       const res = await dataMainInterface.getRaiServeList({
         PageSize: this.pageSize,
         CurrentIndex: this.page_no,
         SellerId: salesArr.join(","),
-        ShareSellerId: this.filterObj.serveTypeId ? this.filterObj.serveTypeId.join(",") : "", //共享小时id
+        ShareSellerId: SellerIds.join(","), //共享小时id
         ServeTypeId: this.filterObj.serviceType,
         TagType: this.tagType,
         TagId: this.tagId,
         Status: this.filterObj.status,
         SortType: this.sortType,
+        KeyWord: this.searchVal,
       });
       if (res.Ret === 200) {
         this.tableData = res.Data.List || [];

src/views/roadshow_manage/roleConfig/activityBtnDiaConfig.js

@@ -33,7 +33,7 @@ export default {
     // ficc管理员权限
     ficc_admin: researcher_obj,
     // 权益管理员权限
-    rai_admin: researcher_obj,
+    rai_admin: seller_obj_rai,
     // ficc研究员权限
     ficc_researcher: researcher_obj,
     // ficc研究员(最早定义)权限

src/views/roadshow_manage/roleConfig/activityCellDiaConfig.js

@@ -33,7 +33,7 @@ export default {
     // ficc管理员权限
     ficc_admin: researcher_obj,
     // 权益管理员权限
-    rai_admin: researcher_obj,
+    rai_admin: seller_obj_rai,
     // ficc研究员权限
     ficc_researcher: researcher_obj,
     // ficc研究员(最早定义)权限

src/views/roadshow_manage/roleConfig/myCalendarConfig.js

@@ -1,8 +1,8 @@
 // 研究员
-export const ENUM_RESEARCHLIST = ['ficc_researcher', 'researcher', 'rai_researcher','ficc_admin', 'rai_admin',];
+export const ENUM_RESEARCHLIST = ['ficc_researcher', 'researcher', 'rai_researcher','ficc_admin',];
 
 // 销售/组长
-export const sellerList = ['ficc_seller', 'rai_seller', 'ficc_group', 'rai_group'];
+export const sellerList = ['ficc_seller', 'rai_seller', 'ficc_group', 'rai_group','rai_admin'];
 
 // admin
 const adminList = [ 'admin'];