Skip to content

J
jinfa-platform
Commit a00f1b49 authored by rainbowmorel@163.com's avatar rainbowmorel@163.com
Browse files
Options

修改送货单收货单的页面

parent c39df004
Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 140 deletions
src/pages/order/constants/label.ts
View file @ a00f1b49
...@@ -3,6 +3,7 @@ export const ReceiptAddLabel = '新增收货单'; ...@@ -3,6 +3,7 @@ export const ReceiptAddLabel = '新增收货单';
export const ReceiptAbstractLabel = '收货单摘要'; export const ReceiptAbstractLabel = '收货单摘要';
export const DeliveryAbstractLabel = '送货单摘要'; export const DeliveryAbstractLabel = '送货单摘要';
export const DeliveryAbstractNoLabel = '送货通知编号'; export const DeliveryAbstractNoLabel = '送货通知编号';
export const ReNoLabel = '收货单编号';
export const DeliveryPanleNoLabel = '送货计划编号' export const DeliveryPanleNoLabel = '送货计划编号'
export const SupplyMembersLabel = '供应会员'; export const SupplyMembersLabel = '供应会员';
export const NoteLabel = '备注'; export const NoteLabel = '备注';
......
src/pages/order/deliveryNotice/receivingNoteQuery/details.tsx
View file @ a00f1b49
...@@ -6,15 +6,15 @@ ...@@ -6,15 +6,15 @@
import AnchorPage, { AnchorsItem } from '@/components/AnchorPage' import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
import React, { useEffect, useState } from 'react' import React, { useEffect, useState } from 'react'
import { import {
BillsInfo, ConsigneeLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel, BillsInfo, BuyerLabel, ConsigneeLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel,
DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryNoLabel, DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryNoLabel,
DeliveryPhoneLabel, DeliverySlefAddrLabel, DeliveryTimeLabel, DeliveryTypeLabel, DeliveryPhoneLabel, DeliverySlefAddrLabel, DeliveryTimeLabel, DeliveryTypeLabel,
Distribution, ExternalRoamRecord, Harvest, LogisticsCarNoLabel, LogisticsCompanyLabel, Distribution, ExternalRoamRecord, Harvest, LogisticsCarNoLabel, LogisticsCompanyLabel,
LogisticsInfo, LogisticsNoLabel, NoteLabel, OutStatusLabel, ReceivingAddress, ReceivingTime LogisticsInfo, LogisticsNoLabel, NoteLabel, OutStatusLabel, ReceiptAbstractLabel, ReceivingAddress, ReceivingTime, ReNoLabel
} from '../../constants' } from '../../constants'
import { BaseInfo as ContentBox } from '@/components/BaseInfo' import { BaseInfo as ContentBox } from '@/components/BaseInfo'
import { Table } from 'antd'; 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 { useLocation } from 'umi';
import NoteFactoryService from '../../assets/handles/DeliveryNoteService'; import NoteFactoryService from '../../assets/handles/DeliveryNoteService';
...@@ -71,11 +71,15 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => { ...@@ -71,11 +71,15 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
> >
<ContentBox title={BillsInfo.name} id={BillsInfo.key}> <ContentBox title={BillsInfo.name} id={BillsInfo.key}>
<ContentBoxItem label={DeliveryNoLabel}> <ContentBoxItem label={ReNoLabel}>
{info?.deliveryNo} {info?.receiveNo}
</ContentBoxItem> </ContentBoxItem>
<ContentBoxItem label={DeliveryAbstractLabel}> <ContentBoxItem label={BuyerLabel}>
{info?.buyerMemberName}
</ContentBoxItem>
<ContentBoxItem label={ReceiptAbstractLabel}>
{info?.digest} {info?.digest}
</ContentBoxItem> </ContentBoxItem>
...@@ -90,53 +94,66 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => { ...@@ -90,53 +94,66 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
<ContentBox title={Harvest.name} id={Harvest.key}> <ContentBox title={Harvest.name} id={Harvest.key}>
<ContentBoxItem label={ReceivingTime}> <div>
{info?.receiveTime} <ContentBoxItem label={ReceivingTime}>
</ContentBoxItem> {info?.receiveTime}
</ContentBoxItem>
<ContentBoxItem label={ConsigneeLabel}> <ContentBoxItem label={ConsigneeLabel}>
{info?.receiveVO?.consignee}
</ContentBoxItem>
<ContentBoxItem label={ReceivingAddress}>
<div>
{info?.receiveVO?.provinceName}
{info?.receiveVO?.cityName}
{info?.receiveVO?.districtName}
{info?.receiveVO?.streetName}
{info?.receiveVO?.address}
</div>
<div>
{info?.receiveVO?.phone}
{info?.receiveVO?.consignee} {info?.receiveVO?.consignee}
</div> </ContentBoxItem>
</ContentBoxItem> <ContentBoxItem label={DeliveryPhoneLabel}>
{info?.receiveVO?.phone}
</ContentBoxItem>
</div>
<div>
<ContentBoxItem label={ReceivingAddress}>
<div>
{info?.receiveVO?.provinceName}
{info?.receiveVO?.cityName}
{info?.receiveVO?.districtName}
{info?.receiveVO?.streetName}
{info?.receiveVO?.address}
</div>
<div>
{info?.receiveVO?.phone}
{info?.receiveVO?.consignee}
</div>
</ContentBoxItem>
</div>
<ContentBoxItem label={DeliveryPhoneLabel}>
{info?.receiveVO?.phone}
</ContentBoxItem>
</ContentBox> </ContentBox>
<ContentBox title={DeliveryInfo.name} id={DeliveryInfo.key}> <ContentBox title={DeliveryInfo.name} id={DeliveryInfo.key}>
<ContentBoxItem label={ConsigneeTimeLabel}>
{info?.sendTime}
</ContentBoxItem>
<ContentBoxItem label={DeliverySlefAddrLabel}>
<div>
{info?.deliverVO?.provinceName}
{info?.deliverVO?.cityName}
{info?.deliverVO?.districtName}
{info?.deliverVO?.streetName}
{info?.deliverVO?.address}
</div>
<div>
{info?.deliverVO?.phone}
{info?.deliverVO?.consignee}
</div>
</ContentBoxItem> <div>
<ContentBoxItem label={DeliveryNoLabel}>
{info?.deliveryNo}
</ContentBoxItem>
<ContentBoxItem label={ConsigneeTimeLabel}>
{info?.sendTime}
</ContentBoxItem>
</div>
<div>
<ContentBoxItem label={DeliverySlefAddrLabel}>
<div>
{info?.deliverVO?.provinceName}
{info?.deliverVO?.cityName}
{info?.deliverVO?.districtName}
{info?.deliverVO?.streetName}
{info?.deliverVO?.address}
</div>
<div>
{info?.deliverVO?.phone}
{info?.deliverVO?.consignee}
</div>
</ContentBoxItem>
</div>
</ContentBox> </ContentBox>
...@@ -145,22 +162,28 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => { ...@@ -145,22 +162,28 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
<ContentBoxItem label={DeliveryTypeLabel}> <ContentBoxItem label={DeliveryTypeLabel}>
{service.getDeliveryType(info?.deliveryType)} {service.getDeliveryType(info?.deliveryType)}
</ContentBoxItem> </ContentBoxItem>
<ContentBoxItem label={LogisticsCarNoLabel}>
{info?.executorVO?.carNumbers} <ContentBoxItem label={LogisticsNoLabel}>
{info?.logisticsNo}
</ContentBoxItem> </ContentBoxItem>
<ContentBoxItem label={LogisticsCompanyLabel}> <ContentBoxItem label={LogisticsCompanyLabel}>
{info?.logisticsCompany} {info?.logisticsCompany}
</ContentBoxItem> </ContentBoxItem>
<ContentBoxItem label={LogisticsNoLabel}>
{info?.logisticsNo} <ContentBoxItem label={LogisticsCarNoLabel}>
{info?.executorVO?.carNumbers}
</ContentBoxItem> </ContentBoxItem>
</ContentBox> </ContentBox>
<ContentBox title={DeliveryGood.name} id={DeliveryGood.key} cols={1}> <ContentBox title={DeliveryGood.name} id={DeliveryGood.key} cols={1}>
<Table <Table
columns={DeliveryNoticeTableColumn} columns={
info?.type == 1 ? DeliveryNoticeTableColumn : DeliveryNoticeTableColumnSRM
}
rowKey="id" rowKey="id"
dataSource={tableDataSource} dataSource={tableDataSource}
pagination={{ pagination={{
......
src/pages/order/deliveryNotice/receivingNoteQuery/index.tsx
View file @ a00f1b49
...@@ -75,13 +75,13 @@ const ReceivingNoteQuery: React.FC = () => { ...@@ -75,13 +75,13 @@ const ReceivingNoteQuery: React.FC = () => {
) )
} }
}, },
{ // {
title: '操作', // title: '操作',
dataIndex: '', // dataIndex: '',
key: 'x', // key: 'x',
align: 'center', // align: 'center',
render: (record) => renderOptionButton(record) // render: (record) => renderOptionButton(record)
}, // },
] ]
const fetchData = (params: unknown) => { const fetchData = (params: unknown) => {
......
src/pages/order/deliveryNotice/receivingNoteQuery/schema/index.tsx
View file @ a00f1b49
...@@ -2,85 +2,86 @@ ...@@ -2,85 +2,86 @@
* 订单能力 -送货通知单协同 - 待确认送货通知单 - Schema * 订单能力 -送货通知单协同 - 待确认送货通知单 - Schema
* @author: Gavin * @author: Gavin
*/ */
import { ISchema } from '@formily/antd' import { ISchema } from '@formily/antd'
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
export const receivingNoteQuerySchema: ISchema = { export const receivingNoteQuerySchema: ISchema = {
type: 'object', type: 'object',
properties: { properties: {
mageLayout: { mageLayout: {
type: 'object', type: 'object',
'x-component': 'mega-layout', 'x-component': 'mega-layout',
properties: { properties: {
topLayout: { topLayout: {
type: 'object', type: 'object',
'x-component': 'mega-layout', 'x-component': 'mega-layout',
'x-component-props': { 'x-component-props': {
grid: true, className: 'useMegaStart'
}, },
properties: { properties: {
ctl: { ctl: {
type: 'object', type: 'object',
'x-component': 'Children', 'x-component': 'Children',
'x-component-props': { 'x-component-props': {
children: '{{controllerBtns}}', children: '{{controllerBtns}}',
}, },
}, },
receiveNo: { receiveNo: {
type: 'string', type: 'string',
'x-component': 'Search', 'x-component': 'Search',
'x-component-props': { 'x-component-props': {
allowClear: true, allowClear: true,
placeholder: '请输入收货单号' placeholder: '请输入收货单号'
}, },
}, },
}, },
}, },
[FORM_FILTER_PATH]: { [FORM_FILTER_PATH]: {
type: 'object', type: 'object',
'x-component': 'flex-layout', 'x-component': 'flex-layout',
'x-component-props': { 'x-component-props': {
rowStyle: { rowStyle: {
flexWrap: 'nowrap', flexWrap: 'nowrap',
}, justifyContent: 'flex-start'
colStyle: { },
marginLeft: 20, colStyle: {
}, marginRight: 20,
}, },
properties: { },
abstract: { properties: {
type: 'string', abstract: {
'x-component-props': { type: 'string',
allowClear: true, 'x-component-props': {
placeholder: '收货单摘要' allowClear: true,
} placeholder: '收货单摘要'
}, }
'[startDate, endDate]': { },
type: 'daterange', '[startDate, endDate]': {
'x-component-props': { type: 'daterange',
allowClear: true, 'x-component-props': {
placeholder: ['收货开始日期', '收货结束日期'], allowClear: true,
}, placeholder: ['收货开始日期', '收货结束日期'],
}, },
supplyMember: { },
type: 'string', supplyMember: {
'x-component-props': { type: 'string',
allowClear: true, 'x-component-props': {
placeholder: '采购会员' allowClear: true,
} placeholder: '采购会员'
}, }
submit: { },
'x-component': 'Submit', submit: {
'x-mega-props': { 'x-component': 'Submit',
span: 1, 'x-mega-props': {
}, span: 1,
'x-component-props': { },
children: '查询', 'x-component-props': {
}, children: '查询',
}, },
} },
} }
} }
} }
} }
} }
\ 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