|
@@ -2,31 +2,6 @@
|
|
|
<div id="arrange">
|
|
|
<!-- <detail-frame :title="pageTitle" :returns="returns"> -->
|
|
|
<el-row type="flex" justify="center" v-if="view == 'plan'">
|
|
|
- <!-- <el-col :span="12">
|
|
|
- <el-card header="全年计划信息">
|
|
|
- <el-form :model="info" :rules="rules" :isNew="isNew" label-width="60px" size="small" @submit.native.prevent>
|
|
|
- <el-form-item label="年份" required>
|
|
|
- {{ info.year }}
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="标题" prop="title" required>
|
|
|
- {{ info.title }}
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
- <el-collapse v-model="collapse" accordion>
|
|
|
- <el-collapse-item title="计划简表" name="1">
|
|
|
- <data-table :fields="fields" :data="selectList" :opera="opera" @edit="toEdit" @delete="toDelete" :height="heights"></data-table>
|
|
|
- </el-collapse-item>
|
|
|
- </el-collapse>
|
|
|
- <el-form-item>
|
|
|
- <el-row type="flex" align="middle" justify="space-around" style="margin-top:20px">
|
|
|
- <el-col :span="6">
|
|
|
- <el-button type="primary" @click="savePlan">保存全年计划</el-button>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
- </el-card>
|
|
|
- </el-col> -->
|
|
|
<el-col :span="24" :style="`overflow:auto`">
|
|
|
<el-card ref="card" v-if="info.year" height="800px">
|
|
|
<calendar
|
|
@@ -40,13 +15,6 @@
|
|
|
</el-card>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <!-- <template v-else-if="view == 'school'">
|
|
|
- <sch-arr :events="events" :year="info.year" :template="template" @toSave="toSave" @toDirector="toDirector"></sch-arr>
|
|
|
- </template>
|
|
|
- <template v-else>
|
|
|
- <dir-arr :events="events"></dir-arr>
|
|
|
- </template> -->
|
|
|
- <!-- </detail-frame> -->
|
|
|
<el-drawer :visible.sync="drawer" direction="rtl" title="安排计划" @close="toClose">
|
|
|
<event
|
|
|
:data="form"
|
|
@@ -63,6 +31,11 @@
|
|
|
<el-form-item label="请输入您要生成的期数">
|
|
|
<el-input v-model="input.term"></el-input>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="请输入开始的期数">
|
|
|
+ <el-tooltip content="第X期 此处为填写X" placement="right">
|
|
|
+ <el-input-number v-model="input.termnum"></el-input-number>
|
|
|
+ </el-tooltip>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="请选择开始日期">
|
|
|
<el-date-picker
|
|
|
:picker-options="pickerOptions"
|
|
@@ -235,7 +208,7 @@ export default {
|
|
|
this.$set(this, `events`, []);
|
|
|
this.$set(this, `selectList`, []);
|
|
|
this.dialog = false;
|
|
|
- let { term, start } = this.input;
|
|
|
+ let { term, start, termnum } = this.input;
|
|
|
let { day, batchnum, classnum } = this.template;
|
|
|
let event = []; //处理成功事件的存储
|
|
|
//第一次正常安排
|
|
@@ -249,6 +222,9 @@ export default {
|
|
|
i.index = index;
|
|
|
return i;
|
|
|
});
|
|
|
+ //整理期数为输入的期数,将班级
|
|
|
+ event = this.nameTerm(event, termnum);
|
|
|
+ console.log(event);
|
|
|
this.$set(this, `events`, event);
|
|
|
this.$set(this, `selectList`, event);
|
|
|
},
|
|
@@ -321,7 +297,16 @@ export default {
|
|
|
return _.flatten(arr);
|
|
|
},
|
|
|
//模板事件结束
|
|
|
-
|
|
|
+ //将期数改为手动输入的
|
|
|
+ nameTerm(events, start) {
|
|
|
+ let duplicate = _.cloneDeep(events);
|
|
|
+ duplicate = duplicate.map(i => {
|
|
|
+ i.term = start * 1 + i.term - 1;
|
|
|
+ i.title = `第${i.term}期第${i.batch}批次`;
|
|
|
+ return i;
|
|
|
+ });
|
|
|
+ return duplicate;
|
|
|
+ },
|
|
|
//手动操作事件开始
|
|
|
setEvent({ data, isNew }) {
|
|
|
data = JSON.parse(JSON.stringify(data));
|
|
@@ -344,7 +329,6 @@ export default {
|
|
|
},
|
|
|
//列表删除事件
|
|
|
toDelete({ data, index }) {
|
|
|
- console.log(data, index);
|
|
|
this.$set(
|
|
|
this,
|
|
|
`events`,
|