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

fhKeeper/formulahousekeeper/timesheet/src/views/project/cost.vue

@@ -650,6 +650,13 @@
                             stack:'1',
                             barMaxWidth: 30,
                             data: dataList,
+                            label: {
+                                normal: {
+                                    show: true,
+                                    position: 'top',
+                                    formatter: `{c} ${this.yAxisValue==0 ? '元' : '小时'}`,
+                                }
+                            }
                         })
                     }
                     }
@@ -748,6 +755,7 @@
                         }],
                         series: series,
                     };
+                    console.log('人员=======>', series)
                     // console.log('setoption');
                     myChart.setOption(option,{notMerge:true});
             },
@@ -1170,7 +1178,7 @@
                                         normal: {
                                             show: true,
                                             position: 'top',
-                                            formatter: '{c}',
+                                            formatter: `{c} ${this.yAxisValue==0 ? '元' : '小时'}`,
                                         }
                                     }
                                 }],
@@ -1220,6 +1228,13 @@
                                     type: 'bar',
                                     barMaxWidth: 30,
                                     data: yList,
+                                    label: {
+                                        normal: {
+                                            show: true,
+                                            position: 'top',
+                                            formatter: `{c} ${this.yAxisValue==0 ? '元' : '小时'}`,
+                                        }
+                                    }
                                 }],
                                 grid: {  
                                     left: '100px',  

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

@@ -158,7 +158,7 @@
                     </el-table-column>
                     
                     <el-table-column prop="startDate" :label="$t('starttimes')" sortable width="180"></el-table-column>
-                    <el-table-column prop="endDate" :label="$t('deadline')" width="260" fixed="right" sortable>
+                    <el-table-column prop="endDate" :label="$t('deadline')" width="310" fixed="right" sortable>
                         <template slot-scope="scope">
                             <div style="display: flex;justify-content: space-between;padding-right: 40px">
                             <span style="display: inline-block;margin-right: 55px">