diff --git a/src/route/Correction/Correction.tsx b/src/route/Correction/Correction.tsx
index 4839419..effb882 100644
--- a/src/route/Correction/Correction.tsx
+++ b/src/route/Correction/Correction.tsx
@@ -30,7 +30,7 @@ interface DataType {
applyStatus: string;//审核状态
correctionVoucherFileKVs: any //补正凭证
projCorrectionApplyId: string
- authorName:string;
+ authorName: string;
}
import revokeImg from '../../static/revoke.png'
// import { useLocation } from 'react-router-dom'
@@ -64,6 +64,7 @@ export default function Correction() {
dataIndex: 'index',
align: 'center',
width: 80,
+ fixed: 'left',
render: (_text, _record, index) => (page - 1) * 20 + index + 1, // 显示序号,从1开始
},
{
@@ -71,6 +72,8 @@ export default function Correction() {
dataIndex: 'projName',
align: 'center',
key: 'projName',
+ fixed: 'left',
+ width: 150,
render: (text) =>
{text}
,
},
{
@@ -78,12 +81,14 @@ export default function Correction() {
dataIndex: 'authorName',
align: 'center',
key: 'authorName',
+ width: 150,
render: (text) => {text}
,
},
{
title: '类型',
dataIndex: 'type',
key: 'type',
+ width: 130,
align: 'center',
render: (text) => {text == 'CORRECTION1' ? '一次补正' : text == 'CORRECTION2' ? '二次补正' : ''}
,
},
@@ -92,6 +97,7 @@ export default function Correction() {
dataIndex: 'correctionType',
key: 'correctionType',
align: 'center',
+ width: 130,
render: (text) => {text == 'CODE' ? '代码' : text == 'MANUAL' ? '操作手册' : text == 'ALL' ? '全部补正' : ''}
,
},
{
@@ -99,6 +105,7 @@ export default function Correction() {
dataIndex: 'correctionReason',
key: 'correctionReason',
align: 'center',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -124,7 +131,7 @@ export default function Correction() {
title: '补正凭证',
dataIndex: 'correctionVoucherFileKVs',
key: 'correctionVoucherFileKVs',
- // width: 100,
+ width: 150,
align: 'center',
render: (_, record) => (
(record.correctionVoucherFileKVs).map((item: any, index: number) => (
@@ -150,6 +157,7 @@ export default function Correction() {
dataIndex: 'index',
align: 'center',
width: 80,
+ fixed: 'left',
render: (_text, _record, index) => (page - 1) * 20 + index + 1, // 显示序号,从1开始
},
{
@@ -157,6 +165,8 @@ export default function Correction() {
dataIndex: 'projName',
align: 'center',
key: 'projName',
+ width: 150,
+ fixed: 'left',
render: (text) => {text}
,
},
{
@@ -164,6 +174,7 @@ export default function Correction() {
dataIndex: 'authorName',
align: 'center',
key: 'authorName',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -171,12 +182,14 @@ export default function Correction() {
dataIndex: 'type',
key: 'type',
align: 'center',
+ width: 130,
render: (text) => {text == 'CORRECTION1' ? '一次补正' : text == 'CORRECTION2' ? '二次补正' : ''}
,
},
{
title: '补正种类',
dataIndex: 'correctionType',
key: 'correctionType',
+ width: 130,
align: 'center',
render: (text) => {text == 'CODE' ? '代码' : text == 'MANUAL' ? '操作手册' : text == 'ALL' ? '全部补正' : ''}
,
},
@@ -185,6 +198,7 @@ export default function Correction() {
dataIndex: 'correctionReason',
key: 'correctionReason',
align: 'center',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -208,7 +222,7 @@ export default function Correction() {
title: '补正凭证',
dataIndex: 'correctionVoucherFileKVs',
key: 'correctionVoucherFileKVs',
- // width: 100,
+ width: 150,
align: 'center',
render: (_, record) => (
(record.correctionVoucherFileKVs).map((item: any, index: number) => (
@@ -227,6 +241,7 @@ export default function Correction() {
{
title: '操作',
align: 'center',
+ fixed: 'right',
width: 100,
render: (_, record) => (
// {record.name}
@@ -247,6 +262,7 @@ export default function Correction() {
dataIndex: 'index',
align: 'center',
width: 80,
+ fixed: 'left',
render: (_text, _record, index) => (page - 1) * 20 + index + 1, // 显示序号,从1开始
},
{
@@ -254,6 +270,8 @@ export default function Correction() {
dataIndex: 'projName',
align: 'center',
key: 'projName',
+ fixed: 'left',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -261,6 +279,7 @@ export default function Correction() {
dataIndex: 'authorName',
align: 'center',
key: 'authorName',
+ width: 150,
render: (text) => {text}
,
},
@@ -268,6 +287,7 @@ export default function Correction() {
title: '类型',
dataIndex: 'type',
key: 'type',
+ width: 130,
align: 'center',
render: (text) => {text == 'CORRECTION1' ? '一次补正' : text == 'CORRECTION2' ? '二次补正' : ''}
,
},
@@ -276,6 +296,7 @@ export default function Correction() {
dataIndex: 'correctionType',
key: 'correctionType',
align: 'center',
+ width: 130,
render: (text) => {text == 'CODE' ? '代码' : text == 'MANUAL' ? '操作手册' : text == 'ALL' ? '全部补正' : ''}
,
},
{
@@ -283,6 +304,7 @@ export default function Correction() {
dataIndex: 'correctionReason',
key: 'correctionReason',
align: 'center',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -317,14 +339,14 @@ export default function Correction() {
dataIndex: 'reviewReason',
key: 'reviewReason',
align: 'center',
- // width: 150,
+ width: 150,
render: (text) => {text ? text : '—'}
,
},
{
title: '补正凭证',
dataIndex: 'correctionVoucherFileKVs',
key: 'correctionVoucherFileKVs',
- // width: 100,
+ width: 150,
align: 'center',
render: (_, record) => (
(record.correctionVoucherFileKVs).map((item: any, index: number) => (
@@ -349,6 +371,7 @@ export default function Correction() {
title: '序号',
dataIndex: 'index',
align: 'center',
+ fixed: 'left',
width: 80,
render: (_text, _record, index) => (page - 1) * 20 + index + 1, // 显示序号,从1开始
},
@@ -357,12 +380,15 @@ export default function Correction() {
dataIndex: 'projName',
align: 'center',
key: 'projName',
+ width: 150,
+ fixed: 'left',
render: (text) => {text}
,
},
{
title: '产权所属者',
dataIndex: 'authorName',
align: 'center',
+ width: 150,
key: 'authorName',
render: (text) => {text}
,
},
@@ -371,11 +397,13 @@ export default function Correction() {
title: '类型',
dataIndex: 'type',
key: 'type',
+ width: 130,
align: 'center',
render: (text) => {text == 'CORRECTION1' ? '一次补正' : text == 'CORRECTION2' ? '二次补正' : ''}
,
},
{
title: '补正种类',
+ width: 130,
dataIndex: 'correctionType',
key: 'correctionType',
align: 'center',
@@ -383,6 +411,7 @@ export default function Correction() {
},
{
title: '补正原因',
+ width: 150,
dataIndex: 'correctionReason',
key: 'correctionReason',
align: 'center',
@@ -420,14 +449,14 @@ export default function Correction() {
dataIndex: 'reviewReason',
key: 'reviewReason',
align: 'center',
- // width: 150,
+ width: 150,
render: (text) => {text ? text : '—'}
,
},
{
title: '补正凭证',
dataIndex: 'correctionVoucherFileKVs',
key: 'correctionVoucherFileKVs',
- // width: 100,
+ width: 150,
align: 'center',
render: (_, record) => (
(record.correctionVoucherFileKVs).map((item: any, index: number) => (
@@ -447,6 +476,7 @@ export default function Correction() {
title: '操作',
align: 'center',
width: 180,
+ fixed: 'right',
render: (_, record) => (
// {
@@ -459,46 +489,46 @@ export default function Correction() {
// }
// }}> 下载
),
}
@@ -508,6 +538,7 @@ export default function Correction() {
dataIndex: 'index',
align: 'center',
width: 80,
+ fixed: 'left',
render: (_text, _record, index) => (page - 1) * 20 + index + 1, // 显示序号,从1开始
},
{
@@ -515,6 +546,8 @@ export default function Correction() {
dataIndex: 'projName',
align: 'center',
key: 'projName',
+ fixed: 'left',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -522,12 +555,14 @@ export default function Correction() {
dataIndex: 'authorName',
align: 'center',
key: 'authorName',
+ width: 150,
render: (text) => {text}
,
},
{
title: '类型',
dataIndex: 'type',
+ width: 130,
key: 'type',
align: 'center',
render: (text) => {text == 'CORRECTION1' ? '一次补正' : text == 'CORRECTION2' ? '二次补正' : ''}
,
@@ -535,6 +570,7 @@ export default function Correction() {
{
title: '补正种类',
dataIndex: 'correctionType',
+ width: 130,
key: 'correctionType',
align: 'center',
render: (text) => {text == 'CODE' ? '代码' : text == 'MANUAL' ? '操作手册' : text == 'ALL' ? '全部补正' : ''}
,
@@ -544,6 +580,7 @@ export default function Correction() {
dataIndex: 'correctionReason',
key: 'correctionReason',
align: 'center',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -578,14 +615,14 @@ export default function Correction() {
dataIndex: 'reviewReason',
key: 'reviewReason',
align: 'center',
- // width: 150,
+ width: 150,
render: (text) => {text ? text : '—'}
,
},
{
title: '补正凭证',
dataIndex: 'correctionVoucherFileKVs',
key: 'correctionVoucherFileKVs',
- // width: 100,
+ width: 150,
align: 'center',
render: (_, record) => (
(record.correctionVoucherFileKVs).map((item: any, index: number) => (
@@ -604,6 +641,7 @@ export default function Correction() {
{
title: '操作',
align: 'center',
+ fixed: 'right',
width: 180,
render: (_, record) => (
// {record.applyStatus}
@@ -872,7 +910,7 @@ export default function Correction() {
description="暂无数据"
/>,
}}
- scroll={{ y: height - 160 }}
+ scroll={{ x: 2000, y: height - 160 }}
rowKey="projCorrectionApplyId"
/>
diff --git a/src/route/Refun/Refun.tsx b/src/route/Refun/Refun.tsx
index 03db840..a63def6 100644
--- a/src/route/Refun/Refun.tsx
+++ b/src/route/Refun/Refun.tsx
@@ -21,7 +21,7 @@ interface DataType {
applyStatus: string;
reviewReason: string;
projId: string;
- authorName:string;
+ authorName: string;
}
import revokeImg from '../../static/revoke.png'
export default function Refun() {
@@ -47,6 +47,7 @@ export default function Refun() {
dataIndex: 'index',
align: 'center',
width: 80,
+ fixed: 'left',
render: (_text, _record, index) => (page - 1) * 20 + index + 1, // 显示序号,从1开始
},
{
@@ -54,6 +55,8 @@ export default function Refun() {
dataIndex: 'projName',
align: 'center',
key: 'projName',
+ width: 150,
+ fixed: 'left',
render: (text) => {text}
,
},
{
@@ -61,6 +64,7 @@ export default function Refun() {
dataIndex: 'authorName',
align: 'center',
key: 'authorName',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -68,7 +72,7 @@ export default function Refun() {
dataIndex: 'projPayment',
key: 'projPayment',
align: 'center',
- width: 150,
+ width: 100,
render: (text) => {(text / 100).toFixed(2)}
},
@@ -77,6 +81,7 @@ export default function Refun() {
dataIndex: 'refundReason',
key: 'refundReason',
align: 'center',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -102,7 +107,7 @@ export default function Refun() {
title: '退款凭证',
dataIndex: 'refundVoucherFileKVs',
key: 'refundVoucherFileKVs',
- // width: 100,
+ width: 150,
align: 'center',
render: (_, record) => (
(record.refundVoucherFileKVs).map((item: any, index: number) => (
@@ -128,6 +133,7 @@ export default function Refun() {
dataIndex: 'index',
align: 'center',
width: 80,
+ fixed: 'left',
render: (_text, _record, index) => (page - 1) * 20 + index + 1, // 显示序号,从1开始
},
{
@@ -135,6 +141,8 @@ export default function Refun() {
dataIndex: 'projName',
align: 'center',
key: 'projName',
+ fixed: 'left',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -142,6 +150,7 @@ export default function Refun() {
dataIndex: 'authorName',
align: 'center',
key: 'authorName',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -149,7 +158,7 @@ export default function Refun() {
dataIndex: 'projPayment',
key: 'projPayment',
align: 'center',
- width: 150,
+ width: 100,
render: (text) => {(text / 100).toFixed(2)}
,
},
{
@@ -157,6 +166,7 @@ export default function Refun() {
dataIndex: 'refundReason',
key: 'refundReason',
align: 'center',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -180,7 +190,7 @@ export default function Refun() {
title: '退款凭证',
dataIndex: 'refundVoucherFileKVs',
key: 'refundVoucherFileKVs',
- // width: 100,
+ width: 150,
align: 'center',
render: (_, record) => (
// {record.name}
@@ -203,6 +213,7 @@ export default function Refun() {
},
{
title: '操作',
+ fixed: 'right',
align: 'center',
width: 100,
render: (_, record) => (
@@ -224,6 +235,7 @@ export default function Refun() {
dataIndex: 'index',
align: 'center',
width: 80,
+ fixed: 'left',
render: (_text, _record, index) => (page - 1) * 20 + index + 1, // 显示序号,从1开始
},
{
@@ -231,6 +243,8 @@ export default function Refun() {
dataIndex: 'projName',
align: 'center',
key: 'projName',
+ fixed: 'left',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -238,6 +252,7 @@ export default function Refun() {
dataIndex: 'authorName',
align: 'center',
key: 'authorName',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -245,7 +260,7 @@ export default function Refun() {
dataIndex: 'projPayment',
key: 'projPayment',
align: 'center',
- width: 150,
+ width: 100,
render: (text) => {(text / 100).toFixed(2)}
,
},
{
@@ -253,6 +268,7 @@ export default function Refun() {
dataIndex: 'refundReason',
key: 'refundReason',
align: 'center',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -287,14 +303,14 @@ export default function Refun() {
dataIndex: 'reviewReason',
key: 'reviewReason',
align: 'center',
- // width: 150,
+ width: 150,
render: (text) => {text ? text : '—'}
,
},
{
title: '退款凭证',
dataIndex: 'refundVoucherFileKVs',
key: 'refundVoucherFileKVs',
- // width: 100,
+ width: 150,
align: 'center',
render: (_, record) => (
@@ -315,12 +331,15 @@ export default function Refun() {
align: 'center',
width: 80,
render: (_text, _record, index) => (page - 1) * 20 + index + 1, // 显示序号,从1开始
+ fixed: 'left',
},
{
title: '系统名称',
dataIndex: 'projName',
align: 'center',
key: 'projName',
+ fixed: 'left',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -328,6 +347,7 @@ export default function Refun() {
dataIndex: 'authorName',
align: 'center',
key: 'authorName',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -335,7 +355,7 @@ export default function Refun() {
dataIndex: 'projPayment',
key: 'projPayment',
align: 'center',
- width: 150,
+ width: 100,
render: (text) => {(text / 100).toFixed(2)}
,
},
{
@@ -343,6 +363,7 @@ export default function Refun() {
dataIndex: 'refundReason',
key: 'refundReason',
align: 'center',
+ width: 150,
render: (text) => {text}
,
},
{
@@ -377,14 +398,14 @@ export default function Refun() {
dataIndex: 'reviewReason',
key: 'reviewReason',
align: 'center',
- // width: 150,
+ width: 150,
render: (text) => {text ? text : '—'}
,
},
{
title: '退款凭证',
dataIndex: 'refundVoucherFileKVs',
key: 'refundVoucherFileKVs',
- // width: 100,
+ width: 150,
align: 'center',
render: (_, record) => (
// {record.name}
@@ -409,6 +430,7 @@ export default function Refun() {
title: '操作',
align: 'center',
width: 100,
+ fixed: 'right',
render: (_, record) => (
// {record.applyStatus}PENDING
{record.applyStatus == 'PENDING' ? (
@@ -561,6 +583,7 @@ export default function Refun() {
// height: 620,
// background: 'skyblue'
}}
+ scroll={{ x: 2000, y: height - 160 }}
// pagination={false} // 不显示分页
pagination={
{
@@ -581,7 +604,7 @@ export default function Refun() {
description="暂无数据"
/>,
}}
- scroll={{ y: height - 160 }}
+ // scroll={{ }}
rowKey="projRefundApplyId"
/>