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

config/menu-config.js

@@ -14,11 +14,11 @@ const school = [
   //     },
   //   ],
   // },
-  // {
-  //   path: '/plan/index',
-  //   name: '计划管理', //上报名单
-  //   module: 'school',
-  // },
+  {
+    path: '/schoolInfo/index',
+    name: '信息维护', //上报名单
+    module: 'school',
+  },
   {
     path: '/newPlan/index',
     name: '计划管理', //上报名单
@@ -133,7 +133,7 @@ export const menu = [
   {
     path: '',
     name: '系统管理',
-    module: 'center',
+    module: 'center|director',
     children: [
       {
         path: '/train/batch/index',
@@ -159,7 +159,7 @@ export const menu = [
       {
         path: '/school/index',
         name: '学校管理',
-        module: 'center',
+        module: 'center|director',
       },
       {
         path: '/location/index',

parts/print/certCard.vue

@@ -42,13 +42,13 @@
                 </p>
                 <p class="three">
                   <span class="thr1">第</span>
-                  <span class="thr2"> {{ item.termname }}</span>
+                  <span class="thr2"> {{ term }}</span>
                   <span class="thr3">期培训班，培训合格，特发此证。</span>
                 </p>
                 <p class="four">
                   <span class="four1">证书编号：</span>
-                  <span class="four2">{{ item.year }}{{ item.termname }}{{ item.classname }}</span>
-                  <span class="four3">2020年03月16日</span>
+                  <span class="four2">{{ item.year }}{{ term }}{{ getclanum(classname) }}{{ item.number }}</span>
+                  <span class="four3">{{ getend(enddate) }}</span>
                 </p>
               </el-col>
             </el-col>
@@ -70,6 +70,8 @@ export default {
     list: { type: Array, default: () => [] },
     startdate: { type: String },
     enddate: { type: String },
+    classname: { type: String },
+    term: { type: String },
   },
   components: { dataTable },
   data: function() {
@@ -119,6 +121,23 @@ export default {
     toPrint() {
       this.$print(this.$refs.print);
     },
+    // 結束時間
+    getend(date) {
+      let end_date = moment(date).format('YYYY年MM月DD日');
+      if (end_date) return end_date;
+    },
+    // 过滤班级
+    getclanum(index) {
+      var num = index.replace(/[^\d]/g, '');
+      if (num < 10) return '0' + num;
+      else return num;
+    },
+    // 过滤几号学生
+    // getnum(index) {
+    //   let num = index + 1;
+    //   if (num < 10) return '0' + num;
+    //   else return index;
+    // },
   },
   computed: {
     ...mapState(['user']),