licailing 4 years ago
parent
commit
ef276b9fe6

+ 8 - 46
src/main/vue/src/views/performance/ArrangeJudgeList.vue

@@ -19,11 +19,9 @@
                         </el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item style="margin-left: 40px">
+                <el-form-item>
                     <el-button type="primary" @click="getData">查询</el-button>
                 </el-form-item>
-                <!-- <el-collapse v-model="activeNames" @change="handleChange">
-                    <el-collapse-item title="查询区域"> -->
                 <div v-if="!onlines">
                     <el-collapse-transition>
                         <div v-show="showMore">
@@ -63,8 +61,6 @@
                                     </el-col>
                                 </el-row>
                             </el-card>
-                            <!-- </el-collapse-item>
-                            </el-collapse> -->
                         </div>
                     </el-collapse-transition>
                     <div style="width:100%;textAlign:center;margin-bottom:10px;">
@@ -116,6 +112,7 @@
                 </template>
             </el-table-column>
         </el-table>
+
         <el-table
             v-if="onlines"
             :data="tableData"
@@ -128,12 +125,16 @@
             cell-class-name="table-cell"
             :height="tableHeight"
         >
+            <el-table-column label="分组名称" prop="name" min-width="130">
+                <template slot-scope="{ row }">
+                    {{ row.name }}
+                </template>
+            </el-table-column>
             <el-table-column label="参赛专业">
                 <template slot-scope="{ row }">
                     {{ row.specialtyName ? row.specialtyName.join(',') : '' }}
                 </template>
             </el-table-column>
-            <el-table-column prop="name" label="分组名称" min-width="130"> </el-table-column>
             <el-table-column label="评审专家" min-width="130" prop="experts"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" min-width="320">
                 <template slot-scope="{ row }">
@@ -164,42 +165,6 @@
             >
             </el-pagination>
         </div>
-
-        <el-dialog :visible.sync="showProgramme" width="80%" title="未分组节目" center>
-            <el-table
-                :data="unGrouped"
-                row-key="id"
-                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="300"
-            >
-                <el-table-column prop="name" label="节目名称"> </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="考级点"> </el-table-column>
-                <el-table-column label="操作">
-                    <template slot-scope="{ row }">
-                        <el-button @click="choose(row)" size="mini" type="primary">增加</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </el-dialog>
         <organ-log :dialogVisible="isShow" @close="isShow = false" ref="public"></organ-log>
     </div>
 </template>
@@ -232,7 +197,6 @@ export default {
                 quantity: [{ required: true, message: '请输入分组节目数量', trigger: 'blur' }],
                 duration: [{ required: true, message: '请输入单个节目时长', trigger: 'blur' }]
             },
