From e2cc3e2630b80fab156f9bdc31d4e1fcce97cb9e Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 20 Sep 2024 11:40:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/XyTable/index.vue            |   3 +-
 src/views/book/components/addBook.vue       |   7 +-
 src/views/book/index.vue                    |   6 +-
 src/views/student/components/detail.vue     |   9 +-
 src/views/student/components/editDetail.vue |  39 +-
 src/views/student/index.vue                 | 278 ++++++-------
 src/views/student/search.vue                | 415 +++++++++++++-------
 7 files changed, 454 insertions(+), 303 deletions(-)

diff --git a/src/components/XyTable/index.vue b/src/components/XyTable/index.vue
index c16f0bb..3f3bb25 100644
--- a/src/components/XyTable/index.vue
+++ b/src/components/XyTable/index.vue
@@ -1026,7 +1026,8 @@ export default {
 }
 .xy-table__page {
   display: flex;
-  justify-content: right;
+  // justify-content: right;
+  justify-content: flex-end;
   align-items: center;
   border-bottom-right-radius: 4px;
   border-bottom-left-radius: 4px;
diff --git a/src/views/book/components/addBook.vue b/src/views/book/components/addBook.vue
index 450aebf..e346eee 100644
--- a/src/views/book/components/addBook.vue
+++ b/src/views/book/components/addBook.vue
@@ -21,8 +21,11 @@
           <div class="xy-table-item-label" style="font-weight: bold">
             <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>{{type==='more'?'无需预约人':'预约人'}}：
           </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="form.user_id" @change="changeUser" style="width:100%"
+          <div class="xy-table-item-content">
+            <div v-if="type==='editor'">
+              {{form.name}}
+            </div>
+            <el-select v-else v-model="form.user_id" @change="changeUser" style="width:100%"
               :multiple="type==='more'?true:false" filterable remote reserve-keyword
                :placeholder="type==='more'?'请选择无需预约的学员，不选则全部预约':'请选择学员或查找学员'"
               :remote-method="remoteMethod" :loading="loading">
diff --git a/src/views/book/index.vue b/src/views/book/index.vue
index ec05a7b..ac4ac7f 100644
--- a/src/views/book/index.vue
+++ b/src/views/book/index.vue
@@ -64,7 +64,7 @@
         </template> -->
 
         <template v-slot:btns>
-          <el-table-column align='center' fixed="right" label="操作" width="240" header-align="center">
+          <el-table-column align='center' fixed="right" label="操作" width="280" header-align="center">
             <template slot-scope="scope">
               <el-button type="primary" size="small" v-if="scope.row.status>0"
                 @click="checkBook('show',scope.row.id)">查看</el-button>
@@ -74,9 +74,9 @@
                 title="确定取消吗？">
                 <el-button type="primary" size="small" slot="reference">取消</el-button>
               </el-popconfirm>
-              <el-button type="primary" size="small" v-if="scope.row.status===3 ||scope.row.status===4"
+              <el-button  style="margin-left:10px" type="primary" size="small" v-if="scope.row.status===3 ||scope.row.status===4"
                 @click="editBook('editor',scope.row.id,)">编辑</el-button>
-              <el-popconfirm style="margin:0 10px" @confirm="deleteList(scope.row.id)" title="确定删除吗？">
+              <el-popconfirm style="margin-left:10px" @confirm="deleteList(scope.row.id)" title="确定删除吗？">
                 <el-button type="danger" size="small" slot="reference">删除</el-button>
               </el-popconfirm>
 
diff --git a/src/views/student/components/detail.vue b/src/views/student/components/detail.vue
index 0a54d08..b60d73d 100644
--- a/src/views/student/components/detail.vue
+++ b/src/views/student/components/detail.vue
@@ -20,8 +20,13 @@
                   <el-descriptions-item v-for="item in selectFormList" :span="item.span?item.span:1">
                     <template slot="label">
                       {{item.name}}
-                    </template>
-                    {{student_info[item.field]?student_info[item.field]:''}}
+                    </template>
+                    <div v-if="item.field==='company_date'">
+                      {{student_info[item.field]?(student_info[item.field]=='0000-00-00'?'':student_info[item.field]):''}}
+                    </div>
+                    <div v-else>
+                      {{student_info[item.field]?student_info[item.field]:''}}
+                    </div>
                   </el-descriptions-item>
                   <el-descriptions-item  :span="2" v-if="type==='check' || type==='checkshow' || type==='setPosition'">
                     <template slot="label">
diff --git a/src/views/student/components/editDetail.vue b/src/views/student/components/editDetail.vue
index df6ab62..e94e648 100644
--- a/src/views/student/components/editDetail.vue
+++ b/src/views/student/components/editDetail.vue
@@ -60,10 +60,10 @@
       <template v-slot:education>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>学历：
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>最高学历：
           </div>
           <div class="xy-table-item-content">
-            <el-select v-model="form.education" placeholder="请选择学历" clearable style="width: 100%;">
+            <el-select v-model="form.education" placeholder="请选择最高学历" clearable style="width: 100%;">
               <el-option v-for="(item,index) in formSelect.education" :key="index" :label="item.value" :value="item.value">
               </el-option>
             </el-select>
@@ -126,10 +126,10 @@
       <template v-slot:company_has_share>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>有无股份：
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>是否有股份：
           </div>
           <div class="xy-table-item-content">
-            <el-select v-model="form.company_has_share" placeholder="请选择有无股份" clearable style="width: 100%;">
+            <el-select v-model="form.company_has_share" placeholder="请选择是否有股份" clearable style="width: 100%;">
               <el-option v-for="(item,index) in shareList" :key="index" :label="item.value" :value="item.value">
               </el-option>
             </el-select>
@@ -162,6 +162,19 @@
           </div>
         </div>
       </template>
+      <template v-slot:company_need_fund>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>是否需要融资：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select v-model="form.company_need_fund" placeholder="请选择是否需要融资" clearable style="width: 100%;">
+              <el-option v-for="(item,index) in yuanheList" :key="index" :label="item.value" :value="item.value">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
       <template v-slot:company_fund>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
@@ -175,10 +188,10 @@
       <template v-slot:company_area>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>所在区域：
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>公司所属区域：
           </div>
           <div class="xy-table-item-content">
-            <el-select v-model="form.company_area" placeholder="请选择所在区域" clearable style="width: 100%;">
+            <el-select v-model="form.company_area" placeholder="请选择公司所属区域" clearable style="width: 100%;">
               <el-option v-for="(item,index) in formSelect.company_area" :key="index" :label="item.value" :value="item.value">
               </el-option>
             </el-select>
@@ -211,30 +224,30 @@
       <template v-slot:company_product>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>产品：
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>公司主营业务：
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.company_product" placeholder="请输入产品" clearable style="width: 100%;"></el-input>
+            <el-input v-model="form.company_product" placeholder="请输入公司主营业务" clearable style="width: 100%;"></el-input>
           </div>
         </div>
       </template>
       <template v-slot:school>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>毕业院校：
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>最高学历毕业院校：
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.school" placeholder="请输入毕业院校" clearable style="width: 100%;"></el-input>
+            <el-input v-model="form.school" placeholder="请输入最高学历毕业院校" clearable style="width: 100%;"></el-input>
           </div>
         </div>
       </template>
       <template v-slot:speciality>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>专业：
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>最高学历专业：
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.speciality" placeholder="请输入专业" clearable style="width: 100%;"></el-input>
+            <el-input v-model="form.speciality" placeholder="请输入最高学历专业" clearable style="width: 100%;"></el-input>
           </div>
         </div>
       </template>
@@ -343,10 +356,12 @@
           introduce:'',
           company_name:'',
           company_introduce:'',
+          company_date:'',
           company_position:'',
           company_has_share:'',
           type:'',
           company_type:'',
+          company_need_fund:'',
           company_fund:'',
           company_area:'',
           company_industry:'',
diff --git a/src/views/student/index.vue b/src/views/student/index.vue
index e951881..ecc7f8a 100644
--- a/src/views/student/index.vue
+++ b/src/views/student/index.vue
@@ -8,120 +8,128 @@
 
             <div class="searchwrap" style="display: flex;align-items: center;">
               <div>
-                <div>
-                  <el-input v-model="select.keyword" placeholder="请输入关键词"></el-input>
-                </div>
-                <div>
-                  <el-input v-model="select.course_name" placeholder="请输入课程名称"></el-input>
-                </div>
-                <div>
-                  <el-input v-model="select.name" placeholder="请输入姓名"></el-input>
-                </div>
-                <div style="width:250px">
-                  <el-date-picker v-model="birthdayDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                    style="width:100%" @change="changeBirthdayDates" type="daterange" range-separator="至"
-                    start-placeholder="出生日期" end-placeholder="出生日期">
-                  </el-date-picker>
-                </div>
-                <div>
-                  <el-input v-model="select.mobile" placeholder="请输入手机号"></el-input>
-                </div>
-                <div>
-                  <el-input v-model="select.school" placeholder="请输入最高毕业院校"></el-input>
-                </div>
-                <div>
-                  <el-input v-model="select.company_name" placeholder="请输入公司名称"></el-input>
+                <div>
+                  <el-input v-model="select.keyword" placeholder="请输入关键词"></el-input>
+                </div>
+                <div>
+                  <el-input v-model="select.course_name" placeholder="请输入课程名称"></el-input>
+                </div>
+                <div>
+                  <el-date-picker style="width:100%" @change="changeDate" v-model="select.courses_end_date" type="date"
+                    placeholder="课程结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd">
+                  </el-date-picker>
+                </div>
+                <div>
+                  <el-select v-model="select.status" placeholder="请选择审核状态" clearable>
+                    <el-option v-for="item in apply_status_list" :key="item.id" :label="item.value" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </div>
+                <div>
+                  <el-select v-model="select.course_type" placeholder="请选择课程体系" clearable>
+                    <el-option v-for="item in courseTypeList" :key="item.id" :label="item.name" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </div>
+                <div>
+                  <el-input v-model="select.name" placeholder="请输入姓名"></el-input>
+                </div>
+                <div style="width:250px">
+                  <el-date-picker v-model="birthdayDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                    style="width:100%" @change="changeBirthdayDates" type="daterange" range-separator="至"
+                    start-placeholder="出生日期" end-placeholder="出生日期">
+                  </el-date-picker>
+                </div>
+                <div>
+                  <el-input v-model="select.mobile" placeholder="请输入手机号"></el-input>
+                </div>
+                <div>
+                  <el-input v-model="select.school" placeholder="请输入最高毕业院校"></el-input>
+                </div>
+                <div>
+                  <el-select  style="width:100%" v-model="educationType"
+                  @change="(e)=>{changeSelectType(e,'education')}" multiple collapse-tags placeholder="请选择学历" clearable>
+                    <el-option v-for="item in formSelect.education" :key="item.id" :label="item.value"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </div>
+                <div style="width:200px">
+                  <el-select  style="width:100%" v-model="typeSelect" @change="(e)=>{changeSelectType(e,'type')}" multiple collapse-tags
+                    placeholder="请选择个人荣誉" clearable>
+                    <el-option v-for="item in formSelect.type" :key="item.id" :label="item.value" :value="item.value">
+                    </el-option>
+                  </el-select>
+                </div>
+                <div >
+                  <el-select  v-model="select.is_vip" placeholder="请选择学员身份" clearable>
+                    <el-option v-for="item in is_vip_list" :key="item.id" :label="item.value" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </div>
+                <div>
+                  <el-select v-model="select.is_schoolmate" placeholder="请选择是否校友" clearable>
+                    <el-option v-for="item in is_schoolmate_list" :key="item.id" :label="item.value" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </div>
+
+
+                <div>
+                  <el-input v-model="select.company_name" placeholder="请输入公司名称"></el-input>
                 </div>
                 <div>
                   <el-input v-model="select.company_position" placeholder="请输入职务"></el-input>
-                </div>
-                <div>
-
-                  <el-select v-model="select.company_need_fund" placeholder="是否需要融资" clearable>
-                    <el-option v-for="item in yuanheList" :key="item.value" :label="item.value" :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div style="width:250px">
-                  <el-date-picker v-model="companyDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-                    style="width:100%" @change="changeCompanyDates" type="daterange" range-separator="至"
-                    start-placeholder="公司成立日期" end-placeholder="公司成立日期">
-                  </el-date-picker>
-                </div>
-
-                <div>
-                  <el-select v-model="select.company_has_share" placeholder="是否有股份" clearable>
-                    <el-option v-for="item in shareList" :key="item.value" :label="item.value" :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div>
-                  <el-select v-model="select.company_area" placeholder="请选择所属区域" clearable>
-                    <el-option v-for="item in formSelect.company_area" :key="item.id" :label="item.value"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div style="width:250px">
-                  <el-select style="width:100%" v-model="companyType" @change="changeCompanyType" multiple collapse-tags placeholder="请选择企业资质" clearable>
-                    <el-option v-for="item in formSelect.company_type" :key="item.id" :label="item.value"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-
-                <div>
-                  <el-select v-model="select.company_industry" placeholder="请选择所属领域" clearable>
-                    <el-option v-for="item in formSelect.company_industry" :key="item.id" :label="item.value"
-                      :value="item.value">
+                </div>
+                <div>
+                  <el-select v-model="select.company_has_share" placeholder="是否有股份" clearable>
+                    <el-option v-for="item in shareList" :key="item.value" :label="item.value" :value="item.value">
+                    </el-option>
+                  </el-select>
+                </div>
+                <div>
+                  <el-select v-model="select.company_need_fund" placeholder="是否需要融资" clearable>
+                    <el-option v-for="item in yuanheList" :key="item.value" :label="item.value" :value="item.value">
                     </el-option>
-                    <el-option v-for="item in formSelect.company_industry_detail" :key="item.id" :label="item.value"
+                  </el-select>
+                </div>
+                <div style="width:250px">
+                  <el-date-picker v-model="companyDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                    style="width:100%" @change="changeCompanyDates" type="daterange" range-separator="至"
+                    start-placeholder="公司成立日期" end-placeholder="公司成立日期">
+                  </el-date-picker>
+                </div>
+
+                <div style="width:200px">
+                  <el-select style="width:100%" v-model="companyArea"
+                  multiple collapse-tags
+                   @change="(e)=>{changeSelectType(e,'company_area')}"
+                  placeholder="请选择所属区域" clearable>
+                    <el-option v-for="item in formSelect.company_area" :key="item.id" :label="item.value"
                       :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div  style="width:250px">
-                  <el-select v-model="typeSelect" @change="changeTypeSelect"  multiple collapse-tags  placeholder="请选择个人荣誉" clearable>
-                    <el-option v-for="item in formSelect.type" :key="item.id" :label="item.value" :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div>
-                  <el-select v-model="select.education" placeholder="请选择学历" clearable>
-                    <el-option v-for="item in formSelect.education" :key="item.id" :label="item.value"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div>
-                  <el-select v-model="select.is_vip" placeholder="请选择学员身份" clearable>
-                    <el-option v-for="item in is_vip_list" :key="item.id" :label="item.value" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div>
-                  <el-select v-model="select.is_schoolmate" placeholder="请选择是否校友" clearable>
-                    <el-option v-for="item in is_schoolmate_list" :key="item.id" :label="item.value" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </div>
-
-                <div>
-                  <el-date-picker style="width:100%" @change="changeDate" v-model="select.courses_end_date" type="date"
-                    placeholder="课程结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd">
-                  </el-date-picker>
-                </div>
-                <div>
-                  <el-select v-model="select.status" placeholder="请选择审核状态" clearable>
-                    <el-option v-for="item in apply_status_list" :key="item.id" :label="item.value" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div>
-                  <el-select v-model="select.course_type" placeholder="请选择课程体系" clearable>
-                    <el-option v-for="item in courseTypeList" :key="item.id" :label="item.name" :value="item.id">
-                    </el-option>
-                  </el-select>
+                    </el-option>
+                  </el-select>
+                </div>
+                <div style="width:250px">
+                  <el-select style="width:100%" v-model="companyType"
+                    @change="(e)=>{changeSelectType(e,'company_type')}" multiple collapse-tags
+                    placeholder="请选择企业资质" clearable>
+                    <el-option v-for="item in formSelect.company_type" :key="item.id" :label="item.value"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </div>
+
+                <div style="width:250px">
+                  <el-select  style="width:100%" v-model="companyIndustry"  multiple collapse-tags
+                   @change="(e)=>{changeSelectType(e,'company_industry')}" placeholder="请选择所属领域" clearable>
+                    <el-option v-for="item in formSelect.company_industry" :key="item.id" :label="item.value"
+                      :value="item.value">
+                    </el-option>
+                    <!-- <el-option v-for="item in formSelect.company_industry_detail" :key="item.id" :label="item.value"
+                      :value="item.value">
+                    </el-option> -->
+                  </el-select>
                 </div>
 
                 <div>
@@ -239,11 +247,15 @@
     },
     data() {
       return {
-        path: '',
+        path: '',
+        // 多选 获取
         companyDates: [],
-        birthdayDates: [],
-        companyType:[],
-        typeSelect:[],
+        birthdayDates: [],
+        companyType: [],
+        typeSelect: [],
+        educationType:[],
+        companyIndustry:[],
+        companyArea:[],
         select: {
           keyword: '',
           name: '',
@@ -255,8 +267,8 @@
           end_birthday: '',
           start_company_date: '',
           end_company_date: '',
-          company_has_share: '',
-          company_need_fund:'',
+          company_has_share: '',
+          company_need_fund: '',
           company_position: '',
           company_area: '',
           company_type: '',
@@ -347,20 +359,13 @@
       this.getList()
       this.getCourseType()
     },
-    methods: {
-      changeCompanyType(e){
-        if(e){
-          this.select.company_type = e.join(",")
-        }else{
-          this.select.company_type = ''
-        }
-      },
-      changeTypeSelect(e){
-        if(e){
-          this.select.type = e.join(",")
-        }else{
-          this.select.type = ''
-        }
+    methods: {
+      changeSelectType(e, selectName) {
+        if (e) {
+          this.select[selectName] = e.join(",")
+        } else {
+          this.select[selectName] = ''
+        }
       },
       changeCompanyDates(e) {
         if (e) {
@@ -404,15 +409,18 @@
         let index = perSize + e + 1
         return index
       },
-      resetSelect() {
-        this.companyType = []
-        this.typeSelect = []
+      resetSelect() {
+        this.companyType = []
+        this.typeSelect = []
+        this.educationType=[]
+        this.companyIndustry=[]
+        this.companyArea=[]
         this.select.keyword = ''
         this.select.name = ''
         this.select.mobile = ''
         this.select.company_name = ''
         this.select.school = ''
-        this.select.company_has_share = ''
+        this.select.company_has_share = ''
         this.select.company_need_fund = ''
         this.select.start_company_date = ''
         this.select.start_birthday = ''
@@ -449,8 +457,8 @@
           start_company_date: this.select.start_company_date,
           end_company_date: this.select.end_company_date,
           course_name: this.select.course_name,
-          company_has_share: this.select.company_has_share,
-          company_need_fund:this.select.company_need_fund,
+          company_has_share: this.select.company_has_share,
+          company_need_fund: this.select.company_need_fund,
           company_position: this.select.company_position,
           company_area: this.select.company_area,
           company_type: this.select.company_type,
diff --git a/src/views/student/search.vue b/src/views/student/search.vue
index bf226c4..0f59f2c 100644
--- a/src/views/student/search.vue
+++ b/src/views/student/search.vue
@@ -7,88 +7,134 @@
           <div slot="content">
 
             <div class="searchwrap" style="display: flex;align-items: center;">
-              <div>
-                <div>
-                  <el-input v-model="select.name" placeholder="请输入姓名"></el-input>
-                </div>
-                <div>
-                  <el-input v-model="select.mobile" placeholder="请输入手机号"></el-input>
-                </div>
-                <div>
-                  <el-input v-model="select.company_name" placeholder="请输入公司名称"></el-input>
-                </div>
-                <div>
-                  <el-input v-model="select.course_name" placeholder="请输入课程名称"></el-input>
-                </div>
-
-                <div>
-                  <el-input v-model="select.company_position" placeholder="请输入职务"></el-input>
-                </div>
-                <div>
-                  <el-select v-model="select.company_area" placeholder="请选择所属区域" clearable>
-                    <el-option v-for="item in formSelect.company_area" :key="item.id" :label="item.value"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div>
-                  <el-select v-model="select.company_type" placeholder="请选择企业资质" clearable>
-                    <el-option v-for="item in formSelect.company_type" :key="item.id" :label="item.value"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-
-                <div>
-                  <el-select v-model="select.company_industry" placeholder="请选择所属领域" clearable>
-                    <el-option v-for="item in formSelect.company_industry" :key="item.id" :label="item.value"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div>
-                  <el-select v-model="select.type" placeholder="请选择个人荣誉" clearable>
-                    <el-option v-for="item in formSelect.type" :key="item.id" :label="item.value" :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div>
-                  <el-select v-model="select.education" placeholder="请选择学历" clearable>
-                    <el-option v-for="item in formSelect.education" :key="item.id" :label="item.value"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div>
-                  <el-select v-model="select.is_vip" placeholder="请选择学员身份" clearable>
-                    <el-option v-for="item in is_vip_list" :key="item.id" :label="item.value" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div>
-                  <el-select v-model="select.is_schoolmate" placeholder="请选择是否校友" clearable>
-                    <el-option v-for="item in is_schoolmate_list" :key="item.id" :label="item.value" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </div>
+              <div>
+                <div>
+                  <el-input v-model="select.keyword" placeholder="请输入关键词"></el-input>
+                </div>
+                <div>
+                  <el-input v-model="select.course_name" placeholder="请输入课程名称"></el-input>
+                </div>
+                <div>
+                  <el-date-picker style="width:100%" @change="changeDate" v-model="select.courses_end_date" type="date"
+                    placeholder="课程结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd">
+                  </el-date-picker>
+                </div>
+                <div>
+                  <el-select v-model="select.status" placeholder="请选择审核状态" clearable>
+                    <el-option v-for="item in apply_status_list" :key="item.id" :label="item.value" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </div>
+                <div>
+                  <el-select v-model="select.course_type" placeholder="请选择课程体系" clearable>
+                    <el-option v-for="item in courseTypeList" :key="item.id" :label="item.name" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </div>
+                <div>
+                  <el-input v-model="select.name" placeholder="请输入姓名"></el-input>
+                </div>
+                <div style="width:250px">
+                  <el-date-picker v-model="birthdayDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                    style="width:100%" @change="changeBirthdayDates" type="daterange" range-separator="至"
+                    start-placeholder="出生日期" end-placeholder="出生日期">
+                  </el-date-picker>
+                </div>
+                <div>
+                  <el-input v-model="select.mobile" placeholder="请输入手机号"></el-input>
+                </div>
+                <div>
+                  <el-input v-model="select.school" placeholder="请输入最高毕业院校"></el-input>
+                </div>
+                <div>
+                  <el-select  style="width:100%" v-model="educationType"
+                  @change="(e)=>{changeSelectType(e,'education')}" multiple collapse-tags placeholder="请选择学历" clearable>
+                    <el-option v-for="item in formSelect.education" :key="item.id" :label="item.value"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </div>
+                <div style="width:200px">
+                  <el-select  style="width:100%" v-model="typeSelect" @change="(e)=>{changeSelectType(e,'type')}" multiple collapse-tags
+                    placeholder="请选择个人荣誉" clearable>
+                    <el-option v-for="item in formSelect.type" :key="item.id" :label="item.value" :value="item.value">
+                    </el-option>
+                  </el-select>
+                </div>
+                <div >
+                  <el-select  v-model="select.is_vip" placeholder="请选择学员身份" clearable>
+                    <el-option v-for="item in is_vip_list" :key="item.id" :label="item.value" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </div>
+                <div>
+                  <el-select v-model="select.is_schoolmate" placeholder="请选择是否校友" clearable>
+                    <el-option v-for="item in is_schoolmate_list" :key="item.id" :label="item.value" :value="item.id">
+                    </el-option>
+                  </el-select>
+                </div>
+
+
+                <div>
+                  <el-input v-model="select.company_name" placeholder="请输入公司名称"></el-input>
+                </div>
+                <div>
+                  <el-input v-model="select.company_position" placeholder="请输入职务"></el-input>
+                </div>
+                <div>
+                  <el-select v-model="select.company_has_share" placeholder="是否有股份" clearable>
+                    <el-option v-for="item in shareList" :key="item.value" :label="item.value" :value="item.value">
+                    </el-option>
+                  </el-select>
+                </div>
+                <div>
+                  <el-select v-model="select.company_need_fund" placeholder="是否需要融资" clearable>
+                    <el-option v-for="item in yuanheList" :key="item.value" :label="item.value" :value="item.value">
+                    </el-option>
+                  </el-select>
+                </div>
+                <div style="width:250px">
+                  <el-date-picker v-model="companyDates" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+                    style="width:100%" @change="changeCompanyDates" type="daterange" range-separator="至"
+                    start-placeholder="公司成立日期" end-placeholder="公司成立日期">
+                  </el-date-picker>
+                </div>
+
+                <div style="width:200px">
+                  <el-select style="width:100%" v-model="companyArea"
+                  multiple collapse-tags
+                   @change="(e)=>{changeSelectType(e,'company_area')}"
+                  placeholder="请选择所属区域" clearable>
+                    <el-option v-for="item in formSelect.company_area" :key="item.id" :label="item.value"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </div>
+                <div style="width:250px">
+                  <el-select style="width:100%" v-model="companyType"
+                    @change="(e)=>{changeSelectType(e,'company_type')}" multiple collapse-tags
+                    placeholder="请选择企业资质" clearable>
+                    <el-option v-for="item in formSelect.company_type" :key="item.id" :label="item.value"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </div>
+
+                <div style="width:250px">
+                  <el-select  style="width:100%" v-model="companyIndustry"  multiple collapse-tags
+                   @change="(e)=>{changeSelectType(e,'company_industry')}" placeholder="请选择所属领域" clearable>
+                    <el-option v-for="item in formSelect.company_industry" :key="item.id" :label="item.value"
+                      :value="item.value">
+                    </el-option>
+                    <!-- <el-option v-for="item in formSelect.company_industry_detail" :key="item.id" :label="item.value"
+                      :value="item.value">
+                    </el-option> -->
+                  </el-select>
+                </div>
+
+
+
 
-                <div>
-                  <el-date-picker style="width:100%" @change="changeDate" v-model="select.courses_end_date" type="date"
-                    placeholder="课程结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd">
-                  </el-date-picker>
-                </div>
-                <div>
-                  <el-select v-model="select.status" placeholder="请选择审核状态" clearable>
-                    <el-option v-for="item in apply_status_list" :key="item.id" :label="item.value" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div>
-                  <el-select v-model="select.course_type" placeholder="请选择课程体系" clearable>
-                    <el-option v-for="item in courseTypeList" :key="item.id" :label="item.name" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </div>
                 <div>
                   <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
                   <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
@@ -191,24 +237,40 @@
     data() {
       return {
         path: '',
-        select: {
-          name: '',
-          mobile: '',
-          course_name: '',
-          company_name: '',
-          company_position: '',
-          company_area: '',
-          company_type: '',
-          company_industry: '',
-          is_vip: '',
-          is_schoolmate: '',
-          courses_end_date: '',
-          education: '',
-          type: '',
-          status: "",
-          course_type: '',
-          page: 1,
-          page_size: 10,
+        // 多选 获取
+        companyDates: [],
+        birthdayDates: [],
+        companyType: [],
+        typeSelect: [],
+        educationType:[],
+        companyIndustry:[],
+        companyArea:[],
+        select: {
+          keyword: '',
+          name: '',
+          mobile: '',
+          course_name: '',
+          company_name: '',
+          school: '',
+          start_birthday: '',
+          end_birthday: '',
+          start_company_date: '',
+          end_company_date: '',
+          company_has_share: '',
+          company_need_fund: '',
+          company_position: '',
+          company_area: '',
+          company_type: '',
+          company_industry: '',
+          is_vip: '',
+          is_schoolmate: '',
+          courses_end_date: '',
+          education: '',
+          type: '',
+          status: "",
+          course_type: '',
+          page: 1,
+          page_size: 10,
         },
         courseTypeList: [],
         list: [],
@@ -283,7 +345,33 @@
       this.getList()
       this.getCourseType()
     },
-    methods: {
+    methods: {
+      changeSelectType(e, selectName) {
+        if (e) {
+          this.select[selectName] = e.join(",")
+        } else {
+          this.select[selectName] = ''
+        }
+      },
+      changeCompanyDates(e) {
+        if (e) {
+          this.select.start_company_date = e[0]
+          this.select.end_company_date = e[1]
+        } else {
+          this.select.start_company_date = ''
+          this.select.end_company_date = ''
+        }
+      },
+      changeBirthdayDates(e) {
+        if (e) {
+          this.select.start_birthday = e[0]
+          this.select.end_birthday = e[1]
+        } else {
+          this.select.start_birthday = ''
+          this.select.end_birthday = ''
+        }
+      },
+
       pageIndexChange(e) {
         this.select.page = e
         this.getList()
@@ -298,43 +386,66 @@
         let index = perSize + e + 1
         return index
       },
-      resetSelect() {
-        this.select.name = ''
-        this.select.mobile = ''
-        this.select.company_name = ''
-        this.select.course_name = ''
-        this.select.company_position = ''
-        this.select.company_area = ''
-        this.select.company_type = ''
-        this.select.company_industry = ''
-        this.select.is_vip = ''
-        this.select.courses_end_date = ''
-        this.select.is_schoolmate = ''
-        this.select.education = ''
-        this.select.type = ''
-        this.select.status = ''
-        this.select.course_type = ''
+      resetSelect() {
+        this.companyType = []
+        this.typeSelect = []
+        this.educationType=[]
+        this.companyIndustry=[]
+        this.companyArea=[]
+        this.select.keyword = ''
+        this.select.name = ''
+        this.select.mobile = ''
+        this.select.company_name = ''
+        this.select.school = ''
+        this.select.company_has_share = ''
+        this.select.company_need_fund = ''
+        this.select.start_company_date = ''
+        this.select.start_birthday = ''
+        this.birthdayDates = []
+        this.select.end_birthday = ''
+        this.select.end_company_date = ''
+        this.companyDates = []
+        this.select.course_name = ''
+        this.select.company_position = ''
+        this.select.company_area = ''
+        this.select.company_type = ''
+        this.select.company_industry = ''
+        this.select.is_vip = ''
+        this.select.courses_end_date = ''
+        this.select.is_schoolmate = ''
+        this.select.education = ''
+        this.select.type = ''
+        this.select.status = ''
+        this.select.course_type = ''
         this.select.page = 1
         this.getList()
       },
       async getList() {
         const res = await indexStudy({
-          page: this.select.page,
-          page_size: this.select.page_size,
-          name: this.select.name,
-          mobile: this.select.mobile,
-          company_name: this.select.company_name,
-          course_name: this.select.course_name,
-          company_position: this.select.company_position,
-          company_area: this.select.company_area,
-          company_type: this.select.company_type,
-          company_industry: this.select.company_industry,
-          is_vip: this.select.is_vip,
-          courses_end_date: this.select.courses_end_date,
-          is_schoolmate: this.select.is_schoolmate,
-          education: this.select.education,
-          type: this.select.type,
-          status: this.select.status,
+          page: this.select.page,
+          page_size: this.select.page_size,
+          keyword: this.select.keyword,
+          name: this.select.name,
+          mobile: this.select.mobile,
+          company_name: this.select.company_name,
+          school: this.select.school,
+          start_birthday: this.select.start_birthday,
+          end_birthday: this.select.end_birthday,
+          start_company_date: this.select.start_company_date,
+          end_company_date: this.select.end_company_date,
+          course_name: this.select.course_name,
+          company_has_share: this.select.company_has_share,
+          company_need_fund: this.select.company_need_fund,
+          company_position: this.select.company_position,
+          company_area: this.select.company_area,
+          company_type: this.select.company_type,
+          company_industry: this.select.company_industry,
+          is_vip: this.select.is_vip,
+          courses_end_date: this.select.courses_end_date,
+          is_schoolmate: this.select.is_schoolmate,
+          education: this.select.education,
+          type: this.select.type,
+          status: this.select.status,
           course_type: this.select.course_type
         })
         this.list = res.list.data
@@ -368,25 +479,33 @@
         download(
           '/api/admin/users/study',
           'get', {
-            export_fields: _export,
-            name: this.select.name,
-            mobile: this.select.mobile,
-            company_name: this.select.company_name,
-            course_name: this.select.course_name,
-            company_position: this.select.company_position,
-            company_area: this.select.company_area,
-            company_type: this.select.company_type,
-            company_industry: this.select.company_industry,
-            is_vip: this.select.is_vip,
-            courses_end_date: this.select.courses_end_date,
-            is_schoolmate: this.select.is_schoolmate,
-            education: this.select.education,
-            type: this.select.type,
-            status: this.select.status,
+            export_fields: _export,
+            keyword: this.select.keyword,
+            name: this.select.name,
+            mobile: this.select.mobile,
+            company_name: this.select.company_name,
+            school: this.select.school,
+            start_birthday: this.select.start_birthday,
+            end_birthday: this.select.end_birthday,
+            start_company_date: this.select.start_company_date,
+            end_company_date: this.select.end_company_date,
+            course_name: this.select.course_name,
+            company_has_share: this.select.company_has_share,
+            company_need_fund: this.select.company_need_fund,
+            company_position: this.select.company_position,
+            company_area: this.select.company_area,
+            company_type: this.select.company_type,
+            company_industry: this.select.company_industry,
+            is_vip: this.select.is_vip,
+            courses_end_date: this.select.courses_end_date,
+            is_schoolmate: this.select.is_schoolmate,
+            education: this.select.education,
+            type: this.select.type,
+            status: this.select.status,
             course_type: this.select.course_type,
             is_export: 1,
             page: 1,
-            page_size: 999
+            page_size: 99999
           },
           `学员信息.xlsx`)
       },