From c2a7e10fb7a9ddbc3bbb6bd36a83ecba30f279aa Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 5 Sep 2024 18:08:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/book/components/checkBook.vue   |  11 +-
 src/views/book/index.vue                  |   4 +-
 src/views/component/imports.vue           |  15 +-
 src/views/config/components/addDonate.vue | 191 +++++++++++++++++++++
 src/views/config/donate.vue               | 198 ++++++++++++++++++++++
 src/views/course/components/addCourse.vue |   2 +-
 src/views/student/components/detail.vue   |  71 ++++----
 7 files changed, 448 insertions(+), 44 deletions(-)
 create mode 100644 src/views/config/components/addDonate.vue
 create mode 100644 src/views/config/donate.vue

diff --git a/src/views/book/components/checkBook.vue b/src/views/book/components/checkBook.vue
index 7d8a7aa..a5455dd 100644
--- a/src/views/book/components/checkBook.vue
+++ b/src/views/book/components/checkBook.vue
@@ -35,7 +35,6 @@
               </div>
               <div>
                 <span>同行人：</span>
-
                 <span>
                   <template  v-if="submitObj.appointment_accompany&&submitObj.appointment_accompany.length>0">
                     <template v-for="item in submitObj.appointment_accompany">
@@ -57,6 +56,13 @@
                       v-if="submitObj.status===item.id">{{item.value}}</el-tag>
                   </template>
                 </span>
+              </div>
+              <div v-if="submitObj.status===1">
+                <span>预约二维码链接：</span>
+                <span>
+                  <a :href="baseUrl+submitObj.h5_url" target="_blank" style="color:blue">{{baseUrl}}{{submitObj.h5_url}}</a>
+
+                </span>
               </div>
               <div v-if="type==='show'">
                 <span>审核意见：</span>
@@ -148,7 +154,8 @@
         type: 'show',
         id: '',
         submitObj: {},
-        thirdArr: [],
+        thirdArr: [],
+        baseUrl:`${process.env.VUE_APP_BASE_API}`,
         form: {
           name: '',
         },
diff --git a/src/views/book/index.vue b/src/views/book/index.vue
index e87ec3a..532389a 100644
--- a/src/views/book/index.vue
+++ b/src/views/book/index.vue
@@ -40,7 +40,7 @@
     </div>
 
     <div>
-      <xy-table :list="list" :total="total" @pageIndexChange="pageIndexChange" @pageSizeChange="pageSizeChange"
+      <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">
@@ -60,7 +60,7 @@
         </template>
 
         <template v-slot:btns>
-          <el-table-column align='center' label="操作" width="220" header-align="center">
+          <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>
diff --git a/src/views/component/imports.vue b/src/views/component/imports.vue
index c005418..97a99ca 100644
--- a/src/views/component/imports.vue
+++ b/src/views/component/imports.vue
@@ -82,7 +82,7 @@
         let _except = []
         // 学员去除一些信息
         if (this.tableName === 'users') {
-          _except = ['plate', 'is_import', 'is_vip', 'is_schoolmate', 'appointment_total', 'letter', 'score', 'code',
+          _except = ['introduce','honour','company_need_fund','company_other','remark','plate', 'is_import', 'is_vip', 'is_schoolmate', 'appointment_total', 'letter', 'score', 'code',
             'pid'
           ]
         }
@@ -127,10 +127,15 @@
           })
         }
         // 学员 + 课程
