From d229adaf6fd79956ab87524fed0fcb9a0ca8ed2c Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 10 Sep 2024 17:18:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/book/appointment.vue            |  12 +-
 src/views/book/components/addType.vue     |  27 ++++-
 src/views/book/count.vue                  |  15 ++-
 src/views/book/index.vue                  | 140 ++++++++++++----------
 src/views/config/banner.vue               |  13 +-
 src/views/config/donate.vue               |  11 +-
 src/views/config/info.vue                 |  10 ++
 src/views/config/teacher.vue              |  10 +-
 src/views/course/apply.vue                |  10 +-
 src/views/course/apply_list.vue           |  14 +++
 src/views/course/attendance.vue           |  11 +-
 src/views/course/class.vue                |  10 ++
 src/views/course/components/addCourse.vue |   7 +-
 src/views/course/components/addTypes.vue  |  10 +-
 src/views/course/components/applyForm.vue |   9 +-
 src/views/course/components/editPane.vue  |  48 +++++---
 src/views/course/history.vue              |  68 ++++++-----
 src/views/course/index.vue                |  14 ++-
 src/views/course/pay.vue                  |  12 +-
 src/views/course/txl.vue                  |  15 ++-
 src/views/student/components/detail.vue   |   3 +-
 src/views/student/index.vue               |  50 +++++---
 src/views/student/search.vue              |  26 +++-
 23 files changed, 392 insertions(+), 153 deletions(-)

diff --git a/src/views/book/appointment.vue b/src/views/book/appointment.vue
index 8a92e40..65f3a32 100644
--- a/src/views/book/appointment.vue
+++ b/src/views/book/appointment.vue
@@ -12,6 +12,10 @@
               <div>
                 <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
               </div>
+              <div>
+                <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
+
+              </div>
               <div>
                 <el-button type="primary" size="small" @click="editAppointment('add')">新增</el-button>
               </div>
@@ -145,6 +149,12 @@
         this.select.page_size = e
         this.select.page = 1
         this.getList()
+      },
+      resetSelect(){
+
+        this.select.name = ''
+        this.select.page=1
+        this.getList()
       },
       async getList() {
         const res = await index({
@@ -154,7 +164,7 @@
           sort_name:'sort',
           sort_type:'ASC',
           filter: [{
-            key: 'name',
+            key: 'real_name',
             op: 'like',
             value: this.select.name
           }]
diff --git a/src/views/book/components/addType.vue b/src/views/book/components/addType.vue
index 9420c48..fbde5d1 100644
--- a/src/views/book/components/addType.vue
+++ b/src/views/book/components/addType.vue
@@ -102,6 +102,16 @@
             <my-tinymce v-if="showTinymce" @input="saveContent" :value="form.content"></my-tinymce>
           </div>
         </div>
+      </template>
+      <template v-slot:tips>
+        <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">
+            <my-tinymce v-if="showTinymce1" @input="saveContent1" :value="form.tips"></my-tinymce>
+          </div>
+        </div>
       </template>
     </xy-dialog>
   </div>
@@ -121,7 +131,8 @@
         isShow: false,
         type: 'add',
         id: '',
-        showTinymce: false,
+        showTinymce: false,
+        showTinymce1: false,
         form: {
           name: '',
           introduce: '',
@@ -133,7 +144,8 @@
           image_id: [],
           start_time: '09:00',
           end_time: '17:30',
-          content: ''
+          content: '',
+          tips:''
         },
         action: `${process.env.VUE_APP_UPLOAD_API}`,
         fileList: [],
@@ -149,6 +161,9 @@
     methods: {
       saveContent(e) {
         this.form.content = e
+      },
+      saveContent1(e) {
+        this.form.tips = e
       },
       changeDateRange(e) {
         console.log(e)
@@ -201,9 +216,10 @@
           this.form = this.base.requestToForm(res, this.form)
           this.fileList = res.image
           this.form.dateRange = res.start_time ? [res.start_time, res.end_time] : ['', ''],
-            this.form.sort = res.sort ? res.sort : 0
+          this.form.sort = res.sort ? res.sort : 0
           this.form.is_book = res.is_book ? res.is_book : 0
-          this.showTinymce = true
+          this.showTinymce = true
+          this.showTinymce1 = true
         })
       },
 
@@ -230,7 +246,8 @@
 </script>
 
 <style scoped lang="scss">
-  ::v-deep .content,
+  ::v-deep .content,
+  ::v-deep .tips,
   ::v-deep .image_id {
     flex-basis: 100%;
   }
diff --git a/src/views/book/count.vue b/src/views/book/count.vue
index f5b0ce2..e19b145 100644
--- a/src/views/book/count.vue
+++ b/src/views/book/count.vue
@@ -26,8 +26,11 @@
                 </div>
               </div>
               <div>
-                <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
-              </div>
+                <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+                <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
+
+              </div>
+
             </div>
           </div>
         </lx-header>
@@ -161,6 +164,14 @@
           sort_type: 'DESC',
         })
         this.course_options = res.data
