Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -840,7 +840,7 @@
                     <el-table :show-header="true" :data="fillMembList_leave" highlight-current-row :height="400" style="width: 100%;">
                     <el-table-column prop="label" label="姓名" >
                         <template slot-scope="scope">
-                            <span>{{(scope.row.leaveDays || scope.row.leaveTimes) ? scope.row.label + (scope.row.leaveDays ? '(请假' + scope.row.leaveDays + '天 - ' + leaveTypeName[scope.row.leaveType].name + ')' : '(请假' + scope.row.leaveTimes + 'h - ' + leaveTypeName[scope.row.leaveType].name + ')') : scope.row.label}}</span>
+                            <span>{{(scope.row.leaveDays || scope.row.leaveTimes) ? scope.row.label + (scope.row.leaveDays ? '(请假' + scope.row.leaveDays + '天 - ' + leaveTypeName[scope.row.leaveType] + ')' : '(请假' + scope.row.leaveTimes + 'h - ' + leaveTypeName[scope.row.leaveType] + ')') : scope.row.label}}</span>
                         </template>
                     </el-table-column>
                     <el-table-column prop="deptName" label="部门" >
@@ -1537,17 +1537,7 @@
 
                 approvalProcessDialog: false,
                 approvalProcessData: [],
-                leaveTypeName: [
-                    {name: '事假', id: 0},
-                    {name: '病假', id: 1},
-                    {name: '年假', id: 2},
-                    {name: '产假', id: 3},
-                    {name: '婚假', id: 4},
-                    {name: '丧假', id: 5},
-                    {name: '调休假', id: 6},
-                    {name: '陪产假', id: 7},
-                    {name: '其他', id: 8}
-                ],
+                leaveTypeName: ['事假','病假','年假','产假','婚假','丧假','调休假','陪产假','其他',],
             };
         },
         watch: {