licailing 4 лет назад
Родитель
Сommit
10bd13d7b4

+ 1 - 0
src/main/vue/src/views/performance/ArrangeJudgeList.vue

@@ -72,6 +72,7 @@
                             :plain="!showMore"
                             :icon="showMore ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"
                             @click="showMore = !showMore"
+                            size="mini"
                             >{{ showMore ? '隐藏查询区域' : '显示查询区域' }}</el-button
                         >
                     </div>

+ 154 - 93
src/main/vue/src/views/performance/ProgrammeList.vue

@@ -7,7 +7,6 @@
                         <el-form-item label="展演活动名称">
                             <el-select
                                 v-model="performanceId"
-                                clearable
                                 filterable
                                 placeholder="展演活动名称"
                                 style="width: 100%"
@@ -22,51 +21,6 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
-                    <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-row>
-                <el-row>
-                    <el-col :span="8"
-                        ><el-form-item label="考级点名称">
-                            <el-input placeholder="考级点名称" v-model="search" clearable></el-input> </el-form-item
-                    ></el-col>
-
                     <el-col :span="8">
                         <el-form-item label="参赛专业">
                             <el-cascader
@@ -82,59 +36,153 @@
                             </el-cascader>
                         </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-col :span="8">
+                        <el-form-item label="节目状态">
+                            <el-select v-model="form.programmeStatus" clearable>
                                 <el-option
-                                    v-for="item in levelSingleOptions"
+                                    v-for="item in programmeStatusOptions"
                                     :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-option>
                             </el-select>
-                            <el-select
-                                v-model="form.levelSettingId"
-                                clearable
-                                filterable
-                                placeholder="请选择"
-                                style="width: 100%"
-                                v-else
+                        </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-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
                     >
-                </el-row>
+                </div>
                 <el-form-item>
                     <el-button @click="getData" type="primary" icon="el-icon-search">查询 </el-button>
                     <el-button @click="clearSearch" type="primary">清空 </el-button>
@@ -343,7 +391,8 @@ export default {
                 { label: '已提交', value: 'SUBMIT' },
                 { label: '初选未通过', value: 'AUDIT_FAILED' },
                 { label: '审核未通过', value: 'REVIEW_FAILED' }
-            ]
+            ],
+            showMore: false
         };
     },
     created() {
@@ -504,6 +553,12 @@ export default {
             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) {
@@ -550,6 +605,12 @@ export default {
             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', {