licailing %!s(int64=4) %!d(string=hai) anos
pai
achega
b0495c4752

+ 2 - 0
src/main/java/com/izouma/wenlvju/dto/RateDTO.java

@@ -88,6 +88,8 @@ public class RateDTO {
     @ApiModelProperty(value = "等级")
     private String grade;
 
+    private int sort;
+
     @ExcelIgnore
     @ApiModelProperty(value = "驳回时间")
     private LocalDateTime rejectedAt;

+ 26 - 4
src/main/java/com/izouma/wenlvju/service/performance/ProgrammeService.java

@@ -127,6 +127,28 @@ public class ProgrammeService {
         return record;
     }
 
+    public Page<Programme> all2(PageQuery pageQuery) {
+        Map<String, Object> query = pageQuery.getQuery();
+        Object code = query.get("code");
+        String artCode = null;
+        if (ObjectUtil.isNotNull(code)) {
+            artCode = Convert.convert(String.class, code);
+            query.remove("code");
+        }
+
+        List<ArtType> artTypes = artTypeRepo.findAll();
+
+        String finalArtCode = artCode;
+        return programmeRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
+            List<Predicate> and = JpaUtils.toPredicates(pageQuery, Programme.class, root, criteriaQuery, criteriaBuilder);
+            if (StrUtil.isNotBlank(finalArtCode)) {
+                and.add(root.get("specialtyId").in(artTypeService.getIds(artTypes, finalArtCode)));
+            }
+            return criteriaBuilder.and(and.toArray(new Predicate[0]));
+
+        }), JpaUtils.toPageRequest(pageQuery));
+    }
+
 
     public Page<ProgrammeDTO> backAll(PageQuery pageQuery) {
         Map<String, Object> query = pageQuery.getQuery();
@@ -140,7 +162,7 @@ public class ProgrammeService {
         List<ArtType> artTypes = artTypeRepo.findAll();
 
         String finalArtCode = artCode;
-        Page<Programme> all = programmeRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
+        Page<Programme> all =  programmeRepo.findAll(((root, criteriaQuery, criteriaBuilder) -> {
             List<Predicate> and = JpaUtils.toPredicates(pageQuery, Programme.class, root, criteriaQuery, criteriaBuilder);
             if (StrUtil.isNotBlank(finalArtCode)) {
                 and.add(root.get("specialtyId").in(artTypeService.getIds(artTypes, finalArtCode)));
@@ -605,19 +627,19 @@ public class ProgrammeService {
             List<Programme> programmes = programmeRepo.findAllByPerformanceIdAndProgrammeStatusAndReviewArrangeIdIsNull(performanceId, ProgrammeStatus.SUBMIT);
             if (CollUtil.isNotEmpty(programmes)) {
                 this.sort(programmes);
-                return this.toShowDTOList(programmes, performance.getName());
+                return this.toShowDTOList(programmes);
             }
             return null;
         }
         List<Programme> programmes = programmeRepo.findAllByPerformanceIdAndProgrammeStatusAndArrangeIdIsNull(performanceId, ProgrammeStatus.SUBMIT);
         if (CollUtil.isNotEmpty(programmes)) {
             this.sort(programmes);
-            return this.toShowDTOList(programmes, performance.getName());
+            return this.toShowDTOList(programmes);
         }
         return null;
     }
 
-    private List<ProgrammeShowDTO> toShowDTOList(List<Programme> programmes, String name) {
+    public List<ProgrammeShowDTO> toShowDTOList(List<Programme> programmes) {
         Map<Long, String> settingMap = settingRepo.findAllByFlagIn(CollUtil.newArrayList(3, 4))
                 .stream()
                 .collect(Collectors.toMap(Setting::getId, Setting::getName));

+ 9 - 0
src/main/java/com/izouma/wenlvju/web/performance/ProgrammeController.java

@@ -19,6 +19,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -185,6 +186,14 @@ public class ProgrammeController extends BaseController {
         return programmeService.toShowDTO(programme);
     }
 
+    @PostMapping("/showAll")
+    @ApiOperation("考级机构查看节目信息")
+    public Page<ProgrammeShowDTO> showAll(@RequestBody PageQuery pageQuery) {
+        Page<Programme> all = programmeService.all2(pageQuery);
+        return new PageImpl<>(programmeService.toShowDTOList(all.getContent()), all.getPageable()
+                , all.getTotalElements());
+    }
+
     @ApiOperation("获取手机号/token")
     @PostMapping("/getAuth")
     public Map<String, String> getAuth(@RequestParam Long id, @RequestParam String phone) {

+ 10 - 0
src/main/vue/src/router.js

@@ -799,6 +799,16 @@ const router = new Router({
                     meta: {
                         title: '培训机构'
                     }
+                },
+                /**初审 */
+                {
+                    path: '/programmeGOList',
+                    name: 'ProgrammegoList',
+                    component: () =>
+                        import(/* webpackChunkName: "programmeList" */ '@/views/performance/ProgrammeGOList.vue'),
+                    meta: {
+                        title: '节目列表'
+                    }
                 }
                 /**INSERT_LOCATION**/
             ]

+ 753 - 0
src/main/vue/src/views/performance/ProgrammeGOList.vue

@@ -0,0 +1,753 @@
+<template>
+    <div class="list-view">
+        <div class="filters-container">
+            <el-form :model="form" inline size="mini" label-width="100px">
+                <el-row>
+                    <el-col :span="8">
+                        <el-form-item label="参赛专业">
+                            <el-cascader
+                                ref="artCascader"
+                                style="width: 100%"
+                                v-model="form.specialtyId"
+                                :props="optionProps"
+                                :options="artTypes"
+                                :show-all-levels="false"
+                                placeholder="请选择专业"
+                                clearable
+                            >
+                            </el-cascader>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-collapse-transition>
+                    <div v-show="showMore">
+                        <el-row>
+                            <el-col :span="8">
+                                <el-form-item label="考级机构名称">
+                                    <el-select
+                                        v-model="form.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-col>
+                            <el-col :span="8">
+                                <el-form-item label="承办单位名称">
+                                    <el-select
+                                        v-model="form.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-col>
+
+                            <el-col :span="8"
+                                ><el-form-item label="考级点名称">
+                                    <el-input
+                                        placeholder="考级点名称"
+                                        v-model="search"
+                                        clearable
+                                    ></el-input> </el-form-item
+                            ></el-col>
+                        </el-row>
+                        <el-row>
+                            <el-col :span="8">
+                                <el-form-item label="节目名称">
+                                    <el-input placeholder="节目名称" v-model="form.name" clearable></el-input>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8"
+                                ><el-form-item label="参赛组别">
+                                    <el-select
+                                        v-model="form.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-col>
+
+                            <el-col :span="8"
+                                ><el-form-item label="参赛级别" v-if="form.competitionGroup">
+                                    <el-select
+                                        v-model="form.levelSettingId"
+                                        clearable
+                                        filterable
+                                        placeholder="参赛级别"
+                                        style="width: 100%"
+                                        v-if="form.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="form.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-col
+                            >
+                        </el-row>
+                    </div>
+                </el-collapse-transition>
+                <div style="width:100%;textAlign:center;margin-bottom:10px;">
+                    <el-button
+                        class="more"
+                        round
+                        type="primary"
+                        :plain="!showMore"
+                        :icon="showMore ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"
+                        @click="showMore = !showMore"
+                        size="mini"
+                        >{{ showMore ? '隐藏查询区域' : '显示查询区域' }}</el-button
+                    >
+                </div>
+                <el-form-item>
+                    <el-button @click="getData" type="primary" icon="el-icon-search">查询 </el-button>
+                    <el-button @click="clearSearch" type="primary">清空 </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"
+                        :disabled="totalElements < 1"
+                        >导出
+                    </el-button>
+                </el-form-item>
+            </el-form>
+        </div>
+        <el-table
+            :data="tableData"
+            row-key="id"
+            ref="table"
+            empty-text="加载中..."
+            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="节目编号" width="80" fixed="left"> </el-table-column>
+            <el-table-column prop="name" label="节目名称" fixed="left"> </el-table-column>
+            <el-table-column prop="specialty" label="参赛专业"> </el-table-column>
+            <el-table-column
+                prop="competitionGroup"
+                label="参赛组别"
+                :formatter="competitionGroupFormatter"
+                min-width="70"
+            >
+            </el-table-column>
+            <el-table-column prop="level" label="参赛级别" min-width="70"> </el-table-column>
+            <!-- <el-table-column prop="durationOfWork" label="作品时长" min-width="70"> </el-table-column> -->
+            <el-table-column prop="quantity" label="参赛人数" min-width="70"> </el-table-column>
+            <el-table-column prop="contact" label="联系人" min-width="68"> </el-table-column>
+            <el-table-column prop="phone" label="联系电话" min-width="95"> </el-table-column>
+            <el-table-column prop="gradingOrganization" label="考级机构" show-overflow-tooltip min-width="160">
+            </el-table-column>
+            <el-table-column prop="organization" label="承办单位" min-width="160"> </el-table-column>
+            <el-table-column prop="examPoint" label="考级点" min-width="160"> </el-table-column>
+            <el-table-column
+                prop="programmeStatus"
+                label="节目状态"
+                min-width="180"
+                :formatter="programmeStatusFormatter"
+            ></el-table-column>
+            <el-table-column label="操作" align="left" fixed="right" min-width="260">
+                <template slot-scope="{ row, $index }">
+                    <el-button @click="showRow(row)" size="mini" plain>查看</el-button>
+                    <el-button type="warning" @click="playVideo(row, $index)" size="mini" plain>查看作品</el-button>
+                    <el-button
+                        @click="audit(row, 'AUDIT_FAILED')"
+                        type="danger"
+                        size="mini"
+                        plain
+                        v-if="row.programmeStatus == 'SUBMIT' && performance.auditTimes == 0"
+                        >不通过</el-button
+                    >
+                    <el-button
+                        @click="audit(row, 'SUBMIT')"
+                        type="info"
+                        size="mini"
+                        plain
+                        v-if="row.programmeStatus == 'AUDIT_FAILED' && performance.auditTimes == 0"
+                        >撤回</el-button
+                    >
+                    <!-- <el-button @click="showCode(row)" type="primary" 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>
+
+        <el-dialog title="二维码" :visible.sync="dialogCode" width="400px" center>
+            <div style="margin-left: 70px;">
+                <qrcode-vue :value="dialogUrl" :size="200" level="H" />
+            </div>
+        </el-dialog>
+        <el-dialog class="videoDialog" destroy-on-close center append-to-body :visible.sync="showViedo" width="70%">
+            <video
+                :src="programme.video"
+                controls
+                style="max-height: 600px; max-width: 100%; margin: 0 auto"
+                v-if="programme.video"
+            >
+                您的浏览器不支持 video 标签。
+            </video>
+            <!-- <div style="width: 85%; height:600px;margin: 0 auto" v-if="programme.annex"> -->
+            <img style="max-height:600px; max-width: 100%; " :src="programme.annex" alt="" v-if="programme.annex" />
+            <!-- </div> -->
+            <div style="margin: 10px">
+                <el-button size="mini" @click="move(-1)" :disabled="index == 0">上一个</el-button>
+                <el-button size="mini" @click="move(1)" :disabled="(page - 1) * pageSize + index == totalElements - 1"
+                    >下一个</el-button
+                >
+                <el-button @click="showViedo = false" size="mini">关闭</el-button>
+            </div>
+        </el-dialog>
+        <programme-log :dialogVisible="isShow" @close="isShow = false" ref="public"></programme-log>
+    </div>
+</template>
+<script>
+import delChild from '@/mixins/delChild';
+import { mapState } from 'vuex';
+import pageableTable from '@/mixins/pageableTable';
+import QrcodeVue from 'qrcode.vue';
+import ProgrammeLog from '@/components/ProgrammeLog.vue';
+export default {
+    name: 'ProgrammeList',
+    mixins: [pageableTable, delChild],
+    props: ['review'],
+    data() {
+        return {
+            multipleMode: false,
+            search: '',
+            url: '/programme/showAll',
+            downloading: false,
+            competitionGroupOptions: [
+                { label: '个人', value: 'SINGLE' },
+                { label: '集体', value: 'COLLECTIVE' }
+            ],
+            form: {},
+            levelSingleOptions: [],
+            levelCollectiveOptions: [],
+            dialogUrl: '',
+            dialogCode: false,
+            isShow: false,
+            gradingOrganizationIdOptions: [],
+            organizationIdOptions: [],
+            performanceId: '',
+            performances: [],
+            performance: {},
+            artTypes: [],
+            optionProps: {
+                value: 'id',
+                label: 'name',
+                children: 'children',
+                multiple: false,
+                emitPath: false,
+                checkStrictly: true,
+                expandTrigger: 'hover'
+            },
+            showViedo: false,
+            showImg: false,
+            videoUrl: '',
+            annex: '',
+            programmeStatusOptions: [
+                { label: '未提交', value: 'INITIAL' },
+                { label: '已提交', value: 'SUBMIT' },
+                { label: '初选未通过', value: 'AUDIT_FAILED' },
+                { label: '审核未通过', value: 'REVIEW_FAILED' }
+            ],
+            showMore: false,
+            programme: {},
+            index: 0
+        };
+    },
+    created() {
+        if (this.$route.query.pid) {
+            this.performanceId = Number(this.$route.query.pid);
+        }
+        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(
+                '/performance/all',
+                {
+                    size: 1000,
+                    sort: 'year,desc',
+                    query: {
+                        publish: true
+                    }
+                },
+                { body: 'json' }
+            )
+            .then(res => {
+                if (res.content.length > 0) {
+                    res.content.forEach(item => {
+                        this.performances.push({
+                            label: item.name,
+                            value: item.id
+                        });
+                    });
+                    this.performanceId = res.content[0].id;
+                    this.performance = res.content[0];
+                    this.getData();
+                }
+            })
+            .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);
+            });
+    },
+    components: {
+        QrcodeVue,
+        ProgrammeLog
+    },
+    computed: {
+        selection() {
+            return this.$refs.table.selection.map(i => i.id);
+        }
+    },
+    methods: {
+        programmeStatusFormatter(row, column, cellValue, index) {
+            let selectedOption = this.programmeStatusOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        competitionGroupFormatter(row, column, cellValue, index) {
+            let selectedOption = this.competitionGroupOptions.find(i => i.value === cellValue);
+            if (selectedOption) {
+                return selectedOption.label;
+            }
+            return '';
+        },
+        beforeGetData() {
+            let data = {
+                sort: 'programmeStatus,desc',
+                query: {}
+            };
+            if (this.form.competitionGroup) {
+                data.query.competitionGroup = this.form.competitionGroup;
+            }
+            if (this.form.levelSettingId) {
+                data.query.levelSettingId = this.form.levelSettingId;
+            }
+            if (this.form.gradingOrganizationId) {
+                data.query.gradingOrganizationId = this.form.gradingOrganizationId;
+            }
+            if (this.form.organizationId) {
+                data.query.organizationId = this.form.organizationId;
+            }
+            if (this.form.specialtyId) {
+                data.query.code = this.getCode(this.form.specialtyId);
+            }
+            if (this.performanceId) {
+                data.query.performanceId = this.performanceId;
+            }
+            if (this.review) {
+                data.query.programmeStatus = 'SUBMIT';
+            }
+            if (this.form.name) {
+                data.query.name = this.form.name;
+            }
+            if (this.form.programmeStatus) {
+                data.query.programmeStatus = this.form.programmeStatus;
+            }
+            return data;
+        },
+        toggleMultipleMode(multipleMode) {
+            this.multipleMode = multipleMode;
+            if (!multipleMode) {
+                this.$refs.table.clearSelection();
+            }
+        },
+        addRow() {
+            this.$router.push({
+                path: '/programmeEdit',
+                query: {
+                    ...this.$route.query
+                }
+            });
+        },
+        showRow(row) {
+            this.isShow = true;
+            this.$refs.public.dataApi(row.id);
+        },
+        download() {
+            this.downloading = true;
+
+            let data = {
+                sort: 'programmeStatus,desc',
+                size: 1000,
+                query: {}
+            };
+            if (this.form.competitionGroup) {
+                data.query.competitionGroup = this.form.competitionGroup;
+            }
+            if (this.form.levelSettingId) {
+                data.query.levelSettingId = this.form.levelSettingId;
+            }
+            if (this.form.gradingOrganizationId) {
+                data.query.gradingOrganizationId = this.form.gradingOrganizationId;
+            }
+            if (this.organizationId) {
+                data.query.form.organizationId = this.form.organizationId;
+            }
+            if (this.form.specialtyId) {
+                data.query.code = this.getCode(this.form.specialtyId);
+            }
+            if (this.performanceId) {
+                data.query.performanceId = this.performanceId;
+            }
+            if (this.form.name) {
+                data.query.name = this.form.name;
+            }
+            if (this.form.programmeStatus) {
+                data.query.programmeStatus = this.form.programmeStatus;
+            }
+
+            this.$axios
+                .get('/programme/excel', {
+                    responseType: 'blob',
+                    params: data
+                })
+                .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);
+                    }
+                });
+        },
+        showCode(row) {
+            this.dialogCode = true;
+            this.dialogUrl =
+                'http://yskj.njlyw.cn:8081/h5/home?performanceId=' + row.performanceId + '&programmeId=' + row.id;
+        },
+        clearSearch() {
+            this.form = {};
+            this.getData();
+        },
+        getCode(value) {
+            return this.forTree(this.artTypes, value).code;
+        },
+        forTree(list, value) {
+            var result = null;
+            if (!list) {
+                return;
+            }
+            for (var i in list) {
+                if (result !== null) {
+                    break;
+                }
+                var item = list[i];
+                if (item.id == value) {
+                    result = item;
+                    break;
+                } else if (item.children && item.children.length > 0) {
+                    result = this.forTree(item.children, value);
+                }
+            }
+            return result;
+        },
+        // closeEvent() {
+        //     document.exitPictureInPicture();
+        // },
+        // playVideo(row) {
+        //     if (row.video) {
+        //         this.showViedo = true;
+        //         this.videoUrl = row.video;
+        //     } else {
+        //         this.$message.success('暂无视频');
+        //     }
+        // },
+        playImg(row) {
+            if (row.annex) {
+                this.showImg = true;
+                this.annex = row.annex;
+            } else {
+                this.$message.success('暂无图片');
+            }
+        },
+        audit(row, status) {
+            this.$set(row, 'loading', true);
+            let str = '确认该节目未通过初选?',
+                remark = '未通过考级机构初选。';
+            if (status == 'SUBMIT') {
+                str = '确认撤回,撤回后可参加后续的审核。';
+                remark = '撤消未通过考级机构初选。';
+            }
+            this.$confirm(str, '提示', {
+                confirmButtonText: '确认',
+                cancelButtonText: '取消',
+                type: 'warning'
+            })
+                .then(() => {
+                    this.$http
+                        .post('/programme/firstAudit', {
+                            id: row.id,
+                            status: status,
+                            remark: remark
+                        })
+                        .then(res => {
+                            this.$set(row, 'loading', false);
+                            this.$message.success('操作成功');
+                            this.getData();
+                        })
+                        .catch(e => {
+                            console.log(e);
+                            this.$set(row, 'loading', false);
+                            this.$message.error(e.error);
+                        });
+                })
+                .catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消'
+                    });
+                    this.$set(row, 'loading', false);
+                });
+        },
+        playVideo(row, index) {
+            this.index = index;
+            this.showViedo = true;
+            this.programme = row;
+        },
+        move(direction) {
+            const end = direction + this.index;
+            this.programme = { ...this.tableData[end] };
+            this.index = end;
+        }
+    }
+};
+</script>
+<style lang="less" scoped>
+.right {
+    float: right;
+}
+/deep/.el-form-item--mini.el-form-item,
+.el-form-item--small.el-form-item {
+    margin-bottom: 10px;
+}
+.videoDialog {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .el-dialog {
+        max-width: 900px;
+        margin-top: 0px;
+
+        .close {
+            position: absolute;
+            right: 0px;
+            top: -42px;
+            width: 71px;
+            height: 32px;
+            background: #00000015;
+
+            font-size: 12px;
+            color: #fdffff;
+            line-height: 32px;
+            text-align: center;
+            cursor: pointer;
+
+            &:hover {
+                background: #00000055;
+            }
+        }
+    }
+    .el-dialog__header {
+        display: none;
+    }
+
+    .el-dialog__body {
+        padding: 0;
+
+        video {
+            display: block;
+            height: auto;
+            width: 100%;
+            outline: none;
+        }
+    }
+}
+</style>

