Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet/src/routes.js

@@ -66,7 +66,7 @@ import leave from './views/leave/list';
 import customData from './views/project/custom_data';
 
 // 出差
-import awayOffice from './views/awayOffice/awayOffice';
+// import awayOffice from './views/awayOffice/awayOffice';
 
 // 研究中心
 // import research from './views/research/list';
@@ -268,16 +268,16 @@ export const allRouters = [//组织架构
             { path: '/leave', component: leave, name: '请假管理' }
         ]
     },
-    {
-        path: '/',
-        component: Home,
-        name: '出差管理',
-        iconCls: 'iconfont firerock-iconwj-qjd',
-        leaf: true,
-        children: [
-            { path: '/awayOffice', component: awayOffice, name: '出差管理' }
-        ]
-    },
+    // {
+    //     path: '/',
+    //     component: Home,
+    //     name: '出差管理',
+    //     iconCls: 'iconfont firerock-iconwj-qjd',
+    //     leaf: true,
+    //     children: [
+    //         { path: '/awayOffice', component: awayOffice, name: '出差管理' }
+    //     ]
+    // }, 
     {
         path: '/',
         component: Home,

fhKeeper/formulahousekeeper/timesheet/src/views/profession/list.vue

@@ -20,7 +20,7 @@
         </el-col>
 
         <!--列表-->
-        <el-table :data="list" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;">
+        <el-table :data="list" highlight-current-row v-loading="listLoading" :height="tableHeight" style="width: 100%;"> 
             <el-table-column type="index" width="60">
                 <template slot-scope="scope" >
                         {{scope.$index+1+(page-1)*size}}