展演开关

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

@@ -72,6 +72,8 @@ public class Performance extends BaseEntity {
     @ApiModelProperty(value = "复审比例")
     private BigDecimal reviewRatio;
 
+    private boolean close;
+
     @Transient
     private long programmeNum;
 }

src/main/vue/src/views/performance/PerformanceEdit.vue

@@ -120,7 +120,9 @@
             <el-form-item prop="codeImg" label="活动工作群">
                 <single-upload v-model="formData.codeImg"></single-upload>
             </el-form-item>
-            <!-- <el-form-item> </el-form-item> -->
+            <el-form-item prop="close" label="开启">
+                <el-switch v-model="formData.close"></el-switch>
+            </el-form-item>
         </el-form>
         <div class="btn">
             <el-button @click="onSave" :loading="saving" type="primary">保存</el-button>

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

@@ -225,7 +225,7 @@
             <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="130">
+            <el-table-column prop="gradingOrganizationId" label="考级机构" show-overflow-tooltip min-width="130">
                 <template slot="header" slot-scope="{ column }">
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
                 </template>
@@ -233,7 +233,7 @@
                     <span>{{ row.gradingOrganization }}</span>
                 </template>
             </el-table-column>
-            <el-table-column prop="organization" label="承办单位" min-width="170">
+            <el-table-column prop="organizationId" label="承办单位" min-width="170">
                 <template slot="header" slot-scope="{ column }">
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
                 </template>
@@ -251,7 +251,11 @@
                 label="节目状态"
                 min-width="90"
                 :formatter="programmeStatusFormatter"
-            ></el-table-column>
+            >
+                <template slot="header" slot-scope="{ column }">
+                    <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
+                </template>
+            </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>
@@ -585,7 +589,6 @@ export default {
         },
         beforeGetData() {
             let data = {
-                sort: 'programmeStatus,desc',
                 query: {}
             };
             if (this.form.competitionGroup) {

src/main/vue/src/views/performance/ProgrammeOrgList.vue

@@ -129,9 +129,9 @@
                 </el-row>
                 <el-form-item>
                     <el-button @click="canAdd" type="primary" icon="el-icon-search">查询 </el-button>
-                    <!-- <el-button @click="addRow" type="primary" icon="el-icon-plus" v-if="add">添加 </el-button> -->
-                    <el-button @click="addRow" type="primary" icon="el-icon-plus">添加 </el-button>
-                    <!-- <el-upload
+                    <el-button @click="addRow" type="primary" icon="el-icon-plus" v-if="add">添加 </el-button>
+                    <!-- <el-button @click="addRow" type="primary" icon="el-icon-plus">添加 </el-button> -->
+                    <el-upload
                         :action="uploadUrl"
                         :before-upload="beforeUpload"
                         :headers="headers"
@@ -152,8 +152,8 @@
                             :disabled="loading"
                             >批量上传</el-button
                         >
-                    </el-upload> -->
-                    <el-upload
+                    </el-upload>
+                    <!-- <el-upload
                         :action="uploadUrl"
                         :before-upload="beforeUpload"
                         :headers="headers"
@@ -173,7 +173,7 @@
                             :disabled="loading"
                             >批量上传</el-button
                         >
-                    </el-upload>
+                    </el-upload> -->
                     <el-button
                         @click="download"
                         type="primary"
@@ -214,7 +214,7 @@
             <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 prop="gradingOrganizationId" label="考级机构" show-overflow-tooltip min-width="160">
                 <template slot="header" slot-scope="{ column }">
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
                 </template>
@@ -222,7 +222,7 @@
                     <span>{{ row.gradingOrganization }}</span>
                 </template>
             </el-table-column>
-            <el-table-column prop="organization" label="承办单位" min-width="180">
+            <el-table-column prop="organizationId" label="承办单位" min-width="180">
                 <template slot="header" slot-scope="{ column }">
                     <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
                 </template>
@@ -240,7 +240,11 @@
                 label="节目状态"
                 min-width="180"
                 :formatter="programmeStatusFormatter"
-            ></el-table-column>
+            >
+                <template slot="header" slot-scope="{ column }">
+                    <sortable-header :column="column" :current-sort="sort" @changeSort="changeSort"> </sortable-header>
+                </template>
+            </el-table-column>
             <!-- <el-table-column prop="examPoint" label="考级点" min-width="160"> </el-table-column> -->
             <el-table-column label="操作" align="center" fixed="right" min-width="300">
                 <template slot-scope="{ row, $index }">
@@ -250,7 +254,7 @@
                         @click="editRow(row)"
                         size="mini"
                         plain
-                        v-if="row.programmeStatus == 'INITIAL'"
+                        v-if="row.programmeStatus == 'INITIAL' && add"
                         >编辑</el-button
                     >
                     <!-- <el-button
@@ -354,7 +358,10 @@
             />
             <div style="display: block; 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
+                    size="mini"
+                    @click="move(1)"
+                    :disabled="(page - 1) * pageSize + index == totalElements - 1 || index >= pageSize - 1"
                     >下一个</el-button
                 >
                 <el-button @click="showViedo = false" size="mini">关闭</el-button>
@@ -546,7 +553,6 @@ export default {
         },
         beforeGetData() {
             let data = {
-                sort: 'programmeStatus,desc',
                 query: {
                     organizationId: this.organization.id,
                     performanceId: Number(this.$route.query.pid)
@@ -773,11 +779,12 @@ export default {
             let data = this.performances.find(item => {
                 return item.id == this.performanceId;
             });
-            if (data.endDate >= this.currentTime) {
-                this.add = true;
-            } else {
-                this.add = false;
-            }
+            // if (data.endDate >= this.currentTime) {
+            //     this.add = true;
+            // } else {
+            //     this.add = false;
+            // }
+            this.add = data.close;
             this.getData();
         },
         playVideo(row, index) {

src/main/vue/src/views/performance/ProgrammeScoreList.vue

@@ -183,7 +183,7 @@
                         <el-button
                             size="mini"
                             @click="move(1)"
-                            :disabled="(page - 1) * pageSize + index == totalElements - 1"
+                            :disabled="(page - 1) * pageSize + index == totalElements - 1 || index >= pageSize - 1"
                             >下一个</el-button
                         >
                         <el-button @click="showViedo = false" size="mini">关闭</el-button>