Skip to content

J
jinfa-platform
Commit 15d85f3b authored by shenshaokai's avatar shenshaokai
Browse files
Options

Merge branch 'fix-20221102' into 'jinfa-20221102'

fix: 合同-合同查询-合同详情-合同采购材料-关联请购单弹窗样式调整 See merge request project/jinfa-platform!503
parents 646fc7fd 10e0ffe6
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
src/pages/contract/manage/details/Table.tsx
View file @ 15d85f3b
......@@ -13,6 +13,7 @@ export const purchasecolumns: any = [
title: intl.formatMessage({ id: 'contract.purchase.digest' }),
dataIndex: 'digest',
align: 'left',
width: 120,
},
{
title: intl.formatMessage({ id: 'contract.purchase.member' }),
......@@ -28,6 +29,7 @@ export const purchasecolumns: any = [
title: intl.formatMessage({ id: 'contract.businessType' }),
dataIndex: 'businessTypeName',
align: 'left',
width: 120,
},
{
title: intl.formatMessage({ id: 'contract.purchase.department' }),
......@@ -48,7 +50,7 @@ export const purchasecolumns: any = [
title: intl.formatMessage({ id: 'contract.purchase.type' }),
dataIndex: 'deliveryMethodName',
align: 'left',
width: 120,
},
{
title: intl.formatMessage({ id: 'contract.purchase.address' }),
......@@ -64,6 +66,7 @@ export const purchasecolumns: any = [
title: intl.formatMessage({ id: 'contract.arrivalArea' }),
dataIndex: 'arrivalAreaName',
align: 'left',
width: 120,
},
{
title: intl.formatMessage({ id: 'contract.purchase.materialNumber' }),
......@@ -74,6 +77,7 @@ export const purchasecolumns: any = [
title: intl.formatMessage({ id: 'contract.materialMark' }),
dataIndex: 'materialNo',
align: 'left',
width: 120,
},
{
title: intl.formatMessage({ id: 'contract.purchase.materialName' }),
......@@ -84,10 +88,11 @@ export const purchasecolumns: any = [
title: intl.formatMessage({ id: 'contract.purchase.quantity' }),
dataIndex: 'quantity',
align: 'left',
width: 80
},
// {
// title: intl.formatMessage({ id: 'contract.purchase.internalState' }),
// dataIndex: 'buyerInnerStatusName',
// align: 'left',
// },
]
\ No newline at end of file
]
src/pages/contract/manage/details/index.tsx
View file @ 15d85f3b
......@@ -877,6 +877,7 @@ const Details = (props: any) => {
cancel={() => setAssociatedDocumentsVisible(false)}
visible={associatedDocumentsVisible}
width={1200}
scroll={{ x: 1900 }}
columns={purchasecolumns}
modalTitle={intl.formatMessage({ id: 'contract.guanlianqinggoudan' })}
fetchTableData={params => getTable(params)}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment