liuchang/fe_service_ebtp_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://10.124.128.2:8888/eshop/fe_service_ebtp_frontend into 20220613-将PUT和DELETE请求更改成POST请求

Browse Source
This commit is contained in:
jl-zhoujl2
2022-07-26 15:08:55 +08:00
parent 9b3fabfbc9 541b685651
commit 002de3e410
162 changed files with 6179 additions and 1956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pages/Finance/Cost/components/Complete.tsx
View File

@ -18,9 +18,9 @@ const Complete: React.FC<{}> = () => {
const columnsComplete: ProColumns<any>[] = [
//已完成表格
{ title: '项目名称', dataIndex: 'projectName', width: 200 },
{ title: '项目名称', dataIndex: 'projectName', width: '35%' },
{
title: '费用类型', width: 100, render: (_, record) => {
title: '费用类型', width: '5%', render: (_, record) => {
let val = '-';
if (record.expensesType == '1') {//标书费  采购文件费用 招募文件费用
if (record.bidMethodDict === 'procurement_mode_1' || record.bidMethodDict === 'procurement_mode_2') {
@ -40,14 +40,14 @@ const Complete: React.FC<{}> = () => {
return val;
}
},
{ title: '费用内容描述', dataIndex: 'commodityDescribe' },
{ title: '下单时间', dataIndex: 'createDate', width: 100, valueType: 'dateTime' },
{ title: '支付时间', dataIndex: 'paymentTime', width: 100, valueType: 'dateTime' },
{ title: '金额(元)', dataIndex: 'amount', width: 80 },
{ title: '费用内容描述', dataIndex: 'commodityDescribe', width: '25%' },
{ title: '下单时间', dataIndex: 'createDate', width: '10%', valueType: 'dateTime' },
{ title: '支付时间', dataIndex: 'paymentTime', width: '10%', valueType: 'dateTime' },
{ title: '金额(元)', dataIndex: 'amount', width: '4%' },
{
title: '操作',
dataIndex: 'option',
width: 150,
width: '3%',
valueType: 'option',
render: (_, record) => {
if (record.bidInvoice == null) {
@ -99,6 +99,8 @@ const Complete: React.FC<{}> = () => {
getCheckboxProps: (record) => ({
disabled: record.bidInvoice == null ? false : true
}),
columnWidth: '1px',
fixed: true,
}}
pagination={{ defaultPageSize: 10 }} //默认显示条数
// bordered

23
src/pages/Finance/Cost/index.tsx
View File

@ -30,11 +30,16 @@ const finance: React.FC<{}> = () => {
setActiveKey(key);
}
const columns: ProColumns<any>[] = [//未支付
{ title: '序号', valueType: 'index', width: 60, hideInTable: true },
{ title: '项目名称', dataIndex: 'projectName', },
{ title: '订单号', dataIndex: 'orderNumber', width: 100, },
{ title: '序号', valueType: 'index', width: 0, hideInTable: true },
{ title: '项目名称', dataIndex: 'projectName', width: '25%', },
{
title: '费用类型', width: 100, render: (_, record) => {
title: '订单号', dataIndex: 'orderNumber', width: '9.3%',
render: (record) => {
return <span style={{ wordBreak: 'break-all', wordWrap: 'break-word' }}>{record}</span>
}
},
{
title: '费用类型', width: '5%', render: (_, record) => {
let val = '-';
if (record.expensesType == '1') {//标书费  采购文件费用 招募文件费用
if (record.bidMethodDict === 'procurement_mode_1' || record.bidMethodDict === 'procurement_mode_2') {
@ -54,11 +59,11 @@ const finance: React.FC<{}> = () => {
return val;
}
},
{ title: '费用内容描述', dataIndex: 'commodityDescribe', },
{ title: '下单时间', dataIndex: 'createDate', width: 100, valueType: 'dateTime', },
{ title: '金额(元)', dataIndex: 'amount', width: 100, },
{ title: '费用内容描述', dataIndex: 'commodityDescribe', width: '25%', },
{ title: '下单时间', dataIndex: 'createDate', width: '6%', valueType: 'dateTime', },
{ title: '金额(元)', dataIndex: 'amount', width: '4%', },
{
title: '状态', dataIndex: 'state', width: 80,
title: '状态', dataIndex: 'state', width: '3%',
valueEnum: {
"0": { text: '未支付', },
"1": { text: '支付中', },
@ -69,7 +74,7 @@ const finance: React.FC<{}> = () => {
},
},
{
title: '操作', dataIndex: 'option', width: 150,
title: '操作', dataIndex: 'option', width: '5%',
valueType: 'option',
render: (_, record) => {
return (