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

src/views/student/detail.vue

@@ -193,8 +193,12 @@ export default {
       let planyearid = _.get(this.defaultOption, 'planyearid');
       let res;
       let msg;
+      let sch = this.schcoolList.find(f => f.name == data.school_name);
+      console.log(sch);
+      if (sch) data.schid = sch.code;
+      console.log(data);
       if (isNew) {
-        data.openid = new Date().getTime();
+        // data.openid = new Date().getTime();
         // data.nation = `汉族`;
         // data.yard = `测试学院`;
         // data.major = `测试专业`;

src/views/train-plan/leave.vue

@@ -35,7 +35,7 @@ export default {
           return item === '0' ? '审核中' : item === '1' ? '通过' : '未通过';
         },
       },
-      { label: '拒绝原因', prop: 'refcause' },
+      { label: '学校备注', prop: 'refcause' },
       {
         label: '类型',
         prop: 'type',