修改意见

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>
@@ -146,6 +150,12 @@
         this.select.page = 1
         this.getList()
       },
+      resetSelect(){
+
+        this.select.name = ''
+        this.select.page=1
+        this.getList()
+      },
       async getList() {
         const res = await index({
           page: this.select.page,
@@ -154,7 +164,7 @@
           sort_name:'sort',
           sort_type:'ASC',
           filter: [{
-            key: 'name',
+            key: 'real_name',
             op: 'like',
             value: this.select.name
           }]

src/views/book/components/addType.vue

@@ -103,6 +103,16 @@
           </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>
 </template>
@@ -122,6 +132,7 @@
         type: 'add',
         id: '',
         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: [],
@@ -150,6 +162,9 @@
       saveContent(e) {
         this.form.content = e
       },
+      saveContent1(e) {
+        this.form.tips = e
+      },
       changeDateRange(e) {
         console.log(e)
         if (e) {
@@ -204,6 +219,7 @@
           this.form.sort = res.sort ? res.sort : 0
           this.form.is_book = res.is_book ? res.is_book : 0
           this.showTinymce = true
+          this.showTinymce1 = true
         })
       },
 
@@ -231,6 +247,7 @@
 
 <style scoped lang="scss">
   ::v-deep .content,
+  ::v-deep .tips,
   ::v-deep .image_id {
     flex-basis: 100%;
   }

src/views/book/count.vue

@@ -27,7 +27,10 @@
               </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>
         </lx-header>
@@ -162,6 +165,14 @@
         })
         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({
           page: this.select.page,

src/views/book/index.vue

@@ -23,6 +23,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="exportExcel">导出</el-button>
               </div>
@@ -40,8 +44,8 @@
     </div>
 
     <div>
-      <xy-table :list="list" :showIndexFixed="'left'" :total="total" @pageIndexChange="pageIndexChange" @pageSizeChange="pageSizeChange"
+      <xy-table :list="list" :showIndexFixed="'left'" :total="total" @pageIndexChange="pageIndexChange"
-        :table-item="table_item">
+        @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">
@@ -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,

src/views/config/banner.vue

@@ -17,6 +17,8 @@
               </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>
                 <el-button type="primary" size="small" @click="editBanner('add')">新增</el-button>
@@ -96,7 +98,7 @@
           value: '首页'
         }, {
           id: 2,
-          value: '课程中心、我的课程、报名状态'
+          value: '我的课程、报名状态'
         }
         // , {
         //   id: 3,
@@ -159,6 +161,13 @@
         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({
           page: this.select.page,

src/views/config/donate.vue

@@ -17,6 +17,8 @@
               </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>
                 <el-button type="primary" size="small" @click="editNotice('add')">新增</el-button>
@@ -145,6 +147,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({
           page_size: this.select.page_size,

src/views/config/info.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="editInfo('add')">新增</el-button>
               </div>
@@ -92,6 +96,12 @@
         this.select.page = 1
         this.getList()
       },
+      resetSelect(){
+
+        this.select.name = ''
+        this.select.page=1
+        this.getList()
+      },
       async getList() {
         const res = await index({
           page: this.select.page,

src/views/config/teacher.vue

@@ -11,6 +11,8 @@
               </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>
                 <el-button type="primary" size="small" @click="editTeacher('add')">新增</el-button>
@@ -108,6 +110,12 @@
         this.select.page = 1
         this.getList()
       },
+      resetSelect(){
+
+        this.select.name = ''
+        this.select.page=1
+        this.getList()
+      },
       async getList() {
         const res = await index({
           page: this.select.page,

src/views/course/apply.vue

@@ -21,6 +21,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>
@@ -174,6 +175,13 @@
         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({
           page: this.select.page,

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>
@@ -243,6 +244,19 @@
         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({
           page: this.select.page,

src/views/course/attendance.vue

@@ -22,6 +22,8 @@
               </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="importTable">导入</el-button>
                 <el-button type="primary" size="small" @click="exportExcel">导出</el-button>
               </div>
@@ -216,6 +218,13 @@
 
         // {"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({
           page: this.select.page,

src/views/course/class.vue

@@ -23,6 +23,9 @@
               <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>
 
@@ -174,6 +177,13 @@
         })
         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({
           page: this.select.page,

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.isShow = false
       },
       getDetail() {
         show({

src/views/course/components/addTypes.vue

@@ -100,10 +100,10 @@
         form: {
           name:'',
           status:1,
-          wait_tip:"我们将在1-3个工作日内审核并通知您报名结果….",
+          wait_tip:"",
-          pass_tip:"恭喜您，您已被录取！",
+          pass_tip:"",
-          fault_tip:'很遗憾，您未通过审核。',
+          fault_tip:'',
-          back_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
         })
       },

src/views/course/components/applyForm.vue

@@ -5,6 +5,10 @@
         <div style="display: flex;align-items: center;justify-content: space-between;font-size: 26px;">
           <div>创建报名表单</div>
           <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>
@@ -229,6 +233,7 @@
       selectPick(i, index) {
         this.$refs.editPane.selectedIndex = index
         this.$refs.editPane.selectedForm = deepCopy(i)
+        this.$refs.editPane.formList = deepCopy(this.formList)
         this.$refs.editPane.showForm = true
       },
       // 处理 保存 删除过来的item

src/views/course/components/editPane.vue

@@ -107,6 +107,7 @@
         selectItem: [], //自定义下拉内容，先绑定数组后转为对象
         validation: [], //效验规则
         parameters: [], //数据字典
+        formList:[],
         forms: [], //表
       };
     },
@@ -127,13 +128,13 @@
         }
 
       },
+      // 选择数据库字段
       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() {
-
+                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(",")
+        // 字段标识不能重复
+
+
+        // 下拉选项
         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
@@ -195,16 +220,11 @@
     watch: {
       selectedForm(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) {

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>
@@ -169,6 +171,14 @@
         this.select.page = 1
         this.getList()
       },
+      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({

src/views/course/index.vue

@@ -29,6 +29,9 @@
               <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>
               </div>
@@ -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>
@@ -185,6 +188,15 @@
         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({
           page: this.select.page,

src/views/course/pay.vue

@@ -19,6 +19,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="exportExcel">导出</el-button>
               </div>
@@ -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>
@@ -227,6 +231,12 @@
         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({
           page: this.select.page,

src/views/course/txl.vue

@@ -61,6 +61,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="importTable">导入</el-button>
                   <el-button type="primary" size="small" @click="exportExcel">导出</el-button>
                 </div>
@@ -234,6 +235,18 @@
         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({
           page: this.select.page,

src/views/student/components/detail.vue

@@ -316,6 +316,7 @@
           this.form.status = res.status ? res.status : 0
           this.form.score = res.score ? res.score : ''
           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)

src/views/student/index.vue

@@ -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>
@@ -306,6 +307,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,

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>
@@ -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,