From 7a8e816d446c48ad1450cf3cd780bdeef7a730f1 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 9 Oct 2024 09:01:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=9C=BA=E5=9C=B0=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/book/appointment.vue               |  18 +-
 src/views/book/components/addAppointment.vue |  18 +-
 src/views/book/components/addBook.vue        |  34 +-
 src/views/book/components/checkBook.vue      |  12 +-
 src/views/book/components/showCount.vue      |   2 +-
 src/views/book/index.vue                     |  23 +-
 src/views/config/components/addTeacher.vue   |  78 +--
 src/views/course/txl.vue                     |   8 +-
 src/views/student/index.vue                  |  41 +-
 src/views/student/search.vue                 | 626 ++++++++++---------
 10 files changed, 477 insertions(+), 383 deletions(-)

diff --git a/src/views/book/appointment.vue b/src/views/book/appointment.vue
index 65f3a32..3c86093 100644
--- a/src/views/book/appointment.vue
+++ b/src/views/book/appointment.vue
@@ -39,7 +39,7 @@
             </template>
           </el-table-column>
         </template>
-        <template v-slot:dateRange>
+        <!-- <template v-slot:dateRange>
           <el-table-column align='center' label="可预约时间段" width="120" header-align="center">
             <template slot-scope="scope">
               <div v-if="scope.row.start_time">
@@ -48,7 +48,7 @@
               <div v-else></div>
             </template>
           </el-table-column>
-        </template>
+        </template> -->
         <template v-slot:btns>
           <el-table-column align='center' fixed="right" label="操作" width="180" header-align="center">
             <template slot-scope="scope">
@@ -118,12 +118,14 @@
           label: '场地容纳人数',
           align: 'center',
           width: 120,
-        },  {
-          prop: 'dateRange',
-          label: '可预约时间段',
-          align: 'center',
-          width: 120,
-        },{
+        },
+        // {
+        //   prop: 'dateRange',
+        //   label: '可预约时间段',
+        //   align: 'center',
+        //   width: 120,
+        // },
+        {
           prop: 'status',
           label: '状态',
           align: 'center',
diff --git a/src/views/book/components/addAppointment.vue b/src/views/book/components/addAppointment.vue
index 34c0ea6..383e965 100644
--- a/src/views/book/components/addAppointment.vue
+++ b/src/views/book/components/addAppointment.vue
@@ -112,7 +112,7 @@
           </div>
         </div>
       </template>
-      <template v-slot:dateRange>
+     <!-- <template v-slot:dateRange>
         <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>可预约时间段：
@@ -123,7 +123,7 @@
             </el-time-picker>
           </div>
         </div>
-      </template>
+      </template> -->
 
       <template v-slot:file_ids>
         <div class="xy-table-item">
@@ -195,10 +195,10 @@
           total: '',
           status: 1,
           use_student: 1,
-          dateRange: ['09:00','17:30'],
+          // dateRange: ['09:00','17:30'],
           file_ids: [],
-          start_time:'09:00',
-          end_time:'17:30',
+          // start_time:'09:00',
+          // end_time:'17:30',
           // door:'',
           // room:''
         },
@@ -283,7 +283,7 @@
           this.form.sort = res.sort?res.sort:0
           this.form.status = res.status ? res.status : 0
           this.form.use_student = res.use_student ? res.use_student : 0
-          this.form.dateRange = res.start_time?[res.start_time,res.end_time]:['','']
+          // this.form.dateRange = res.start_time?[res.start_time,res.end_time]:['','']
           // this.form.door = res.door?JSON.parse(res.door):''
           // this.form.room = res.room?JSON.parse(res.room):''
         })
@@ -311,10 +311,10 @@
             total: '',
             status: 1,
             use_student: 1,
-            dateRange: ['09:00','17:30'],
+            // dateRange: ['09:00','17:30'],
             file_ids: [],
-            start_time:'09:00',
-            end_time:'17:30'
+            // start_time:'09:00',
+            // end_time:'17:30'
           }
           this.$refs['dialog'].reset()
         }
diff --git a/src/views/book/components/addBook.vue b/src/views/book/components/addBook.vue
index 0b60754..1133862 100644
--- a/src/views/book/components/addBook.vue
+++ b/src/views/book/components/addBook.vue
@@ -86,7 +86,7 @@
             <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>预约场地：
           </div>
           <div class="xy-table-item-content">
-            <el-select v-model="form.site" placeholder="请选择预约场地" clearable style="width:100%">
+            <el-select v-model="siteData" @change="changeSite" multiple collapse-tags placeholder="请选择预约场地" clearable style="width:100%">
               <el-option v-for="item in site_options" :key="item.id" :label="item.real_name" :value="item.id">
               </el-option>
             </el-select>
