修改

src/mixin/formMixin.js

@@ -129,11 +129,11 @@ export default {
         sort: 0,
         span: 2
       }, {
-        name: '企业性质',
+        name: '企业资质',
         field: 'company_type',
         rule: '',
         edit_input: "checkbox",
-        help: '请选择企业性质',
+        help: '请选择企业资质',
         need_fill: 0,
         belong_user: 1,
         select_item: [],
@@ -374,6 +374,17 @@ export default {
         belong_user_table: 'education',
         sort: 0,
       }, {
+        name: '个人简介',
+        field: 'introduce',
+        rule: '',
+        edit_input: "text",
+        help: '请体现个人的优势，详细描述个人学习经历、所在校友会、工作经历、社会职务和其他荣誉等。',
+        need_fill: 0,
+        belong_user: 1,
+        belong_user_table: 'introduce',
+        sort: 0,
+        span: 2
+      },  {
         name: '公司',
         field: 'company_name',
         rule: '',
@@ -384,7 +395,28 @@ export default {
         belong_user_table: 'company_name',
         sort: 0,
         span: 2
+      },  {
+        name: '公司简介',
+        field: 'company_introduce',
+        rule: '',
+        edit_input: "text",
+        help: '请阐述公司近两年销售额、人员规模、专利等情况（请如实填写，这将影响您的报名情况）',
+        need_fill: 0,
+        belong_user: 1,
+        belong_user_table: 'company_introduce',
+        sort: 0,
+        span: 2
       }, {
+        name: '公司成立时间',
+        field: 'company_date',
+        rule: '',
+        edit_input: "date",
+        help: '请选择公司成立时间',
+        need_fill: 0,
+        belong_user: 1,
+        belong_user_table: 'company_date',
+        sort: 0,
+      },  {
         name: '职务',
         field: 'company_position',
         rule: '',

src/views/component/imports.vue

@@ -83,7 +83,7 @@
         let _except = []
         // 学员去除一些信息
         if (this.tableName === 'users') {
-          _except = ['introduce','honour','company_need_fund','company_other','remark','plate', 'is_import', 'is_vip', 'is_schoolmate', 'appointment_total', 'letter', 'score', 'code',
+          _except = ['honour','company_need_fund','company_other','remark','plate', 'is_import', 'is_vip', 'is_schoolmate', 'appointment_total', 'letter', 'score', 'code',
             'pid'
           ]
         }

src/views/course/apply_list.vue

@@ -28,7 +28,7 @@
                   </el-select>
                 </div>
                 <div>
-                  <el-select v-model="select.company_type" placeholder="请选择企业性质" clearable>
+                  <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>
@@ -36,14 +36,14 @@
                 </div>
 
                 <div>
-                  <el-select v-model="select.company_industry" placeholder="请选择所属行业" clearable>
+                  <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-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>

src/views/course/components/addCourse.vue

@@ -232,8 +232,8 @@
                   <Button v-if="formList.length>0" ghost type="primary" @click="editForm('editor')">编辑表单</Button>
                   <Button v-else ghost type="primary" @click="editForm('add')">新增表单</Button>
                 </template>
-                <el-form style="min-height: 300px;display: flex;flex-wrap: wrap;" label-width="80px"
+                <el-form style="min-height: 300px;display: flex;flex-wrap: wrap;justify-content: space-between;padding: 0 4%;" label-width="80px"
-                  label-position="right" size="small">
+                  label-position="top" size="small">
                   <!-- <el-divider>基础字段</el-divider>
                   <el-form-item :label="i.name" :required="
                       i.rule ? !!i.rule.includes('required') : false
@@ -245,7 +245,7 @@
                     <el-input placeholder="选填字段" :disabled="true"></el-input>
                   </el-form-item> -->
                   <el-divider>表单字段</el-divider>
-                  <el-form-item style="flex-basis: 100%;" :label="i.name || '字段名称'" :required="
+                  <el-form-item style="flex-basis: 45%;" :label="i.name || '字段名称'" :required="
                         i.rule ? !!i.rule.includes('required') : false
                       " v-for="(i, index) in formList">
                     <formSlotRender :config="i" :index="index"></formSlotRender>

src/views/course/components/applyForm.vue

@@ -34,8 +34,8 @@
                     style="position: relative; inset: 0 0 0 0; height: 100%" width="80%" top="40px" :visible="true"
                     :modal="false" :append-to-body="false" :modal-append-to-body="false">
 
-                    <el-form style="min-height: 500px;display: flex;flex-wrap: wrap;" label-width="80px"
+                    <el-form style="min-height: 500px;display: flex;flex-wrap: wrap;padding: 0 4%;" label-width="80px"
-                      label-position="right" size="small">
+                      label-position="top" size="small">
                       <!-- <el-divider>表单字段</el-divider> -->
                       <!-- <el-form-item :label="i.name" :required="
                           i.rule ? !!i.rule.includes('required') : false

src/views/course/txl.vue

@@ -26,7 +26,7 @@
                   </el-select>
                 </div>
                 <div>
-                  <el-select v-model="select.company_type" placeholder="请选择企业性质" clearable>
+                  <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>
@@ -34,14 +34,14 @@
                 </div>
 
                 <div>
-                  <el-select v-model="select.company_industry" placeholder="请选择所属行业" clearable>
+                  <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-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>

src/views/student/components/editDetail.vue

@@ -70,6 +70,16 @@
           </div>
         </div>
       </template>
+      <template v-slot:introduce>
+        <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.introduce" type="textarea" placeholder="请输入个人简介" clearable style="width: 100%;"></el-input>
+          </div>
+        </div>
+      </template>
       <template v-slot:company_name>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
@@ -80,6 +90,29 @@
           </div>
         </div>
       </template>
+      <template v-slot:company_introduce>
+        <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.company_introduce" type="textarea" placeholder="请输入公司简介" clearable style="width: 100%;"></el-input>
+          </div>
+        </div>
+      </template>
+      <template v-slot:company_date>
+        <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-date-picker style="width: 100%;" v-model="form.company_date" type="date" value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd" placeholder="公司成立时间">
+            </el-date-picker>
+          </div>
+        </div>
+      </template>
+
       <template v-slot:company_position>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
@@ -106,10 +139,10 @@
       <template v-slot:type>
         <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="typeList" @change="changeType" multiple placeholder="请选择人才类型" clearable style="width: 100%;">
+            <el-select v-model="typeList" @change="changeType" multiple placeholder="请选择个人荣誉" clearable style="width: 100%;">
               <el-option v-for="(item,index) in formSelect.type" :key="index" :label="item.value" :value="item.value">
               </el-option>
             </el-select>
@@ -119,10 +152,10 @@
       <template v-slot:company_type>
         <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="companyTypeList" multiple placeholder="请选择企业性质" clearable style="width: 100%;">
+            <el-select v-model="companyTypeList" multiple placeholder="请选择企业资质" clearable style="width: 100%;">
               <el-option v-for="(item,index) in formSelect.company_type" :key="index" :label="item.value" :value="item.value">
               </el-option>
             </el-select>
@@ -155,10 +188,10 @@
       <template v-slot:company_industry>
         <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_industry" placeholder="请选择所属行业" clearable style="width: 100%;">
+            <el-select v-model="form.company_industry" placeholder="请选择所属领域" clearable style="width: 100%;">
               <el-option v-for="(item,index) in formSelect.company_industry" :key="index" :label="item.value" :value="item.value">
               </el-option>
             </el-select>
@@ -275,7 +308,7 @@
           </div>
           <div class="xy-table-item-content">
             <el-select v-model="form.is_yuanhe" placeholder="请选择是否为元禾投资企业" clearable style="width: 100%;">
-              <el-option v-for="(item,index) in formSelect.is_yuanhe" :key="index" :label="item.value" :value="item.value">
+              <el-option v-for="(item,index) in yuanheList" :key="index" :label="item.value" :value="item.value">
               </el-option>
             </el-select>
           </div>
@@ -307,7 +340,9 @@
           mobile:"",
           idcard:"",
           education:'',
+          introduce:'',
           company_name:'',
+          company_introduce:'',
           company_position:'',
           company_has_share:'',
           type:'',

src/views/student/index.vue

@@ -8,6 +8,12 @@
 
             <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>
@@ -17,12 +23,23 @@
                 <div>
                   <el-input v-model="select.company_name" placeholder="请输入公司名称"></el-input>
                 </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-input v-model="select.course_name" placeholder="请输入课程名称"></el-input>
+                  <el-input v-model="select.company_position" placeholder="请输入职务"></el-input>
                 </div>
 
                 <div>
-                  <el-input v-model="select.company_position" placeholder="请输入职务"></el-input>
+                  <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>
@@ -32,7 +49,7 @@
                   </el-select>
                 </div>
                 <div>
-                  <el-select v-model="select.company_type" placeholder="请选择企业性质" clearable>
+                  <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>
@@ -40,14 +57,14 @@
                 </div>
 
                 <div>
-                  <el-select v-model="select.company_industry" placeholder="请选择所属行业" clearable>
+                  <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-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>
@@ -206,11 +223,16 @@
     data() {
       return {
         path: '',
+        companyDates:[],
         select: {
+          keyword:'',
           name: '',
           mobile: '',
           course_name: '',
           company_name: '',
+          start_company_date: '',
+          end_company_date: '',
+          company_has_share: '',
           company_position: '',
           company_area: '',
           company_type: '',
@@ -277,7 +299,7 @@
           prop: 'company_name',
           label: '公司名称',
           align: 'left',
-          width:200
+          width: 200
         }, {
           prop: 'company_position',
           label: '职务',
@@ -302,6 +324,15 @@
       this.getCourseType()
     },
     methods: {
+      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 = ''
+        }
+      },
       importTable(row) {
         // this.$refs.imports.tableData = {
         //   'data[course_id]': row.course_id,
@@ -320,15 +351,20 @@
         this.select.page = 1
         this.getList()
       },
-      getIndex(e){
+      getIndex(e) {
-        let perSize = (this.select.page -1 ) * this.select.page_size
+        let perSize = (this.select.page - 1) * this.select.page_size
         let index = perSize + e + 1
         return index
       },
       resetSelect() {
+        this.select.keyword = ''
         this.select.name = ''
         this.select.mobile = ''
         this.select.company_name = ''
+        this.select.company_has_share = ''
+        this.select.start_company_date = ''
+        this.select.end_company_date = ''
+        this.companyDates=[]
         this.select.course_name = ''
         this.select.company_position = ''
         this.select.company_area = ''
@@ -348,10 +384,14 @@
         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,
+          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_position: this.select.company_position,
           company_area: this.select.company_area,
           company_type: this.select.company_type,

src/views/student/search.vue

@@ -32,7 +32,7 @@
                   </el-select>
                 </div>
                 <div>
-                  <el-select v-model="select.company_type" placeholder="请选择企业性质" clearable>
+                  <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>
@@ -40,14 +40,14 @@
                 </div>
 
                 <div>
-                  <el-select v-model="select.company_industry" placeholder="请选择所属行业" clearable>
+                  <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-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>

src/views/student/user.vue

@@ -1,241 +0,0 @@
-<template>
-  <div>
-
-    <div>
-      <div ref="lxHeader">
-        <lx-header icon="md-apps" :text="$route.meta.title" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
-          <div slot="content">
-
-            <div class="searchwrap" style="display: flex;align-items: center;">
-              <div v-if="path==2">
-                <div>
-                  <el-input v-model="select.course_name" placeholder="请输入课程名称"></el-input>
-                </div>
-              </div>
-              <div v-else>
-                <div>
-                  <el-input v-model="select.name" placeholder="请输入姓名"></el-input>
-                </div>
-                <div>
-                  <el-input v-model="select.company_name" placeholder="请输入公司名称"></el-input>
-                </div>
-                <div>
-                  <el-select v-model="select.company_position" placeholder="请选择职务" clearable>
-                    <el-option v-for="item in company_position_list" :key="item.id" :label="item.value"
-                      :value="item.id">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div>
-                  <el-select v-model="select.company_type" placeholder="请选择企业性质" clearable>
-                    <el-option v-for="item in company_type_list" :key="item.id" :label="item.value" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div>
-                  <el-select v-model="select.company_area" placeholder="请选择所属区域" clearable>
-                    <el-option v-for="item in company_area_list" :key="item.id" :label="item.value" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div>
-                  <el-select v-model="select.company_industry" placeholder="请选择所属行业" clearable>
-                    <el-option v-for="item in company_industry_list" :key="item.id" :label="item.value"
-                      :value="item.id">
-                    </el-option>
-                  </el-select>
-                </div>
-              </div>
-              <div>
-                <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
-                <el-button v-if="path==2" type="primary" size="small">导出</el-button>
-              </div>
-            </div>
-          </div>
-
-        </lx-header>
-      </div>
-    </div>
-
-    <div>
-      <div v-if="path==2" style="margin-bottom:10px">统计：本年度学员共计{{year_total}}人；累计学员{{alltotal}}人。</div>
-      <xy-table :list="list" @pageIndexChange="pageIndexChange" @pageSizeChange="pageSizeChange" :total="total" :table-item="table_item">
-        <template v-slot:btns>
-          <el-table-column align='center' label="操作" fixed="right" width="80" header-align="center">
-            <template slot-scope="scope">
-              <el-button type="primary" size="small" @click="showDetail('show',scope.row.id)">查看</el-button>
-            </template>
-          </el-table-column>
-        </template>
-      </xy-table>
-    </div>
-
-    <student-detail ref="studentDetail"></student-detail>
-  </div>
-</template>
-
-<script>
-  import studentDetail from './components/detail.vue';
-  import myMixins from "@/mixin/selectMixin.js";
-  import {
-    indexStudy
-  } from '@/api/student/index.js'
-  export default {
-    mixins: [myMixins],
-    components: {
-      studentDetail
-    },
-    data() {
-      return {
-        path: '',
-        select: {
-          name: '',
-          course_name: '',
-          company_name: '',
-          company_position: '',
-          company_area: '',
-          company_type: '',
-          company_industry: '',
-          page: 1,
-          page_size: 10,
-        },
-        company_position_list: [],
-        company_type_list: [],
-        company_industry_list: [],
-        company_area_list: [],
-        list: [],
-        year_total:0,
-        alltotal:0,
-        total: 0,
-        table_item: [{
-          prop: 'username',
-          label: '姓名',
-          align: 'center',
-          width: 120
-        }, {
-          prop: 'sex',
-          label: '性别',
-          align: 'center',
-          width: 120
-        },{
-          prop: 'idcard',
-          label: '身份证号',
-          align: 'center',
-          width: 180
-        }, {
-          prop: 'mobile',
-          label: '联系方式',
-          align: 'center',
-          width: 120,
-        }, {
-          prop: 'birthday',
-          label: '出生年月',
-          align: 'center',
-          width: 120,
-        }, {
-          prop: 'email',
-          label: '邮箱',
-          align: 'center',
-          width: 120,
-        },{
-          prop: 'company_name',
-          label: '公司名称',
-          align: 'left',
-        }, {
-          prop: 'company_position',
-          label: '职务',
-          align: 'center',
-          width: 120,
-        }]
-
-      }
-    },
-    created() {
-      const _path = this.$route.path.split("_")
-      console.log("_path", this.$route, _path)
-      this.path = _path[1]
-      if (this.path == 2) {
-        this.table_item.unshift({
-          prop: 'courses.name',
-          label: '课程名称',
-          align: 'left',
-          width: 200,
-        })
-      }
-      this.getList()
-    },
-    methods: {
-      pageIndexChange(e){
-        this.select.page = e
-        this.getList()
-      },
-      pageSizeChange(e){
-        this.select.page_size = e
-        this.select.page = 1
-        this.getList()
-      },
-      async getList() {
-        const res = await indexStudy({
-          page: this.select.page,
-          page_size: this.select.page_size,
-          filter: [{
-            key: 'course_name',
-            op: 'like',
-            value: this.select.course_name
-          }, {
-            key: 'name',
-            op: 'like',
-            value: this.select.name
-          }, {
-            key: 'company_name',
-            op: 'like',
-            value: this.select.company_name
-          }, {
-            key: 'company_position',
-            op: 'eq',
-            value: this.select.company_position
-          }, {
-            key: 'company_area',
-            op: 'eq',
-            value: this.select.company_area
-          }, {
-            key: 'company_type',
-            op: 'eq',
-            value: this.select.company_type
-          }, {
-            key: 'company_industry',
-            op: 'eq',
-            value: this.select.company_industry
-          }]
-        })
-        this.list = res.list.data
-        this.total = res.list.total
-        this.year_total = res.year_total
-        this.alltotal = res.total
-      },
-      showDetail(type, id) {
-        this.$refs.studentDetail.id = id
-        this.$refs.studentDetail.type = type
-        this.$refs.studentDetail.isShow = true
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .searchwrap {
-    display: flex;
-    align-items: center;
-
-    &>div {
-      display: flex;
-      align-items: center;
-
-      &>div {
-
-        margin-right: 10px;
-      }
-
-    }
-  }
-</style>