展演

src/main/java/com/izouma/wenlvju/domain/performance/Participant.java

@@ -1,21 +1,32 @@
 package com.izouma.wenlvju.domain.performance;
 
+import com.izouma.wenlvju.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
+import javax.persistence.Entity;
 import java.time.LocalDate;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@Entity
 @ApiModel(value = "参演人员")
-public class Participant {
+@Where(clause = "del = 0")
+public class Participant extends BaseEntity {
+    private Long programmeId;
+
+    @ApiModelProperty(value = "姓名")
     private String name;
 
+    @ApiModelProperty(value = "性别")
     private String sex;
 
+    @ApiModelProperty(value = "出生年月")
     private LocalDate birthday;
 
     private String img;

src/main/java/com/izouma/wenlvju/domain/performance/Programme.java

@@ -1,6 +1,7 @@
 package com.izouma.wenlvju.domain.performance;
 
 import com.izouma.wenlvju.domain.BaseEntity;
+import com.izouma.wenlvju.enums.CompetitionGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -10,14 +11,17 @@ import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.Transient;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-//@Entity
+@Entity
 @Where(clause = "del = 0")
-@ApiModel(value = "活动安排")
+@ApiModel(value = "节目安排")
 public class Programme extends BaseEntity {
     @ApiModelProperty(value = "节目名称")
     private String name;
@@ -25,8 +29,9 @@ public class Programme extends BaseEntity {
     @ApiModelProperty(value = "参赛专业")
     private Long specialtyId;
 
+    @Enumerated(EnumType.STRING)
     @ApiModelProperty(value = "参赛组别")
-    private String group;
+    private CompetitionGroup competitionGroup;
 
     @ApiModelProperty(value = "参赛级别")
     private Long levelSettingId;
@@ -34,8 +39,8 @@ public class Programme extends BaseEntity {
     @ApiModelProperty(value = "作品时长")
     private int durationOfWork;
 
-    @ApiModelProperty(value = "参赛人数")
-    private int quantity;
+    @ApiModelProperty(value = "指导老师")
+    private String instructor;
 
     @ApiModelProperty(value = "联系人")
     private String contact;
@@ -54,4 +59,9 @@ public class Programme extends BaseEntity {
 
     @ApiModelProperty(value = "节目视频")
     private String video;
+
+    @Transient
+    @ApiModelProperty(value = "参赛人数")
+    private int quantity;
+
 }

src/main/java/com/izouma/wenlvju/enums/Group.java → src/main/java/com/izouma/wenlvju/enums/CompetitionGroup.java

@@ -1,6 +1,6 @@
 package com.izouma.wenlvju.enums;
 
-public enum Group {
+public enum CompetitionGroup {
     /*
     单人
      */

src/main/java/com/izouma/wenlvju/repo/performance/ParticipantRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.wenlvju.repo.performance;
+
+import com.izouma.wenlvju.domain.performance.Participant;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface ParticipantRepo extends JpaRepository<Participant, Long>, JpaSpecificationExecutor<Participant> {
+    @Query("update Participant t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/wenlvju/repo/performance/ProgrammeRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.wenlvju.repo.performance;
+
+import com.izouma.wenlvju.domain.performance.Programme;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface ProgrammeRepo extends JpaRepository<Programme, Long>, JpaSpecificationExecutor<Programme> {
+    @Query("update Programme t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/wenlvju/service/performance/ParticipantService.java

@@ -0,0 +1,20 @@
+package com.izouma.wenlvju.service.performance;
+
+import com.izouma.wenlvju.domain.performance.Participant;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.repo.performance.ParticipantRepo;
+import com.izouma.wenlvju.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class ParticipantService {
+
+    private ParticipantRepo participantRepo;
+
+    public Page<Participant> all(PageQuery pageQuery) {
+        return participantRepo.findAll(JpaUtils.toSpecification(pageQuery, Participant.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/wenlvju/service/performance/ProgrammeService.java

@@ -0,0 +1,20 @@
+package com.izouma.wenlvju.service.performance;
+
+import com.izouma.wenlvju.domain.performance.Programme;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.repo.performance.ProgrammeRepo;
+import com.izouma.wenlvju.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class ProgrammeService {
+
+    private ProgrammeRepo programmeRepo;
+
+    public Page<Programme> all(PageQuery pageQuery) {
+        return programmeRepo.findAll(JpaUtils.toSpecification(pageQuery, Programme.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/wenlvju/web/AuthenticationController.java

@@ -33,16 +33,6 @@ public class AuthenticationController {
 
     @PostMapping("/login")
     public String loginByUserPwd(String username, String password, Integer expiration) {
-//        Authentication authentication = authenticate(username, password);
-//        JwtUser jwtUser = (JwtUser) authentication.getPrincipal();
-//        LocalDate start = Convert.convert(LocalDate.class, "2021-6-2");
-//        if (authentication.getAuthorities()
-//                .contains(new SimpleGrantedAuthority(AuthorityName.ROLE_ADMIN.name()))) {
-//            return jwtTokenUtil.generateToken(jwtUser);
-//        } else if (LocalDate.now().isAfter(start)) {
-//            return jwtTokenUtil.generateToken(jwtUser);
-//        }
-//        throw new AuthenticationException("禁止登录", null);
         Authentication authentication = authenticate(username, password);
         JwtUser jwtUser = (JwtUser) authentication.getPrincipal();
         return jwtTokenUtil.generateToken(jwtUser);

src/main/java/com/izouma/wenlvju/web/SettingController.java

@@ -78,8 +78,6 @@ public class SettingController extends BaseController {
         return record;
     }
 
-
-    //@PreAuthorize("hasRole('ADMIN')")
     @PostMapping("/all")
     public Page<Setting> all(@RequestBody PageQuery pageQuery) {
         return settingService.all(pageQuery);

src/main/java/com/izouma/wenlvju/web/performance/ParticipantController.java

@@ -0,0 +1,63 @@
+package com.izouma.wenlvju.web.performance;
+
+import com.izouma.wenlvju.web.BaseController;
+import com.izouma.wenlvju.domain.performance.Participant;
+import com.izouma.wenlvju.service.performance.ParticipantService;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.performance.ParticipantRepo;
+import com.izouma.wenlvju.utils.ObjUtils;
+import com.izouma.wenlvju.utils.excel.ExcelUtils;
+
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/participant")
+@AllArgsConstructor
+public class ParticipantController extends BaseController {
+    private ParticipantService participantService;
+    private ParticipantRepo participantRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Participant save(@RequestBody Participant record) {
+        if (record.getId() != null) {
+            Participant orig = participantRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return participantRepo.save(orig);
+        }
+        return participantRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Participant> all(@RequestBody PageQuery pageQuery) {
+        return participantService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public Participant get(@PathVariable Long id) {
+        return participantRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        participantRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Participant> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/java/com/izouma/wenlvju/web/performance/ProgrammeController.java

@@ -0,0 +1,63 @@
+package com.izouma.wenlvju.web.performance;
+
+import com.izouma.wenlvju.web.BaseController;
+import com.izouma.wenlvju.domain.performance.Programme;
+import com.izouma.wenlvju.service.performance.ProgrammeService;
+import com.izouma.wenlvju.dto.PageQuery;
+import com.izouma.wenlvju.exception.BusinessException;
+import com.izouma.wenlvju.repo.performance.ProgrammeRepo;
+import com.izouma.wenlvju.utils.ObjUtils;
+import com.izouma.wenlvju.utils.excel.ExcelUtils;
+
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/programme")
+@AllArgsConstructor
+public class ProgrammeController extends BaseController {
+    private ProgrammeService programmeService;
+    private ProgrammeRepo programmeRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public Programme save(@RequestBody Programme record) {
+        if (record.getId() != null) {
+            Programme orig = programmeRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return programmeRepo.save(orig);
+        }
+        return programmeRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/all")
+    public Page<Programme> all(@RequestBody PageQuery pageQuery) {
+        return programmeService.all(pageQuery);
+    }
+
+    @GetMapping("/get/{id}")
+    public Programme get(@PathVariable Long id) {
+        return programmeRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        programmeRepo.softDelete(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<Programme> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/genjson/Participant.json

@@ -0,0 +1 @@
+{"tableName":"Participant","className":"Participant","remark":"参演人员","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/java/com/izouma/wenlvju","viewPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/wenlvju/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"name","modelName":"name","remark":"姓名","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"sex","modelName":"sex","remark":"性别","showInList":true,"showInForm":true,"formType":"select","apiFlag":"1","optionsValue":"[{\"label\":\"男\",\"value\":\"男\"},{\"label\":\"女\",\"value\":\"女\"}]"},{"name":"birthday","modelName":"birthday","remark":"出生年月","showInList":true,"showInForm":true,"formType":"date"},{"name":"img","modelName":"img","remark":"照片","showInList":true,"showInForm":true,"formType":"singleImage"},{"name":"phone","modelName":"phone","remark":"考生/家长联系方式","showInList":true,"showInForm":true,"formType":"singleLineText","validate":true,"validatorType":"phone"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.wenlvju","tablePackage":"com.izouma.wenlvju.domain.performance.Participant","genPackage":"performance"}

src/main/vue/src/components/VideoUpload.vue

@@ -22,7 +22,7 @@
             <i class="el-icon-loading"></i>
             <el-progress :stroke-width="4" :percentage="progress"></el-progress>
         </div>
-        <el-button v-else type="primary" size="mini">上传 </el-button>
+        <el-button v-else type="primary" size="mini" plain>上传视频 </el-button>
     </el-upload>
 </template>
 <script>

src/main/vue/src/mixins/delChild.js

@@ -0,0 +1,14 @@
+export default {
+    methods: {
+        delChild(list) {
+            return list.map(item => {
+                const info = {
+                    ...item,
+                    ['children']:
+                        item['children'] && item['children'].length > 0 ? this.delChild(item['children']) : null
+                };
+                return info;
+            });
+        }
+    }
+};

src/main/vue/src/router.js

@@ -582,6 +582,42 @@ const router = new Router({
                     meta: {
                         title: '考级专业考官编辑'
                     }
+                },
+                {
+                    path: '/programmeEdit',
+                    name: 'ProgrammeEdit',
+                    component: () =>
+                        import(/* webpackChunkName: "programmeEdit" */ '@/views/performance/ProgrammeEdit.vue'),
+                    meta: {
+                        title: '节目管理编辑'
+                    }
+                },
+                {
+                    path: '/programmeList',
+                    name: 'ProgrammeList',
+                    component: () =>
+                        import(/* webpackChunkName: "programmeList" */ '@/views/performance/ProgrammeList.vue'),
+                    meta: {
+                        title: '节目管理'
+                    }
+                },
+                {
+                    path: '/participantEdit',
+                    name: 'ParticipantEdit',
+                    component: () =>
+                        import(/* webpackChunkName: "participantEdit" */ '@/views/performance/ParticipantEdit.vue'),
+                    meta: {
+                        title: '参演人员编辑'
+                    }
+                },
+                {
+                    path: '/participantList',
+                    name: 'ParticipantList',
+                    component: () =>
+                        import(/* webpackChunkName: "participantList" */ '@/views/performance/ParticipantList.vue'),
+                    meta: {
+                        title: '参演人员'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

src/main/vue/src/views/PerformanceApplyEdit.vue

@@ -62,8 +62,10 @@
 </template>
 <script>
 import { mapState } from 'vuex';
+import delChild from '@/mixins/delChild';
 export default {
     name: 'PerformanceApplyEdit',
+    mixins: [delChild],
     created() {
         if (this.$route.query.id) {
             this.$http
@@ -160,16 +162,6 @@ export default {
                         this.$message.error((e || {}).error || '删除失败');
                     }
                 });
-        },
-        delChild(list) {
-            return list.map(item => {
-                const info = {
-                    ...item,
-                    ['children']:
-                        item['children'] && item['children'].length > 0 ? this.delChild(item['children']) : null
-                };
-                return info;
-            });
         }
     }
 };

src/main/vue/src/views/performance/ParticipantEdit.vue

@@ -0,0 +1,125 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="142px"
+            label-position="right"
+            size="small"
+            style="max-width: 500px;"
+        >
+            <el-form-item prop="name" label="姓名">
+                <el-input v-model="formData.name"></el-input>
+            </el-form-item>
+            <el-form-item prop="sex" label="性别">
+                <el-select v-model="formData.sex" clearable filterable placeholder="请选择">
+                    <el-option v-for="item in sexOptions" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="birthday" label="出生年月">
+                <el-date-picker
+                    v-model="formData.birthday"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                >
+                </el-date-picker>
+            </el-form-item>
+            <el-form-item prop="img" label="照片">
+                <single-upload v-model="formData.img"></single-upload>
+            </el-form-item>
+            <el-form-item prop="phone" label="考生/家长联系方式">
+                <el-input v-model="formData.phone"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+export default {
+    name: 'ParticipantEdit',
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('participant/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        }
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                phone: [
+                    {
+                        pattern: /^1[3-9]\d{9}$/,
+                        message: '请输入正确的手机号',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            sexOptions: [
+                { label: '男', value: '男' },
+                { label: '女', value: '女' }
+            ]
+        };
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/participant/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/participant/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/performance/ParticipantList.vue

@@ -0,0 +1,180 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                >导出EXCEL
+            </el-button>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="name" label="姓名"> </el-table-column>
+            <el-table-column prop="sex" label="性别" :formatter="sexFormatter"> </el-table-column>
+            <el-table-column prop="birthday" label="出生年月"> </el-table-column>
+            <el-table-column prop="img" label="照片">
+                <template slot-scope="{ row }">
+                    <el-image
+                        style="width: 30px; height: 30px"
+                        :src="row.img"
+                        fit="cover"
+                        :preview-src-list="[row.img]"
+                    ></el-image>
+                </template>
+            </el-table-column>
+            <el-table-column prop="phone" label="考生/家长联系方式"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'ParticipantList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/participant/all',
+            downloading: false,
+            sexOptions: [
+                { label: '男', value: '男' },
+                { label: '女', value: '女' }
+            ]
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        sexFormatter(row, column, cellValue, index) {
+            let selectedOption = this.sexOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            return { search: this.search };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/participantEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/participantEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/participant/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/participant/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/performance/ProgrammeEdit.vue

@@ -0,0 +1,420 @@
+<template>
+    <div class="edit-view">
+        <el-form
+            :model="formData"
+            :rules="rules"
+            ref="form"
+            label-width="80px"
+            label-position="right"
+            size="small"
+            style="max-width: 600px;"
+        >
+            <el-form-item prop="name" label="节目名称">
+                <el-input v-model="formData.name"></el-input>
+            </el-form-item>
+            <el-form-item prop="specialtyId" label="参赛专业">
+                <el-cascader
+                    ref="artCascader"
+                    style="width: 100%"
+                    v-model="formData.artTypeId"
+                    :props="optionProps"
+                    :options="artTypes"
+                    :show-all-levels="false"
+                    placeholder="请选择专业"
+                >
+                </el-cascader>
+            </el-form-item>
+            <el-form-item prop="competitionGroup" label="参赛组别">
+                <el-select v-model="formData.competitionGroup" clearable filterable placeholder="请选择">
+                    <el-option
+                        v-for="item in competitionGroupOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="levelSettingId" label="参赛级别" v-if="formData.competitionGroup">
+                <el-select
+                    v-model="formData.levelSettingId"
+                    clearable
+                    filterable
+                    placeholder="请选择"
+                    style="width: 100%"
+                    v-if="formData.competitionGroup == 'SINGLE'"
+                >
+                    <el-option
+                        v-for="item in levelSingleOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                        <span style="float: left">{{ item.label }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 13px">{{ item.desc }}</span>
+                    </el-option>
+                </el-select>
+                <el-select
+                    v-model="formData.levelSettingId"
+                    clearable
+                    filterable
+                    placeholder="请选择"
+                    style="width: 100%"
+                    v-else
+                >
+                    <el-option
+                        v-for="item in levelCollectiveOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                        <span style="float: left">{{ item.label }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 13px">{{ item.desc }}</span>
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="durationOfWork" label="作品时长">
+                <el-input v-model="formData.durationOfWork"></el-input>
+            </el-form-item>
+            <el-form-item prop="instructor" label="指导老师">
+                <el-input v-model="formData.instructor"></el-input>
+            </el-form-item>
+            <el-form-item prop="video" label="作品视频">
+                <video-upload v-model="formData.video"></video-upload>
+            </el-form-item>
+
+            <el-form-item prop="gradingOrganizationId" label="考级机构">
+                <el-select
+                    v-model="formData.gradingOrganizationId"
+                    clearable
+                    filterable
+                    placeholder="请选择"
+                    style="width: 100%"
+                >
+                    <el-option
+                        v-for="item in gradingOrganizationIdOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="organizationId" label="承办单位">
+                <el-select
+                    v-model="formData.organizationId"
+                    clearable
+                    filterable
+                    placeholder="请选择"
+                    style="width: 100%"
+                >
+                    <el-option
+                        v-for="item in organizationIdOptions"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    >
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item prop="examPoint" label="考级点">
+                <el-input v-model="formData.examPoint"></el-input>
+            </el-form-item>
+            <el-form-item prop="contact" label="联系人">
+                <el-input v-model="formData.contact"></el-input>
+            </el-form-item>
+            <el-form-item prop="phone" label="联系电话">
+                <el-input v-model="formData.phone"></el-input>
+            </el-form-item>
+
+            <!-- <el-form-item label="参演人员"> -->
+            <el-button type="primary" size="mini" @click="onAddOtherForm()" style="margin: 10px" plain
+                >添加参演人员</el-button
+            >
+            <div class="add-con" v-for="(item, index) in participants" :key="index">
+                <div v-if="!item.del">
+                    <el-row>
+                        <el-col :span="11">
+                            <el-form-item prop="name" label="姓名">
+                                <el-input v-model="item.name"></el-input>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="11">
+                            <el-form-item prop="birthday" label="出生年月">
+                                <el-date-picker
+                                    v-model="item.birthday"
+                                    type="date"
+                                    value-format="yyyy-MM-dd"
+                                    placeholder="选择日期"
+                                >
+                                </el-date-picker>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-col :span="11">
+                            <el-form-item prop="sex" label="性别">
+                                <el-select v-model="item.sex"></el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="11">
+                            <el-form-item prop="phone" label="联系方式">
+                                <el-input v-model="item.phone"></el-input>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <el-row>
+                        <el-form-item label="照片">
+                            <single-upload v-model="item.img"></single-upload>
+                        </el-form-item>
+
+                        <el-form-item>
+                            <el-button
+                                class="del"
+                                type="danger"
+                                size="small"
+                                icon="el-icon-delete"
+                                @click="onDeleteOtherForm(item, index)"
+                            ></el-button>
+                        </el-form-item>
+                    </el-row>
+                </div>
+            </div>
+            <!-- </el-form-item> -->
+
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving" type="danger" v-if="formData.id">删除 </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+import delChild from '@/mixins/delChild';
+import { mapState } from 'vuex';
+export default {
+    name: 'ProgrammeEdit',
+    mixins: [delChild],
+    created() {
+        if (this.$route.query.id) {
+            this.$http
+                .get('programme/get/' + this.$route.query.id)
+                .then(res => {
+                    this.formData = res;
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.$message.error(e.error);
+                });
+        } else if (this.organization) {
+            this.formData.organizationId = this.organization.id;
+            this.formData.contact = this.organization.owner;
+            this.formData.phone = this.organization.ownerPhone;
+            if (this.organization.gradingOrganizationId.length > 0) {
+                this.formData.gradingOrganizationId = this.organization.gradingOrganizationId[0];
+            }
+        }
+        this.$http
+            .post('/setting/byFlag', { flag: 3 })
+            .then(res => {
+                if (res.length > 0) {
+                    res.forEach(item => {
+                        this.levelSingleOptions.push({
+                            label: item.name,
+                            value: item.id,
+                            desc: item.code
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+        this.$http
+            .post('/setting/byFlag', { flag: 4 })
+            .then(res => {
+                if (res.length > 0) {
+                    res.forEach(item => {
+                        this.levelCollectiveOptions.push({
+                            label: item.name,
+                            value: item.id,
+                            desc: item.code
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+        this.$http
+            .post('/gradingOrganization/all', { size: 1000, query: { del: false } }, { body: 'json' })
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.gradingOrganizationIdOptions.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+        this.$http
+            .post('/organization/all', { size: 1000, query: { del: false } }, { body: 'json' })
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.organizationIdOptions.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                }
+            })
+            .catch(e => {
+                console.log(e);
+                this.$message.error(e.error);
+            });
+        this.$http
+            .post('/artType/allList')
+            .then(res => {
+                this.artTypes = this.delChild(res);
+            })
+            .catch(e => {
+                console.log(e);
+            });
+    },
+    data() {
+        return {
+            saving: false,
+            formData: {},
+            rules: {
+                phone: [
+                    {
+                        pattern: /^1[3-9]\d{9}$/,
+                        message: '请输入正确的手机号',
+                        trigger: 'blur'
+                    }
+                ]
+            },
+            competitionGroupOptions: [
+                { label: '个人', value: 'SINGLE' },
+                { label: '集体', value: 'COLLECTIVE' }
+            ],
+            levelSingleOptions: [],
+            levelCollectiveOptions: [],
+            gradingOrganizationIdOptions: [],
+            organizationIdOptions: [],
+            artTypes: [],
+            optionProps: {
+                value: 'id',
+                label: 'name',
+                children: 'children',
+                multiple: false,
+                emitPath: false,
+                checkStrictly: true,
+                expandTrigger: 'hover'
+            },
+            participants: []
+        };
+    },
+    computed: {
+        ...mapState(['organization'])
+    },
+    methods: {
+        onSave() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    this.submit();
+                } else {
+                    return false;
+                }
+            });
+        },
+        submit() {
+            let data = { ...this.formData };
+
+            this.saving = true;
+            this.$http
+                .post('/programme/save', data, { body: 'json' })
+                .then(res => {
+                    this.saving = false;
+                    this.$message.success('成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.saving = false;
+                    this.$message.error(e.error);
+                });
+        },
+        onDelete() {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/programme/del/${this.formData.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error((e || {}).error || '删除失败');
+                    }
+                });
+        },
+        onAddOtherForm() {
+            console.log(this.participants.length);
+            if (this.formData.competitionGroup == 'SINGLE' && this.participants.length > 0) {
+                this.$alert('单人组别只能添加一个参赛人员信息', '提示', {
+                    confirmButtonText: '确定',
+                    callback: action => {
+                        this.$message({
+                            type: 'info',
+                            message: '添加失败'
+                        });
+                    }
+                });
+            } else {
+                this.participants.push({
+                    name: '',
+                    sex: '',
+                    birthday: '',
+                    phone: '',
+                    img: ''
+                });
+            }
+        },
+        onDeleteOtherForm(info, index) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'warning' })
+                .then(() => {
+                    const schedules = [...this.schedules];
+                    if (info.id) {
+                        info.del = true;
+                        schedules[index] = info;
+                    } else {
+                        schedules.splice(index, 1);
+                    }
+                    this.schedules = schedules;
+                    this.$message.success('删除成功');
+                })
+                .catch(e => {});
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+.add-con {
+    background-color: #f7f7f7;
+    width: 100%;
+    margin: 7px 0;
+    padding-top: 14px;
+}
+</style>

src/main/vue/src/views/performance/ProgrammeList.vue

@@ -0,0 +1,208 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <!-- <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
+            <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
+            <el-button
+                @click="download"
+                type="primary"
+                icon="el-icon-download"
+                :loading="downloading"
+                class="filter-item"
+                >导出EXCEL
+            </el-button> -->
+            <el-form :model="form" inline size="mini">
+                <el-form-item label="考级机构名称">
+                    <el-input placeholder="考级机构名称" v-model="search" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="承办单位名称">
+                    <el-input placeholder="承办单位名称" v-model="search" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="考级点名称">
+                    <el-input placeholder="考级点名称" v-model="search" clearable></el-input>
+                </el-form-item>
+                <br />
+                <el-form-item label="考级机构名称">
+                    <el-input placeholder="考级机构名称" v-model="search" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="承办单位名称">
+                    <el-input placeholder="承办单位名称" v-model="search" clearable></el-input>
+                </el-form-item>
+                <el-form-item label="考级点名称">
+                    <el-input placeholder="考级点名称" v-model="search" clearable></el-input>
+                </el-form-item>
+                <br />
+                <el-form-item>
+                    <el-button @click="getData" type="primary" icon="el-icon-search">搜索 </el-button>
+                    <el-button @click="addRow" type="primary" icon="el-icon-plus">添加 </el-button>
+                    <!-- <el-button @click="download" type="primary" icon="el-icon-download" :loading="downloading"
+                        >导出EXCEL
+                    </el-button> -->
+                </el-form-item>
+            </el-form>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            header-row-class-name="table-header-row"
+            header-cell-class-name="table-header-cell"
+            row-class-name="table-row"
+            cell-class-name="table-cell"
+            :height="tableHeight"
+        >
+            <el-table-column v-if="multipleMode" align="center" type="selection" width="50"> </el-table-column>
+            <el-table-column prop="id" label="ID" width="100"> </el-table-column>
+            <el-table-column prop="name" label="节目名称"> </el-table-column>
+            <el-table-column prop="specialtyId" label="参赛专业"> </el-table-column>
+            <el-table-column prop="competitionGroup" label="参赛组别" :formatter="competitionGroupFormatter">
+            </el-table-column>
+            <el-table-column prop="levelSettingId" label="参赛级别"> </el-table-column>
+            <el-table-column prop="durationOfWork" label="作品时长"> </el-table-column>
+            <el-table-column prop="quantity" label="参赛人数"> </el-table-column>
+            <el-table-column prop="contact" label="联系人"> </el-table-column>
+            <el-table-column prop="phone" label="联系电话"> </el-table-column>
+            <el-table-column prop="gradingOrganizationId" label="考级机构"> </el-table-column>
+            <el-table-column prop="examPoint" label="考级点"> </el-table-column>
+            <el-table-column prop="video" label="节目视频"> </el-table-column>
+            <el-table-column label="操作" align="center" fixed="right" min-width="150">
+                <template slot-scope="{ row }">
+                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination
+                background
+                @size-change="onSizeChange"
+                @current-change="onCurrentChange"
+                :current-page="page"
+                :page-sizes="[10, 20, 30, 40, 50]"
+                :page-size="pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="totalElements"
+            >
+            </el-pagination>
+        </div>
+    </div>
+</template>
+<script>
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+
+export default {
+    name: 'ProgrammeList',
+    mixins: [pageableTable],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/programme/all',
+            downloading: false,
+            competitionGroupOptions: [
+                { label: '个人', value: 'SINGLE' },
+                { label: '集体', value: 'COLLECTIVE' }
+            ],
+            form: {}
+        };
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        competitionGroupFormatter(row, column, cellValue, index) {
+            let selectedOption = this.competitionGroupOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            return { search: this.search };
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/programmeEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        editRow(row) {
+            this.$router.push({
+                path: '/programmeEdit',
+                query: {
+                    id: row.id
+                }
+            });
+        },
+        download() {
+            this.downloading = true;
+            this.$axios
+                .get('/programme/excel', {
+                    responseType: 'blob',
+                    params: { size: 10000 }
+                })
+                .then(res => {
+                    console.log(res);
+                    this.downloading = false;
+                    const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                    const link = document.createElement('a');
+                    link.href = downloadUrl;
+                    link.setAttribute('download', res.headers['content-disposition'].split('filename=')[1]);
+                    document.body.appendChild(link);
+                    link.click();
+                    link.remove();
+                })
+                .catch(e => {
+                    console.log(e);
+                    this.downloading = false;
+                    this.$message.error(e.error);
+                });
+        },
+        operation1() {
+            this.$notify({
+                title: '提示',
+                message: this.selection
+            });
+        },
+        operation2() {
+            this.$message('操作2');
+        },
+        deleteRow(row) {
+            this.$alert('删除将无法恢复，确认要删除么？', '警告', { type: 'error' })
+                .then(() => {
+                    return this.$http.post(`/programme/del/${row.id}`);
+                })
+                .then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                })
+                .catch(e => {
+                    if (e !== 'cancel') {
+                        this.$message.error(e.error);
+                    }
+                });
+        }
+    }
+};
+</script>
+<style lang="less" scoped></style>

src/main/vue/src/views/rate/RateAudit.vue

@@ -211,23 +211,12 @@
 </template>
 <script>
 import { mapState } from 'vuex';
+import delChild from '@/mixins/delChild';
 export default {
     name: 'RateEdit',
+    mixins: [delChild],
     computed: {
         ...mapState(['userInfo'])
-        // saveOtherJson() {
-        //     const collaborates = [...this.collaborates]
-        //         .filter(item => {
-        //             return !!item.gradingOrganizationId || !!item.consent || !!item.artTypeId;
-        //         })
-        //         .map(item => {
-        //             return {
-        //                 ...item,
-        //                 rateId: this.rateId
-        //             };
-        //         });
-        //     return JSON.stringify(collaborates);
-        // }
     },
     created() {
         if (this.$route.query.id) {
@@ -396,16 +385,6 @@ export default {
             this.inputVisible = false;
             this.inputValue = '';
         },
-        delChild(list) {
-            return list.map(item => {
-                const info = {
-                    ...item,
-                    ['children']:
-                        item['children'] && item['children'].length > 0 ? this.delChild(item['children']) : null
-                };
-                return info;
-            });
-        },
         completed() {
             this.$confirm('确认审核已完成吗?', '提示', {
                 confirmButtonText: '确定',

src/main/vue/src/views/rate/RateEdit.vue

@@ -267,8 +267,10 @@
 </template>
 <script>
 import { mapState } from 'vuex';
+import delChild from '@/mixins/delChild';
 export default {
     name: 'RateEdit',
+    mixins: [delChild],
     computed: {
         ...mapState(['organization']),
         saveOtherJson() {
@@ -545,16 +547,6 @@ export default {
                         this.$message.error((e || {}).error || '撤回失败');
                     }
                 });
-        },
-        delChild(list) {
-            return list.map(item => {
-                const info = {
-                    ...item,
-                    ['children']:
-                        item['children'] && item['children'].length > 0 ? this.delChild(item['children']) : null
-                };
-                return info;
-            });
         }
     }
 };

src/main/vue/src/views/user/ExpertEdit.vue

@@ -78,7 +78,9 @@
     </div>
 </template>
 <script>
+import delChild from '@/mixins/delChild';
 export default {
+    mixins: [delChild],
     created() {
         if (this.$route.query.id) {
             this.$http
@@ -240,16 +242,6 @@ export default {
                     }
                 })
                 .catch(() => {});
-        },
-        delChild(list) {
-            return list.map(item => {
-                const info = {
-                    ...item,
-                    ['children']:
-                        item['children'] && item['children'].length > 0 ? this.delChild(item['children']) : null
-                };
-                return info;
-            });
         }
     }
 };