lrf402788946 4 years ago
parent
commit
1f061e6021
2 changed files with 19 additions and 16 deletions
  1. 3 16
      src/views/new-plan/arrange/arrange.vue
  2. 16 0
      src/views/new-plan/arrange/arrange/table.vue

+ 3 - 16
src/views/new-plan/arrange/arrange.vue

@@ -1,20 +1,8 @@
 <template>
   <div id="arrange">
-    <el-row type="flex" justify="center" v-if="view == 'plan'">
-      <el-col :span="24" :style="`overflow:auto`">
-        <el-card ref="card" v-if="info.year" height="800px">
-          <el-row type="flex" align="middle" style="padding:10px">
-            <el-col :span="2">
-              <el-button type="primary" size="mini" @click="dialog = true">生成模板计划</el-button>
-            </el-col>
-            <el-col :span="2">
-              <el-button type="primary" size="mini" @click="savePlan">保存计划</el-button>
-            </el-col>
-          </el-row>
-          <table-cal :events="events" :vacation="vacation" @cellClick="eventClick"></table-cal>
-        </el-card>
-      </el-col>
-    </el-row>
+    <el-card ref="card" v-if="info.year" height="800px">
+      <table-cal :events="events" :vacation="vacation" @cellClick="eventClick" @toSave="savePlan" @toSetPlan="() => (dialog = true)"></table-cal>
+    </el-card>
     <el-drawer :visible.sync="drawer" direction="rtl" title="安排计划" @close="toClose">
       <event
         :data="form"
@@ -345,7 +333,6 @@ export default {
     },
     //列表删除事件,一定是删除批次,班级属于内部信息,期需要自己把批次都删了
     toDelete(data) {
-      console.log(data);
       let { term, batch } = data;
       let res = this.events.find(f => f.term == term);
       if (res) {

+ 16 - 0
src/views/new-plan/arrange/arrange/table.vue

@@ -1,6 +1,14 @@
 <template>
   <div id="tableCal">
     <template v-if="already">
+      <el-row type="flex" align="middle" style="padding:10px">
+        <el-col :span="2">
+          <el-button type="primary" size="mini" @click="toAuto">生成模板计划</el-button>
+        </el-col>
+        <el-col :span="2">
+          <el-button type="success" size="mini" @click="toSave">保存计划</el-button>
+        </el-col>
+      </el-row>
       <table border="1" class="table" style="zoom:0.8" v-for="month in 12" :key="month">
         <template v-if="toDisplay(month)">
           <tr>
@@ -534,6 +542,14 @@ export default {
       }
       this.$set(this, `list`, obj);
     },
+    //去自动生成
+    toAuto() {
+      this.$emit('toSetPlan');
+    },
+    //保存
+    toSave() {
+      this.$emit('toSave');
+    },
   },
   filters: {
     getWord(month) {