+      },
+      resetSelect(){
+
+        this.select.name = ''
+        this.select.course_name = ''
+        this.select.course_id=''
+        this.select.page=1
+        this.getList()
       },
       async getList() {
         const res = await indexStudy({
diff --git a/src/views/book/index.vue b/src/views/book/index.vue
index 532389a..e0c2e5e 100644
--- a/src/views/book/index.vue
+++ b/src/views/book/index.vue
@@ -22,9 +22,13 @@
               </div>
               <div>
                 <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
-              </div>
-              <div>
-                <el-button type="primary" size="small" @click="exportExcel">导出</el-button>
+              </div>
+              <div>
+                <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
+
+              </div>
+              <div>
+                <el-button type="primary" size="small" @click="exportExcel">导出</el-button>
               </div>
               <div>
                 <el-button type="primary" size="small" @click="editBook('add')">手动预约</el-button>
@@ -40,8 +44,8 @@
     </div>
 
     <div>
-      <xy-table :list="list" :showIndexFixed="'left'" :total="total" @pageIndexChange="pageIndexChange" @pageSizeChange="pageSizeChange"
-        :table-item="table_item">
+      <xy-table :list="list" :showIndexFixed="'left'" :total="total" @pageIndexChange="pageIndexChange"
+        @pageSizeChange="pageSizeChange" :table-item="table_item">
         <template v-slot:status>
           <el-table-column align='center' label="状态" width="120" header-align="center">
             <template slot-scope="scope">
@@ -61,15 +65,15 @@
 
         <template v-slot:btns>
           <el-table-column align='center' fixed="right" label="操作" width="220" header-align="center">
-            <template slot-scope="scope">
-              <el-button type="primary" size="small" v-if="scope.row.status>0"
-               @click="checkBook('show',scope.row.id)">查看</el-button>
+            <template slot-scope="scope">
+              <el-button type="primary" size="small" v-if="scope.row.status>0"
+                @click="checkBook('show',scope.row.id)">查看</el-button>
               <el-button type="primary" size="small" v-if="scope.row.status===0"
                 @click="checkBook('check',scope.row.id)">审核</el-button>
-              <el-button  type="primary" size="small" v-if="scope.row.status===3"
-                @click="editBook('editor',scope.row.id,)">编辑</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-button type="primary" size="small" v-if="scope.row.status===3"
+                @click="editBook('editor',scope.row.id,)">编辑</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>
@@ -88,14 +92,14 @@
   import checkBook from './components/checkBook.vue';
   import addBook from './components/addBook.vue';
   import {
-    index,
+    index,
     destroy
   } from "@/api/book/index.js"
   import {
     index as getAppointment
-  } from "@/api/book/appointment.js"
-  import {
-    download
+  } from "@/api/book/appointment.js"
+  import {
+    download
   } from "@/utils/downloadRequest";
   export default {
     mixins: [myMixins],
@@ -173,6 +177,14 @@
         this.select.page = 1
         this.getList()
       },
+      resetSelect() {
+
+        this.select.date = ''
+        this.select.site = ''
+        this.select.user_name = ''
+        this.select.page = 1
+        this.getList()
+      },
       async getList() {
         const res = await index({
           page: this.select.page,
@@ -225,59 +237,59 @@
         this.$refs.checkBook.type = type
         this.$refs.checkBook.isShow = true
       },
-      editBook(type, id,status) {
+      editBook(type, id, status) {
         if (id) {
           this.$refs.addBook.id = id
         }
-        this.$refs.addBook.type = type
+        this.$refs.addBook.type = type
         this.$refs.addBook.site_options = this.site_options
         this.$refs.addBook.isShow = true
-      },
-      exportExcel() {
-        let _export = {}
-        this.table_item.map(item => {
-          if (item.prop === 'status') {
-            _export['status_text'] = item.label
-          }else if (item.prop === 'date') {
-            _export['start_time'] = '预约开始时间'
-          }else if (item.prop === 'timerange') {
-            _export['end_time'] = '预约结束时间'
-          } else {
-            _export[item.prop] = item.label
-          }
-        })
-        download(
-          '/api/admin/appointments/index',
-          'get', {
-            user_name: this.select.user_name,
-            export_fields: _export,
-            show_relation: ['user', 'appointmentConfig'],
-            filter: [{
-              key: 'date',
-              op: 'eq',
-              value: this.select.date ? this.select.date : ''
-            }, {
-              key: 'site',
-              op: 'eq',
-              value: this.select.site
-            }],
-            is_export: 1,
-            page: 1,
-            page_size: 999
-          },
-          `预约信息.xlsx`)
-      },
-      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 = {}
+        this.table_item.map(item => {
+          if (item.prop === 'status') {
+            _export['status_text'] = item.label
+          } else if (item.prop === 'date') {
+            _export['start_time'] = '预约开始时间'
+          } else if (item.prop === 'timerange') {
+            _export['end_time'] = '预约结束时间'
+          } else {
+            _export[item.prop] = item.label
+          }
+        })
+        download(
+          '/api/admin/appointments/index',
+          'get', {
+            user_name: this.select.user_name,
+            export_fields: _export,
+            show_relation: ['user', 'appointmentConfig'],
+            filter: [{
+              key: 'date',
+              op: 'eq',
+              value: this.select.date ? this.select.date : ''
+            }, {
+              key: 'site',
+              op: 'eq',
+              value: this.select.site
+            }],
+            is_export: 1,
+            page: 1,
+            page_size: 999
+          },
+          `预约信息.xlsx`)
+      },
+      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/config/banner.vue b/src/views/config/banner.vue
index 64d8745..1c60ed8 100644
--- a/src/views/config/banner.vue
+++ b/src/views/config/banner.vue
@@ -16,7 +16,9 @@
                 </el-select>
               </div>
               <div>
-                <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+                <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+                <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
+
               </div>
               <div>
                 <el-button type="primary" size="small" @click="editBanner('add')">新增</el-button>
@@ -96,7 +98,7 @@
           value: '首页'
         }, {
           id: 2,
-          value: '课程中心、我的课程、报名状态'
+          value: '我的课程、报名状态'
         }
         // , {
         //   id: 3,
@@ -158,6 +160,13 @@
         this.select.page_size = e
         this.select.page = 1
         this.getList()
+      },
+      resetSelect(){
+
+        this.select.name = ''
+        this.select.position = ''
+        this.select.page=1
+        this.getList()
       },
       async getList() {
         const res = await index({
diff --git a/src/views/config/donate.vue b/src/views/config/donate.vue
index eac8ce4..2f794bc 100644
--- a/src/views/config/donate.vue
+++ b/src/views/config/donate.vue
@@ -16,7 +16,9 @@
                 </el-select>
               </div>
               <div>
-                <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+                <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+                <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
+
               </div>
               <div>
                 <el-button type="primary" size="small" @click="editNotice('add')">新增</el-button>
@@ -144,6 +146,13 @@
         }
         this.$refs.addDonate.type = type
         this.$refs.addDonate.isShow = true
+      },
+      resetSelect(){
+
+        this.select.username = ''
+        this.select.course = ''
+        this.select.page=1
+        this.getList()
       },
       async getList() {
         const res = await index({
diff --git a/src/views/config/info.vue b/src/views/config/info.vue
index d71e9ff..dbe89e4 100644
--- a/src/views/config/info.vue
+++ b/src/views/config/info.vue
@@ -11,6 +11,10 @@
               </div>
               <div>
                 <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+              </div>
+              <div>
+                <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
+
               </div>
               <div>
                 <el-button type="primary" size="small" @click="editInfo('add')">新增</el-button>
@@ -91,6 +95,12 @@
         this.select.page_size = e
         this.select.page = 1
         this.getList()
+      },
+      resetSelect(){
+
+        this.select.name = ''
+        this.select.page=1
+        this.getList()
       },
       async getList() {
         const res = await index({
diff --git a/src/views/config/teacher.vue b/src/views/config/teacher.vue
index 25a3603..d2b3c9b 100644
--- a/src/views/config/teacher.vue
+++ b/src/views/config/teacher.vue
@@ -10,7 +10,9 @@
                 <el-input v-model="select.name" placeholder="请输入姓名"></el-input>
               </div>
               <div>
-                <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+                <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+                <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
+
               </div>
               <div>
                 <el-button type="primary" size="small" @click="editTeacher('add')">新增</el-button>
@@ -107,6 +109,12 @@
         this.select.page_size = e
         this.select.page = 1
         this.getList()
+      },
+      resetSelect(){
+
+        this.select.name = ''
+        this.select.page=1
+        this.getList()
       },
       async getList() {
         const res = await index({
diff --git a/src/views/course/apply.vue b/src/views/course/apply.vue
index 92683a7..094597e 100644
--- a/src/views/course/apply.vue
+++ b/src/views/course/apply.vue
@@ -20,7 +20,8 @@
                 </el-select>
               </div>
               <div>
-                <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+                <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+                <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
               </div>
             </div>
           </div>
@@ -173,6 +174,13 @@
         this.select.page_size = e
         this.select.page = 1
         this.getList()
+      },
+      resetSelect(){
+        this.select.name = ''
+        this.select.type = ''
+        this.select.dateRange = ''
+        this.select.page=1
+        this.getList()
       },
       async getList() {
         const res = await index({
diff --git a/src/views/course/apply_list.vue b/src/views/course/apply_list.vue
index 26a54f6..fb7645f 100644
--- a/src/views/course/apply_list.vue
+++ b/src/views/course/apply_list.vue
@@ -69,6 +69,7 @@
                 </div>
                 <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 style="margin-right:10px" type="primary" size="small" @click="exportExcel">导出</el-button>
                   <el-popconfirm @confirm="updateAllStatus" title="确定要批量审核吗？">
                     <el-button type="primary" size="small" slot="reference">批量审核</el-button>
@@ -242,6 +243,19 @@
         this.select.page_size = e
         this.select.page = 1
         this.getList()
+      },
+      resetSelect(){
+        this.select.name = ''
+        this.select.mobile = ''
+        this.select.company_name = ''
+        this.select.company_position = ''
+        this.select.company_area = ''
+        this.select.company_type = ''
+        this.select.company_industry = ''
+        this.select.education = ''
+        this.select.status = ''
+        this.select.page=1
+        this.getList()
       },
       async getList() {
         const res = await index({
diff --git a/src/views/course/attendance.vue b/src/views/course/attendance.vue
index 9be7aa2..188a0a6 100644
--- a/src/views/course/attendance.vue
+++ b/src/views/course/attendance.vue
@@ -21,7 +21,9 @@
                 </el-select>
               </div>
               <div>
-                <el-button type="primary" size="small" @click='select.page=1,getList()'>查询</el-button>
+                <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="importTable">导入</el-button>
                 <el-button type="primary" size="small" @click="exportExcel">导出</el-button>
               </div>
@@ -215,6 +217,13 @@
         this.$refs.imports.show()
 
         // {"course_id":15,"course_content_id":188}
+      },
+      resetSelect(){
+        this.select.name = ''
+        this.select.date = ''
+        this.select.status = ''
+        this.select.page=1
+        this.getList()
       },
       async getList() {
         const res = await index({
diff --git a/src/views/course/class.vue b/src/views/course/class.vue
index bff53e9..1dc3f89 100644
--- a/src/views/course/class.vue
+++ b/src/views/course/class.vue
@@ -22,6 +22,9 @@
               </div>
               <div>
                 <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+              </div>
+              <div>
+                <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
               </div>
             </div>
           </div>
@@ -173,6 +176,13 @@
           page_size: 999
         })
         this.teacher_options = res.data
+      },
+      resetSelect(){
+        this.select.name = ''
+        this.select.type = ''
+        this.select.dateRange = ''
+        this.select.page=1
+        this.getList()
       },
       async getList() {
         const res = await index({
diff --git a/src/views/course/components/addCourse.vue b/src/views/course/components/addCourse.vue
index 8c69e54..e397ba5 100644
--- a/src/views/course/components/addCourse.vue
+++ b/src/views/course/components/addCourse.vue
@@ -261,7 +261,7 @@
         <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" @click="closeSubmit">完成并关闭</Button> -->
+        <Button type="primary"  v-if="active===1" @click="closeSubmit">完成并关闭</Button>
       </template>
 
 
@@ -487,8 +487,9 @@
         })
       },
       closeSubmit() {
-        this.isShow = false
-        this.$emit('refresh')
+        this.$emit('refresh')
+
+          this.isShow = false
       },
       getDetail() {
         show({
diff --git a/src/views/course/components/addTypes.vue b/src/views/course/components/addTypes.vue
index 7b51ab8..ba49e90 100644
--- a/src/views/course/components/addTypes.vue
+++ b/src/views/course/components/addTypes.vue
@@ -100,10 +100,10 @@
         form: {
           name:'',
           status:1,
-          wait_tip:"我们将在1-3个工作日内审核并通知您报名结果….",
-          pass_tip:"恭喜您，您已被录取！",
-          fault_tip:'很遗憾，您未通过审核。',
-          back_tip:"很遗憾，您未通过审核。",
+          wait_tip:"",
+          pass_tip:"",
+          fault_tip:'',
+          back_tip:"",
           year_total:""
         },
         rules: {
@@ -138,7 +138,7 @@
         show({
           id: this.id
         }).then(res => {
-          this.form = this.base.requestToForm(res, this.form)
+          this.form = this.base.deepCopy(res)
           this.form.status = res.status?res.status:0
         })
       },
diff --git a/src/views/course/components/applyForm.vue b/src/views/course/components/applyForm.vue
index a808bb5..cf9257a 100644
--- a/src/views/course/components/applyForm.vue
+++ b/src/views/course/components/applyForm.vue
@@ -4,7 +4,11 @@
       <template v-slot:title>
         <div style="display: flex;align-items: center;justify-content: space-between;font-size: 26px;">
           <div>创建报名表单</div>
-          <div style="cursor: pointer;">
+          <div style="cursor: pointer;">
+            <!-- <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> -->
             <Button type="primary" @click="dialogVisible = false">完成并关闭</Button>
           </div>
         </div>
@@ -228,7 +232,8 @@
       //  选中的 表单数据
       selectPick(i, index) {
         this.$refs.editPane.selectedIndex = index
-        this.$refs.editPane.selectedForm = deepCopy(i)
+        this.$refs.editPane.selectedForm = deepCopy(i)
+        this.$refs.editPane.formList = deepCopy(this.formList)
         this.$refs.editPane.showForm = true
       },
       // 处理 保存 删除过来的item
diff --git a/src/views/course/components/editPane.vue b/src/views/course/components/editPane.vue
index b21db03..97450d2 100644
--- a/src/views/course/components/editPane.vue
+++ b/src/views/course/components/editPane.vue
@@ -106,7 +106,8 @@
         selectedIndex: 0, // 选择的表单item index
         selectItem: [], //自定义下拉内容，先绑定数组后转为对象
         validation: [], //效验规则
-        parameters: [], //数据字典
+        parameters: [], //数据字典
+        formList:[],
         forms: [], //表
       };
     },
@@ -126,14 +127,14 @@
           this.debouncedInputHandler(e);
         }
 
-      },
+      },
+      // 选择数据库字段
       changeIsUser(e) {
         console.log("e", e)
         console.log(this.selectedForm)
         if(e){
           this.selectFormList.map(item => {
             if (e === item.belong_user_table) {
-              // this.selectedForm = this.base.requestToForm(item,this.selectedForm)
               this.selectedForm.name = item.name
               this.selectedForm.field = item.field
               this.selectedForm.help = item.help
@@ -151,20 +152,44 @@
           })
         }else{
           this.selectedForm.belong_user = 0
-
         }
 
       },
 
-      saveField() {
-
+      saveField() {
+                console.log("this.selectedForm.select_item",this.selectedForm)
+        if(this.base.isNull(this.selectedForm.name)){
+          this.$Message.warning("字段名称不能为空")
+          return
+        }
+        if(this.base.isNull(this.selectedForm.field)){
+          this.$Message.warning("字段标识不能为空")
+          return
+        }
         this.selectedForm.select_item = []
         this.selectedForm.select_item = this.selectItem
-        this.selectedForm.rule = this.validation.join(",")
+        this.selectedForm.rule = this.validation.join(",")
+        // 字段标识不能重复
+
+
+        // 下拉选项
         if (this.selectedForm.edit_input === 'radio' || this.selectedForm.edit_input === 'checkbox') {
           if (this.selectedForm.select_item.length === 0) {
             this.$Message.warning("请输入下拉框选项")
             return
+          }else{
+            // 下拉框选项值不能为空
+            let count = 0
+            this.selectedForm.select_item.map(item=>{
+              if(this.base.isNull(item.value) || this.base.isNull(item.key)){
+                count++
+                // item.value = item.key
+              }
+            })
+            if(count>0){
+              this.$Message.warning("下拉框选项键值不能为空")
+              return
+            }
           }
         }
         // return
@@ -194,17 +219,12 @@
     },
     watch: {
       selectedForm(newVal) {
-        console.log("newval", newVal)
+        console.log("newval", newVal)
+
         if (newVal) {
           if (newVal.select_item) {
             this.selectItem = [];
             this.selectItem = newVal.select_item
-            // for(let key in newVal.select_item) {
-            //   this.selectItem.push({
-            //     key,
-            //     value: newVal.select_item[key]
-            //   })
-            // }
           }
           this.validation = []
           if (newVal.rule) {
diff --git a/src/views/course/history.vue b/src/views/course/history.vue
index 43847ef..e76114d 100644
--- a/src/views/course/history.vue
+++ b/src/views/course/history.vue
@@ -28,6 +28,7 @@
               </div>
               <div>
                 <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+                <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
               </div>
             </div>
           </div>
@@ -69,7 +70,8 @@
             <template slot-scope="scope">
               <el-button type="primary" size="small" @click="showCourse('show',scope.row.id)">查看课程</el-button>
               <el-button type="primary" size="small" @click="toTxl(scope.row)">通讯录</el-button>
-              <el-button v-if="scope.row.is_fee===1" type="primary" size="small" @click="toPay(scope.row)">缴费记录</el-button>
+              <el-button v-if="scope.row.is_fee===1" type="primary" size="small"
+                @click="toPay(scope.row)">缴费记录</el-button>
             </template>
           </el-table-column>
         </template>
@@ -105,8 +107,8 @@
           status: '',
           page: 1,
           page_size: 10,
-        },
-        history_date:'',
+        },
+        history_date: '',
         list: [],
         total: 0,
         table_item: [{
@@ -142,21 +144,21 @@
 
       }
     },
-    created() {
-      this.history_date = this.$moment().add(-30, 'days').format('YYYY-MM-DD'),
+    created() {
+      this.history_date = this.$moment().add(-30, 'days').format('YYYY-MM-DD'),
 
-      this.getList()
+        this.getList()
       this.getTypes()
     },
     methods: {
       getTypes() {
         indexType({
           page: 1,
-          page_size: 999,
-          sort_name:'id',
-          sort_type:'ASC',
+          page_size: 999,
+          sort_name: 'id',
+          sort_type: 'ASC',
         }).then(res => {
-          // this.courseTypesList = res.data.filter(item => item.status === 1)
+          // this.courseTypesList = res.data.filter(item => item.status === 1)
           this.courseTypesList = res.data
         })
       },
@@ -169,14 +171,22 @@
         this.select.page = 1
         this.getList()
       },
-      async getList() {
-        console.log("history_date",this.history_date)
+      resetSelect() {
+        this.select.name = ''
+        this.select.type = ''
+        this.select.dateRange = ''
+        this.select.status = ''
+        this.select.page = 1
+        this.getList()
+      },
+      async getList() {
+        console.log("history_date", this.history_date)
         const res = await index({
           page: this.select.page,
           page_size: this.select.page_size,
-          show_relation: ['typeDetail'],
-          sort_name:'id',
-          sort_type:'DESC',
+          show_relation: ['typeDetail'],
+          sort_name: 'id',
+          sort_type: 'DESC',
           filter: [{
             key: 'name',
             op: 'like',
@@ -193,10 +203,10 @@
             key: 'start_date',
             op: 'range',
             value: this.select.dateRange
-          },{
-            key: 'end_date',
-            op: 'lt',
-            value: this.history_date
+          }, {
+            key: 'end_date',
+            op: 'lt',
+            value: this.history_date
           }]
         })
         this.list = res.data
@@ -210,12 +220,12 @@
         }
       },
 
-      showCourse(type, id) {
-        if(id){
-          this.$refs.showCourse.id = id
-        }
-        this.$refs.showCourse.type = type
-        this.$refs.showCourse.isShow = true
+      showCourse(type, id) {
+        if (id) {
+          this.$refs.showCourse.id = id
+        }
+        this.$refs.showCourse.type = type
+        this.$refs.showCourse.isShow = true
       },
 
       toTxl(row) {
@@ -227,8 +237,8 @@
             title: row.name,
             id: row.id,
             date: row.start_date + '至' + row.end_date,
-            leibie: value,
-            is_history:true
+            leibie: value,
+            is_history: true
           }
         })
       },
@@ -240,8 +250,8 @@
             title: row.name,
             id: row.id,
             date: row.start_date + '至' + row.end_date,
-            leibie: value,
-            type:'show'
+            leibie: value,
+            type: 'show'
           }
         })
       },
diff --git a/src/views/course/index.vue b/src/views/course/index.vue
index 15c5fbb..53a833c 100644
--- a/src/views/course/index.vue
+++ b/src/views/course/index.vue
@@ -28,6 +28,9 @@
               </div>
               <div>
                 <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+              </div>
+              <div>
+                <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
               </div>
               <div>
                 <el-button type="primary" size="small" @click="editCourse('add')">新增课程</el-button>
@@ -61,7 +64,7 @@
           <el-table-column align='center' label="课程状态" width="120" header-align="center">
             <template slot-scope="scope">
               <div v-for="item in course_date">
-                <el-tag :type="item.type" v-if="scope.row.date_status===item.value">{{item.value}}</el-tag>
+                <el-tag :type="item.type" v-if="scope.row.course_status===item.id">{{item.value}}</el-tag>
               </div>
             </template>
           </el-table-column>
@@ -184,6 +187,15 @@
         this.select.page_size = e
         this.select.page = 1
         this.getList()
+      },
+      resetSelect(){
+
+        this.select.name = ''
+        this.select.type = ''
+        this.select.course_status = ''
+        this.select.dateRange = ''
+        this.select.page=1
+        this.getList()
       },
       async getList() {
         const res = await index({
diff --git a/src/views/course/pay.vue b/src/views/course/pay.vue
index 6494d0a..90a3f46 100644
--- a/src/views/course/pay.vue
+++ b/src/views/course/pay.vue
@@ -18,6 +18,10 @@
               </div>
               <div>
                 <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+              </div>
+              <div>
+                <el-button type="primary" size="small" @click="resetSelect">重置</el-button>
+
               </div>
               <div>
                 <el-button type="primary" size="small" @click="exportExcel">导出</el-button>
@@ -70,7 +74,7 @@
           <el-table-column align='center' label="缴费截图" width="100" header-align="center">
             <template slot-scope="scope">
               <template v-for="item in scope.row.fee_files">
-                <el-image style="width:'40px';height:'40px'" :src="item.url"
+                <el-image style="width:80px;height:80px" :src="item.url"
                   :preview-src-list="[item.url]"></el-image>
               </template>
             </template>
@@ -226,6 +230,12 @@
         this.select.page_size = e
         this.select.page = 1
         this.getList()
+      },
+      resetSelect(){
+        this.select.name = ''
+        this.select.fee_status = ''
+        this.select.page=1
+        this.getList()
       },
       async getList() {
         const res = await indexStudy({
diff --git a/src/views/course/txl.vue b/src/views/course/txl.vue
index 6a4e451..4a3365a 100644
--- a/src/views/course/txl.vue
+++ b/src/views/course/txl.vue
@@ -60,7 +60,8 @@
                   </el-select>
                 </div> -->
                 <div>
-                  <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+                  <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="importTable">导入</el-button>
                   <el-button type="primary" size="small" @click="exportExcel">导出</el-button>
                 </div>
@@ -233,6 +234,18 @@
         this.select.page_size = e
         this.select.page = 1
         this.getList()
+      },
+      resetSelect(){
+        this.select.name = ''
+        this.select.mobile = ''
+        this.select.company_name = ''
+        this.select.company_position = ''
+        this.select.company_area = ''
+        this.select.company_type = ''
+        this.select.company_industry = ''
+        this.select.education = ''
+        this.select.page=1
+        this.getList()
       },
       async getList() {
         const res = await index({
diff --git a/src/views/student/components/detail.vue b/src/views/student/components/detail.vue
index 15f3ae6..432d9ad 100644
--- a/src/views/student/components/detail.vue
+++ b/src/views/student/components/detail.vue
@@ -315,7 +315,8 @@
           }
           this.form.status = res.status ? res.status : 0
           this.form.score = res.score ? res.score : ''
-          this.form.reason = res.reason ? res.reason : ''
+          this.form.reason = res.reason ? res.reason : ''
+          this.form.giveup_reason = res.giveup_reason?res.giveup_reason:''
           this.fileList = res.files ? res.files : []
 
           console.log("this.sign_info", this.sign_info)
diff --git a/src/views/student/index.vue b/src/views/student/index.vue
index 85151a6..a8c87dd 100644
--- a/src/views/student/index.vue
+++ b/src/views/student/index.vue
@@ -21,7 +21,7 @@
                   <el-input v-model="select.course_name" placeholder="请输入课程名称"></el-input>
                 </div>
 
-                <div>
+                <div>
                   <el-input v-model="select.company_position" placeholder="请输入职务"></el-input>
                 </div>
                 <div>
@@ -92,6 +92,7 @@
 
                 <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="importTable">导入</el-button>
                   <el-button type="primary" size="small" @click="updateSchoolmates(1)">批量设置校友库</el-button>
                   <el-button type="primary" size="small" @click="updateSchoolmates(0)">批量取消校友库</el-button>
@@ -113,16 +114,16 @@
           <el-table-column align='left' label="课程" width="380" header-align="center">
             <template slot-scope="scope">
               <div v-for="(item,index) in scope.row.course_signs">
-                <div v-if="item.course"
-                style="width:100%;display: flex;justify-content: space-between;align-items: center;margin-bottom:5px">
-                  <div>
-                    {{item.course.year?item.course.year:''}}{{item.course.type_detail.name+' | '}}{{item.course.name}}
-                  </div>
-                  <template v-for="state in apply_status_list">
-                    <el-tag style="margin-left:20px" :type="state.type"
-                      v-if="item.status===state.id">{{state.value}}</el-tag>
-                  </template>
-                </div>
+                <div v-if="item.course"
+                  style="width:100%;display: flex;justify-content: space-between;align-items: center;margin-bottom:5px">
+                  <div>
+                    {{item.course.year?item.course.year:''}}{{item.course.type_detail.name+' | '}}{{item.course.name}}
+                  </div>
+                  <template v-for="state in apply_status_list">
+                    <el-tag style="margin-left:20px" :type="state.type"
+                      v-if="item.status===state.id">{{state.value}}</el-tag>
+                  </template>
+                </div>
 
               </div>
             </template>
@@ -185,9 +186,9 @@
     indexStudy,
     updateSchoolmate
   } from '@/api/student/index.js'
-  import imports from "@/views/component/imports.vue"
-  import {
-    index as indexTypes
+  import imports from "@/views/component/imports.vue"
+  import {
+    index as indexTypes
   } from "@/api/course/courseType.js"
   export default {
     mixins: [myMixins, formMixin],
@@ -284,7 +285,7 @@
       }
     },
     created() {
-      this.getList()
+      this.getList()
       this.getCourseType()
     },
     methods: {
@@ -305,6 +306,25 @@
         this.select.page_size = e
         this.select.page = 1
         this.getList()
+      },
+      resetSelect() {
+        this.select.name=''
+        this.select.mobile=''
+        this.select.company_name=''
+        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.page = 1
+        this.getList()
       },
       async getList() {
         const res = await indexStudy({
diff --git a/src/views/student/search.vue b/src/views/student/search.vue
index 7614f54..fa454d0 100644
--- a/src/views/student/search.vue
+++ b/src/views/student/search.vue
@@ -91,6 +91,7 @@
                 </div>
                 <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="exportExcel">导出</el-button>
                 </div>
               </div>
@@ -172,9 +173,9 @@
   } from "@/utils/downloadRequest";
   import {
     indexStudy
-  } from '@/api/student/index.js'
-  import {
-    index as indexTypes
+  } from '@/api/student/index.js'
+  import {
+    index as indexTypes
   } from "@/api/course/courseType.js"
   export default {
     mixins: [myMixins, formMixin],
@@ -279,6 +280,25 @@
         this.select.page = 1
         this.getList()
       },
+      resetSelect() {
+        this.select.name = ''
+        this.select.mobile = ''
+        this.select.company_name = ''
+        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.page = 1
+        this.getList()
+      },
       async getList() {
         const res = await indexStudy({
           page: this.select.page,