-        if (this.tableName === 'users') {
+        if (this.tableName === 'users') {
+          b.unshift({
+            key: 'status',
+            title: '审核状态',
+            width: 120
+          });
           b.unshift({
             key: 'course_name',
-            title: '课程名字',
+            title: '课程名称',
             width: 120
           });
         }
@@ -211,10 +216,10 @@
         console.log("data", data)
         if (this.tableName === 'course_keeps') {
           data.push(['（上传前请删除示例）', '', '', ''])
-          data.push(['（请设置单元格格式为文本格式）2024-09-03', 'xxx', '出勤/缺勤'])
+          data.push(['2024-09-03', 'xxx', '出勤/缺勤'])
         }else if (this.tableName === 'course_contents') {
           data.push(['（上传前请删除示例）', '', '', ''])
-          data.push(['（请设置单元格格式为文本格式）2024-09-03', '上午13:00-14:00', '王老师', '《战略思维2》', '苏州大学', '老师简介'])
+          data.push(['2024-09-03', '上午13:00-14:00', '王老师', '《战略思维2》', '苏州大学', '老师简介'])
         }else if(this.tableName === 'course_signs'){
           data.push(['（请确保学员联系方式不为空）', '', '', ''])
         }
diff --git a/src/views/config/components/addDonate.vue b/src/views/config/components/addDonate.vue
new file mode 100644
index 0000000..9e5cce3
--- /dev/null
+++ b/src/views/config/components/addDonate.vue
@@ -0,0 +1,191 @@
+<template>
+  <div>
+    <xy-dialog ref="dialog" :width="70" :is-show.sync="isShow" :type="'form'"
+      :title="type === 'add' ? '新增校友捐赠' : '编辑校友捐赠'" :form="form" :rules='rules' @submit="submit">
+      <template v-slot:username>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>姓名：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.username" placeholder="请输入姓名" clearable style="width: 100%;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:course>
+        <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.course" placeholder="请选择就读班级" clearable style="width: 100%;">
+              <el-option v-for="(item,index) in course_options" :key="index" :label="item.value" :value="item.value">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+      <template v-slot:mobile>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>联系方式：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.mobile" placeholder="请输入联系方式" clearable style="width: 100%;"></el-input>
+          </div>
+        </div>
+      </template>
+      <template v-slot:company_name>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>公司名称：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.company_name" placeholder="请输入公司名称" clearable style="width: 100%;"></el-input>
+          </div>
+        </div>
+      </template>
+      <template v-slot:company_position>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>职务：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.company_position" placeholder="请输入职务" clearable style="width: 100%;"></el-input>
+          </div>
+        </div>
+      </template>
+      <template v-slot:donate>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>我希望捐赠：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.donate" placeholder="请输入" type="textarea" clearable style="width: 100%;"></el-input>
+          </div>
+        </div>
+      </template>
+
+    </xy-dialog>
+
+  </div>
+</template>
+
+<script>
+  import {
+    save,
+    show
+  } from "@/api/system/baseForm.js"
+  export default {
+    components: {
+
+    },
+    data() {
+      return {
+        isShow: false,
+        type: 'add',
+        id: '',
+        table_name: 'donates',
+        course_options:[{
+					label: '高研班｜第一期高级科创人才研修班',
+					value: '高研班｜第一期高级科创人才研修班'
+				}, {
+					label: '高研班｜第二期高级科创人才研修班',
+					value: '高研班｜第二期高级科创人才研修班'
+				},{
+					label: '高研班｜第三期高级科创人才研修班',
+					value: '高研班｜第三期高级科创人才研修班'
+				}, {
+					label: '高研班｜第四期高级科创人才研修班',
+					value: '高研班｜第四期高级科创人才研修班'
+				},{
+					label: '高研班｜第五期高级科创人才研修班',
+					value: '高研班｜第五期高级科创人才研修班'
+				}, {
+					label: '高研班｜第六期高级科创人才研修班',
+					value: '高研班｜第六期高级科创人才研修班'
+				}, {
+					label: '其他',
+					value: '其他'
+				}],
+        form: {
+          username: '',
+          course: '',
+          mobile: '',
+          company_name: '',
+          company_position: '',
+          donate: ''
+        },
+        rules: {
+          username: [{
+            required: true,
+            message: '请输入姓名'
+          }],
+          course: [{
+            required: true,
+            message: '请选择就读班级'
+          }],
+          mobile: [{
+            required: true,
+            message: '请输入联系方式'
+          }],
+          mobile: [{
+            required: true,
+            message: '请输入联系方式'
+          }]
+        }
+      }
+    },
+    created() {},
+    methods: {
+
+      submit() {
+        if (this.id) {
+          this.form.id = this.id
+        }
+        if (this.type == 'add') {
+          this.form.id = ''
+        }
+        console.log("this.form",this.form)
+        save({
+          table_name: this.table_name,
+          ...this.form
+        }).then(res => {
+          this.$message({
+            type: 'success',
+            message: this.type === 'add' ? '新增成功' : '编辑成功'
+          })
+          this.isShow = false
+          this.$emit('refresh')
+        })
+      },
+
+      getDetail() {
+        show({
+          id: this.id,
+          table_name: this.table_name,
+        }).then(res => {
+          this.form = this.base.requestToForm(res, this.form)
+        })
+      }
+    },
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+          if (this.type === 'editor') {
+            this.getDetail()
+          }
+        } else {
+          this.id = ''
+          this.type = "add"
+          this.$refs['dialog'].reset()
+        }
+      },
+    }
+
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/views/config/donate.vue b/src/views/config/donate.vue
new file mode 100644
index 0000000..eac8ce4
--- /dev/null
+++ b/src/views/config/donate.vue
@@ -0,0 +1,198 @@
+<template>
+  <div>
+
+    <div>
+      <div ref="lxHeader">
+        <lx-header icon="md-apps" :text="$route.meta.title" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+          <div slot="content">
+            <div class="searchwrap" style="display: flex;align-items: center;">
+              <div>
+                <el-input v-model="select.username" placeholder="请输入姓名"></el-input>
+              </div>
+              <div>
+                <el-select v-model="select.course" placeholder="请选择就读班级" clearable>
+                  <el-option v-for="(item,index) in course_options" :key="index" :label="item.value" :value="item.value">
+                  </el-option>
+                </el-select>
+              </div>
+              <div>
+                <el-button type="primary" size="small" @click="select.page=1,getList()">查询</el-button>
+              </div>
+              <div>
+                <el-button type="primary" size="small" @click="editNotice('add')">新增</el-button>
+              </div>
+            </div>
+          </div>
+
+        </lx-header>
+      </div>
+    </div>
+
+    <div>
+      <xy-table :list="list" :total="total" @pageIndexChange="pageIndexChange" @pageSizeChange="pageSizeChange"
+        :table-item="table_item">
+        <template v-slot:btns>
+          <el-table-column align='center' fixed="right" label="操作" width="180" header-align="center">
+            <template slot-scope="scope">
+              <el-button type="primary" size="small" @click="editNotice('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>
+          </el-table-column>
+        </template>
+      </xy-table>
+    </div>
+
+    <add-donate ref="addDonate" @refresh="getList"></add-donate>
+  </div>
+</template>
+
+<script>
+  import addDonate from './components/addDonate.vue';
+  import {
+    index,
+    destroy
+  } from "@/api/system/baseForm.js"
+  export default {
+    components: {
+      addDonate
+    },
+    data() {
+      return {
+        select: {
+          username:'',
+          course:'',
+          table_name: 'donates',
+          page: 1,
+          page_size: 10
+        },
+        course_options:[{
+        	label: '高研班｜第一期高级科创人才研修班',
+        	value: '高研班｜第一期高级科创人才研修班'
+        }, {
+        	label: '高研班｜第二期高级科创人才研修班',
+        	value: '高研班｜第二期高级科创人才研修班'
+        },{
+        	label: '高研班｜第三期高级科创人才研修班',
+        	value: '高研班｜第三期高级科创人才研修班'
+        }, {
+        	label: '高研班｜第四期高级科创人才研修班',
+        	value: '高研班｜第四期高级科创人才研修班'
+        },{
+        	label: '高研班｜第五期高级科创人才研修班',
+        	value: '高研班｜第五期高级科创人才研修班'
+        }, {
+        	label: '高研班｜第六期高级科创人才研修班',
+        	value: '高研班｜第六期高级科创人才研修班'
+        }, {
+        	label: '其他',
+        	value: '其他'
+        }],
+        list: [],
+        total: 0,
+        table_item: [{
+          prop: 'username',
+          label: '姓名',
+          align: 'left',
+          width: 160,
+        }, {
+          prop: 'course',
+          label: '就读班级',
+          align: 'left',
+          // width:240
+        }, {
+          prop: 'mobile',
+          label: '联系方式',
+          align: 'center',
+          width: 160,
+        }, {
+          prop: 'company_name',
+          label: '公司名称',
+          align: 'left',
+          width: 240,
+        }, {
+          prop: 'company_position',
+          label: '职务',
+          align: 'center',
+          width: 160,
+        }, {
+          prop: 'donate',
+          label: '我希望捐赠',
+          align: 'center',
+          width: 240,
+        }]
+
+      }
+    },
+    created() {
+      this.getList()
+    },
+    methods: {
+      pageIndexChange(e) {
+        this.select.page = e
+        this.getList()
+      },
+      pageSizeChange(e) {
+        this.select.page_size = e
+        this.select.page = 1
+        this.getList()
+      },
+      editNotice(type, id) {
+        if (type == 'editor') {
+          this.$refs.addDonate.id = id
+        }
+        this.$refs.addDonate.type = type
+        this.$refs.addDonate.isShow = true
+      },
+      async getList() {
+        const res = await index({
+          page_size: this.select.page_size,
+          page: this.select.page,
+          table_name: this.select.table_name,
+          filter:[{
+            key:'username',
+            op:'like',
+            value:this.select.username
+          },{
+            key:'course',
+            op:'like',
+            value:this.select.course
+          }]
+        })
+        this.list = res.data
+        this.total = res.total
+      },
+      deleteList(id) {
+        var that = this;
+        destroy({
+          id: id,
+          table_name: this.select.table_name
+        }).then(response => {
+          this.$Message.success('操作成功');
+          this.getList()
+        }).catch(error => {
+          console.log(error)
+          reject(error)
+        })
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .searchwrap {
+    display: flex;
+    align-items: center;
+
+    &>div {
+      display: flex;
+      align-items: center;
+      margin-right: 10px;
+
+      span {
+        min-width: 70px;
+      }
+    }
+  }
+</style>
diff --git a/src/views/course/components/addCourse.vue b/src/views/course/components/addCourse.vue
index 2fdef66..8c69e54 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" @click="closeSubmit">完成并关闭</Button> -->
       </template>
 
 
diff --git a/src/views/student/components/detail.vue b/src/views/student/components/detail.vue
index 641430a..15f3ae6 100644
--- a/src/views/student/components/detail.vue
+++ b/src/views/student/components/detail.vue
@@ -23,46 +23,47 @@
                     </template>
                     {{student_info[item.field]?student_info[item.field]:''}}
                   </el-descriptions-item>
-                  <el-descriptions-item v-if="type==='check' || type==='checkshow' || type==='setPosition'">
+                  <el-descriptions-item  :span="2" v-if="type==='check' || type==='checkshow' || type==='setPosition'">
                     <template slot="label">
                       本班职务
                     </template>
                     {{sign_result.position?sign_result.position:''}}
-                  </el-descriptions-item>
+                  </el-descriptions-item>
+                  <!-- 报名信息 -->
+                  <template v-if="sign_info.length>0">
+                    <!-- <lx-header v-if="type==='check' || type==='checkshow' || type==='setPosition'" icon="" text="报名信息"
+                      style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+                    </lx-header> -->
+                    <template v-if="type==='check' || type==='checkshow' || type==='setPosition'">
+                      <!-- <el-descriptions class="margin-top" :column="2" border> -->
+                        <template v-for="item in sign_info">
+                          <el-descriptions-item :span="2" v-if="item.submit_files && item.submit_files.length>0">
+                            <template slot="label">
+                              {{item.name}}
+                            </template>
+                            <div>
+                              <template v-for="file in item.submit_files">
+                                <img style="width:100px;margin:10px" :src="host+file"></img>
+                              </template>
+                            </div>
+                          </el-descriptions-item>
+                          <el-descriptions-item v-else  :span="2">
+                            <template slot="label">
+                              {{item.name}}
+                            </template>
+                            {{item.value}}
+                          </el-descriptions-item>
+                        </template>
+
+
+                      <!-- </el-descriptions> -->
+                    </template>
+                  </template>
                 </el-descriptions>
 
               </div>
-              <!-- 报名信息 -->
-              <template v-if="sign_info.length>0">
-                <lx-header v-if="type==='check' || type==='checkshow' || type==='setPosition'" icon="" text="报名信息"
-                  style="margin-bottom: 10px; border: 0px; margin-top: 15px">
-                </lx-header>
-                <div v-if="type==='check' || type==='checkshow' || type==='setPosition'">
-                  <el-descriptions class="margin-top" :column="2" border>
-                    <template v-for="item in sign_info">
-                      <el-descriptions-item :span="2" v-if="item.submit_files && item.submit_files.length>0">
-                        <template slot="label">
-                          {{item.name}}
-                        </template>
-                        <div>
-                          <template v-for="file in item.submit_files">
-                            <img style="width:100px;margin:10px" :src="host+file"></img>
-                          </template>
-                        </div>
-                      </el-descriptions-item>
-                      <el-descriptions-item v-else>
-                        <template slot="label">
-                          {{item.name}}
-                        </template>
-                        {{item.value}}
-                      </el-descriptions-item>
-                    </template>
 
 
-                  </el-descriptions>
-                </div>
-              </template>
-
               <!-- 审核查看 -->
               <lx-header v-if="type=='checkshow' || type=='check'" icon="" text="审核结果"
                 style="margin-bottom: 10px; border: 0px; margin-top: 15px">
@@ -296,9 +297,11 @@
           this.form.position = res.position ? res.position : ''
           let _arr = []
           if (res.data && Array.isArray(res.data)) {
-            res.data.map(item => {
-              if (!this.base.isNull(item.value) && item.value.indexOf("/storage/files/") !== -1) {
-                item.submit_files = item.value.split(",")
+            res.data.map(item => {
+              if(item.edit_input==='files'){
+                if (!this.base.isNull(item.value) && item.value.indexOf("/storage/files/") !== -1) {
+                  item.submit_files = item.value.split(",")
+                }
               }
               // 处理自定义字段中是否 是个人用户信息
               if (!this.student_info.hasOwnProperty(item.field)) {