@@ -159,7 +159,8 @@
         isShow: false,
         type: 'add',
         typeName: '手动预约',
-        id: '',
+        id: '',
+        siteData:[],
         form: {
           course_id: '',
           user_id: '',
@@ -224,6 +225,14 @@
           this.form.timeRange = ''
         }
       },
+      changeSite(e){
+        console.log("eqwe",e)
+        if(e.length>0){
+          this.form.site = e.join(",")
+        }else{
+          this.form.site = ''
+        }
+      },
       compareTime(startTime) {
         let date1 = this.$moment()
         let sign1 = this.$moment(startTime)
@@ -280,12 +289,16 @@
       getDetail() {
         show({
           id: this.id,
-          show_relation: ['user', 'appointmentConfig']
+          show_relation: ['user']
         }).then(res => {
           this.form = this.base.requestToForm(res, this.form)
           this.form.status = res.status ? res.status : 0
-          this.form.site = res.site?parseInt(res.site):''
-          this.form.timeRange = [res.start_time, res.end_time]
+          let _arr = res.site?res.site.split(","):[]
+          _arr.map(item=>{
+            this.siteData.push(parseInt(item))
+          })
+          this.form.timeRange = [res.start_time, res.end_time]
+
         })
       },
       formatHH(val) {
@@ -349,11 +362,11 @@
         const res = await getAppointment({
           page: 1,
           page_size: 999,
-          // filter: [{
-          //   key: 'status',
-          //   op: 'eq',
-          //   value: 1
-          // }]
+          filter: [{
+            key: 'status',
+            op: 'eq',
+            value: 1
+          }]
         })
         this.site_options = res.data
       },
@@ -393,6 +406,7 @@
           this.type = "add"
           this.typeName = '手动预约'
           this.course_id = ''
+          this.siteData = []
           this.form = {
             course_id: '',
             user_id: '',
diff --git a/src/views/book/components/checkBook.vue b/src/views/book/components/checkBook.vue
index 50090ae..b2808af 100644
--- a/src/views/book/components/checkBook.vue
+++ b/src/views/book/components/checkBook.vue
@@ -22,8 +22,14 @@
                 <span>{{submitObj.content}}</span>
               </div>
               <div>
-                <span>预约场地：</span>
-                <span>{{submitObj.appointment_config?submitObj.appointment_config.real_name:''}}</span>
+                <span>预约场地：</span>
+                <span v-if="submitObj.site_detail&&submitObj.site_detail.length>0">
+                  <template v-for="(item,index) in submitObj.site_detail">
+                    {{item.real_name}}
+                    <template v-if="index+1<submitObj.site_detail.length">,</template>
+                  </template>
+                </span>
+
               </div>
               <div>
                 <span>车牌：</span>
@@ -235,7 +241,7 @@
       async getDetail() {
         await show({
           id: this.id,
-          show_relation: ['user', 'appointmentAccompany', 'appointmentConfig', 'third_appointment_logs']
+          show_relation: ['user', 'appointmentAccompany', 'third_appointment_logs']
         }).then(res => {
           this.submitObj = this.base.deepCopy(res, this.submitObj)
           this.thirdArr = res.third_appointment_logs ? res.third_appointment_logs : []
diff --git a/src/views/book/components/showCount.vue b/src/views/book/components/showCount.vue
index dfcdcb1..d014b3a 100644
--- a/src/views/book/components/showCount.vue
+++ b/src/views/book/components/showCount.vue
@@ -140,7 +140,7 @@
           page: this.select.page,
           page_size: this.select.page_size,
           user_name: this.select.user_name,
-          show_relation: ['user', 'appointmentConfig'],
+          show_relation: ['user'],
         })
         this.list = res.data
         this.total = res.total
diff --git a/src/views/book/index.vue b/src/views/book/index.vue
index df074ac..bb7aa39 100644
--- a/src/views/book/index.vue
+++ b/src/views/book/index.vue
@@ -55,13 +55,17 @@
             </template>
           </el-table-column>
         </template>
-        <!--       <template v-slot:timerange>
-          <el-table-column align='center' label="预约时段" width="360" header-align="center">
+        <template v-slot:site_detail>
+          <el-table-column align='center' label="预约场地" width="240" header-align="center">
             <template slot-scope="scope">
-              {{scope.row.start_time}}-{{scope.row.end_time}}
+              <template v-if="scope.row.site_detail&&scope.row.site_detail.length>0">
+                <template v-for="(item,index) in scope.row.site_detail">
+                  {{item.real_name}}<template v-if="index+1<scope.row.site_detail.length">,</template>
+                </template>
+              </template>
             </template>
           </el-table-column>
-        </template> -->
+        </template>
 
         <template v-slot:btns>
           <el-table-column align='center' fixed="right" label="操作" width="280" header-align="center">
@@ -74,7 +78,8 @@
                 title="确定取消吗？">
                 <el-button type="primary" size="small" slot="reference">取消</el-button>
               </el-popconfirm>
-              <el-button  style="margin-left:10px" 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-left:10px" @confirm="deleteList(scope.row.id)" title="确定删除吗？">
                 <el-button type="danger" size="small" slot="reference">删除</el-button>
@@ -140,7 +145,7 @@
           align: 'center',
           width: 120,
         }, {
-          prop: 'appointment_config.real_name',
+          prop: 'site_detail',
           label: '预约场地',
           align: 'center',
           width: 120,
@@ -148,7 +153,7 @@
           prop: 'plate',
           label: '车牌',
           align: 'center',
-          // width: 180,
+          width: 180,
         }, {
           prop: 'accompany_total',
           label: '同行人数',
@@ -195,7 +200,7 @@
           page: this.select.page,
           page_size: this.select.page_size,
           user_name: this.select.user_name,
-          show_relation: ['user', 'appointmentConfig', 'third_appointment_logs'],
+          show_relation: ['user', 'third_appointment_logs'],
           filter: [{
             key: 'date',
             op: 'eq',
@@ -268,7 +273,7 @@
           'get', {
             user_name: this.select.user_name,
             export_fields: _export,
-            show_relation: ['user', 'appointmentConfig'],
+            show_relation: ['user'],
             filter: [{
               key: 'date',
               op: 'eq',
diff --git a/src/views/config/components/addTeacher.vue b/src/views/config/components/addTeacher.vue
index 2bfc922..c2c8b81 100644
--- a/src/views/config/components/addTeacher.vue
+++ b/src/views/config/components/addTeacher.vue
@@ -24,16 +24,16 @@
             </el-select>
           </div>
         </div>
-      </template>
-      <template v-slot:mobile>
-        <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-input v-model="form.mobile" placeholder="请输入联系方式" clearable style="width: 100%;"></el-input>
-          </div>
-        </div>
+      </template>
+      <template v-slot:mobile>
+        <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-input v-model="form.mobile" placeholder="请输入联系方式" clearable style="width: 100%;"></el-input>
+          </div>
+        </div>
       </template>
       <template v-slot:introduce>
         <div class="xy-table-item">
@@ -43,7 +43,6 @@
           <div class="xy-table-item-content">
             <el-input v-model="form.introduce" type="textarea" placeholder="请输入介绍" clearable
               style="width: 100%;"></el-input>
-
           </div>
         </div>
       </template>
@@ -70,29 +69,29 @@
         id: '',
         form: {
           name: '',
-          sex: '',
-          mobile:'',
+          sex: '',
+          mobile: '',
           introduce: ''
-        },
-        sex_options:[{
-          label:'男',
-          value:'男'
-        },{
-          label:'女',
-          value:'女'
+        },
+        sex_options: [{
+          label: '男',
+          value: '男'
+        }, {
+          label: '女',
+          value: '女'
         }],
         rules: {
-          name:[{
-            required:true,
-            message:'请输入姓名'
-          }],
-          sex:[{
-            required:true,
-            message:'请选择性别'
-          }],
-          mobile:[{
-            required:true,
-            message:'请输入联系方式'
+          name: [{
+            required: true,
+            message: '请输入姓名'
+          }],
+          sex: [{
+            required: true,
+            message: '请选择性别'
+          }],
+          mobile: [{
+            required: true,
+            message: '请输入联系方式'
           }]
         }
       }
@@ -120,7 +119,7 @@
         show({
           id: this.id
         }).then(res => {
-          this.form = this.base.requestToForm(res,this.form)
+          this.form = this.base.requestToForm(res, this.form)
         })
       }
     },
@@ -131,12 +130,12 @@
             this.getDetail()
           }
         } else {
-          this.id = ''
-          this.form = {
-            name: '',
-            sex: '',
-            mobile:'',
-            introduce: ''
+          this.id = ''
+          this.form = {
+            name: '',
+            sex: '',
+            mobile: '',
+            introduce: ''
           }
           this.$refs['dialog'].reset()
         }
@@ -149,7 +148,8 @@
 <style scoped lang="scss">
   ::v-deep .name,
   ::v-deep .sex,
-  ::v-deep .introduce {
+  ::v-deep .introduce,
+  ::v-deep .mobile {
     flex-basis: 100%;
   }
 </style>
diff --git a/src/views/course/txl.vue b/src/views/course/txl.vue
index 3629225..6f5db1f 100644
--- a/src/views/course/txl.vue
+++ b/src/views/course/txl.vue
@@ -247,7 +247,13 @@
             label: '报名时间',
             align: 'center',
             width: 180,
-          }, {
+          }, {
+            prop: 'user.plate',
+            label: '车牌号',
+            align: 'left',
+            width: 180,
+
+          },{
             prop: 'status',
             label: '审核状态',
             align: 'center',
diff --git a/src/views/student/index.vue b/src/views/student/index.vue
index 410af6d..749bbe3 100644
--- a/src/views/student/index.vue
+++ b/src/views/student/index.vue
@@ -134,6 +134,12 @@
                           </el-option> -->
                         </el-select>
                       </div>
+                      <div>
+                        <el-select v-model="select.has_openid" placeholder="是否绑定小程序" clearable>
+                          <el-option v-for="item in false_or_true" :key="item.id" :label="item.value" :value="item.id">
+                          </el-option>
+                        </el-select>
+                      </div>
                     </div>
 
                   </template>
@@ -196,9 +202,8 @@
         <template v-slot:is_schoolmate>
           <el-table-column align='center' label="是否校友库学员" width="120" header-align="center">
             <template slot-scope="scope">
-              <div v-for="item in is_schoolmate_list">
-                <el-tag v-if="scope.row.is_schoolmate===item.id" :type="item.type">{{item.value}}</el-tag>
-              </div>
+              <el-tag v-if="scope.row.is_schoolmate===1" type="">是</el-tag>
+              <el-tag v-else type="info">否</el-tag>
             </template>
           </el-table-column>
         </template>
@@ -212,7 +217,21 @@
               <div v-else>公益</div>
             </template>
           </el-table-column>
-        </template>
+        </template>
+        <template v-slot:is_wx>
+          <el-table-column align='center' label="是否绑定小程序" width="120" header-align="center">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.openid">
+                  是
+              </el-tag>
+              <el-tag v-else type="info">
+                  否
+              </el-tag>
+
+            </template>
+          </el-table-column>
+        </template>
+
         <template v-slot:btns>
           <el-table-column align='center' label="操作" fixed="right" width="180" header-align="center">
             <template slot-scope="scope">
@@ -287,7 +306,8 @@
           education: '',
           type: '',
           status: "",
-          course_type: '',
+          course_type: '',
+          has_openid:'',
           page: 1,
           page_size: 10,
         },
@@ -359,6 +379,11 @@
           label: '学员身份',
           align: 'center',
           width: 120,
+        },{
+          prop: 'is_wx',
+          label: '是否绑定小程序',
+          align: 'center',
+          width: 120,
         }]
 
       }
@@ -447,7 +472,8 @@
         this.select.education = ''
         this.select.type = ''
         this.select.status = ''
-        this.select.course_type = ''
+        this.select.course_type = ''
+        this.select.has_openid = ''
         this.select.page = 1
         this.getList()
       },
@@ -476,7 +502,8 @@
           is_schoolmate: this.select.is_schoolmate,
           education: this.select.education,
           type: this.select.type,
-          status: this.select.status,
+          status: this.select.status,
+          has_openid:this.select.has_openid,
           course_type: this.select.course_type
         })
         this.list = res.list.data
diff --git a/src/views/student/search.vue b/src/views/student/search.vue
index 99454bb..5d3066a 100644
--- a/src/views/student/search.vue
+++ b/src/views/student/search.vue
@@ -7,141 +7,151 @@
           <div slot="content">
 
             <div class="searchwrap" style="display: flex;align-items: center;">
-              <div>
-                <div>
-                  <el-input v-model="select.keyword" placeholder="请输入关键词"></el-input>
-                </div>
-                <xy-selectors style="width:auto" @reset="resetSelect" @search="select.page=1,getList()">
-                  <template v-slot:selected>
-                    <div class="selected-wrap">
-                      <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>
-                  </template>
-                </xy-selectors>
-
-
-
-
-
+              <div>
+                <div>
+                  <el-input v-model="select.keyword" placeholder="请输入关键词"></el-input>
+                </div>
+                <xy-selectors style="width:auto" @reset="resetSelect" @search="select.page=1,getList()">
+                  <template v-slot:selected>
+                    <div class="selected-wrap">
+                      <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-select v-model="select.has_openid" placeholder="是否绑定小程序" clearable>
+                          <el-option v-for="item in false_or_true" :key="item.id" :label="item.value" :value="item.id">
+                          </el-option>
+                        </el-select>
+                      </div>
+                    </div>
+                  </template>
+                </xy-selectors>
+
+
+
+
+
 
                 <div>
                   <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
@@ -160,13 +170,13 @@
     <div>
       <div class="txl">统计：本年度学员共计{{year_total}}人；累计学员{{alltotal}}人。</div>
       <xy-table :list="list" @pageIndexChange="pageIndexChange" @pageSizeChange="pageSizeChange" :total="total"
-        :table-item="table_item"  :showIndex="false">
-        <template v-slot:index>
-          <el-table-column align='center' fixed="left" label="" width="50" header-align="center">
-            <template slot-scope="scope">
-              {{getIndex(scope.$index)}}
-            </template>
-          </el-table-column>
+        :table-item="table_item" :showIndex="false">
+        <template v-slot:index>
+          <el-table-column align='center' fixed="left" label="" width="50" header-align="center">
+            <template slot-scope="scope">
+              {{getIndex(scope.$index)}}
+            </template>
+          </el-table-column>
         </template>
         <template v-slot:course_list>
           <el-table-column align='left' label="课程" width="320" header-align="center">
@@ -210,6 +220,20 @@
             </template>
           </el-table-column>
         </template>
+        <template v-slot:is_wx>
+          <el-table-column align='center' label="是否绑定小程序" width="120" header-align="center">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.openid">
+                是
+              </el-tag>
+              <el-tag v-else type="info">
+                否
+              </el-tag>
+
+            </template>
+          </el-table-column>
+        </template>
+
         <template v-slot:btns>
           <el-table-column align='center' label="操作" fixed="right" width="80" header-align="center">
             <template slot-scope="scope">
@@ -245,40 +269,41 @@
     data() {
       return {
         path: '',
-        // 多选 获取
-        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,
+        // 多选 获取
+        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: '',
+          has_openid: '',
+          page: 1,
+          page_size: 10,
         },
         courseTypeList: [],
         list: [],
@@ -291,7 +316,7 @@
           align: 'center',
           width: 50,
           fixed: 'left'
-        },{
+        }, {
           prop: 'course_list',
           label: '课程名称',
           align: 'left',
@@ -328,8 +353,8 @@
         }, {
           prop: 'company_name',
           label: '公司名称',
-          align: 'left',
-          width:200
+          align: 'left',
+          width: 200
         }, {
           prop: 'company_position',
           label: '职务',
@@ -345,6 +370,11 @@
           label: '学员身份',
           align: 'center',
           width: 120,
+        }, {
+          prop: 'is_wx',
+          label: '是否绑定小程序',
+          align: 'center',
+          width: 120,
         }]
 
       }