-            showProgramme: false,
             unGrouped: [],
             competitionGroupOptions: [
                 { label: '个人', value: 'SINGLE' },
@@ -257,9 +221,8 @@ export default {
                 { body: 'json' }
             )
             .then(res => {
-                // console.log(res);
                 this.onlines = res.content[0].online;
-                // console.log(this.onlines);
+                console.log(this.onlines);
                 if (res.content.length > 0) {
                     res.content.forEach(item => {
                         this.performances.push({
@@ -276,7 +239,6 @@ export default {
                             { body: 'json' }
                         )
                         .then(res => {
-                            console.log(res);
                             if (res.content.length > 0) {
                                 res.content.forEach(item => {
                                     this.addressList.push({

+ 166 - 156
src/main/vue/src/views/performance/ArrangeList.vue

@@ -23,33 +23,29 @@
                     <el-button type="primary" @click="getData">查看活动分组情况</el-button>
                     <el-button type="primary" @click="intoGroup">查看未分组情况情况</el-button>
                 </el-form-item>
-                <!-- <el-collapse v-model="activeNames" @change="handleChange"> -->
-                <el-collapse-transition>
-                    <div v-show="showMore">
-                        <el-card shadow="hover" :body-style="{ padding: '20px' }" style="margin-bottom: 20px">
-                            <el-row :gutter="15">
-                                <el-col :span="12" :offset="0">
-                                    <el-form-item
-                                        prop="address"
-                                        class="flex"
-                                        label="活动地点"
-                                        style="width: 467px"
-                                        v-if="performance.online"
-                                    >
-                                        <el-select v-model="form.address">
-                                            <el-option
-                                                v-for="(item, index) in addresses"
-                                                :key="index"
-                                                :value="item.value"
-                                                :label="item.value"
-                                            ></el-option>
-                                        </el-select>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6" :offset="0">
-                                    <el-form-item class="flex" label="分组节目数量" prop="quantity">
-                                        <el-input-number type="number" v-model="form.quantity"></el-input-number>
-                                        <!-- <el-select v-model="form.quantity" clearable>
+                <div v-if="performance.status == 'UNDER_REVIEW' || performance.status == 'ARRANGE'">
+                    <el-collapse-transition>
+                        <div v-show="showMore">
+                            <el-card shadow="hover" :body-style="{ padding: '15px' }" style="margin-bottom: 15px">
+                                <el-row :gutter="15">
+                                    <el-col :span="12" :offset="0">
+                                        <el-form-item label="活动日期" prop="dateRange" v-if="!performance.online">
+                                            <el-date-picker
+                                                v-model="dateRange"
+                                                value-format="yyyy-MM-dd"
+                                                type="daterange"
+                                                range-separator="至"
+                                                start-placeholder="开始日期"
+                                                end-placeholder="结束日期"
+                                                style="width: 316px"
+                                            >
+                                            </el-date-picker>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="6" :offset="0">
+                                        <el-form-item class="flex" label="分组节目数量" prop="quantity">
+                                            <el-input-number type="number" v-model="form.quantity"></el-input-number>
+                                            <!-- <el-select v-model="form.quantity" clearable>
                                             <el-option
                                                 v-for="item in nums"
                                                 :key="item"
@@ -57,134 +53,139 @@
                                                 :value="item"
                                             ></el-option>
                                         </el-select> -->
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="12">
-                                    <el-form-item label="时间安排" prop="morning" v-if="performance.online">
-                                        <el-checkbox v-model="form.morning" disabled>上午</el-checkbox>
-                                        <el-time-select
-                                            placeholder="起始时间"
-                                            format="HH:mm"
-                                            value-format="HH:mm:ss"
-                                            v-model="timeRange[0]"
-                                            :picker-options="{
-                                                start: '08:30',
-                                                step: '00:15',
-                                                end: '12:00'
-                                            }"
-                                            class="time"
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="12">
+                                        <el-form-item label="时间安排" prop="morning" v-if="!performance.online">
+                                            <el-checkbox v-model="form.morning" disabled>上午</el-checkbox>
+                                            <el-time-select
+                                                placeholder="起始时间"
+                                                format="HH:mm"
+                                                value-format="HH:mm:ss"
+                                                v-model="timeRange[0]"
+                                                :picker-options="{
+                                                    start: '08:30',
+                                                    step: '00:15',
+                                                    end: '12:00'
+                                                }"
+                                                class="time"
+                                            >
+                                            </el-time-select>
+                                            <el-time-select
+                                                placeholder="结束时间"
+                                                v-model="timeRange[1]"
+                                                :picker-options="{
+                                                    start: '08:30',
+                                                    step: '00:15',
+                                                    end: '12:00',
+                                                    minTime: timeRange[0]
+                                                }"
+                                                class="time"
+                                            >
+                                            </el-time-select>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="6" :offset="0">
+                                        <el-form-item
+                                            class="flex"
+                                            label="单个节目时长"
+                                            prop="duration"
+                                            v-if="!performance.online"
                                         >
-                                        </el-time-select>
-                                        <el-time-select
-                                            placeholder="结束时间"
-                                            v-model="timeRange[1]"
-                                            :picker-options="{
-                                                start: '08:30',
-                                                step: '00:15',
-                                                end: '12:00',
-                                                minTime: timeRange[0]
-                                            }"
-                                            class="time"
-                                        >
-                                        </el-time-select>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6" :offset="0">
-                                    <el-form-item
-                                        class="flex"
-                                        label="单个节目时长"
-                                        prop="duration"
-                                        v-if="performance.online"
-                                    >
-                                        <!-- <el-input-number type="number" v-model="form.duration"></el-input-number> -->
-                                        <el-select v-model="form.duration" clearable>
-                                            <el-option
-                                                v-for="item in times"
-                                                :key="item"
-                                                :label="item"
-                                                :value="item"
-                                            ></el-option>
-                                        </el-select>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="12" :offset="0">
-                                    <el-form-item label=" " prop="afternoon" v-if="performance.online">
-                                        <el-checkbox v-model="form.afternoon" disabled>下午</el-checkbox>
+                                            <!-- <el-input-number type="number" v-model="form.duration"></el-input-number> -->
+                                            <el-select v-model="form.duration" clearable>
+                                                <el-option
+                                                    v-for="item in times"
+                                                    :key="item"
+                                                    :label="item"
+                                                    :value="item"
+                                                ></el-option>
+                                            </el-select>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="12" :offset="0">
+                                        <el-form-item label=" " prop="afternoon" v-if="!performance.online">
+                                            <el-checkbox v-model="form.afternoon" disabled>下午</el-checkbox>
 
-                                        <el-time-select
-                                            placeholder="起始时间"
-                                            format="HH:mm"
-                                            value-format="HH:mm:ss"
-                                            v-model="afterTimeRange[0]"
-                                            :picker-options="{
-                                                start: '13:00',
-                                                step: '00:15',
-                                                end: '18:00'
-                                            }"
-                                            class="time"
-                                        >
-                                        </el-time-select>
-                                        <el-time-select
-                                            placeholder="结束时间"
-                                            v-model="afterTimeRange[1]"
-                                            :picker-options="{
-                                                start: '13:00',
-                                                step: '00:15',
-                                                end: '18:00',
-                                                minTime: afterTimeRange[0]
-                                            }"
-                                            class="time"
-                                        >
-                                        </el-time-select>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="6" :offset="0">
-                                    <el-form-item label="参赛专业" class="flex" prop="specialtyId">
-                                        <el-select v-model="form.specialtyId" multiple>
-                                            <el-option
-                                                v-for="item in artTypes"
-                                                :key="item.value"
-                                                :value="item.value"
-                                                :label="item.label"
-                                            ></el-option>
-                                        </el-select>
-                                    </el-form-item>
-                                </el-col>
-                                <el-col :span="12" :offset="0">
-                                    <el-form-item label="活动日期" prop="dateRange" v-if="performance.online">
-                                        <el-date-picker
-                                            v-model="dateRange"
-                                            value-format="yyyy-MM-dd"
-                                            type="daterange"
-                                            range-separator="至"
-                                            start-placeholder="开始日期"
-                                            end-placeholder="结束日期"
-                                            style="width: 316px"
+                                            <el-time-select
+                                                placeholder="起始时间"
+                                                format="HH:mm"
+                                                value-format="HH:mm:ss"
+                                                v-model="afterTimeRange[0]"
+                                                :picker-options="{
+                                                    start: '13:00',
+                                                    step: '00:15',
+                                                    end: '18:00'
+                                                }"
+                                                class="time"
+                                            >
+                                            </el-time-select>
+                                            <el-time-select
+                                                placeholder="结束时间"
+                                                v-model="afterTimeRange[1]"
+                                                :picker-options="{
+                                                    start: '13:00',
+                                                    step: '00:15',
+                                                    end: '18:00',
+                                                    minTime: afterTimeRange[0]
+                                                }"
+                                                class="time"
+                                            >
+                                            </el-time-select>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="6" :offset="0">
+                                        <el-form-item label="参赛专业" class="flex" prop="specialtyId">
+                                            <el-select v-model="form.specialtyId" multiple>
+                                                <el-option
+                                                    v-for="item in artTypes"
+                                                    :key="item.value"
+                                                    :value="item.value"
+                                                    :label="item.label"
+                                                ></el-option>
+                                            </el-select>
+                                        </el-form-item>
+                                    </el-col>
+                                    <el-col :span="12" :offset="0">
+                                        <el-form-item
+                                            prop="address"
+                                            class="flex"
+                                            label="活动地点"
+                                            style="width: 467px"
+                                            v-if="!performance.online"
                                         >
-                                        </el-date-picker>
-                                    </el-form-item>
-                                </el-col>
-                            </el-row>
+                                            <el-select v-model="form.address">
+                                                <el-option
+                                                    v-for="(item, index) in addresses"
+                                                    :key="index"
+                                                    :value="item.value"
+                                                    :label="item.value"
+                                                ></el-option>
+                                            </el-select>
+                                        </el-form-item>
+                                    </el-col>
+                                </el-row>
 
-                            <el-form-item style="margin-left: 40px">
-                                <el-button type="primary" @click="clear">清空</el-button>
-                                <el-button type="primary" @click="group">节目分组</el-button>
-                                <el-button type="primary">发布分组安排</el-button>
-                                <el-button type="primary">导出分组安排</el-button>
-                            </el-form-item>
-                        </el-card>
+                                <el-form-item style="margin-left: 40px">
+                                    <el-button type="primary" @click="clear">清空</el-button>
+                                    <el-button type="primary" @click="group">节目分组</el-button>
+                                    <el-button type="primary">发布分组安排</el-button>
+                                    <el-button type="primary">导出分组安排</el-button>
+                                </el-form-item>
+                            </el-card>
+                        </div>
+                    </el-collapse-transition>
+                    <div style="width:100%;textAlign:center;margin-bottom:18px;">
+                        <el-button
+                            class="more"
+                            round
+                            type="primary"
+                            :plain="!showMore"
+                            :icon="showMore ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"
+                            @click="showMore = !showMore"
+                            >{{ showMore ? '隐藏分组编排' : '显示分组编排' }}</el-button
+                        >
                     </div>
-                </el-collapse-transition>
-                <div style="width:100%;textAlign:center;margin-bottom:18px;">
-                    <el-button
-                        class="more"
-                        round
-                        type="primary"
-                        :plain="!showMore"
-                        :icon="showMore ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"
-                        @click="showMore = !showMore"
-                        >{{ showMore ? '隐藏分组编排' : '显示分组编排' }}</el-button
-                    >
                 </div>
             </el-form>
         </div>
@@ -479,12 +480,21 @@ export default {
             this.$refs.public.init(row.id);
         },
         programme(row) {
-            this.$router.push({
-                path: '/programmeGroupList',
-                query: {
-                    aid: row.id
-                }
-            });
+            if (this.performance.online) {
+                this.$router.push({
+                    path: '/progGroupOnlineList',
+                    query: {
+                        aid: row.id
+                    }
+                });
+            } else {
+                this.$router.push({
+                    path: '/programmeGroupList',
+                    query: {
+                        aid: row.id
+                    }
+                });
+            }
         },
         download() {
             this.downloading = true;