From 4ea08828ecf03d2e743ce5cbfc363f7b000bfc89 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 25 Sep 2024 09:57:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/common.js             |  6 +--
 src/views/course/apply_list.vue | 70 +++++++++++++++++--------
 src/views/course/history.vue    | 31 ++++++-----
 src/views/course/txl.vue        | 93 ++++++++++++++++++++++++---------
 src/views/student/index.vue     |  2 +-
 5 files changed, 139 insertions(+), 63 deletions(-)

diff --git a/src/utils/common.js b/src/utils/common.js
index 5b77449..b65c343 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -25,7 +25,7 @@ let base = {
   isUrl (url) {
     return this.checkUrl(url)
   },
-  isNull(val){
+  isNull(p) {
     return p == '' || p == undefined || p == null || p == 'undefined' || p == 'null';
   },
   // 手机号*号
@@ -286,10 +286,6 @@ let base = {
     }
     return nodes
   },
-
-  isNull(p) {
-    return p == '' || p == undefined || p == null || p == 'undefined' || p == 'null';
-  },
   deepCopy(data) {
     //string,number,bool,null,undefined,symbol
     //object,array,date
diff --git a/src/views/course/apply_list.vue b/src/views/course/apply_list.vue
index cae490b..66b980f 100644
--- a/src/views/course/apply_list.vue
+++ b/src/views/course/apply_list.vue
@@ -19,45 +19,56 @@
                       <div>
                         <el-input v-model="select.mobile" placeholder="请输入手机号"></el-input>
                       </div>
+                      <div style="width:200px">
+                        <el-select v-model="typeSelect" placeholder="请选择个人荣誉"  @change="(e)=>{changeSelectType(e,'type')}" multiple collapse-tags 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
+                        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>
                         <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_area" placeholder="请选择所属区域" clearable>
+                      <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>
-                        <el-select v-model="select.company_type" placeholder="请选择企业资质" clearable>
+                      <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>
-                        <el-select v-model="select.company_industry" placeholder="请选择所属领域" clearable>
+                      <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-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"
+                          <!-- <el-option v-for="item in formSelect.company_industry_detail" :key="item.id" :label="item.value"
                             :value="item.value">
-                          </el-option>
+                          </el-option> -->
                         </el-select>
                       </div>
                       <div>
@@ -159,7 +170,12 @@
     },
     data() {
       return {
-        subjectObj: {},
+        subjectObj: {},
+        companyType: [],
+        typeSelect: [],
+        educationType:[],
+        companyIndustry:[],
+        companyArea:[],
         select: {
           name: '',
           mobile: '',
@@ -267,7 +283,14 @@
       }
       this.getList()
     },
-    methods: {
+    methods: {
+      changeSelectType(e, selectName) {
+        if (e) {
+          this.select[selectName] = e.join(",")
+        } else {
+          this.select[selectName] = ''
+        }
+      },
       pageIndexChange(e) {
         this.select.page = e
         this.getList()
@@ -282,7 +305,12 @@
         let index = perSize + e + 1
         return index
       },
-      resetSelect() {
+      resetSelect() {
+        this.companyType = []
+        this.typeSelect = []
+        this.educationType=[]
+        this.companyIndustry=[]
+        this.companyArea=[]
         this.select.name = ''
         this.select.mobile = ''
         this.select.company_name = ''
diff --git a/src/views/course/history.vue b/src/views/course/history.vue
index c5fcb1b..dc0adcc 100644
--- a/src/views/course/history.vue
+++ b/src/views/course/history.vue
@@ -125,7 +125,13 @@
           label: '报名截止日期',
           align: 'center',
           width: 120,
-        }, {
+        },{
+          prop: 'sign_pass_total',
+          label: '学员人数',
+          align: 'center',
+          width: 120,
+        },
+        {
           prop: 'type_detail.name',
           label: '课程体系',
           align: 'center',
@@ -229,17 +235,18 @@
       },
 
       toTxl(row) {
-        let value = row.type_detail.name
-
-        this.$router.push({
-          path: '/course/txl',
-          query: {
-            title: row.name,
-            id: row.id,
-            date: row.start_date + '至' + row.end_date,
-            leibie: value,
-            is_history: true
-          }
+        let value = row.type_detail.name
+
+        this.$router.push({
+          path: '/course/txl',
+          query: {
+            title: row.name,
+            id: row.id,
+            date: row.start_date ? row.start_date + '至' + row.end_date : '',
+            leibie: value,
+            is_history: row.course_status === 40 ? true : false,
+            is_fee:row.is_fee
+          }
         })
       },
       toPay(row) {
diff --git a/src/views/course/txl.vue b/src/views/course/txl.vue
index c4a5e50..3629225 100644
--- a/src/views/course/txl.vue
+++ b/src/views/course/txl.vue
@@ -15,47 +15,59 @@
                       <div>
                         <el-input v-model="select.mobile" placeholder="请输入手机号"></el-input>
                       </div>
+                      <div  style="width:200px">
+                        <el-select v-model="typeSelect" placeholder="请选择个人荣誉"  @change="(e)=>{changeSelectType(e,'type')}" multiple collapse-tags 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
+                        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>
                         <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_area" placeholder="请选择所属区域" clearable>
+                      <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>
-                        <el-select v-model="select.company_type" placeholder="请选择企业资质" clearable>
+                      <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>
-                        <el-select v-model="select.company_industry" placeholder="请选择所属领域" clearable>
+                      <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-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"
+                          <!-- <el-option v-for="item in formSelect.company_industry_detail" :key="item.id" :label="item.value"
                             :value="item.value">
-                          </el-option>
+                          </el-option> -->
                         </el-select>
                       </div>
+
                     </div>
                   </template>
                 </xy-selectors>
@@ -100,12 +112,15 @@
           </el-table-column>
         </template>
         <template v-slot:btns>
-          <el-table-column align='left' fixed="right" label="操作" width="240" header-align="center">
+          <el-table-column align='left' fixed="right" label="操作" width="320" header-align="center">
             <template slot-scope="scope">
               <el-button type="primary" v-if="scope.row.status===1 " size="small"
                 @click="showDetail('setPosition',scope.row)">设置班委</el-button>
               <el-button type="primary" size="small" @click="editSign('editor',scope.row)">编辑</el-button>
-              <el-button type="primary" size="small" @click="showDetail('checkshow',scope.row)">查看</el-button>
+              <el-button type="primary" size="small" @click="showDetail('checkshow',scope.row)">查看</el-button>
+              <el-popconfirm style="margin:0 10px" @confirm="deleteList(scope.row.id)" title="确定删除吗？">
+                <el-button type="danger" size="small" slot="reference">删除</el-button>
+              </el-popconfirm>
             </template>
           </el-table-column>
         </template>
@@ -124,7 +139,8 @@
   import myMixins from "@/mixin/selectMixin.js";
   import formMixin from "@/mixin/formMixin.js";
   import {
-    index
+    index,
+    destroy
   } from '@/api/apply/index.js'
   import {
     download
@@ -142,7 +158,12 @@
     },
     data() {
       return {
-        subjectObj: {},
+        subjectObj: {},
+        companyType: [],
+        typeSelect: [],
+        educationType:[],
+        companyIndustry:[],
+        companyArea:[],
         select: {
           name: '',
           mobile: '',
@@ -246,7 +267,14 @@
       this.getAutoForm()
       this.getList()
     },
-    methods: {
+    methods: {
+      changeSelectType(e, selectName) {
+        if (e) {
+          this.select[selectName] = e.join(",")
+        } else {
+          this.select[selectName] = ''
+        }
+      },
       pageIndexChange(e) {
         this.select.page = e
         this.getList()
@@ -262,6 +290,11 @@
         return index
       },
       resetSelect(){
+        this.companyType = []
+        this.typeSelect = []
+        this.educationType=[]
+        this.companyIndustry=[]
+        this.companyArea=[]
         this.select.name = ''
         this.select.mobile = ''
         this.select.company_name = ''
@@ -294,7 +327,7 @@
           }, {
             key: 'status',
             op: 'eq',
-            value: 1
+            value: '1'
           }, {
             key: 'fee_status',
             op: 'eq',
@@ -335,6 +368,18 @@
         this.$refs.editSign.row = row
         this.$refs.editSign.formList = this.formList
         this.$refs.editSign.isShow = true
+      },
+      deleteList(id) {
+        var that = this;
+        destroy({
+          id: id,
+        }).then(response => {
+          this.$Message.success('删除成功');
+          this.getList()
+        }).catch(error => {
+          console.log(error)
+          reject(error)
+        })
       },
       exportExcel() {
         let _export = {}
diff --git a/src/views/student/index.vue b/src/views/student/index.vue
index 82cc667..410af6d 100644
--- a/src/views/student/index.vue
+++ b/src/views/student/index.vue
@@ -50,7 +50,7 @@
                         <el-input v-model="select.school" placeholder="请输入最高毕业院校"></el-input>
                       </div>
                       <div>
-                        <el-select  style="width:100%" v-model="educationType"
+                        <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">