Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

pages/workflow/process/index.vue

@@ -98,7 +98,8 @@ export default {
           key: 'id',
           title: this.l('id'),
           align: 'left',
-          high: true
+          high: true,
+          hide:true,
         },
         {
           key: 'name',
@@ -109,7 +110,7 @@ export default {
         {
           key: 'status',
           title: this.l('status'),
-          align: 'left',
+          align: 'center',
           high: true,
           code: 'workflow.schema.status',
           width: 80
@@ -118,7 +119,7 @@ export default {
         {
           key: 'processingStatus',
           title: this.l('processingStatus'),
-          align: 'left',
+          align: 'center',
           easy: true,
           width: 100,
           high: true
@@ -126,28 +127,28 @@ export default {
         {
           key: 'rejectStatus',
           title: this.l('rejectStatus'),
-          align: 'left',
+          align: 'center',
            width: 100,
           high: true
         },
         {
           key: 'endStatus',
           title: this.l('endStatus'),
-          align: 'left',
+          align: 'center',
            width: 100,
           high: true
         },
         {
           key: 'terminateStatus',
           title: this.l('terminateStatus'),
-          align: 'left',
+          align: 'center',
            width: 100,
           high: true
         },
         {
           key: 'creationTime',
           title: this.l('creationTime'),
-          align: 'left',
+          align: 'center',
           high: true
         },
         {

plugins/request/index.js

@@ -87,8 +87,8 @@ service.defaults.headers.put['Content-Type'] = 'application/json';
 service.interceptors.request.use(
   config => {
     // 在请求发送之前做一些处理
-    // const token = util.cookies.get('token');
-    const token = sessionStorage.getItem('token');
+    const token = util.cookies.get('token');
+    // const token = sessionStorage.getItem('token');
     if (token) {
       // 让每个请求携带token-- ['X-Token']为自定义key 请根据实际情况自行修改
       config.headers['Authorization'] = 'Bearer ' + token;