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

src/views/kaoqin/index.vue

@@ -102,7 +102,7 @@ export default {
   created() {
     this.searchinfo();
   },
-  computed: { ...mapState(['user']) },
+  computed: { ...mapState(['user', 'defaultOption']) },
   methods: {
     ...mapActions(['query', 'delete']),
     ...student({ stuquery: 'query' }),
@@ -110,7 +110,7 @@ export default {
     ...util({ fetchUtil: 'fetch' }),
     ...classes({ classesquery: 'query' }),
     async searchinfo() {
-      // let stuid = this.user.id;
+      let stuid = this.user.id;
       const res = await this.schPlanquery();
       this.$set(this, `planList`, res.data);
     },
@@ -135,9 +135,6 @@ export default {
 
     async onsearch({ skip = 0, limit = 10, ...info } = {}) {
       const res = await this.query({ skip, termid: this.form.termid, classid: this.form.classid, limit, ...info });
-
-      console.log(res.data);
-
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
         this.$set(this, `total`, res.total);

src/views/leave/index.vue

@@ -61,7 +61,7 @@ export default {
     this.search();
   },
   computed: {
-    ...mapState(['user']),
+    ...mapState(['user', 'defaultOption']),
     mainTitle() {
       let meta = this.$route.meta;
       let main = meta.title || '';
@@ -78,6 +78,12 @@ export default {
     ...mapActions(['query', 'delete', 'update']),
     ...student({ allRequest: 'mergeRequest' }),
     async search({ skip = 0, limit = 10, ...info } = {}) {
+      if (this.defaultOption.termid) {
+        info = { termid: this.defaultOption.termid };
+      }
+      if (!this.defaultOption.termid && this.defaultOption.planid) {
+        info = { termid: this.defaultOption.planid };
+      }
       const res = await this.query({ skip, limit, ...info, schid: this.user.code });
       if (this.$checkRes(res)) {
         let studs = await this.allRequest({ method: 'fetch', data: _.uniq(res.data.map(i => i.studentid)) });

src/views/new-plan/index.vue

@@ -69,6 +69,7 @@ export default {
     ...trainplan(['query', 'create', 'delete', 'update']),
     ...schPlan({ schPlanQuery: 'query', createSchPlan: 'create', updateSchPlan: 'update' }),
     async search({ skip = 0, limit = 10, ...info } = {}) {
+      info = { planyearid: this.defaultOption.planyearid };
       const res = await this.query({ skip, limit, ...info });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
@@ -114,7 +115,7 @@ export default {
     },
   },
   computed: {
-    ...mapState(['user']),
+    ...mapState(['user', 'defaultOption']),
     pageTitle() {
       return `${this.$route.meta.title}`;
     },