Skip to content

J
jinfa-platform
Commit e987e66c authored by Gavin Peng's avatar Gavin Peng
Browse files
Options

feat: 补齐所有页面详情大致内容

parent e3897c59
Hide whitespace changes
Inline Side-by-side
Showing with 669 additions and 103 deletions
config/routes/orderRoute/deliveryNoticeCollaboration.ts
View file @ e987e66c
......@@ -19,6 +19,7 @@ const DeliveryNoticeCollaboration = [
name: '送货通知单详情',
component: '@/pages/order/deliveryNoticeCollaboration/deliveryNoticeQuery/details',
hideInMenu: true,
noMargin: true,
},
{
......@@ -31,8 +32,9 @@ const DeliveryNoticeCollaboration = [
/** 送货通知单详情*/
path: '/memberCenter/order/deliveryNoticeCollaboration/await/details',
name: '送货通知单详情',
component: '@/pages/order/deliveryNoticeCollaboration/deliveryNoticeQuery/details',
component: '@/pages/order/deliveryNoticeCollaboration/deliveryNoticeAwait/details',
hideInMenu: true,
noMargin: true,
},
],
}
......
config/routes/orderRoute/deliveryNoticeManagement.ts
View file @ e987e66c
......@@ -19,6 +19,7 @@ const DeliveryNoticeManagement = [
name: '送货通知单详情',
component: '@/pages/order/deliveryNoticeManagement/deliveryNoticeQuery/details',
hideInMenu: true,
noMargin: true,
},
{
......@@ -33,6 +34,7 @@ const DeliveryNoticeManagement = [
name: '增修查送货通知单SRM详情',
component: '@/pages/order/deliveryNoticeManagement/deliveryNoticeAwaitSRM/details',
hideInMenu: true,
noMargin: true,
},
{
......@@ -47,6 +49,7 @@ const DeliveryNoticeManagement = [
name: '增修查送货通知单B2B详情',
component: '@/pages/order/deliveryNoticeManagement/deliveryNoticeAwaitB2B/details',
hideInMenu: true,
noMargin: true,
},
]
}
......
src/pages/order/constants/anchors.ts
View file @ e987e66c
......@@ -30,6 +30,16 @@ const Material: AnchorsItem = {
name: "送货物料"
}
const ShippingInfo: AnchorsItem = {
key: "ShippingInfo",
name: "送货信息"
}
const DeliveryList: AnchorsItem = {
key: "DeliveryList",
name: "送货列表"
}
const Harvest: AnchorsItem = {
key: "Harvest",
name: "收货信息"
......@@ -40,7 +50,6 @@ const HarvestMaterial: AnchorsItem = {
name: "收货物料"
}
const Circulation: AnchorsItem = {
key: 'Circulation',
name: "流转进度"
......@@ -101,6 +110,26 @@ const DeliveryPlanCollaborationAnchors: AnchorsItem[] = [
ExternalRoamRecord,
]
// deliveryNoticeManagement -> deliveryNoticeDetaitls
const DeliveryNoticeDetaitlsAnchors: AnchorsItem[] =[
Circulation,
BaseInfo,
ShippingInfo,
DeliveryList,
ExternalRoamRecord,
]
// deliveryNoticeManagement -> deliveryNoticeAwaitSRM
// deliveryNoticeManagement -> deliveryNoticeAwaitB2B
const DeliveryNoticeAwaitAnchors: AnchorsItem[] = [
Circulation,
BaseInfo,
ShippingInfo,
DeliveryList,
Remarks,
ExternalRoamRecord,
]
export {
BaseInfo,
BillsInfo,
......@@ -120,4 +149,8 @@ export {
Remarks,
DeliveryPlanCollaborationAnchors,
PlannedDelivery,
DeliveryNoticeDetaitlsAnchors,
ShippingInfo,
DeliveryList,
DeliveryNoticeAwaitAnchors,
}
\ No newline at end of file
src/pages/order/constants/label.ts
View file @ e987e66c
......@@ -38,11 +38,20 @@ export const Purchaser = '采购商';
export const SubmitDeliveryPlan = '提交送货计划';
export const Supplier = '供应商';
export const ConfirmDeliveryPlan = '提交送货计划';
export const ConfirmDeliveryPlan = '确认送货计划';
export const OutStatusLogTitleLabel = '外部单据流转记录';
export const NoticeNo = '通知单编号';
export const NoticeSummary = '通知单摘要';
export const DeliveryDate = '送货日期';
export const DeliveryTime = '送货时间';
export const ReceivingAddress = '收货地址';
export const SubmitDeliveryNotice = '提交送货通知单';
export const ConfirmDeliveryNotice = '确认送货通知单';
export const OutStatusLogTitleLabel = '外部单据流转记录';
......
src/pages/order/constants/page-table-column.tsx
View file @ e987e66c
......@@ -76,7 +76,7 @@ export const PlannedDeliveryMaterialExpandableTableColumn: any = [
{ dataIndex: 'name8', ...PlannedDeliveryNumColumn, },
];
// // 外部单据流转记录
// 外部单据流转记录
export const ExternalRoamRecordTableColumn: any = [
{ dataIndex: 'id', ...FlowOnColumn, },
{ dataIndex: 'operatorRoleName', ...FlowRoleColumn, },
......@@ -84,4 +84,31 @@ export const ExternalRoamRecordTableColumn: any = [
{ dataIndex: 'operation', ...FlowOptionsColumn, },
{ dataIndex: 'createTime', ...FlowOptionsTimeColumn, },
{ dataIndex: 'remark', ...FlowNoteColumn },
]
// 送货物料
export const DeliveryMaterialsTableColumn: any = [
{ dataIndex: 'name1', ...MaterialNoColumn, },
{ dataIndex: 'name2', ...MaterialNameColumn, },
{ dataIndex: 'name3', ...MaterialModelColumn, },
{ dataIndex: 'name4', ...ClassColumn, },
{ dataIndex: 'name5', ...BrandColumn, },
{ dataIndex: 'name6', ...UntilColumn, },
{ dataIndex: 'name7', ...OrderNoColumn, },
{ dataIndex: 'name8', ...OrderCreatedAtColumn, },
{ dataIndex: 'name9', ...OredrNumColumn, },
{ dataIndex: 'name10', ...PlannedDeliveryNumColumn, },
]
// 送货商品
export const DeliveryGoodsTableColumn: any = [
{ dataIndex: 'name1', ...CommodityIdColumn, },
{ dataIndex: 'name2', ...TradeNameColumn, },
{ dataIndex: 'name3', ...ClassColumn, },
{ dataIndex: 'name4', ...BrandColumn, },
{ dataIndex: 'name5', ...UntilColumn, },
{ dataIndex: 'name6', ...OrderNoColumn, },
{ dataIndex: 'name7', ...OrderCreatedAtColumn, },
{ dataIndex: 'name8', ...OredrNumColumn, },
{ dataIndex: 'name9', ...PlannedDeliveryNumColumn, },
]
\ No newline at end of file
src/pages/order/constants/table-column.ts
View file @ e987e66c
......@@ -4,115 +4,115 @@ import dayjs from "dayjs"
* 订单模块 Table Column 分离 （国际化统一配置）
* @author: 莫雷
*/
export const CommodityIdColumn = {
export const CommodityIdColumn: any = {
title: '商品ID',
dataIndex: 'productId',
key: 'productId',
align: 'center',
}
export const TradeNameColumn = {
export const TradeNameColumn: any = {
title: '商品名称',
dataIndex: 'productName',
key: 'productName',
align: 'center',
}
export const MaterialNoColumn = {
export const MaterialNoColumn: any = {
title: '物料编号',
align: 'center',
}
export const MaterialNameColumn = {
export const MaterialNameColumn: any = {
title: '物料名称',
align: 'center',
}
export const MaterialModelColumn = {
export const MaterialModelColumn: any = {
title: '规格型号',
align: 'center',
}
export const ClassColumn = {
export const ClassColumn: any = {
title: '品类',
dataIndex: 'category',
key: 'category',
align: 'center',
}
export const BrandColumn = {
export const BrandColumn: any = {
title: '品牌',
dataIndex: 'brand',
key: 'brand',
align: 'center',
}
export const UntilColumn = {
export const UntilColumn: any = {
title: '单位',
dataIndex: 'unit',
key: 'unit',
align: 'center',
}
export const OrderNoColumn = {
export const OrderNoColumn: any = {
title: '订单号',
dataIndex: 'orderNo',
key: 'orderNo',
align: 'center',
}
export const OrderSummaryColumn = {
export const OrderSummaryColumn: any = {
title: '订单摘要',
align: 'center',
}
export const OrderCreatedAtColumn = {
export const OrderCreatedAtColumn: any = {
title: '下单时间',
align: 'center',
render: (txt, rcoed) => dayjs(rcoed.createTime).format('YYYY-MM-DD HH:mm:ss')
}
export const OredrNumColumn = {
export const OredrNumColumn: any = {
title: '订单数量',
dataIndex: 'purchaseCount',
key: 'purchaseCount',
align: 'center',
}
export const DeliveryNumColumn = {
export const DeliveryNumColumn: any = {
title: '送货数量',
dataIndex: 'deliveryCount',
key: 'deliveryCount',
align: 'center',
}
export const ConsigneeNumColumn = {
export const ConsigneeNumColumn: any = {
title: '收货数量',
align: 'center',
}
export const TransitNumColumn = {
export const TransitNumColumn: any = {
title: '在途数量',
align: 'center',
render: (txt, rcoed) => txt
}
export const DeliveredNumColumn = {
export const DeliveredNumColumn: any = {
title: '待送货数量',
align: 'center',
}
export const PlannedDeliveryNumColumn = {
export const PlannedDeliveryNumColumn: any = {
title: '计划送货数量',
align: 'center',
}
export const FlowOnColumn = {
export const FlowOnColumn: any = {
title: '流转顺序号',
align: 'center',
}
export const FlowRoleColumn = {
export const FlowRoleColumn: any = {
title: '操作角色',
align: 'center',
}
......@@ -122,17 +122,17 @@ export const FlowStatusColumn = {
align: 'center',
}
export const FlowOptionsColumn = {
export const FlowOptionsColumn: any = {
title: '操作',
align: 'center',
}
export const FlowOptionsTimeColumn = {
export const FlowOptionsTimeColumn: any = {
title: '操作时间',
align: 'center',
}
export const FlowNoteColumn = {
export const FlowNoteColumn: any = {
title: '备注',
align: 'center',
}
\ No newline at end of file
src/pages/order/deliveryNoticeCollaboration/deliveryNoticeAwait/details.tsx
View file @ e987e66c
......@@ -3,22 +3,119 @@
* @author: Gavin
* @description:
*/
import React, { useState } from 'react'
import { PageHeaderWrapper } from '@ant-design/pro-layout'
import { history } from 'umi'
import ReutrnEle from '@/components/ReturnEle'
import React, { useState } from 'react'
import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
import { history } from 'umi'
import { Circulation, BaseInfo as base_info, ShippingInfo, DeliveryList, Remarks, ExternalRoamRecord, Purchaser, SubmitDeliveryNotice, Supplier, ConfirmDeliveryNotice, NoticeNo, SupplyMember, NoticeSummary, ExternalState, DeliveryDate, ReceivingAddress, DeliveryTime, } from '../../constants'
import BaseInfo from '@/components/BaseInfo/BaseInfo'
import { Button, Space, Steps, Table, Tag } from 'antd'
import { CheckCircleOutlined } from '@ant-design/icons'
import CustomizedModal, { SubmitFeedback } from '../../components/customizedModal'
import { DeliveryMaterialsTableColumn, ExternalRoamRecordTableColumn } from '../../constants/page-table-column'
const DeliveryNoticeAwaitDetails: React.FC = () => {
const DeliveryNoticeAwaitDetails: React.FC = () => {
const [iAnchors, setiAnchors] = useState<AnchorsItem[]>([
Circulation,
base_info,
ShippingInfo,
DeliveryList,
ExternalRoamRecord,
])
const [details, setDetails] = useState<any>({})
return (
<PageHeaderWrapper
title={details?.name}
const [modalVisible, setModalVisible] = useState<boolean>(false)
const modalSubmint = (values: SubmitFeedback) => {
console.log('modalSubmint -> values :>> ', values)
}
return (<>
<AnchorPage
title={details?.name || '送货通知单协同 - 送货通知单详情'}
onBack={() => history.goBack()}
backIcon={<ReutrnEle />}
anchors={iAnchors}
extra={
<Space>
{/* 条件渲染 */}
<Button type='primary' icon={<CheckCircleOutlined />} onClick={() => { setModalVisible(true) }}>提交</Button>
</Space>
}
>
<div>送货通知单协同 - 送货通知单详情</div>
</PageHeaderWrapper>
<BaseInfo className='mt-0' title={Circulation.name} id={Circulation.key} cols={1}>
<Steps progressDot current={0}>
<Steps.Step title={Purchaser} description={SubmitDeliveryNotice} />
<Steps.Step title={Supplier} description={ConfirmDeliveryNotice} />
</Steps>
</BaseInfo>
<BaseInfo className='mt-16' title={base_info.name} id={base_info.key}>
<BaseInfo.BaseInfoItem label={NoticeNo}>
DL2014070100001
</BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={SupplyMember}>
温州龙昌手袋有限公司
</BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={NoticeSummary}>
2014-07-01~2014-07-31 广州白马皮具交易中心送货计划
</BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={ExternalState}>
<Tag color='blue'>待确认</Tag>
</BaseInfo.BaseInfoItem>
</BaseInfo>
<BaseInfo className='mt-16' title={ShippingInfo.name} id={ShippingInfo.key}>
<BaseInfo.BaseInfoItem label={DeliveryDate}>
2020-08-25
</BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={ReceivingAddress}>
<div>李四/18600001999</div>
<div>广东省东莞市南城区鸿福东路1068号美居中心6楼 李四/18600001999</div>
</BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={DeliveryTime}>
08:00 至 12:00
</BaseInfo.BaseInfoItem>
</BaseInfo>
<BaseInfo className='mt-16' title={DeliveryList.name} id={DeliveryList.key} cols={1}>
{/* SRM 物料列表(DeliveryMaterialsTableColumn), B2B商品列表(DeliveryGoodsTableColumn) */}
<Table
rowKey={'id'}
dataSource={[{
id: '1',
'name1': '1',
'name2': '2',
'name3': '3',
'name4': '4',
'name5': '5',
'name6': '6',
'name7': '7',
'name8': '8',
'name9': '6',
},]}
columns={DeliveryMaterialsTableColumn}
/>
</BaseInfo>
<BaseInfo className='mt-16' title={ExternalRoamRecord.name} id={ExternalRoamRecord.key} cols={1}>
<Table
rowKey={'id'}
dataSource={[{
id: '1',
'name1': '1',
'name2': '操作角色',
'name3': '状态',
'name4': '操作',
'name5': '操作时间',
'name6': '备注',
},]}
columns={ExternalRoamRecordTableColumn}
/>
</BaseInfo>
</AnchorPage>
<CustomizedModal
title='确认送货通知单'
visible={modalVisible}
defaultRadioValue={1}
radioGroup={[{ label: '确认', value: 1, isReason: false }, { label: '不确认', value: 2, isReason: true }]}
onSubmit={(values) => modalSubmint(values)}
onCancel={(visible: boolean) => setModalVisible(visible)}
/>
</>
)
}
......
src/pages/order/deliveryNoticeCollaboration/deliveryNoticeQuery/details.tsx
View file @ e987e66c
......@@ -3,22 +3,97 @@
* @author: Gavin
* @description:
*/
import React, { useState } from 'react'
import { PageHeaderWrapper } from '@ant-design/pro-layout'
import { history } from 'umi'
import ReutrnEle from '@/components/ReturnEle'
import React, { useState } from 'react'
import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
import { history } from 'umi'
import { Circulation, BaseInfo as base_info, ShippingInfo, DeliveryList, ExternalRoamRecord, Purchaser, SubmitDeliveryNotice, Supplier, ConfirmDeliveryNotice, NoticeNo, SupplyMember, NoticeSummary, ExternalState, DeliveryDate, ReceivingAddress, DeliveryTime, } from '../../constants'
import BaseInfo from '@/components/BaseInfo/BaseInfo'
import { Steps, Table, Tag } from 'antd'
import { DeliveryMaterialsTableColumn, ExternalRoamRecordTableColumn } from '../../constants/page-table-column'
const DeliveryNoticeCollaborationDetails: React.FC = () => {
const DeliveryNoticeCollaborationDetails: React.FC = () => {
const [iAnchors, setiAnchors] = useState<AnchorsItem[]>([
Circulation,
base_info,
ShippingInfo,
DeliveryList,
ExternalRoamRecord,
])
const [details, setDetails] = useState<any>({})
return (
<PageHeaderWrapper
title={details?.name}
<AnchorPage
title={details?.name || '送货通知单管理 - 送货通知单详情'}
onBack={() => history.goBack()}
backIcon={<ReutrnEle />}
anchors={iAnchors}
>
<div>送货通知单管理 - 送货通知单详情</div>
</PageHeaderWrapper>
<BaseInfo className='mt-0' title={Circulation.name} id={Circulation.key} cols={1}>
<Steps progressDot current={0}>
<Steps.Step title={Purchaser} description={SubmitDeliveryNotice} />
<Steps.Step title={Supplier} description={ConfirmDeliveryNotice} />
</Steps>
</BaseInfo>
<BaseInfo className='mt-16' title={base_info.name} id={base_info.key}>
<BaseInfo.BaseInfoItem label={NoticeNo}>
DL2014070100001
</BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={SupplyMember}>
温州龙昌手袋有限公司
</BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={NoticeSummary}>
2014-07-01~2014-07-31 广州白马皮具交易中心送货计划
</BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={ExternalState}>
<Tag color='green'>已提交</Tag>
</BaseInfo.BaseInfoItem>
</BaseInfo>
<BaseInfo className='mt-16' title={ShippingInfo.name} id={ShippingInfo.key}>
<BaseInfo.BaseInfoItem label={DeliveryDate}>
2020-08-25
</BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={ReceivingAddress}>
<div>李四/18600001999</div>
<div>广东省东莞市南城区鸿福东路1068号美居中心6楼 李四/18600001999</div>
</BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={DeliveryTime}>
08:00 至 12:00
</BaseInfo.BaseInfoItem>
</BaseInfo>
<BaseInfo className='mt-16' title={DeliveryList.name} id={DeliveryList.key} cols={1}>
{/* SRM 物料列表(DeliveryMaterialsTableColumn), B2B商品列表(DeliveryGoodsTableColumn) */}
<Table
rowKey={'id'}
dataSource={[{
id: '1',
'name1': '1',
'name2': '2',
'name3': '3',
'name4': '4',
'name5': '5',
'name6': '6',
'name7': '7',
'name8': '8',
'name9': '6',
},]}
columns={DeliveryMaterialsTableColumn}
/>
</BaseInfo>
<BaseInfo className='mt-16' title={ExternalRoamRecord.name} id={ExternalRoamRecord.key} cols={1}>
<Table
rowKey={'id'}
dataSource={[{
id: '1',
'name1': '1',
'name2': '操作角色',
'name3': '状态',
'name4': '操作',
'name5': '操作时间',
'name6': '备注',
},]}
columns={ExternalRoamRecordTableColumn}
/>
</BaseInfo>
</AnchorPage>
)
}
......
src/pages/order/deliveryNoticeManagement/deliveryNoticeAwaitB2B/details.tsx
View file @ e987e66c
......@@ -3,23 +3,145 @@
* @author: Gavin
* @description: 与SRM内容大致相同，文件分开方便后续对接以及日后变动修改二开
*/
import React, { useState } from 'react'
import { PageHeaderWrapper } from '@ant-design/pro-layout'
import { history } from 'umi'
import ReutrnEle from '@/components/ReturnEle'
const DeliveryNoticeManagementAwaitB2BDetails: React.FC = () => {
const [details, setDetails] = useState<any>({})
return (
<PageHeaderWrapper
title={details?.name}
onBack={() => history.goBack()}
backIcon={<ReutrnEle />}
>
<div>待提交送货通知单B2B - 增修查送货通知单B2B详情</div>
</PageHeaderWrapper>
)
}
export default DeliveryNoticeManagementAwaitB2BDetails
\ No newline at end of file
import React, { useState } from 'react'
import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
import { history } from 'umi'
import { Circulation, BaseInfo as base_info, ShippingInfo, DeliveryList, Remarks, ExternalRoamRecord, Purchaser, SubmitDeliveryNotice, Supplier, ConfirmDeliveryNotice, NoticeSummary, BuyerLabel, DeliveryDate, ReceivingAddress, } from '../../constants'
import BaseInfo from '@/components/BaseInfo/BaseInfo'
import { Button, DatePicker, Form, Input, Steps, Table, TimePicker } from 'antd'
import { AddressDrawer } from '@/components/AddressDrawer'
import { ExternalRoamRecordTableColumn } from '../../constants/page-table-column'
import { PlusOutlined } from '@ant-design/icons'
import { BrandColumn, ClassColumn, CommodityIdColumn, FlowOptionsColumn, OrderCreatedAtColumn, OrderNoColumn, OredrNumColumn, PlannedDeliveryNumColumn, TradeNameColumn, UntilColumn } from '../../constants/table-column'
const formItemLayout = {
labelCol: { span: 3 },
wrapperCol: { span: 18 }
}
const aa = [
{ id: '1', 'name1': '1', 'name2': '2', 'name3': '3', 'name4': '4', 'name5': '5', 'name6': '6', 'name7': '7', 'name8': '8', 'name9': '6', },
]
const DeliveryNoticeManagementAwaitB2BDetails: React.FC = () => {
const [iAnchors, setiAnchors] = useState<AnchorsItem[]>([
Circulation,
base_info,
ShippingInfo,
DeliveryList,
Remarks,
ExternalRoamRecord,
])
const [details, setDetails] = useState<any>({})
return (
<AnchorPage
title={details?.name || '没有title'}
onBack={() => history.goBack()}
anchors={iAnchors}
>
<Form labelAlign='left'>
<BaseInfo className='mt-0' title={Circulation.name} id={Circulation.key} cols={1}>
<Steps progressDot current={0}>
<Steps.Step title={Purchaser} description={SubmitDeliveryNotice} />
<Steps.Step title={Supplier} description={ConfirmDeliveryNotice} />
</Steps>
</BaseInfo>
<BaseInfo className='mt-16' title={base_info.name} id={base_info.key}>
<Form.Item
{...formItemLayout}
label={NoticeSummary}
>
<Input />
</Form.Item>
<Form.Item
{...formItemLayout}
label={BuyerLabel}
>
<Input />
</Form.Item>
</BaseInfo>
<BaseInfo className='mt-16' title={ShippingInfo.name} id={ShippingInfo.key}>
<Form.Item
{...formItemLayout}
label={DeliveryDate}
>
<DatePicker style={{ width: '100%' }} />
</Form.Item>
<Form.Item
{...formItemLayout}
label={ReceivingAddress}
name='test'
>
<AddressDrawer />
</Form.Item>
<Form.Item
{...formItemLayout}
label={DeliveryDate}
>
<TimePicker.RangePicker format={'HH:mm'} style={{ width: '100%' }} />
</Form.Item>
</BaseInfo>
<BaseInfo className='mt-16' title={DeliveryList.name} id={DeliveryList.key} cols={1}>
<Button icon={<PlusOutlined />}>选择</Button>
{/* B2B 商品列表*/}
<Table
rowKey={'id'}
dataSource={aa}
columns={[
{ dataIndex: 'name1', ...CommodityIdColumn, },
{ dataIndex: 'name2', ...TradeNameColumn, },
{ dataIndex: 'name3', ...ClassColumn, },
{ dataIndex: 'name4', ...BrandColumn, },
{ dataIndex: 'name5', ...UntilColumn, },
{ dataIndex: 'name6', ...OrderNoColumn, },
{ dataIndex: 'name7', ...OrderCreatedAtColumn, },
{ dataIndex: 'name8', ...OredrNumColumn, },
{
dataIndex: 'name9',
...PlannedDeliveryNumColumn,
render: (_, rcode, index) => {
return (<Input />)
},
editable: true,
},
{
key: 'action',
...FlowOptionsColumn,
render: () => (<Button type='link'>删除</Button>)
}
]}
/>
</BaseInfo>
<BaseInfo className='mt-16' title={Remarks.name} id={Remarks.key} cols={1}>
<Form.Item
// { ...formItemLayout }
labelCol={{ span: 0 }}
wrapperCol={{ span: 24 }}
>
<Input.TextArea rows={6} maxLength={300} placeholder='最长600个字符,300个汉字。' />
</Form.Item>
</BaseInfo>
<BaseInfo className='mt-16' title={ExternalRoamRecord.name} id={ExternalRoamRecord.key} cols={1}>
<Table
rowKey={'id'}
dataSource={[{
id: '1',
'name1': '1',
'name2': '操作角色',
'name3': '状态',
'name4': '操作',
'name5': '操作时间',
'name6': '备注',
},]}
columns={ExternalRoamRecordTableColumn}
/>
</BaseInfo>
</Form>
</AnchorPage>
)
}
export default DeliveryNoticeManagementAwaitB2BDetails
\ No newline at end of file
src/pages/order/deliveryNoticeManagement/deliveryNoticeAwaitB2B/index.tsx
View file @ e987e66c
......@@ -63,6 +63,7 @@ const DeliveryNoticeManagementAwaitB2B: React.FC = () => {
dataIndex: 'id',
key: 'id',
width: 160,
ellipsis: true,
render: (text: unknown, record: unknown) => <EyePreview url='/memberCenter/order/deliveryNoticeManagement/awaitB2B/details'>{text}</EyePreview>
},
{ title: '通知单摘要', dataIndex: 'id2', key: 'id2' },
......
src/pages/order/deliveryNoticeManagement/deliveryNoticeAwaitSRM/details.tsx
View file @ e987e66c
......@@ -3,23 +3,147 @@
* @author: Gavin
* @description: 与B2B内容大致相同，文件分开方便后续对接以及日后变动修改二开
*/
import React, { useState } from 'react'
import { PageHeaderWrapper } from '@ant-design/pro-layout'
import { history } from 'umi'
import ReutrnEle from '@/components/ReturnEle'
const DeliveryNoticeManagementAwaitSRMDetails: React.FC = () => {
const [details, setDetails] = useState<any>({})
return (
<PageHeaderWrapper
title={details?.name}
onBack={() => history.goBack()}
backIcon={<ReutrnEle />}
>
<div>待提交送货通知单SRM - 增修查送货通知单SRM详情</div>
</PageHeaderWrapper>
)
}
export default DeliveryNoticeManagementAwaitSRMDetails
\ No newline at end of file
import React, { useState } from 'react'
import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
import { history } from 'umi'
import { BaseInfo as base_info, DeliveryList, Remarks, ExternalRoamRecord, Circulation, Purchaser, SubmitDeliveryNotice, Supplier, ConfirmDeliveryNotice, NoticeSummary, BuyerLabel, DeliveryDate, ReceivingAddress, ShippingInfo, } from '../../constants'
import BaseInfo from '@/components/BaseInfo/BaseInfo'
import { Button, DatePicker, Form, Input, Steps, Table, TimePicker } from 'antd'
import { PlusOutlined } from '@ant-design/icons'
import { AddressDrawer } from '@/components/AddressDrawer'
import { BrandColumn, ClassColumn, FlowOptionsColumn, MaterialModelColumn, MaterialNameColumn, MaterialNoColumn, OrderCreatedAtColumn, OrderNoColumn, OredrNumColumn, PlannedDeliveryNumColumn, UntilColumn } from '../../constants/table-column'
import { ExternalRoamRecordTableColumn } from '../../constants/page-table-column'
const formItemLayout = {
labelCol: { span: 3 },
wrapperCol: { span: 18 }
}
const aa = [
{ id: '1', 'name1': '1', 'name2': '2', 'name3': '3', 'name4': '4', 'name5': '5', 'name6': '6', 'name7': '7', 'name8': '8', 'name9': '6', },
]
const DeliveryNoticeManagementAwaitSRMDetails: React.FC = () => {
const [iAnchors, setiAnchors] = useState<AnchorsItem[]>([
Circulation,
base_info,
ShippingInfo,
DeliveryList,
Remarks,
ExternalRoamRecord,
])
const [details, setDetails] = useState<any>({})
return (
<AnchorPage
title={details?.name || '没有title'}
onBack={() => history.goBack()}
anchors={iAnchors}
>
<Form labelAlign='left'>
<BaseInfo className='mt-0' title={Circulation.name} id={Circulation.key} cols={1}>
<Steps progressDot current={0}>
<Steps.Step title={Purchaser} description={SubmitDeliveryNotice} />
<Steps.Step title={Supplier} description={ConfirmDeliveryNotice} />
</Steps>
</BaseInfo>
<BaseInfo className='mt-16' title={base_info.name} id={base_info.key}>
<Form.Item
{...formItemLayout}
label={NoticeSummary}
>
<Input />
</Form.Item>
<Form.Item
{...formItemLayout}
label={BuyerLabel}
>
<Input />
</Form.Item>
</BaseInfo>
<BaseInfo className='mt-16' title={ShippingInfo.name} id={ShippingInfo.key}>
<Form.Item
{...formItemLayout}
label={DeliveryDate}
>
<DatePicker style={{ width: '100%' }} />
</Form.Item>
<Form.Item
{...formItemLayout}
label={ReceivingAddress}
name='test'
>
<AddressDrawer />
</Form.Item>
<Form.Item
{...formItemLayout}
label={DeliveryDate}
>
<TimePicker.RangePicker format={'HH:mm'} style={{ width: '100%' }} />
</Form.Item>
</BaseInfo>
<BaseInfo className='mt-16' title={DeliveryList.name} id={DeliveryList.key} cols={1}>
<Button icon={<PlusOutlined />}>选择</Button>
{/* SRM 物料列表*/}
<Table
rowKey={'id'}
dataSource={aa}
columns={[
{ dataIndex: 'name1', ...MaterialNoColumn, },
{ dataIndex: 'name2', ...MaterialNameColumn, },
{ dataIndex: 'name3', ...MaterialModelColumn, },
{ dataIndex: 'name4', ...ClassColumn, },
{ dataIndex: 'name5', ...BrandColumn, },
{ dataIndex: 'name6', ...UntilColumn, },
{ dataIndex: 'name7', ...OrderNoColumn, },
{ dataIndex: 'name8', ...OrderCreatedAtColumn, },
{ dataIndex: 'name9', ...OredrNumColumn, },
{
dataIndex: 'name10',
...PlannedDeliveryNumColumn,
render: (_, rcode, index) => {
return (<Input />)
},
editable: true,
},
{
key: 'action',
...FlowOptionsColumn,
render: () => (<Button type='link'>删除</Button>)
}
]}
/>
</BaseInfo>
<BaseInfo className='mt-16' title={Remarks.name} id={Remarks.key} cols={1}>
<Form.Item
// { ...formItemLayout }
labelCol={{ span: 0 }}
wrapperCol={{ span: 24 }}
>
<Input.TextArea rows={6} maxLength={300} placeholder='最长600个字符,300个汉字。' />
</Form.Item>
</BaseInfo>
<BaseInfo className='mt-16' title={ExternalRoamRecord.name} id={ExternalRoamRecord.key} cols={1}>
<Table
rowKey={'id'}
dataSource={[{
id: '1',
'name1': '1',
'name2': '操作角色',
'name3': '状态',
'name4': '操作',
'name5': '操作时间',
'name6': '备注',
},]}
columns={ExternalRoamRecordTableColumn}
/>
</BaseInfo>
</Form>
</AnchorPage>
)
}
export default DeliveryNoticeManagementAwaitSRMDetails
\ No newline at end of file
src/pages/order/deliveryNoticeManagement/deliveryNoticeQuery/details.tsx
View file @ e987e66c
......@@ -3,22 +3,92 @@
* @author: Gavin
* @description:
*/
import React, { useState } from 'react'
import { PageHeaderWrapper } from '@ant-design/pro-layout'
import { history } from 'umi'
import ReutrnEle from '@/components/ReturnEle'
import React, { useState } from 'react'
import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
import { history } from 'umi'
import { Circulation, ConfirmDeliveryPlan, DeliveryNoticeDetaitlsAnchors, Purchaser, SubmitDeliveryPlan, Supplier, BaseInfo as base_Info, NoticeNo, BuyerLabel, NoticeSummary, ExternalState, ShippingInfo, DeliveryDate, DeliveryTime, ReceivingAddress, DeliveryList, ExternalRoamRecord, } from '../../constants'
import BaseInfo from '@/components/BaseInfo/BaseInfo'
import { Steps, Table, Tag } from 'antd'
import { DeliveryMaterialsTableColumn, ExternalRoamRecordTableColumn } from '../../constants/page-table-column'
const DeliveryNoticeManagementDetails: React.FC = () => {
const DeliveryNoticeManagementDetails: React.FC = () => {
const [iAnchors, setiAnchors] = useState<AnchorsItem[]>(DeliveryNoticeDetaitlsAnchors)
const [details, setDetails] = useState<any>({})
return (
<PageHeaderWrapper
title={details?.name}
<AnchorPage
title={details?.name || '没有title'}
onBack={() => history.goBack()}
backIcon={<ReutrnEle />}
anchors={iAnchors}
>
<div>送货通知单管理 - 送货通知单详情</div>
</PageHeaderWrapper>
<BaseInfo className='mt-0' title={Circulation.name} id={Circulation.key} cols={1}>
<Steps progressDot current={0}>
<Steps.Step title={Purchaser} description={SubmitDeliveryPlan} />
<Steps.Step title={Supplier} description={ConfirmDeliveryPlan} />
</Steps>
</BaseInfo>
<BaseInfo className='mt-16' title={base_Info.name} id={base_Info.key}>
<BaseInfo.BaseInfoItem label={NoticeNo}>
DL2014070100001
</BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={BuyerLabel}>
温州龙昌手袋有限公司
</BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={NoticeSummary}>
2014-07-01~2014-07-31 广州白马皮具交易中心送货计划
</BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={ExternalState}>
<Tag color='green'>已提交</Tag>
</BaseInfo.BaseInfoItem>
</BaseInfo>
<BaseInfo className='mt-16' title={ShippingInfo.name} id={ShippingInfo.key}>
<BaseInfo.BaseInfoItem label={DeliveryDate}>
2020-08-25
</BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={ReceivingAddress}>
<div>李四/18600001999</div>
<div>广东省东莞市南城区鸿福东路1068号美居中心6楼 李四/18600001999</div>
</BaseInfo.BaseInfoItem>
<BaseInfo.BaseInfoItem label={DeliveryTime}>
08:00 至 12:00
</BaseInfo.BaseInfoItem>
</BaseInfo>
<BaseInfo className='mt-16' title={DeliveryList.name} id={DeliveryList.key} cols={1}>
{/* SRM 物料列表(DeliveryMaterialsTableColumn), B2B商品列表(DeliveryGoodsTableColumn) */}
<Table
rowKey={'id'}
dataSource={[{
id: '1',
'name1': '1',
'name2': '2',
'name3': '3',
'name4': '4',
'name5': '5',
'name6': '6',
'name7': '7',
'name8': '8',
'name9': '6',
},]}
columns={DeliveryMaterialsTableColumn}
/>
</BaseInfo>
<BaseInfo className='mt-16' title={ExternalRoamRecord.name} id={ExternalRoamRecord.key} cols={1}>
<Table
rowKey={'id'}
dataSource={[{
id: '1',
'name1': '1',
'name2': '操作角色',
'name3': '状态',
'name4': '操作',
'name5': '操作时间',
'name6': '备注',
},]}
columns={ExternalRoamRecordTableColumn}
/>
</BaseInfo>
</AnchorPage>
)
}
......
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