@@ -353,32 +383,32 @@
       this.getList()
       this.getCourseType()
     },
-    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 = ''
-        }
-      },
+    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
@@ -388,72 +418,74 @@
         this.select.page_size = e
         this.select.page = 1
         this.getList()
-      },
-      getIndex(e){
-        let perSize = (this.select.page -1 ) * this.select.page_size
-        let index = perSize + e + 1
-        return index
       },
-      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 = ''
+      getIndex(e) {
+        let perSize = (this.select.page - 1) * this.select.page_size
+        let index = perSize + e + 1
+        return index
+      },
+      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.has_openid = ''
         this.select.page = 1
         this.getList()
       },
       async getList() {
         const res = await indexStudy({
-          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,
+          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,
+          has_openid: this.select.has_openid,
           course_type: this.select.course_type
         })
         this.list = res.list.data
@@ -474,43 +506,44 @@
         this.$refs.studentDetail.isShow = true
       },
       exportExcel() {
-        let _export = {
-          'course_signs.0.course.name':'课程名称'
+        let _export = {
+          'course_signs.0.course.name': '课程名称'
         }
-        this.selectFormList.map(item => {
-          if(item.prop==='index'){
-
-          }else{
-            _export[item.field] = item.name
+        this.selectFormList.map(item => {
+          if (item.prop === 'index') {
+
+          } else {
+            _export[item.field] = item.name
           }
         })
         download(
           '/api/admin/users/study',
           'get', {
-            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,
+            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,
+            has_openid: this.select.has_openid,
             is_export: 1,
             page: 1,
             page_size: 99999
@@ -546,7 +579,8 @@
     align-items: center;
     flex-wrap: wrap;
 
-    &>div,.selected-wrap  {
+    &>div,
+    .selected-wrap {
       display: flex;
       align-items: center;
       // margin-bottom: 10px;