From 7f6e4535691528e2ddea07f9a28e32cf417148a5 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 30 Dec 2024 13:05:01 +0800
Subject: [PATCH] up

---
 src/mixin/formMixin.js                    | 12 +++++-----
 src/views/course/components/applyForm.vue |  5 +++--
 src/views/student/index.vue               | 14 +++++++++---
 src/views/student/search.vue              | 27 ++++++++++++++++-------
 4 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/src/mixin/formMixin.js b/src/mixin/formMixin.js
index 9b28ad6..aea8881 100644
--- a/src/mixin/formMixin.js
+++ b/src/mixin/formMixin.js
@@ -145,7 +145,7 @@ export default {
         name: '融资情况',
         field: 'company_fund',
         rule: '',
-        edit_input: "text",
+        edit_input: "textarea",
         help: '请输入融资情况',
         need_fill: 0,
         belong_user: 1,
@@ -192,7 +192,7 @@ export default {
         name: '产品',
         field: 'company_product',
         rule: '',
-        edit_input: "text",
+        edit_input: "textarea",
         help: '请输入产品',
         need_fill: 0,
         belong_user: 1,
@@ -377,7 +377,7 @@ export default {
           name: '个人简介',
           field: 'introduce',
           rule: '',
-          edit_input: "text",
+          edit_input: "textarea",
           help: '请体现个人的优势，详细描述个人学习经历、所在校友会、工作经历、社会职务和其他荣誉等。',
           need_fill: 0,
           belong_user: 1,
@@ -399,7 +399,7 @@ export default {
           name: '公司简介',
           field: 'company_introduce',
           rule: '',
-          edit_input: "text",
+          edit_input: "textarea",
           help: '请阐述公司近两年销售额、人员规模、专利等情况（请如实填写，这将影响您的报名情况）',
           need_fill: 0,
           belong_user: 1,
@@ -494,7 +494,7 @@ export default {
           name: '融资情况',
           field: 'company_fund',
           rule: '',
-          edit_input: "text",
+          edit_input: "textarea",
           help: '请输入融资情况',
           need_fill: 0,
           belong_user: 1,
@@ -543,7 +543,7 @@ export default {
           name: '公司主营业务',
           field: 'company_product',
           rule: '',
-          edit_input: "text",
+          edit_input: "textarea",
           help: '请详细描述具体内容',
           need_fill: 0,
           belong_user: 1,
diff --git a/src/views/course/components/applyForm.vue b/src/views/course/components/applyForm.vue
index 4e78cea..86b8dae 100644
--- a/src/views/course/components/applyForm.vue
+++ b/src/views/course/components/applyForm.vue
@@ -211,8 +211,9 @@
           edit_to_migration,
           validation_rules
         } = await config(false);
-        this.rules = validation_rules
-        this.types = edit_to_migration.filter(item => item.edit_input !== 'textarea' && item.edit_input !==
+        this.rules = validation_rules
+        // item.edit_input !== 'textarea' &&
+        this.types = edit_to_migration.filter(item =>  item.edit_input !==
           "richtext" &&
           item.edit_input !== "file" && item.edit_input !== "map");
 
diff --git a/src/views/student/index.vue b/src/views/student/index.vue
index 749bbe3..e038c91 100644
--- a/src/views/student/index.vue
+++ b/src/views/student/index.vue
@@ -14,6 +14,11 @@
                 <xy-selectors style="width:auto" @reset="resetSelect" @search="select.page=1,getList()">
                   <template v-slot:selected>
                     <div class="selected-wrap">
+                      <div>
+                        <el-date-picker style="width:100%" v-model="select.year"
+                          type="year" placeholder="查询年份" value-format="yyyy" format="yyyy">
+                        </el-date-picker>
+                      </div>
                       <div>
                         <el-input v-model="select.course_name" placeholder="请输入课程名称"></el-input>
                       </div>
@@ -285,7 +290,8 @@
         companyArea:[],
         select: {
           keyword: '',
-          name: '',
+          name: '',
+          year:'',
           mobile: '',
           course_name: '',
           company_name: '',
@@ -449,7 +455,8 @@
         this.companyIndustry=[]
         this.companyArea=[]
         this.select.keyword = ''
-        this.select.name = ''
+        this.select.name = ''
+        this.select.year = ''
         this.select.mobile = ''
         this.select.company_name = ''
         this.select.school = ''
@@ -482,7 +489,8 @@
           page: this.select.page,
           page_size: this.select.page_size,
           keyword: this.select.keyword,
-          name: this.select.name,
+          name: this.select.name,
+          year:this.select.year?this.select.year:'',
           mobile: this.select.mobile,
           company_name: this.select.company_name,
           school: this.select.school,
diff --git a/src/views/student/search.vue b/src/views/student/search.vue
index 04e1972..946569f 100644
--- a/src/views/student/search.vue
+++ b/src/views/student/search.vue
@@ -13,7 +13,12 @@
                 </div>
                 <xy-selectors style="width:auto" @reset="resetSelect" @search="select.page=1,getList()">
                   <template v-slot:selected>
-                    <div class="selected-wrap">
+                    <div class="selected-wrap">
+                      <div>
+                        <el-date-picker style="width:100%" v-model="select.year"
+                          type="year" placeholder="查询年份" value-format="yyyy" format="yyyy">
+                        </el-date-picker>
+                      </div>
                       <div>
                         <el-input v-model="select.course_name" placeholder="请输入课程名称"></el-input>
                       </div>
@@ -168,7 +173,7 @@
     </div>
 
     <div>
-      <div class="txl">统计：本年度学员共计{{year_total}}人；累计学员{{alltotal}}人。</div>
+      <div class="txl">统计：{{searyear?searyear+'年':'本年度'}}学员共计{{year_total}}人；学员总计{{alltotal}}人。</div>
       <xy-table :list="list" @pageIndexChange="pageIndexChange" @pageSizeChange="pageSizeChange" :total="total"
         :table-item="table_item" :showIndex="false">
         <template v-slot:index>
@@ -278,7 +283,8 @@
         companyIndustry: [],
         companyArea: [],
         select: {
-          keyword: '',
+          keyword: '',
+          year:'',
           name: '',
           mobile: '',
           course_name: '',
@@ -309,7 +315,8 @@
         list: [],
         year_total: 0,
         alltotal: 0,
-        total: 0,
+        total: 0,
+        searyear:'',
         table_item: [{
           prop: 'index',
           label: '',
@@ -431,7 +438,8 @@
         this.companyIndustry = []
         this.companyArea = []
         this.select.keyword = ''
-        this.select.name = ''
+        this.select.name = ''
+        this.select.year = ''
         this.select.mobile = ''
         this.select.company_name = ''
         this.select.school = ''
@@ -464,7 +472,8 @@
           page: this.select.page,
           page_size: this.select.page_size,
           keyword: this.select.keyword,
-          name: this.select.name,
+          name: this.select.name,
+          year:this.select.year?this.select.year:'',
           mobile: this.select.mobile,
           company_name: this.select.company_name,
           school: this.select.school,
@@ -491,7 +500,8 @@
         this.list = res.list.data
         this.total = res.list.total
         this.year_total = res.year_total
-        this.alltotal = res.total
+        this.alltotal = res.total
+        this.searyear = this.select.year?this.select.year:''
       },
       changeDate(e) {
         if (e) {
@@ -521,7 +531,8 @@
           'get', {
             export_fields: _export,
             keyword: this.select.keyword,
-            name: this.select.name,
+            name: this.select.name,
+            year:this.select.year?this.select.year:'',
             mobile: this.select.mobile,
             company_name: this.select.company_name,
             school: this.select.school,