Skip to content

J
jinfa-platform
Commit 5640aa4a authored by leimo's avatar leimo
Browse files
Options

Merge branch '20418order' into 'v2-220418'

修改送货单收货单的页面 See merge request linkseeks-design/pro-platform!462
parents 0f8b53c3 a00f1b49
Hide whitespace changes
Inline Side-by-side
Showing with 334 additions and 259 deletions
src/pages/order/constants/label.ts
View file @ 5640aa4a
......@@ -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 = '备注';
......
src/pages/order/deliveryNotice/manageB2B/add.tsx
View file @ 5640aa4a
......@@ -63,6 +63,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
service.setTableData(tableDataSource);
service.submit().then(res => {
if (res.code === 1000) {
handleLeave(false)
history.go(-1)
}
});
......@@ -74,9 +75,19 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
}, [form, tableDataSource])
const handleRemoveMaterialTableRow = (i: number) => {
const source: any[] = tableDataSource;
const newSource = source.splice(i, 0)
setTableDataSource(newSource);
const source: any[] = JSON.parse(JSON.stringify(tableDataSource));
source.splice(i, 1);
setTableDataSource(source);
let atpm = JSON.parse(JSON.stringify(anchors));
atpm.pop()
setAnchors([
...atpm,
{
...DeliveryGood,
name: `${DeliveryGood.name}(${source.length})`
}
])
}
return (
......@@ -107,7 +118,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
</FormItem>
<FormItem label={NoteLabel} name="remark">
<Input />
<Input placeholder='最长100字符，50个汉字' maxLength={100} />
</FormItem>
<FormItem
......@@ -137,9 +148,6 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
</FormItem>
<FormItem
rules={[
required()
]}
label={DeliveryNameLabel} name="executorVO.consignee">
<Input />
</FormItem>
......@@ -155,7 +163,6 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
<FormItem
rules={[
required('请出入正确的手机号'),
{ pattern: PATTERN_MAPS.phone, message: "手机号是否正确" }
]}
label={DeliveryPhoneLabel} name="executorVO.phone">
......@@ -175,11 +182,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
</FormItem>
<FormItem
rules={[
required()
]}
label={ReceivingAddress} name="receiveVO">
<ReceiverAddress
disabled={true}
/>
......@@ -254,6 +257,17 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
})
}
let atpm = JSON.parse(JSON.stringify(anchors));
atpm.pop()
setAnchors([
...atpm,
{
...DeliveryGood,
name: `${DeliveryGood.name}(${value.length})`
}
])
setTableDataSource(value)
}}
/>
......
src/pages/order/deliveryNotice/manageB2B/edit.tsx
View file @ 5640aa4a
......@@ -32,7 +32,6 @@ const ContentBoxItem = ContentBox.BaseInfoItem;
const DeliveryNoticeManageSRMEdit: React.FC = () => {
const [tableDataSource, setTableDataSource] = useState<any>([]);
const [outerHistoryList, setOuterHistoryList] = useState<any>([]);
const { renderPrompt, handleLeave } = usePrompt()
const location: any = useLocation()
const { id } = location.query
......@@ -46,18 +45,24 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
Distribution,
DeliveryInfo,
LogisticsInfo,
DeliveryGood,
])
useEffect(() => {
form.setFieldsValue({ sourceType: 0, id: id })
service.getDetailById(id).then(res => {
form.setFieldsValue(res)
setOuterHistoryList(res?.outerHistoryList)
})
service.getOrderDeliveryOrderDetailProductPage({ id }).then(res => {
setTableDataSource(res?.data)
setAnchors([
...anchors,
{
...DeliveryGood,
name: `${DeliveryGood.name}(${res?.data?.length})`
}
])
})
}, [id])
......@@ -72,6 +77,7 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
service.setTableData(tableDataSource);
service.submit().then(res => {
if (res.code === 1000) {
handleLeave(false)
history.go(-1)
}
});
......@@ -109,7 +115,7 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
<FormItem rules={[
required()
]} label={DeliveryAbstractLabel} name="digest">
<Input />
<Input placeholder='最长100字符,50个汉字' />
</FormItem>
<FormItem label={NoteLabel} name="remark">
......@@ -121,14 +127,16 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
required()
]}
label={BuyerLabel} name="member">
<RoleSelect formatFeils={(e) => {
return {
buyerMemberId: e.id,
buyerRoleId: e.roleId,
roleType: 2,
name: e.name
}
}} />
<RoleSelect
disabled={true}
formatFeils={(e) => {
return {
buyerMemberId: e.id,
buyerRoleId: e.roleId,
roleType: 2,
name: e.name
}
}} />
</FormItem>
</ContentBox>
......@@ -142,26 +150,21 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
<DatePickerSelect disabled={true} className='w-full' />
</FormItem>
<FormItem
rules={[
required()
]}
label={DeliveryTimeLabel} name="deliveryRangeTime">
<DatePickerSelect.RangePicker disabled={true} className="w-full" picker='time' />
label={DeliveryNameLabel} name="executorVO.consignee">
<Input />
</FormItem>
<FormItem
rules={[
required()
]}
label={DeliveryNameLabel} name="executorVO.consignee">
<Input />
label={DeliveryTimeLabel} name="deliveryRangeTime">
<DatePickerSelect.RangePicker disabled={true} className="w-full" picker='time' />
</FormItem>
<FormItem
rules={[
required('请出入正确的手机号'),
{ pattern: PATTERN_MAPS.phone, message: "手机号是否正确" }
]}
label={DeliveryPhoneLabel} name="executorVO.phone">
......@@ -180,11 +183,7 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
</FormItem>
<FormItem
rules={[
required()
]}
label={ReceivingAddress} name="receiveVO">
<ReceiverAddress
disabled={true}
/>
......@@ -255,15 +254,6 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
</ContentBox>
</Form>
<ContentBox title={ExternalRoamRecord.name} key={ExternalRoamRecord.key} cols={1}>
<Table
columns={ExternalRoamRecordTableColumn}
rowKey="id"
dataSource={outerHistoryList}
/>
</ContentBox>
</AnchorPage>
)
}
......
src/pages/order/deliveryNotice/manageSRM/add.tsx
View file @ 5640aa4a
......@@ -5,7 +5,7 @@
*/
import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
import React, { useCallback, useEffect, useState, useContext } from 'react'
import { BaseInfo, BillsInfo, BuyerLabel, ConsigneeLabel, ConsigneePhoneLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel, DeliveryDate, DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryNoLabel, DeliveryPhoneLabel, DeliverySlefAddrLabel, DeliveryTime, DeliveryTimeLabel, DeliveryTypeLabel, Distribution, LogisticsCarNoLabel, LogisticsCompanyLabel, LogisticsInfo, LogisticsNoLabel, NoteLabel, OutStatusLabel, ReceivingAddress } from '../../constants'
import { BaseInfo, BillsInfo, BuyerLabel, ConsigneeLabel, ConsigneePhoneLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel, DeliveryDate, DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryNoLabel, DeliveryPhoneLabel, DeliverySlefAddrLabel, DeliveryTime, DeliveryTimeLabel, DeliveryTypeLabel, Distribution, LogisticsCarNoLabel, LogisticsCompanyLabel, LogisticsInfo, LogisticsNoLabel, Material, NoteLabel, OutStatusLabel, ReceivingAddress } from '../../constants'
import { BaseInfo as ContentBox } from '@/components/BaseInfo'
import { Input, Table, Row, Col, Select, Radio, Form, Button, Modal } from 'antd';
import { DeliveryNoticeTableColumn, DeliveryNoticeTableColumnSRM } from '../../constants/page-table-column';
......@@ -32,7 +32,7 @@ const ContentBoxItem = ContentBox.BaseInfoItem;
const DeliveryNoticeManageSRMDetails: React.FC = () => {
const [tableDataSource, setTableDataSource] = useState();
const [tableDataSource, setTableDataSource] = useState<any[]>();
const { renderPrompt, handleLeave } = usePrompt()
......@@ -44,7 +44,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
Distribution,
DeliveryInfo,
LogisticsInfo,
DeliveryGood,
Material,
])
useEffect(() => {
......@@ -104,8 +104,12 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
<Input />
</FormItem>
<FormItem label={NoteLabel} name="remark">
<Input.TextArea rows={1} />
<FormItem label={NoteLabel} rules={[
{
max: 100, message: '最长100字符，50个行字'
}
]} name="remark">
<Input.TextArea placeholder='最长100字符，50个行字' maxLength={100} rows={1} />
</FormItem>
<FormItem
......@@ -137,9 +141,6 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
</FormItem>
<FormItem
rules={[
required()
]}
label={DeliveryNameLabel} name="executorVO.consignee">
<Input />
</FormItem>
......@@ -154,7 +155,6 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
<FormItem
rules={[
required('请出入正确的手机号'),
{ pattern: PATTERN_MAPS.phone, message: "手机号是否正确" }
]}
label={DeliveryPhoneLabel} name="executorVO.phone">
......@@ -174,19 +174,15 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
</FormItem>
<FormItem
rules={[
required()
]}
label={ReceivingAddress} name="receiveVO">
<ReceiverAddress
disabled={true}
/>
</FormItem>
<FormItem
rules={[
required()
required(`请输入${DeliverySlefAddrLabel}`)
]}
label={DeliverySlefAddrLabel} name="deliveryVO">
......@@ -213,21 +209,22 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
{/* <Radio.Button value={3}>无效配送</Radio.Button> */}
</Radio.Group>
</FormItem>
<FormItem label={LogisticsCarNoLabel} name="executorVO.carNumbers">
<Input maxLength={20} />
<FormItem
label={LogisticsNoLabel} name="logisticsNo">
<Input maxLength={20} placeholder={`请输入${LogisticsNoLabel}`} />
</FormItem>
<FormItem label={LogisticsCompanyLabel} name="logisticsCompanyInt">
<LogisticsCompanyMerchantsSelect />
</FormItem>
<FormItem
label={LogisticsNoLabel} name="logisticsNo">
<Input maxLength={20} />
<FormItem label={LogisticsCarNoLabel} name="executorVO.carNumbers">
<Input maxLength={20} placeholder={`请输入${LogisticsCarNoLabel}`} />
</FormItem>
</ContentBox>
<ContentBox title={DeliveryGood.name} id={DeliveryGood.key} cols={1}>
<ContentBox title={Material.name} id={Material.key} cols={1}>
{/* 在编辑的时候不需要进行此操作 */}
<DeliveryGoodTableSelectSRM
form={form}
......@@ -250,6 +247,17 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
})
}
let atpm = JSON.parse(JSON.stringify(anchors));
atpm.pop()
setAnchors([
...atpm,
{
...Material,
name: `${Material.name}(${value.length})`
}
])
setTableDataSource(value)
}}
/>
......@@ -273,6 +281,29 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
/>
)
}
},
{
title: '操作',
render: (t, r, i) => {
return (
<Button type='link' onClick={() => {
let tpm = JSON.parse(JSON.stringify(tableDataSource))
tpm.splice(i, 1);
let atpm = JSON.parse(JSON.stringify(anchors));
atpm.pop();
setAnchors([
...atpm,
{
...Material,
name: `${Material.name}(${tpm.length})`
}
])
setTableDataSource(tpm);
}}>删除</Button>
)
}
}
]}
dataSource={tableDataSource}
......
src/pages/order/deliveryNotice/manageSRM/details.tsx
View file @ 5640aa4a
......@@ -5,7 +5,7 @@
*/
import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
import React, { useEffect, useLayoutEffect, useState } from 'react'
import { BillsInfo, ConsigneeLabel, ConsigneePhoneLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel, DeliveryDate, DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryNoLabel, DeliveryPhoneLabel, DeliverySlefAddrLabel, DeliveryTime, DeliveryTimeLabel, DeliveryTypeLabel, Distribution, ExternalRoamRecord, LogisticsCarNoLabel, LogisticsCompanyLabel, LogisticsInfo, LogisticsNoLabel, Material, NoteLabel, OutStatusLabel } from '../../constants'
import { BillsInfo, BuyerLabel, ConsigneeLabel, ConsigneePhoneLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel, DeliveryDate, DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryNoLabel, DeliveryPhoneLabel, DeliverySlefAddrLabel, DeliveryTime, DeliveryTimeLabel, DeliveryTypeLabel, Distribution, ExternalRoamRecord, LogisticsCarNoLabel, LogisticsCompanyLabel, LogisticsInfo, LogisticsNoLabel, Material, NoteLabel, OutStatusLabel } from '../../constants'
import { BaseInfo as ContentBox } from '@/components/BaseInfo'
import { Table } from 'antd';
import { DeliveryNoteAddFromTableColumn, DeliveryNoticeTableColumn, DeliveryNoticeTableColumnSRM, ExternalRoamRecordTableColumn } from '../../constants/page-table-column';
......@@ -27,8 +27,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
Distribution,
DeliveryInfo,
LogisticsInfo,
Material,
ExternalRoamRecord
])
const [info, setInfo] = useState<any>();
......@@ -39,15 +38,25 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
useEffect(() => {
service.getDetailInfoById(query.id as string).then(res => {
setInfo(res)
service.getDetailInfoById(query.id as string).then(info => {
setInfo(info)
service.getDetailInfoProductById(query.id as string).then(res => {
setTableDataSource(res.data)
setAnchors([
...anchors,
{
...Material,
name: `${Material.name}(${res.data.length})`
},
{
...ExternalRoamRecord,
name: `${ExternalRoamRecord.name}(${info?.outerHistoryList?.length})`
}
])
setTotalCount(res.totalCount)
})
})
service.getDetailInfoProductById(query.id as string).then(res => {
setTableDataSource(res.data)
setTotalCount(res.totalCount)
})
}, [])
......@@ -69,6 +78,10 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
{info?.deliveryNo}
</ContentBoxItem>
<ContentBoxItem label={BuyerLabel}>
{info?.buyerMemberName}
</ContentBoxItem>
<ContentBoxItem label={DeliveryAbstractLabel}>
{info?.digest}
</ContentBoxItem>
......@@ -88,7 +101,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
</ContentBoxItem>
<ContentBoxItem label={DeliveryNameLabel}>
{info?.executorVO?.consignee}
{info?.executorVO?.consignee ?? '暂无信息'}
</ContentBoxItem>
<ContentBoxItem label={DeliveryTime}>
......@@ -96,7 +109,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
</ContentBoxItem>
<ContentBoxItem label={DeliveryPhoneLabel}>
{info?.executorVO?.phone}
{info?.executorVO?.phone ?? '暂无信息'}
</ContentBoxItem>
</ContentBox>
......@@ -105,21 +118,6 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
{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>
<ContentBoxItem label={DeliveryAddrLabel}>
<div>
{info?.receiverBO?.provinceName ?? ''}
......@@ -135,6 +133,20 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
</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>
</ContentBox>
<ContentBox title={LogisticsInfo.name} id={LogisticsInfo.key}>
......@@ -142,14 +154,14 @@ 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>
......
src/pages/order/deliveryNotice/manageSRM/edit.tsx
View file @ 5640aa4a
......@@ -5,7 +5,7 @@
*/
import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
import React, { useCallback, useEffect, useState, useContext } from 'react'
import { BillsInfo, BuyerLabel, ConsigneeLabel, ConsigneePhoneLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel, DeliveryDate, DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryNoLabel, DeliveryPhoneLabel, DeliverySlefAddrLabel, DeliveryTimeLabel, DeliveryTypeLabel, Distribution, ExternalRoamRecord, LogisticsCarNoLabel, LogisticsCompanyLabel, LogisticsInfo, LogisticsNoLabel, NoteLabel, OutStatusLabel, ReceivingAddress } from '../../constants'
import { BillsInfo, BuyerLabel, ConsigneeLabel, ConsigneePhoneLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel, DeliveryDate, DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryNoLabel, DeliveryPhoneLabel, DeliverySlefAddrLabel, DeliveryTimeLabel, DeliveryTypeLabel, Distribution, ExternalRoamRecord, LogisticsCarNoLabel, LogisticsCompanyLabel, LogisticsInfo, LogisticsNoLabel, Material, NoteLabel, OutStatusLabel, ReceivingAddress } from '../../constants'
import { BaseInfo as ContentBox } from '@/components/BaseInfo'
import { Input, Table, Row, Col, Select, Radio, Form, Button, message, Modal } from 'antd';
import { DeliveryNoticeTableColumn, DeliveryNoticeTableColumnSRM, ExternalRoamRecordTableColumn } from '../../constants/page-table-column';
......@@ -48,7 +48,6 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
Distribution,
DeliveryInfo,
LogisticsInfo,
DeliveryGood,
])
useEffect(() => {
......@@ -60,6 +59,13 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
service.getOrderDeliveryOrderDetailProductPage({ id }).then(res => {
setTableDataSource(res.data)
setAnchors([
...anchors,
{
...Material,
name: `${Material.name}(${res?.data?.length})`
}
])
})
}, [id])
......@@ -73,6 +79,7 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
service.setTableData(tableDataSource);
service.submit().then(res => {
if (res.code === 1000) {
handleLeave(false)
history.go(-1)
}
});
......@@ -115,7 +122,7 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
</FormItem>
<FormItem label={NoteLabel} name="remark">
<Input.TextArea rows={1} />
<Input.TextArea rows={1} placeholder="最长100字符，50个汉字" maxLength={100} />
</FormItem>
<FormItem
......@@ -123,14 +130,16 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
required()
]}
label={BuyerLabel} name="member">
<RoleSelect formatFeils={(e) => {
return {
buyerMemberId: e.id,
buyerRoleId: e.roleId,
roleType: 2,
name: e.name
}
}} />
<RoleSelect
disabled={true}
formatFeils={(e) => {
return {
buyerMemberId: e.id,
buyerRoleId: e.roleId,
roleType: 2,
name: e.name
}
}} />
</FormItem>
</ContentBox>
......@@ -145,9 +154,6 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
</FormItem>
<FormItem
rules={[
required()
]}
label={DeliveryNameLabel} name="executorVO.consignee">
<Input />
</FormItem>
......@@ -162,7 +168,6 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
<FormItem
rules={[
required('请出入正确的手机号'),
{ pattern: PATTERN_MAPS.phone, message: "手机号是否正确" }
]}
label={DeliveryPhoneLabel} name="executorVO.phone">
......@@ -181,9 +186,7 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
</FormItem>
<FormItem
rules={[
required()
]}
label={ReceivingAddress} name="receiveVO">
<ReceiverAddress
......@@ -253,13 +256,13 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
</ContentBox>
</Form>
<ContentBox title={ExternalRoamRecord.name} key={ExternalRoamRecord.key} cols={1}>
{/* <ContentBox title={ExternalRoamRecord.name} key={ExternalRoamRecord.key} cols={1}>
<Table
columns={ExternalRoamRecordTableColumn}
rowKey="id"
dataSource={outerHistoryList}
/>
</ContentBox>
</ContentBox> */}
</AnchorPage>
......
src/pages/order/deliveryNotice/receivingNoteQuery/details.tsx
View file @ 5640aa4a
......@@ -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,53 +94,66 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
<ContentBox title={Harvest.name} id={Harvest.key}>
<ContentBoxItem label={ReceivingTime}>
{info?.receiveTime}
</ContentBoxItem>
<div>
<ContentBoxItem label={ReceivingTime}>
{info?.receiveTime}
</ContentBoxItem>
<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}
<ContentBoxItem label={ConsigneeLabel}>
{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 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>
......@@ -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={{
......
src/pages/order/deliveryNotice/receivingNoteQuery/index.tsx
View file @ 5640aa4a
......@@ -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) => {
......
src/pages/order/deliveryNotice/receivingNoteQuery/schema/index.tsx
View file @ 5640aa4a
......@@ -2,85 +2,86 @@
* 订单能力 -送货通知单协同 - 待确认送货通知单 - Schema
* @author: Gavin
*/
import { ISchema } from '@formily/antd'
import { FORM_FILTER_PATH } from '@/formSchema/const'
export const receivingNoteQuerySchema: ISchema = {
type: 'object',
properties: {
mageLayout: {
type: 'object',
'x-component': 'mega-layout',
properties: {
topLayout: {
type: 'object',
'x-component': 'mega-layout',
'x-component-props': {
grid: true,
},
properties: {
ctl: {
type: 'object',
'x-component': 'Children',
'x-component-props': {
children: '{{controllerBtns}}',
},
},
receiveNo: {
type: 'string',
'x-component': 'Search',
'x-component-props': {
allowClear: true,
placeholder: '请输入收货单号'
},
},
},
},
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'flex-layout',
'x-component-props': {
rowStyle: {
flexWrap: 'nowrap',
},
colStyle: {
marginLeft: 20,
},
},
properties: {
abstract: {
type: 'string',
'x-component-props': {
allowClear: true,
placeholder: '收货单摘要'
}
},
'[startDate, endDate]': {
type: 'daterange',
'x-component-props': {
allowClear: true,
placeholder: ['收货开始日期', '收货结束日期'],
},
},
supplyMember: {
type: 'string',
'x-component-props': {
allowClear: true,
placeholder: '采购会员'
}
},
submit: {
'x-component': 'Submit',
'x-mega-props': {
span: 1,
},
'x-component-props': {
children: '查询',
},
},
}
}
}
}
}
}
\ No newline at end of file
import { ISchema } from '@formily/antd'
import { FORM_FILTER_PATH } from '@/formSchema/const'
export const receivingNoteQuerySchema: ISchema = {
type: 'object',
properties: {
mageLayout: {
type: 'object',
'x-component': 'mega-layout',
properties: {
topLayout: {
type: 'object',
'x-component': 'mega-layout',
'x-component-props': {
className: 'useMegaStart'
},
properties: {
ctl: {
type: 'object',
'x-component': 'Children',
'x-component-props': {
children: '{{controllerBtns}}',
},
},
receiveNo: {
type: 'string',
'x-component': 'Search',
'x-component-props': {
allowClear: true,
placeholder: '请输入收货单号'
},
},
},
},
[FORM_FILTER_PATH]: {
type: 'object',
'x-component': 'flex-layout',
'x-component-props': {
rowStyle: {
flexWrap: 'nowrap',
justifyContent: 'flex-start'
},
colStyle: {
marginRight: 20,
},
},
properties: {
abstract: {
type: 'string',
'x-component-props': {
allowClear: true,
placeholder: '收货单摘要'
}
},
'[startDate, endDate]': {
type: 'daterange',
'x-component-props': {
allowClear: true,
placeholder: ['收货开始日期', '收货结束日期'],
},
},
supplyMember: {
type: 'string',
'x-component-props': {
allowClear: true,
placeholder: '采购会员'
}
},
submit: {
'x-component': 'Submit',
'x-mega-props': {
span: 1,
},
'x-component-props': {
children: '查询',
},
},
}
}
}
}
}
}
\ 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