Commit a00f1b49 authored by rainbowmorel@163.com's avatar rainbowmorel@163.com

修改送货单收货单的页面

parent c39df004
......@@ -3,6 +3,7 @@ export const ReceiptAddLabel = '新增收货单';
export const ReceiptAbstractLabel = '收货单摘要';
export const DeliveryAbstractLabel = '送货单摘要';
export const DeliveryAbstractNoLabel = '送货通知编号';
export const ReNoLabel = '收货单编号';
export const DeliveryPanleNoLabel = '送货计划编号'
export const SupplyMembersLabel = '供应会员';
export const NoteLabel = '备注';
......
......@@ -6,15 +6,15 @@
import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
import React, { useEffect, useState } from 'react'
import {
BillsInfo, ConsigneeLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel,
BillsInfo, BuyerLabel, ConsigneeLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel,
DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryNoLabel,
DeliveryPhoneLabel, DeliverySlefAddrLabel, DeliveryTimeLabel, DeliveryTypeLabel,
Distribution, ExternalRoamRecord, Harvest, LogisticsCarNoLabel, LogisticsCompanyLabel,
LogisticsInfo, LogisticsNoLabel, NoteLabel, OutStatusLabel, ReceivingAddress, ReceivingTime
LogisticsInfo, LogisticsNoLabel, NoteLabel, OutStatusLabel, ReceiptAbstractLabel, ReceivingAddress, ReceivingTime, ReNoLabel
} from '../../constants'
import { BaseInfo as ContentBox } from '@/components/BaseInfo'
import { Table } from 'antd';
import { DeliveryNoticeTableColumn, ExternalRoamRecordTableColumn } from '../../constants/page-table-column';
import { DeliveryNoticeTableColumn, DeliveryNoticeTableColumnSRM, ExternalRoamRecordTableColumn } from '../../constants/page-table-column';
import { useLocation } from 'umi';
import NoteFactoryService from '../../assets/handles/DeliveryNoteService';
......@@ -71,11 +71,15 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
>
<ContentBox title={BillsInfo.name} id={BillsInfo.key}>
<ContentBoxItem label={DeliveryNoLabel}>
{info?.deliveryNo}
<ContentBoxItem label={ReNoLabel}>
{info?.receiveNo}
</ContentBoxItem>
<ContentBoxItem label={DeliveryAbstractLabel}>
<ContentBoxItem label={BuyerLabel}>
{info?.buyerMemberName}
</ContentBoxItem>
<ContentBoxItem label={ReceiptAbstractLabel}>
{info?.digest}
</ContentBoxItem>
......@@ -90,6 +94,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
<ContentBox title={Harvest.name} id={Harvest.key}>
<div>
<ContentBoxItem label={ReceivingTime}>
{info?.receiveTime}
</ContentBoxItem>
......@@ -98,6 +103,12 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
{info?.receiveVO?.consignee}
</ContentBoxItem>
<ContentBoxItem label={DeliveryPhoneLabel}>
{info?.receiveVO?.phone}
</ContentBoxItem>
</div>
<div>
<ContentBoxItem label={ReceivingAddress}>
<div>
{info?.receiveVO?.provinceName}
......@@ -112,17 +123,23 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
</div>
</ContentBoxItem>
</div>
<ContentBoxItem label={DeliveryPhoneLabel}>
{info?.receiveVO?.phone}
</ContentBoxItem>
</ContentBox>
<ContentBox title={DeliveryInfo.name} id={DeliveryInfo.key}>
<div>
<ContentBoxItem label={DeliveryNoLabel}>
{info?.deliveryNo}
</ContentBoxItem>
<ContentBoxItem label={ConsigneeTimeLabel}>
{info?.sendTime}
</ContentBoxItem>
</div>
<div>
<ContentBoxItem label={DeliverySlefAddrLabel}>
<div>
{info?.deliverVO?.provinceName}
......@@ -135,8 +152,8 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
{info?.deliverVO?.phone}
{info?.deliverVO?.consignee}
</div>
</ContentBoxItem>
</div>
</ContentBox>
......@@ -145,22 +162,28 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
<ContentBoxItem label={DeliveryTypeLabel}>
{service.getDeliveryType(info?.deliveryType)}
</ContentBoxItem>
<ContentBoxItem label={LogisticsCarNoLabel}>
{info?.executorVO?.carNumbers}
<ContentBoxItem label={LogisticsNoLabel}>
{info?.logisticsNo}
</ContentBoxItem>
<ContentBoxItem label={LogisticsCompanyLabel}>
{info?.logisticsCompany}
</ContentBoxItem>
<ContentBoxItem label={LogisticsNoLabel}>
{info?.logisticsNo}
<ContentBoxItem label={LogisticsCarNoLabel}>
{info?.executorVO?.carNumbers}
</ContentBoxItem>
</ContentBox>
<ContentBox title={DeliveryGood.name} id={DeliveryGood.key} cols={1}>
<Table
columns={DeliveryNoticeTableColumn}
columns={
info?.type == 1 ? DeliveryNoticeTableColumn : DeliveryNoticeTableColumnSRM
}
rowKey="id"
dataSource={tableDataSource}
pagination={{
......
......@@ -75,13 +75,13 @@ const ReceivingNoteQuery: React.FC = () => {
)
}
},
{
title: '操作',
dataIndex: '',
key: 'x',
align: 'center',
render: (record) => renderOptionButton(record)
},
// {
// title: '操作',
// dataIndex: '',
// key: 'x',
// align: 'center',
// render: (record) => renderOptionButton(record)
// },
]
const fetchData = (params: unknown) => {
......
......@@ -2,10 +2,10 @@
* 订单能力 -送货通知单协同 - 待确认送货通知单 - Schema
* @author: Gavin
*/
import { ISchema } from '@formily/antd'
import { FORM_FILTER_PATH } from '@/formSchema/const'
import { ISchema } from '@formily/antd'
import { FORM_FILTER_PATH } from '@/formSchema/const'
export const receivingNoteQuerySchema: ISchema = {
export const receivingNoteQuerySchema: ISchema = {
type: 'object',
properties: {
mageLayout: {
......@@ -16,7 +16,7 @@
type: 'object',
'x-component': 'mega-layout',
'x-component-props': {
grid: true,
className: 'useMegaStart'
},
properties: {
ctl: {
......@@ -42,9 +42,10 @@
'x-component-props': {
rowStyle: {
flexWrap: 'nowrap',
justifyContent: 'flex-start'
},
colStyle: {
marginLeft: 20,
marginRight: 20,
},
},
properties: {
......@@ -83,4 +84,4 @@
}
}
}
}
\ No newline at end of file
}
\ No newline at end of file
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