diff --git a/src/mixin/formMixin.js b/src/mixin/formMixin.js
index 7312532..a6d56a7 100644
--- a/src/mixin/formMixin.js
+++ b/src/mixin/formMixin.js
@@ -13,7 +13,8 @@ export default {
         help: '请输入姓名',
         need_fill: 0,
         belong_user: 1,
-        belong_user_table: 'username'
+        belong_user_table: 'username',
+        sort: 0,
       }, {
         name: '性别',
         field: 'sex',
@@ -29,7 +30,8 @@ export default {
         }],
         need_fill: 0,
         belong_user: 1,
-        belong_user_table: 'sex'
+        belong_user_table: 'sex',
+        sort: 0,
       }, {
         name: '出生年月',
         field: 'birthday',
@@ -38,7 +40,8 @@ export default {
         help: '请选择出生年月',
         need_fill: 0,
         belong_user: 1,
-        belong_user_table: 'birthday'
+        belong_user_table: 'birthday',
+        sort: 0,
       }, {
         name: '联系方式',
         field: 'mobile',
@@ -47,7 +50,8 @@ export default {
         help: '请输入联系方式',
         need_fill: 0,
         belong_user: 1,
-        belong_user_table: 'mobile'
+        belong_user_table: 'mobile',
+        sort: 0,
       }, {
         name: '身份证号',
         field: 'idcard',
@@ -58,7 +62,8 @@ export default {
         belong_user: 1,
         select_item: [],
         is_open: false,
-        belong_user_table: 'idcard'
+        belong_user_table: 'idcard',
+        sort: 0,
       }, {
         name: '学历',
         field: 'education',
@@ -69,16 +74,19 @@ export default {
         belong_user: 1,
         select_item: [],
         is_open: false,
-        belong_user_table: 'education'
+        belong_user_table: 'education',
+        sort: 0,
       }, {
-        name: '公司名称',
+        name: '公司',
         field: 'company_name',
         rule: '',
         edit_input: "text",
-        help: '请输入公司名称',
+        help: '请输入公司',
         need_fill: 0,
         belong_user: 1,
-        belong_user_table: 'company_name'
+        belong_user_table: 'company_name',
+        sort: 0,
+        span: 2
       }, {
         name: '职务',
         field: 'company_position',
@@ -87,9 +95,10 @@ export default {
         help: '请输入职务',
         need_fill: 0,
         belong_user: 1,
-        belong_user_table: 'company_position'
+        belong_user_table: 'company_position',
+        sort: 0,
       }, {
-        name: '有无股份',
+        name: '股份',
         field: 'company_has_share',
         rule: '',
         edit_input: "radio",
@@ -104,18 +113,21 @@ export default {
           value: '无'
         }],
         is_open: false,
-        belong_user_table: 'company_has_share'
+        belong_user_table: 'company_has_share',
+        sort: 0,
       }, {
-        name: '人才类型',
+        name: '人才类别',
         field: 'type',
         rule: '',
         edit_input: "radio",
-        help: '请选择人才类型',
+        help: '请选择人才类别',
         need_fill: 0,
         belong_user: 1,
         select_item: [],
         is_open: false,
-        belong_user_table: 'type'
+        belong_user_table: 'type',
+        sort: 0,
+        span: 2
       }, {
         name: '企业性质',
         field: 'company_type',
@@ -126,7 +138,9 @@ export default {
         belong_user: 1,
         select_item: [],
         is_open: false, // 控制开启关闭的 参数不做保存
-        belong_user_table: 'company_type'
+        belong_user_table: 'company_type',
+        sort: 0,
+        span: 2
       }, {
         name: '融资情况',
         field: 'company_fund',
@@ -135,40 +149,45 @@ export default {
         help: '请输入融资情况',
         need_fill: 0,
         belong_user: 1,
-        belong_user_table: 'company_fund'
+        belong_user_table: 'company_fund',
+        sort: 0,
+        span: 2
       }, {
-        name: '所在区域',
+        name: '板块',
         field: 'company_area',
         rule: '',
         edit_input: "radio",
-        help: '请选择所在区域',
+        help: '请选择板块',
         need_fill: 0,
         belong_user: 1,
         select_item: [],
         is_open: false,
-        belong_user_table: 'company_area'
+        belong_user_table: 'company_area',
+        sort: 0,
       }, {
-        name: '公司地址',
-        field: 'company_address',
+        name: '所属领域',
+        field: 'company_industry',
         rule: '',
-        edit_input: "text",
-        help: '请填写公司地址',
+        edit_input: "radio",
+        help: '请选择所属领域',
         need_fill: 0,
         belong_user: 1,
         select_item: [],
         is_open: false,
-        belong_user_table: 'company_address'
+        belong_user_table: 'company_industry',
+        sort: 0,
       }, {
-        name: '所属行业',
-        field: 'company_industry',
+        name: '公司地址',
+        field: 'company_address',
         rule: '',
-        edit_input: "radio",
-        help: '请选择所属行业',
+        edit_input: "text",
+        help: '请填写公司地址',
         need_fill: 0,
         belong_user: 1,
-        select_item: [],
         is_open: false,
-        belong_user_table: 'company_industry'
+        belong_user_table: 'company_address',
+        sort: 0,
+        span: 2
       }, {
         name: '产品',
         field: 'company_product',
@@ -177,16 +196,20 @@ export default {
         help: '请输入产品',
         need_fill: 0,
         belong_user: 1,
-        belong_user_table: 'company_product'
+        belong_user_table: 'company_product',
+        sort: 0,
+        span: 2
       }, {
         name: '毕业院校',
         field: 'school',
         rule: '',
         edit_input: "text",
-        help: '请输入产品',
+        help: '请输入毕业院校',
         need_fill: 0,
         belong_user: 1,
-        belong_user_table: 'school'
+        belong_user_table: 'school',
+        sort: 0,
+        span: 2
       }, {
         name: '专业',
         field: 'speciality',
@@ -195,7 +218,8 @@ export default {
         help: '请输入专业',
         need_fill: 0,
         belong_user: 1,
-        belong_user_table: 'speciality'
+        belong_user_table: 'speciality',
+        sort: 0,
       }, {
         name: '海外经验',
         field: 'overseas_experience',
@@ -204,7 +228,8 @@ export default {
         help: '请输入海外经验',
         need_fill: 0,
         belong_user: 1,
-        belong_user_table: 'overseas_experience'
+        belong_user_table: 'overseas_experience',
+        sort: 0,
       }, {
         name: '报名渠道',
         field: 'sign_from',
@@ -212,18 +237,70 @@ export default {
         edit_input: "radio",
         help: '请选择报名渠道',
         need_fill: 0,
+        select_item: [],
         belong_user: 1,
-        belong_user_table: 'sign_from'
+        belong_user_table: 'sign_from',
+        sort: 0,
       }, {
         name: '邮箱',
         field: 'email',
-        rule: '',
+        rule: 'email',
         edit_input: "text",
         help: '请输入邮箱',
         need_fill: 0,
         belong_user: 1,
-        belong_user_table: 'email'
-      }],
+        belong_user_table: 'email',
+        sort: 0,
+      }, {
+        name: '销售额/亿',
+        field: 'sales_volume',
+        rule: '',
+        edit_input: "text",
+        help: '请输入销售额/亿',
+        need_fill: 0,
+        belong_user: 1,
+        belong_user_table: 'sales_volume',
+        sort: 0,
+      }, {
+        name: '估值',
+        field: 'valuation',
+        rule: '',
+        edit_input: "text",
+        help: '请输入估值',
+        need_fill: 0,
+        belong_user: 1,
+        belong_user_table: 'valuation',
+        sort: 0,
+      }, {
+        name: '市值',
+        field: 'market_value',
+        rule: '',
+        edit_input: "text",
+        help: '请输入市值',
+        need_fill: 0,
+        belong_user: 1,
+        belong_user_table: 'market_value',
+        sort: 0,
+      }, {
+        name: '是否为元禾投资企业',
+        field: 'is_yuanhe',
+        rule: '',
+        edit_input: "text",
+        help: '请选择',
+        need_fill: 0,
+        belong_user: 1,
+        select_item: [{
+          key: '是',
+          value: '是'
+        }, {
+          key: '否',
+          value: '否'
+        }],
+        belong_user_table: 'is_yuanhe',
+        sort: 0,
+      }],
+
+
       // 自定义表单的 扩展字段 可填可不填
       selectFormList: [{
         name: '姓名',
@@ -285,11 +362,11 @@ export default {
         belong_user_table: 'idcard',
         sort: 0,
       }, {
-        name: '学历',
+        name: '最高学历',
         field: 'education',
         rule: '',
         edit_input: "radio",
-        help: '请选择学历',
+        help: '有学位证书方可，请如实填写，后续需提供材料证明',
         need_fill: 0,
         belong_user: 1,
         select_item: [],
@@ -301,7 +378,7 @@ export default {
         field: 'company_name',
         rule: '',
         edit_input: "text",
-        help: '请输入公司',
+        help: '请填写公司全称，确保无误',
         need_fill: 0,
         belong_user: 1,
         belong_user_table: 'company_name',
@@ -318,11 +395,11 @@ export default {
         belong_user_table: 'company_position',
         sort: 0,
       }, {
-        name: '股份',
+        name: '是否有股份',
         field: 'company_has_share',
         rule: '',
         edit_input: "radio",
-        help: '请选择有无股份',
+        help: '请选择是否有股份',
         need_fill: 0,
         belong_user: 1,
         select_item: [{
@@ -336,11 +413,11 @@ export default {
         belong_user_table: 'company_has_share',
         sort: 0,
       }, {
-        name: '人才类别',
+        name: '个人荣誉',
         field: 'type',
         rule: '',
         edit_input: "radio",
-        help: '请选择人才类别',
+        help: '请如实填写，后期需提供证明材料',
         need_fill: 0,
         belong_user: 1,
         select_item: [],
@@ -349,11 +426,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: [],
@@ -373,11 +450,11 @@ export default {
         sort: 0,
         span: 2
       }, {
-        name: '板块',
+        name: '公司所属区域',
         field: 'company_area',
         rule: '',
         edit_input: "radio",
-        help: '请选择板块',
+        help: '请选择公司所属区域',
         need_fill: 0,
         belong_user: 1,
         select_item: [],
@@ -401,7 +478,7 @@ export default {
         field: 'company_address',
         rule: '',
         edit_input: "text",
-        help: '请填写公司地址',
+        help: '请按照实际地址填写',
         need_fill: 0,
         belong_user: 1,
         is_open: false,
@@ -409,33 +486,33 @@ export default {
         sort: 0,
         span: 2
       }, {
-        name: '产品',
+        name: '公司主营业务',
         field: 'company_product',
         rule: '',
         edit_input: "text",
-        help: '请输入产品',
+        help: '请详细描述具体内容',
         need_fill: 0,
         belong_user: 1,
         belong_user_table: 'company_product',
         sort: 0,
         span: 2
       }, {
-        name: '毕业院校',
+        name: '最高学历毕业院校',
         field: 'school',
         rule: '',
         edit_input: "text",
-        help: '请输入毕业院校',
+        help: '请输入最高学历毕业院校',
         need_fill: 0,
         belong_user: 1,
         belong_user_table: 'school',
         sort: 0,
         span: 2
       }, {
-        name: '专业',
+        name: '最高学历专业',
         field: 'speciality',
         rule: '',
         edit_input: "text",
-        help: '请输入专业',
+        help: '请输入最高学历专业',
         need_fill: 0,
         belong_user: 1,
         belong_user_table: 'speciality',
@@ -466,7 +543,7 @@ export default {
         field: 'email',
         rule: 'email',
         edit_input: "text",
-        help: '请输入邮箱',
+        help: '请填写常用邮箱，以便接收录取结果信息',
         need_fill: 0,
         belong_user: 1,
         belong_user_table: 'email',
@@ -505,7 +582,7 @@ export default {
         name: '是否为元禾投资企业',
         field: 'is_yuanhe',
         rule: '',
-        edit_input: "text",
+        edit_input: "radio",
         help: '请选择',
         need_fill: 0,
         belong_user: 1,
diff --git a/src/views/book/components/addAppointment.vue b/src/views/book/components/addAppointment.vue
index 1802141..b835552 100644
--- a/src/views/book/components/addAppointment.vue
+++ b/src/views/book/components/addAppointment.vue
@@ -45,10 +45,10 @@
       <template v-slot:address>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>所在楼层：
+            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>详细地址：
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.address" placeholder="请输入所在楼层" clearable style="width: 100%;"></el-input>
+            <el-input v-model="form.address" placeholder="请输入详细地址" clearable style="width: 100%;"></el-input>
           </div>
         </div>
       </template>
@@ -209,6 +209,10 @@
           name: [{
             required: true,
             message: '请输入场地名称'
+          }],
+          address: [{
+            required: true,
+            message: '请输入详细地址'
           }],
         },
       }
diff --git a/src/views/book/components/addCount.vue b/src/views/book/components/addCount.vue
index 93e3c94..ef28163 100644
--- a/src/views/book/components/addCount.vue
+++ b/src/views/book/components/addCount.vue
@@ -8,7 +8,15 @@
             <span style="color: red;font-weight: bold;padding-right: 4px;"></span>所属课程：
           </div>
           <div class="xy-table-item-content">
-            {{form.course?form.course.name:''}}
+            <div v-if="type==='editor'">
+              {{form.course?form.course.name:''}}
+            </div>
+            <div v-else>
+              <el-select v-model="form.course_id" style="width:100%" placeholder="选择课程">
+                <el-option v-for="item in course_options" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+            </div>
           </div>
         </div>
       </template>
@@ -18,7 +26,18 @@
             <span style="color: red;font-weight: bold;padding-right: 4px;"></span>姓名：
           </div>
           <div class="xy-table-item-content">
-            {{form.user?form.user.name:''}}
+            <div v-if="type==='editor'">
+              {{form.user?form.user.name:''}}
+            </div>
+            <div v-else>
+              <el-select v-model="form.user_id" style="width:100%"
+                 filterable remote reserve-keyword
+                 placeholder="输入姓名查找人员"
+                :remote-method="remoteMethod" :loading="loading">
+                <el-option v-for="item in user_options" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+            </div>
           </div>
         </div>
       </template>
@@ -64,7 +83,12 @@
   // import {
   //   save
   // } from "@/api/student/index.js"
-
+  import {
+    index as indexCourse
+  } from "@/api/course/index.js"
+  import {
+    indexStudy
+  } from '@/api/student/index.js'
   import {
     save
   } from '@/api/book/count.js'
@@ -74,7 +98,11 @@
     },
     data() {
       return {
-        isShow: false,
+        isShow: false,
+        type:'add',
+        user_options:[],
+        course_options:[],
+        loading:false,
         form: {
           course_id:'',
           user_id:"",
@@ -91,8 +119,40 @@
         }
       }
     },
-    created() {},
-    methods: {
+    created() {
+      this.getCourseList()
+    },
+    methods: {
+      async getCourseList() {
+        const res = await indexCourse({
+          page: 1,
+          page_size: 999,
+          show_relation: ['type_detail'],
+          sort_name: 'start_date',
+          sort_type: 'DESC',
+        })
+        this.course_options = res.data
+      },
+      remoteMethod(query) {
+        if (query !== '') {
+          this.loading = true;
+          this.getUserList(query)
+        } else {
+          this.user_options = [];
+        }
+      },
+      async getUserList(query) {
+        const res = await indexStudy({
+          page: 1,
+          page_size: 99,
+          name: query
+        })
+        this.user_options = res.list.data
+        if(this.user_options.length===0){
+          this.$Message.warning("当前搜索没有学员")
+        }
+        this.loading = false
+      },
       submit() {
         save({
           ...this.form
@@ -121,7 +181,8 @@
             total: '',
             start_time: '',
             end_time: '',
-          }
+          }
+          this.type='add'
           this.$refs['dialog'].reset()
         }
       },
diff --git a/src/views/book/count.vue b/src/views/book/count.vue
index 2a5af6d..f6772dd 100644
--- a/src/views/book/count.vue
+++ b/src/views/book/count.vue
@@ -24,6 +24,8 @@
               <div>
                 <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
                 <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
+
+                <el-button type="primary" size="small" @click="editCount('add')">新增</el-button>
                 <el-button type="primary" size="small" @click="updateTotal">批量调整</el-button>
               </div>
 
@@ -83,9 +85,12 @@
         </template> -->
 
         <template v-slot:btns>
-          <el-table-column align='center' label="操作" fixed="right" width="80" header-align="center">
+          <el-table-column align='center' label="操作" fixed="right" width="220" header-align="center">
             <template slot-scope="scope">
-              <el-button type="primary" size="small" @click="editCount(scope.row)">调整</el-button>
+              <el-button type="primary" size="small" @click="editCount('editor',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>
@@ -104,7 +109,8 @@
   import updateCount from './components/updateCount.vue';
   import {
     index,
-    update
+    update,
+    destroy
   } from '@/api/book/count.js'
   import {
     index as courseIndex
@@ -213,17 +219,32 @@
         this.list = res.data
         this.total = res.total
       },
-      editCount(row) {
-        this.$refs.addCount.setRow(row)
+      editCount(type, row) {
+        if (type === 'editor') {
+          this.$refs.addCount.setRow(row)
+        }
+        this.$refs.addCount.type = type
         this.$refs.addCount.isShow = true
       },
-      updateTotal() {
+      updateTotal() {
         this.$refs.updateCount.setRow(this.course_options)
         this.$refs.updateCount.isShow = true
       },
       showCounts(name) {
         this.$refs.showCount.setName(name)
         this.$refs.showCount.isShow = true
+      },
+      deleteList(id) {
+        var that = this;
+        destroy({
+          id: id,
+        }).then(response => {
+          this.$Message.success('删除成功');
+          this.getList()
+        }).catch(error => {
+          console.log(error)
+          reject(error)
+        })
       },
     }
   }
diff --git a/src/views/course/components/addCourse.vue b/src/views/course/components/addCourse.vue
index c239cae..9db073f 100644
--- a/src/views/course/components/addCourse.vue
+++ b/src/views/course/components/addCourse.vue
@@ -14,19 +14,19 @@
             </el-steps>
           </div>
         </div>
-      </template>
-      <template v-slot:type v-if="active===0">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>课程体系：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="form.type" @change="changeType" placeholder="请选择体系" clearable style="width: 100%;">
-              <el-option v-for="item in courseTypesList" :key="item.id" :label="item.name" :value="item.id">
-              </el-option>
-            </el-select>
-          </div>
-        </div>
+      </template>
+      <template v-slot:type v-if="active===0">
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>课程体系：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select v-model="form.type" @change="changeType" placeholder="请选择体系" clearable style="width: 100%;">
+              <el-option v-for="item in courseTypesList" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
       </template>
       <template v-slot:name v-if="active===0">
         <div class="xy-table-item">
@@ -44,8 +44,7 @@
             <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.year" type="year"
-              value-format="yyyy" format="yyyy">
+            <el-date-picker style="width: 100%;" v-model="form.year" type="year" value-format="yyyy" format="yyyy">
             </el-date-picker>
           </div>
         </div>
@@ -99,18 +98,31 @@
       </template>
 
 
-      <template v-slot:status v-if="active===0">
+     <!-- <template v-slot:status v-if="active===0">
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
             <span style="color: red;font-weight: bold;padding-right: 4px;"></span>状态：
           </div>
           <div class="xy-table-item-content">
-            <el-select style="width: 100%;" v-model="form.status" placeholder="请选择" clearable>
+            <el-select style="width: 100%;" v-model="form.status" @change="changeStatus" placeholder="请选择">
               <el-option v-for="item in course_status" :key="item.id" :label="item.value" :value="item.id">
               </el-option>
             </el-select>
           </div>
         </div>
+      </template> -->
+      <template v-slot:is_fee v-if="active===0">
+        <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-radio-group style="width:100%" v-model="form.is_fee">
+              <el-radio :label="1">付费</el-radio>
+              <el-radio :label="0">公益</el-radio>
+            </el-radio-group>
+          </div>
+        </div>
       </template>
       <template v-slot:is_arrange v-if="active===0">
         <div class="xy-table-item">
@@ -125,44 +137,32 @@
           </div>
         </div>
       </template>
-      <template v-slot:is_fee v-if="active===0">
+
+      <template v-slot:show_txl v-if="active===0">
         <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-radio-group style="width:100%" v-model="form.is_fee">
-              <el-radio :label="1">付费</el-radio>
-              <el-radio :label="0">公益</el-radio>
+            <el-radio-group style="width:100%" v-model="form.show_txl">
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
+            </el-radio-group>
+          </div>
+        </div>
+      </template>
+      <template v-slot:show_mobile v-if="active===0">
+        <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-radio-group style="width:100%" v-model="form.show_mobile">
+              <el-radio :label="1">是</el-radio>
+              <el-radio :label="0">否</el-radio>
             </el-radio-group>
           </div>
         </div>
-      </template>
-      <template v-slot:show_txl v-if="active===0">
-        <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-radio-group style="width:100%" v-model="form.show_txl">
-              <el-radio :label="1">是</el-radio>
-              <el-radio :label="0">否</el-radio>
-            </el-radio-group>
-          </div>
-        </div>
-      </template>
-      <template v-slot:show_mobile v-if="active===0">
-        <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-radio-group style="width:100%" v-model="form.show_mobile">
-              <el-radio :label="1">是</el-radio>
-              <el-radio :label="0">否</el-radio>
-            </el-radio-group>
-          </div>
-        </div>
       </template>
       <template v-slot:qun_image_id v-if="active===0 && form.is_fee===0">
         <div class="xy-table-item">
@@ -260,12 +260,22 @@
       <template v-slot:footerContent>
         <Button ghost type="primary" v-if="active===1" @click="active=0">上一步</Button>
         <!-- <Button ghost type="primary" v-if="active===0" @click="next">下一步</Button> -->
-        <Button type="primary" ghost @click="checkSubmit" v-if="active===0">保存并下一步</Button>
-        <Button type="primary"  v-if="active===1" @click="closeSubmit">完成并关闭</Button>
+        <Button type="primary" ghost @click="checkSubmit" v-if="active===0">保存并下一步</Button>
+        <Button type="primary" ghost v-if="active===1" @click="closeSubmit(0)" >保存待发布</Button>
+        <Button type="primary" v-if="active===1" @click="closeSubmit(1)">完成并发布</Button>
       </template>
 
 
-    </xy-dialog>
+    </xy-dialog>
+
+    <!-- 发布提示 -->
+    <el-dialog title="是否确认发布" :visible.sync="showTips" width="30%">
+      <div style="padding: 30px;font-size: 24px;text-indent: 2em;">请确认报名表单无误后再发布。</div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="showTips = false">取 消</el-button>
+        <el-button type="primary" @click="saveSubmit">确 定</el-button>
+      </span>
+    </el-dialog>
 
     <applyForm ref="applyForm" @refresh="getFormList"></applyForm>
   </div>
@@ -295,11 +305,12 @@
     },
     data() {
       return {
-        isShow: false,
+        isShow: false,
+        showTips:false,
         type: 'add',
         active: 0,
-        id: '',
-        course_signs_count:0,
+        id: '',
+        course_signs_count: 0,
         action: `${process.env.VUE_APP_UPLOAD_API}`,
         showTinymce: false,
         courseTypesList: [],
@@ -309,18 +320,18 @@
         form: {
           step: '', // 控制课程 课表
           type: '',
-          name: '',
-          year:'',
+          name: '',
+          year: '',
           dateRange: '',
           total: '',
           sign_start_date: '',
           sign_end_date: '',
 
           status: 0,
+          is_fee: 1,
           is_arrange: 1,
-          is_fee: 1,
-          show_txl:1,
-          show_mobile:0,
+          show_txl: 1,
+          show_mobile: 0,
           qun_image_id: '',
           image_id: '',
           publicize_ids: [],
@@ -451,7 +462,8 @@
       submit() {
         if (this.id) {
           this.form.id = this.id
-        }
+        }
+
         // 报名截止时间 不能晚于 日程开始时间
         if (this.form.start_date && this.form.sign_end_date) {
           if (!this.compareTime(this.form.start_date, this.form.sign_end_date)) {
@@ -477,20 +489,66 @@
         }).then(res => {
           this.$message({
             type: 'success',
-            message: '保存课程成功',
-            duration:2000
+            message: '保存课程成功',
+            duration: 2000
           })
           this.id = res.id
           this.$emit('refresh')
           this.active = 1
           // this.active = 1
-
         })
+      },
+      // 发布
+      saveSubmit(){
+        this.form.status = 1
+        save({
+          ...this.form
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: '发布成功',
+            duration: 2000
+          })
+          this.showTips = false
+          this.$emit('refresh')
+          this.isShow = false
+        })
       },
-      closeSubmit() {
-        this.$emit('refresh')
+      closeSubmit(status) {
+        // 发布
+        if(status==1){
+          if(this.formList.length<1){
+            this.$message({
+              type:'warning',
+              message:'需要先创建报名表单才可以发布',
+              duration:2000
+            })
+            return
+          }
+          // 已发布的直接关闭
+          if(this.form.status===1){
+            this.$emit('refresh')
+            this.isShow = false
+          }else{
 
-          this.isShow = false
+            this.showTips = true
+          }
+        }else{
+          this.form.status = 0
+          save({
+            ...this.form
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: '保存成功',
+              duration: 2000
+            })
+            this.$emit('refresh')
+            this.isShow = false
+          })
+        }
+
+
       },
       getDetail() {
         show({
@@ -509,8 +567,8 @@
           this.form.dateRange = res.start_date ? [res.start_date, res.end_date] : ''
           this.form.status = res.status ? res.status : 0
           this.form.is_arrange = res.is_arrange ? res.is_arrange : 0
-          this.form.is_fee = res.is_fee ? res.is_fee : 0
-          this.form.show_txl = res.show_txl===0 ? 0 : 1
+          this.form.is_fee = res.is_fee ? res.is_fee : 0
+          this.form.show_txl = res.show_txl === 0 ? 0 : 1
           this.form.show_mobile = res.show_mobile ? res.show_mobile : 0
           this.showTinymce = true
         })
@@ -538,7 +596,7 @@
       // 打开自定义表单
       editForm(type, id) {
         // this.$refs.applyForm.formList = deepCopy(this.formList)
-        this.$refs.applyForm.course_id = this.id
+        this.$refs.applyForm.course_id = this.id
         this.$refs.applyForm.course_signs_count = this.course_signs_count
         this.$refs.applyForm.dialogVisible = true
       }
@@ -555,7 +613,7 @@
             this.showTinymce = true
           }
         } else {
-          this.id = ''
+          this.id = ''
           this.course_signs_count = 0
           this.showTinymce = false
           this.imgList = []
@@ -566,17 +624,17 @@
           this.form = {
             step: '', // 控制课程 课表
             type: '',
-            name: '',
-            year:'',
+            name: '',
+            year: '',
             dateRange: '',
             total: '',
             sign_start_date: '',
             sign_end_date: '',
             status: 0,
             is_arrange: 1,
-            is_fee: 1,
-            show_txl:1,
-            show_mobile:1,
+            is_fee: 1,
+            show_txl: 1,
+            show_mobile: 1,
             qun_image_id: '',
             image_id: '',
             publicize_ids: [],
@@ -600,13 +658,12 @@
     flex-basis: 100%;
   }
 
-  ::v-deep .status,
   ::v-deep .is_arrange,
-  ::v-deep .is_fee,
-  ::v-deep .show_txl,
+  ::v-deep .is_fee,
+  ::v-deep .show_txl,
   ::v-deep .show_mobile,
   {
-  flex-basis: 33%;
+  flex-basis: 25%;
   }
 
   ::v-deep .el-step.is-simple .el-step__head {
diff --git a/src/views/course/components/applyForm.vue b/src/views/course/components/applyForm.vue
index 49de096..57f9572 100644
--- a/src/views/course/components/applyForm.vue
+++ b/src/views/course/components/applyForm.vue
@@ -370,7 +370,13 @@
             if (item.course_id) {
               item.course_id = ''
             }
-          })
+          })
+          this.formList = []
+          // this.types = []
+          // this.rules = {}
+          this.$refs.editPane.showForm = false
+          this.selectedForm = {}
+          this.selectedIndex = 0
           this.$emit("refresh")
         }
       }
diff --git a/src/views/course/components/editPane.vue b/src/views/course/components/editPane.vue
index 97450d2..d89999d 100644
--- a/src/views/course/components/editPane.vue
+++ b/src/views/course/components/editPane.vue
@@ -157,7 +157,7 @@
       },
 
       saveField() {
-                console.log("this.selectedForm.select_item",this.selectedForm)
+        console.log("this.selectedForm.select_item",this.selectedForm)
         if(this.base.isNull(this.selectedForm.name)){
           this.$Message.warning("字段名称不能为空")
           return
@@ -194,7 +194,6 @@
         }
         // return
         save(this.selectedForm).then(res => {
-          console.log("res", res)
           this.$Message.success('保存成功')
           this.$emit("refreshFormItem", 'save')
           this.showForm = false
@@ -232,6 +231,12 @@
           }
 
         }
+      },
+      showForm(newval){
+        if(!newval){
+          this.selectedForm = {}
+          this.selectedIndex = 0
+        }
       }
     },
     created() {
diff --git a/src/views/student/index.vue b/src/views/student/index.vue
index d04303e..aeb4dcf 100644
--- a/src/views/student/index.vue
+++ b/src/views/student/index.vue
@@ -276,7 +276,8 @@
         }, {
           prop: 'company_name',
           label: '公司名称',
-          align: 'left',
+          align: 'left',
+          width:200
         }, {
           prop: 'company_position',
           label: '职务',
diff --git a/src/views/student/search.vue b/src/views/student/search.vue
index 62b8283..2f1be15 100644
--- a/src/views/student/search.vue
+++ b/src/views/student/search.vue
@@ -258,7 +258,8 @@
         }, {
           prop: 'company_name',
           label: '公司名称',
-          align: 'left',
+          align: 'left',
+          width:200
         }, {
           prop: 'company_position',
           label: '职务',