Skip to content

J
jinfa-platform
Commit 6eec8729 authored by leimo's avatar leimo
Browse files
Options

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

20418order See merge request linkseeks-design/pro-platform!326
parents 3628f7fa 0f23d3f9
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 49 deletions
src/pages/order/deliveryNotice/create/add.tsx
View file @ 6eec8729
......@@ -147,29 +147,22 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
<DatePickerSelect disabled={true} defualtToday={true} className='w-full' />
</FormItem>
<FormItem
rules={[
required()
]}
label={DeliveryNameLabel} name="deliveryVO">
<ShipperAddress
showDefault={true}
onChange={(val) => {
form.setFieldsValue({
"executorVO.phone": val?.phone
})
}}
/>
label={DeliveryTime} name="deliveryRangeTime">
<DatePickerSelect.RangePicker className="w-full" picker='time' />
</FormItem>
<FormItem
rules={[
required()
]}
label={DeliveryTime} name="deliveryRangeTime">
<DatePickerSelect.RangePicker className="w-full" picker='time' />
label={DeliveryNameLabel} name="executorVO.consignee">
<Input />
</FormItem>
<FormItem
......@@ -183,6 +176,22 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
<ContentBox
title={DeliveryInfo.name} id={DeliveryInfo.key}>
<FormItem
rules={[
required()
]}
label={DeliveryNameLabel} name="deliveryVO">
<ShipperAddress
showDefault={true}
onChange={(val) => {
form.setFieldsValue({
"executorVO.phone": val?.phone
})
}}
/>
</FormItem>
<FormItem
rules={[
required()
......
src/pages/order/deliveryNotice/manageB2B/add.tsx
View file @ 6eec8729
......@@ -91,7 +91,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
</FormItem>
<ContentBox title={BillsInfo.name} id={BillsInfo.key}>
<FormItem
rules={[
required()
......@@ -134,20 +134,19 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
rules={[
required()
]}
label={DeliveryNameLabel} name="executorVO">
<ShipperAddress
showDefault={true}
/>
label={DeliveryTimeLabel} name="deliveryRangeTime">
<DatePickerSelect.RangePicker className="w-full" picker='time' />
</FormItem>
<FormItem
rules={[
required()
]}
label={DeliveryTimeLabel} name="deliveryRangeTime">
<DatePickerSelect.RangePicker className="w-full" picker='time' />
label={DeliveryNameLabel} name="executorVO.consignee">
<Input />
</FormItem>
<FormItem
rules={[
required()
......@@ -159,6 +158,19 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
<ContentBox
title={DeliveryInfo.name} id={DeliveryInfo.key}>
<FormItem
rules={[
required()
]}
label={DeliverySlefAddrLabel} name="deliveryVO">
<ShipperAddress
showDefault={true}
/>
</FormItem>
<FormItem
rules={[
required()
......@@ -172,9 +184,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
required()
]}
label={ReceivingAddress} name="receiveVO">
<ReceiverAddress
disabled={true}
formatValue={addrFormatValue}
/>
......
src/pages/order/deliveryNotice/manageB2B/edit.tsx
View file @ 6eec8729
......@@ -7,6 +7,7 @@ import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
import React, { useCallback, useEffect, useState, useContext } from 'react'
import {
BillsInfo, BuyerLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryPhoneLabel,
DeliverySlefAddrLabel,
DeliveryTimeLabel, DeliveryTypeLabel, Distribution, ExternalRoamRecord, LogisticsCarNoLabel, LogisticsCompanyLabel, LogisticsInfo, LogisticsNoLabel, NoteLabel, ReceivingAddress
} from '../../constants'
import { BaseInfo as ContentBox } from '@/components/BaseInfo'
......@@ -136,22 +137,22 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
<DatePickerSelect disabled={true} className='w-full' />
</FormItem>
<FormItem
rules={[
required()
]}
label={DeliveryNameLabel} name="executorVO">
<ShipperAddress
disabled={true}
/>
label={DeliveryTimeLabel} name="deliveryRangeTime">
<DatePickerSelect.RangePicker disabled={true} className="w-full" picker='time' />
</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 label={DeliveryPhoneLabel} name="executorVO.phone">
......@@ -160,6 +161,19 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
</ContentBox>
<ContentBox title={DeliveryInfo.name} id={DeliveryInfo.key}>
<FormItem
rules={[
required()
]}
label={DeliverySlefAddrLabel} name="deliveryVO">
<ShipperAddress
showDefault={true}
/>
</FormItem>
<FormItem
rules={[
required()
......
src/pages/order/deliveryNotice/manageSRM/add.tsx
View file @ 6eec8729
......@@ -133,9 +133,7 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
required()
]}
label={DeliveryNameLabel} name="executorVO.consignee">
<Input />
</FormItem>
<FormItem
......@@ -183,8 +181,8 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
required()
]}
label={ReceivingAddress} name="receiveVO">
<ReceiverAddress
formatValue={addrFormatValue}
/>
</FormItem>
......
src/pages/order/deliveryNotice/manageSRM/edit.tsx
View file @ 6eec8729
......@@ -142,8 +142,8 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
rules={[
required()
]}
label={DeliveryNameLabel} name="executorVO">
<ShipperAddress />
label={DeliveryNameLabel} name="executorVO.consignee">
<Input />
</FormItem>
<FormItem
......@@ -160,6 +160,17 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
</ContentBox>
<ContentBox title={DeliveryInfo.name} id={DeliveryInfo.key}>
<FormItem
rules={[
required()
]}
label={DeliverySlefAddrLabel} name="deliveryVO">
<ShipperAddress
/>
</FormItem>
<FormItem
rules={[
required()
......@@ -175,8 +186,6 @@ const DeliveryNoticeManageSRMEdit: React.FC = () => {
label={ReceivingAddress} name="receiveVO">
<ReceiverAddress
disabled={true}
formatValue={addrFormatValue}
/>
</FormItem>
......
src/pages/order/deliveryNoticeManagement/deliveryNoticeFromCreate/index.tsx
View file @ 6eec8729
......@@ -53,7 +53,7 @@ function DeliveryNoticeFromCreate() {
form.setFieldsValue(res)
console.log(res.products);
setTableDataSource(res.products)
})
......@@ -141,27 +141,24 @@ function DeliveryNoticeFromCreate() {
<DatePickerSelect disabled={true} className='w-full' />
</FormItem>
<FormItem
rules={[
required()
]}
label={DeliveryNameLabel} name="deliveryVO">
<ShipperAddress
onChange={(v) => {
form.setFieldsValue({
"executorVO.phone": v.phone
})
}}
/>
label={DeliveryTimeLabel} name="deliveryRangeTime">
<DatePickerSelect.RangePicker disabled={true} className="w-full" picker='time' />
</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
......@@ -179,6 +176,20 @@ function DeliveryNoticeFromCreate() {
rules={[
required()
]}
label={DeliveryNameLabel} name="deliveryVO">
<ShipperAddress
onChange={(v) => {
form.setFieldsValue({
"executorVO.phone": v.phone
})
}}
/>
</FormItem>
<FormItem
rules={[
required()
]}
label={ConsigneeTimeLabel} name="sendTime">
<DatePickerSelect className="w-full" />
</FormItem>
......
src/pages/order/receivingNote/deliveryNoteManage/index.tsx
View file @ 6eec8729
......@@ -75,8 +75,8 @@ const DeliveryNoteManage: React.FC = () => {
{ title: '单据时间', dataIndex: 'createTime', key: 'createTime' },
{
title: '外部状态',
dataIndex: 'id6',
key: 'id6',
dataIndex: 'outerStatusName',
key: 'outerStatusName',
render: (text, record) => {
const styles = tagService.getTagStyle(record.outerStatus);
return (
......
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