Merge branch 'master' into xqc_970

src/views/dataReport_manage/equityServiceStatistics.vue

@@ -36,6 +36,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 +177,7 @@ export default {
       tagId: "",
       whatWeek: "",
       customSellerList: [],
+      searchVal: "", //客户名称
     };
   },
   computed: {
@@ -196,6 +200,7 @@ export default {
         Status: this.filterObj.status,
         SortType: this.sortType,
         IsExport: true,
+        KeyWord: this.searchVal,
       };
       for (let key in parmsa) {
         paramStr = `${paramStr}&${key}=${parmsa[key]}`;
@@ -212,6 +217,10 @@ export default {
     this.getRaiServeCustomSellerList();
   },
   methods: {
+    handleSearch() {
+      this.page_no = 1;
+      this.getDataList();
+    },
     /* 获取销售 */
     getSale() {
       customInterence.getSalesRaiData().then((res) => {
@@ -264,6 +273,7 @@ export default {
         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/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'];