考勤管理-详情页面

src/views/oa/salary_management/Attendance/modules/AnnualLeave.vue

@@ -37,7 +37,7 @@
                     :columns="columns"
                     :data-source="dataSource"
                     :loading="loading"
-                    :scroll="{x: 1200 ,y:300}"
+                    :scroll="{x: 1200 ,y:400}"
                     :pagination="false"
                 >
                 </a-table>
@@ -51,23 +51,35 @@
       import pick from 'lodash.pick'
       import { FormTypes } from '@/utils/JEditableTableUtil'
       import { putAction,getAction } from '@/api/manage'
+      import JEllipsis from '@/components/jeecg/JEllipsis'
       export default {
         name: 'AnnualLeave',
         components: {
             moment,
+            JEllipsis
         },
         data() {
+          let ellipsis = (v, l) => <j-ellipsis value={v} length={l} />
           return {
               formState:{},
               dataSource: [],
               visible:false,
               loading:false,
               columns: [
+                {
+                    title: '序号',
+                    align:"center",
+                    width:'5%',
+                    dataIndex: 'index',
+                    customRender:function (t, r, index) {
+                        return parseInt(index)+1;
+                    }
+                },
                 {
                     title: '编号',
                     align: "center",
                     dataIndex: 'code',
-                    ellipsis: true,
+                    customRender: (t) => ellipsis(t,17),
                     width:'14%'
                 },
                 {
@@ -75,42 +87,44 @@
                     align: "center",
                     dataIndex: 'name',
                     ellipsis: true,
-                    width:'14%'
+                    customRender: (t) => ellipsis(t,17),
+                    width:'12%'
                 },
                 {
                     title: '组织',
                     align: "center",
                     dataIndex: 'orgName',
                     ellipsis: true,
-                    width:'14%'
+                    width:'12%'
                 },
                 {
                     title: '工资卡号',
                     align: "center",
                     dataIndex: 'cardNo',
                     ellipsis: true,
-                    width:'15%',
+                    width:'14%',
+                    customRender: (t) => ellipsis(t,25),
                 },
                 {
                     title: '年假天数',
                     align: "center",
                     dataIndex: 'annualLeave',
                     ellipsis: true,
-                    width:'14%'
+                    width:'10%'
                 },
                 {
                     title: '已请天数',
                     align: "center",
                     dataIndex: 'used',
                     ellipsis: true,
-                    width:'14%'
+                    width:'10%'
                 },
                 {
                     title: '剩余天数',
                     align: "center",
                     dataIndex: 'surplus',
                     ellipsis: true,
-                    width:'14%'
+                    width:'10%'
                 },
                 
              ]

src/views/oa/salary_management/Attendance/modules/AttendancelDetail.vue

@@ -2,7 +2,7 @@
     <div class="reply" ref = "replyModal">
       <a-modal
         title="考勤明细"
-        width="85%"
+        width="100%"
         :visible="visible"
         :confirmLoading="loading"
         :getContainer ='()=>$refs.replyModal'
@@ -37,7 +37,7 @@
                     :columns="columns"
                     :data-source="dataSource"
                     :loading="loading"
-                    :scroll="{x: 3500 ,y:300}"
+                    :scroll="{x: 3200 ,y:400}"
                     :pagination="false"
                 >
                 </a-table>
@@ -51,30 +51,44 @@
       import pick from 'lodash.pick'
       import { FormTypes } from '@/utils/JEditableTableUtil'
       import { putAction,getAction } from '@/api/manage'
+      import JEllipsis from '@/components/jeecg/JEllipsis'
       export default {
         name: 'AttendancelDetail',
         components: {
             moment,
+            JEllipsis
         },
         data() {
+          let ellipsis = (v, l) => <j-ellipsis value={v} length={l} />
           return {
               formState:{},
               dataSource: [{}],
               visible:false,
               loading:false,
               columns: [
+                {
+                    title: '序号',
+                    align:"center",
+                    width:'2%',
+                    dataIndex: 'index',
+                    customRender:function (t, r, index) {
+                        return parseInt(index)+1;
+                    }
+                },
                 {
                     title: '编号',
                     align: "center",
                     dataIndex: 'code',
                     ellipsis: true,
-                    width:'4%'
+                    customRender: (t) => ellipsis(t,17),
+                    width:'5%'
                 },
                 {
                     title: '姓名',
                     align: "center",
                     dataIndex: 'name',
                     ellipsis: true,
+                    customRender: (t) => ellipsis(t,12),
                     width:'4%'
                 },
                 {
@@ -89,7 +103,8 @@
                     align: "center",
                     dataIndex: 'cardNo',
                     ellipsis: true,
-                    width:'5%'
+                    customRender: (t) => ellipsis(t,25),
+                    width:'6%'
                 },
                 {
                     title: '单双休',
@@ -103,28 +118,28 @@
                     align: "center",
                     dataIndex: 'workingHours',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '出勤天数',
                     align: "center",
                     dataIndex: 'attendanceDays',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '话费补贴',
                     align: "center",
                     dataIndex: 'phoneBill',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '午餐补贴',
                     align: "center",
                     dataIndex: 'lunch',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '住房补贴',
@@ -138,7 +153,7 @@
                     align: "center",
                     dataIndex: 'transportation',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '全勤奖',
@@ -152,91 +167,91 @@
                     align: "center",
                     dataIndex: 'endowmentInsurance',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '失业保险',
                     align: "center",
                     dataIndex: 'unemploymentInsurance',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '医疗保险',
                     align: "center",
                     dataIndex: 'medicalInsurance',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '公积金',
                     align: "center",
                     dataIndex: 'accumulationFund',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '工资抵扣',
                     align: "center",
                     dataIndex: 'deduction',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '迟到次数',
                     align: "center",
                     dataIndex: 'latenessTimes',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '迟到扣费',
                     align: "center",
                     dataIndex: 'latenessCost',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '事假时间',
                     align: "center",
                     dataIndex: 'personalLeave',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '病假时间',
                     align: "center",
                     dataIndex: 'sickLeave',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '婚假时间',
                     align: "center",
                     dataIndex: 'marriageLeave',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '丧假时间',
                     align: "center",
                     dataIndex: 'funeralLeave',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '年假时间',
                     align: "center",
                     dataIndex: 'yearLeave',
                     ellipsis: true,
-                    width:'4%'
+                    width:'3%'
                 },
                 {
                     title: '加班时间(分)',
                     align: "center",
                     dataIndex: 'workOvertime',
                     ellipsis: true,
-                    width:'7%'
+                    width:'4%'
                 },
              ]
           }