Browse Source

考勤管理-年休详情

jingbb 1 year ago
parent
commit
69cf6ed623
1 changed files with 22 additions and 9 deletions
  1. 22 9
      src/views/oa/salary_management/Attendance/modules/AnnualLeave.vue

+ 22 - 9
src/views/oa/salary_management/Attendance/modules/AnnualLeave.vue

@@ -37,7 +37,7 @@
                     :columns="columns"
                     :data-source="dataSource"
                     :loading="loading"
-                    :scroll="{x: 1200 ,y:400}"
+                    :scroll="{x: 1500 ,y:400}"
                     :pagination="false"
                 >
                 </a-table>
@@ -79,23 +79,36 @@
                     title: '编号',
                     align: "center",
                     dataIndex: 'code',
-                    customRender: (t) => ellipsis(t,17),
-                    width:'14%'
+                    customRender: (t) => ellipsis(t,12),
+                    width:'10%'
                 },
                 {
                     title: '姓名',
                     align: "center",
                     dataIndex: 'name',
                     ellipsis: true,
-                    customRender: (t) => ellipsis(t,17),
-                    width:'12%'
+                    customRender: (t) => ellipsis(t,5),
+                    width:'9%'
                 },
                 {
                     title: '组织',
                     align: "center",
                     dataIndex: 'orgName',
                     ellipsis: true,
-                    width:'12%'
+                    width:'10%'
+                },
+                {
+                    title: '单双休',
+                    align: "center",
+                    dataIndex: 'restMode',
+                    ellipsis: true,
+                    width:'10%'
+                },{
+                    title: '工时/天',
+                    align: "center",
+                    dataIndex: 'workingHours',
+                    ellipsis: true,
+                    width:'10%'
                 },
                 {
                     title: '工资卡号',
@@ -110,21 +123,21 @@
                     align: "center",
                     dataIndex: 'annualLeave',
                     ellipsis: true,
-                    width:'14%'
+                    width:'8%'
                 },
                 {
                     title: '已请天数',
                     align: "center",
                     dataIndex: 'used',
                     ellipsis: true,
-                    width:'104'
+                    width:'8%'
                 },
                 {
                     title: '剩余天数',
                     align: "center",
                     dataIndex: 'surplus',
                     ellipsis: true,
-                    width:'14%'
+                    width:'8%'
                 },
                 
              ]