|
|
@@ -23,138 +23,147 @@
|
|
|
<el-button type="primary" @click="getData">查看活动分组情况</el-button>
|
|
|
<el-button type="primary" @click="intoGroup">查看未分组情况情况</el-button>
|
|
|
</el-form-item>
|
|
|
- <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 label="活动日期" prop="dateRange">
|
|
|
- <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="12" :offset="0">
|
|
|
- <el-form-item prop="address" class="flex" label="活动地点" style="width: 100%">
|
|
|
- <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="12">
|
|
|
- <el-form-item label="时间安排" prop="morning">
|
|
|
- <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-collapse v-model="activeNames" @change="handleChange">
|
|
|
+ <el-collapse-item title="分组编排">
|
|
|
+ <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 label="活动日期" prop="dateRange">
|
|
|
+ <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="12" :offset="0">
|
|
|
+ <el-form-item prop="address" class="flex" label="活动地点" style="width: 100%">
|
|
|
+ <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="12">
|
|
|
+ <el-form-item label="时间安排" prop="morning">
|
|
|
+ <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="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" :label="item" :value="item"></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6" :offset="0">
|
|
|
- <el-form-item class="flex" label="单个节目时长" prop="duration">
|
|
|
- <!-- <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">
|
|
|
- <el-checkbox v-model="form.afternoon" disabled>下午</el-checkbox>
|
|
|
+ <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"
|
|
|
+ :label="item"
|
|
|
+ :value="item"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6" :offset="0">
|
|
|
+ <el-form-item class="flex" label="单个节目时长" prop="duration">
|
|
|
+ <!-- <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">
|
|
|
+ <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-row>
|
|
|
+ <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-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>
|
|
|
+ </el-collapse-item>
|
|
|
+ </el-collapse>
|
|
|
</el-form>
|
|
|
</div>
|
|
|
<el-table
|
|
|
@@ -288,7 +297,8 @@ export default {
|
|
|
{ label: '集体', value: 'COLLECTIVE' }
|
|
|
],
|
|
|
nums: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
|
|
|
- times: [3, 5, 10, 15, 20]
|
|
|
+ times: [3, 5, 10, 15, 20],
|
|
|
+ activeNames: []
|
|
|
};
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -596,6 +606,9 @@ export default {
|
|
|
this.$nextTick(() => {
|
|
|
this.$refs.form.resetFields();
|
|
|
});
|
|
|
+ },
|
|
|
+ handleChange(val) {
|
|
|
+ console.log(val);
|
|
|
}
|
|
|
}
|
|
|
};
|
