Merge branch 'master' of http://git.cc-lotus.info/new_train/train-center

src/store/index.js

@@ -11,6 +11,8 @@ import subject from './subject';
 import question from './question';
 import questionnaire from './questionnaire';
 import teacher from './teacher';
+import trainplan from './trainplan';
+
 import plan from './plan';
 Vue.use(Vuex);
 
@@ -27,6 +29,7 @@ export default new Vuex.Store({
     question,
     questionnaire,
     teacher,
+    trainplan,
     plan,
   },
   state: {},

src/store/trainplan.js

@@ -0,0 +1,38 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import _ from 'lodash';
+Vue.use(Vuex);
+const api = {
+  interface: `/api/train/trainplan`,
+};
+const state = () => ({});
+const mutations = {};
+
+const actions = {
+  async query({ commit }, { skip = 0, limit, ...info } = {}) {
+    const res = await this.$axios.$get(`${api.interface}`, { skip, limit, ...info });
+    return res;
+  },
+  async create({ commit }, payload) {
+    const res = await this.$axios.$post(`${api.interface}`, payload);
+    return res;
+  },
+  async fetch({ commit }, payload) {
+    const res = await this.$axios.$get(`${api.interface}/${payload}`);
+    return res;
+  },
+  async update({ commit }, { id, ...data }) {
+    const res = await this.$axios.$post(`${api.interface}/update/${id}`, data);
+    return res;
+  },
+  async delete({ commit }, payload) {
+    const res = await this.$axios.$delete(`${api.interface}/${payload}`);
+    return res;
+  },
+};
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions,
+};

src/views/certificaate/look.vue

@@ -26,10 +26,9 @@
           ><el-col :span="2"></el-col>{{ zhengshuList.years }}年<el-col :span="2"> </el-col>{{ zhengshuList.morths }}月<el-col :span="2"> </el-col>
           {{ zhengshuList.datas }}日
         </el-col>
-
-        <el-col>
-          <button size="mini">打印证书</button>
-        </el-col>
+      </el-col>
+      <el-col :span="24" class="anniu">
+        <button size="mini">打印证书</button>
       </el-col>
     </el-col>
   </div>
@@ -173,6 +172,7 @@ export default {
 .info_1 {
   padding: 0 20px 0 20px;
 }
+// background-image: url(assets/timg.jpg);
 .title {
   font-size: 20px;
   font-weight: 700;
@@ -201,4 +201,7 @@ export default {
 .zhuanye {
   text-align: center;
 }
+.anniu {
+  padding: 30px 0 0 0;
+}
 </style>

src/views/classes/detail.vue

@@ -25,7 +25,7 @@ export default {
     fields: [
       { label: '班级名称', required: true, model: 'name' },
       { label: '人数', required: true, model: 'number' },
-      { label: '批次', required: true, model: 'batch' },
+      { label: '批次', required: true, model: 'batch', type: 'select' },
     ],
     rules: {
       name: [{ required: true, message: '请输入班级名称' }],
@@ -72,6 +72,7 @@ export default {
     async handleSave({ isNew, data }) {
       let res;
       let msg;
+      console.log(isNew);
       if (isNew) {
         res = await this.create(data);
         console.log(res);

src/views/plan/detail.vue

@@ -4,8 +4,8 @@
       <el-row :gutter="10" type="flex">
         <el-col :span="12">
           <el-card header="全年计划信息">
-            <el-form :model="info" :rules="rules" label-width="60px" size="small" @submit.native.prevent>
-              <el-form-item label="年份">
+            <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>
@@ -50,9 +50,8 @@ import dataTable from '@frame/components/data-table';
 import vacationForm from './parts/vacation';
 import event from './parts/event';
 import _ from 'lodash';
-import { createNamespacedHelpers } from 'vuex';
-const { mapActions } = createNamespacedHelpers('plan');
-
+import { mapActions, mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: mapClass } = createNamespacedHelpers('trainplan');
 export default {
   metaInfo: { title: '计划详情' },
   name: 'detail',
@@ -121,6 +120,10 @@ export default {
   },
   mounted() {},
   methods: {
+    ...mapClass(['fetch', 'create', 'update']),
+    // ...mapClass(['fetch', 'create', 'update']),
+    //查询计划
+
     ...mapActions(['fetch', 'create', 'update']),
     //查询计划
     async search() {
@@ -181,10 +184,13 @@ export default {
       this.events.splice(index, 1);
     },
     //保存计划事件
-    savePlan() {
+    savePlan({ isNew }) {
       //全年计划内容
+
       let data = JSON.parse(JSON.stringify(this.info));
-      data.year = this.year;
+
+      data.year = this.info.year;
+      console.log(data.year);
       let termnum = [];
       //1,获取所有期数
       //2,按期数将events内数据分组
@@ -198,7 +204,18 @@ export default {
         return object;
       });
       data.termnum = termnum;
-      //TODO 连接接口
+      let res;
+      let msg;
+      console.log(this.isNew);
+      if (this.isNew) {
+        res = this.create(data);
+        console.log(data);
+        msg = `${this.keyWord}添加成功`;
+      } else {
+        res = this.update(data);
+        msg = `${this.keyWord}修改成功`;
+      }
+      if (this.$checkRes(res, msg)) this.$router.push({ path: '/plan/index' });
     },
     //保存表单函数
     saveForm(events) {
@@ -337,7 +354,7 @@ export default {
       return this.$route.query.id;
     },
     isNew() {
-      return this.$route.query.id ? false : true;
+      return this.$route.query.id ? false : true; //false : true;
     },
     mainTitle() {
       let meta = this.$route.meta;

src/views/plan/index.vue

@@ -10,7 +10,8 @@
 import listFrame from '@frame/layout/admin/list-frame';
 import dataTable from '@frame/components/data-table';
 import { createNamespacedHelpers } from 'vuex';
-const { mapActions } = createNamespacedHelpers('plan');
+const { mapActions } = createNamespacedHelpers('trainplan');
+
 export default {
   metaInfo: { title: '计划管理' },
   name: 'index',
@@ -36,11 +37,11 @@ export default {
       // {
       //   label: '安排班级',
       //   icon: 'el-icon-school',
-      //   methods: 'classes',
+      //     methods: 'classes',
       // },
     ],
     fields: [
-      { label: '计划标题', prop: 'name' },
+      { label: '计划标题', prop: 'title' },
       { label: '年度', prop: 'year' },
       { label: '状态', prop: 'status' },
     ],
@@ -57,6 +58,7 @@ export default {
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
         this.$set(this, `total`, res.total);
+        console.log(res.data);
       }
     },
     toEdit({ data }) {