+ 7 - 24
src/main/vue/src/views/rate/RateDistrictList.vue

@@ -280,25 +280,6 @@
             >
             </el-pagination>
         </div>
-        <!-- <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
-            <div style="height: 150px;width:330px;margin:2px auto">
-                <label style="margin-right: 10px">退回缘由</label>
-                <el-select
-                    v-model="reason"
-                    filterable
-                    allow-create
-                    default-first-option
-                    clearable
-                    placeholder="请选择缘由"
-                    style="width: 70%"
-                >
-                    <el-option v-for="item in dismissReason" :key="item" :label="item" :value="item"> </el-option>
-                </el-select>
-                <div style="margin: 45px 0 0 240px">
-                    <el-button type="primary" @click="saveDismiss">确认</el-button>
-                </div>
-            </div>
-        </el-dialog> -->
         <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
             <div style="height: 150px;width:400px;margin:2px auto">
                 <el-input
@@ -354,7 +335,7 @@ export default {
         },
         ...mapState(['userInfo']),
         moreWidth() {
-            let larges = ['FIRST_REVIEW_COMPLETED', 'FIRST_REVIEW_COMPLETED', 'ACCEPT'];
+            let larges = ['FIRST_REVIEW_COMPLETED', 'FIRST_REVIEW_COMPLETED', 'ACCEPT', 'REVIEW_DENY'];
             let mendus = ['SUBMIT_PAPER_MATERIALS'];
 
             let list = [...this.tableData];
@@ -363,9 +344,8 @@ export default {
                 if (larges.includes(list[i].status)) {
                     size = 300;
                     break;
-                }
-                if (mendus.includes(list[i].status)) {
-                    size = 200;
+                } else if (mendus.includes(list[i].status)) {
+                    size = 220;
                     continue;
                 }
             }
@@ -393,7 +373,10 @@ export default {
             return '';
         },
         beforeGetData() {
-            let data = { sort: 'createdAt,desc', query: { submit: true, district: this.userInfo.district } };
+            let data = {
+                sort: 'sort,desc;score,desc;',
+                query: { submit: true, district: this.userInfo.district }
+            };
             if (this.search) {
                 data.search = this.search;
             }

+ 2 - 30
src/main/vue/src/views/rate/RateDistrictListDone.vue

@@ -178,14 +178,6 @@
                     >
                         退回申请
                     </el-button>
-                    <!-- <el-button
-                        @click="supervision(row.id)"
-                        type="success"
-                        size="mini"
-                        plain
-                        v-if="(row.status === 'ASSIGN_EXPERT') & display"
-                        >分配专家组</el-button
-                    > -->
                     <el-button
                         v-if="row.status === 'SUBMIT_PAPER_MATERIALS'"
                         type="success"
@@ -220,25 +212,6 @@
             >
             </el-pagination>
         </div>
-        <!-- <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
-            <div style="height: 150px;width:330px;margin:2px auto">
-                <label style="margin-right: 10px">退回缘由</label>
-                <el-select
-                    v-model="reason"
-                    filterable
-                    allow-create
-                    default-first-option
-                    clearable
-                    placeholder="请选择缘由"
-                    style="width: 70%"
-                >
-                    <el-option v-for="item in dismissReason" :key="item" :label="item" :value="item"> </el-option>
-                </el-select>
-                <div style="margin: 45px 0 0 240px">
-                    <el-button type="primary" @click="saveDismiss">确认</el-button>
-                </div>
-            </div>
-        </el-dialog> -->
         <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
             <div style="height: 150px;width:400px;margin:2px auto">
                 <el-input
@@ -305,7 +278,7 @@ export default {
                     break;
                 }
                 if (mendus.includes(list[i].status)) {
-                    size = 200;
+                    size = 220;
                     continue;
                 }
             }
@@ -341,7 +314,7 @@ export default {
             //     }
             // };
             let data = {
-                sort: 'createdAt,desc',
+                sort: 'sort,desc;score,desc;',
                 query: {
                     submit: true,
                     district: this.userInfo.district,
@@ -350,7 +323,6 @@ export default {
                         'ASSIGN_EXPERT',
                         'REVIEW_PENDING',
                         'SUBMIT_GRADE',
-                        'SUBMIT_PAPER_MATERIALS',
                         'COLLECT_PAPER_MATERIALS',
                         'COMPLETE'
                     ]

+ 10 - 24
src/main/vue/src/views/rate/RateDistrictListPending.vue

@@ -212,25 +212,6 @@
             >
             </el-pagination>
         </div>
-        <!-- <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
-            <div style="height: 150px;width:330px;margin:2px auto">
-                <label style="margin-right: 10px">退回缘由</label>
-                <el-select
-                    v-model="reason"
-                    filterable
-                    allow-create
-                    default-first-option
-                    clearable
-                    placeholder="请选择缘由"
-                    style="width: 70%"
-                >
-                    <el-option v-for="item in dismissReason" :key="item" :label="item" :value="item"> </el-option>
-                </el-select>
-                <div style="margin: 45px 0 0 240px">
-                    <el-button type="primary" @click="saveDismiss">确认</el-button>
-                </div>
-            </div>
-        </el-dialog> -->
         <el-dialog title="退回缘由" :visible.sync="dialogDismiss" width="500px" center>
             <div style="height: 150px;width:400px;margin:2px auto">
                 <el-input
@@ -295,9 +276,8 @@ export default {
                 if (larges.includes(list[i].status)) {
                     size = 300;
                     break;
-                }
-                if (mendus.includes(list[i].status)) {
-                    size = 200;
+                } else if (mendus.includes(list[i].status)) {
+                    size = 220;
                     continue;
                 }
             }
@@ -326,11 +306,17 @@ export default {
         },
         beforeGetData() {
             let data = {
-                sort: 'createdAt,desc',
+                sort: 'sort,desc;score,desc;',
                 query: {
                     submit: true,
                     district: this.userInfo.district,
-                    status: ['FIRST_REVIEW_PENDING', 'ACCEPT', 'FIRST_REVIEW_COMPLETED', 'REVIEW_DENY']
+                    status: [
+                        'FIRST_REVIEW_PENDING',
+                        'ACCEPT',
+                        'FIRST_REVIEW_COMPLETED',
+                        'REVIEW_DENY',
+                        'SUBMIT_PAPER_MATERIALS'
+                    ]
                 }
             };
             if (this.search) {