Commit f014ecc4 authored by 前端-黄佳鑫's avatar 前端-黄佳鑫

修改物流模块列表字段被修改导致没显示的问题

parent 0b6a43e4
......@@ -57,7 +57,7 @@ const detailInfo: React.FC<{}> = () => {
title: '基本信息',
leftElem: [
{ title: '对应发货单号:', key: 'shipmentOrderNo', value: dataInfo.shipmentOrderCode || '' },
{ title: '对应订单号/售后单:', key: '', value: dataInfo.invoicesNo || '' }
{ title: '对应订单号/售后单:', key: '', value: dataInfo.relevanceOrderCode || '' }
],
centerElem: [
{ title: '收货方:', key: '', value: dataInfo.receiverName || '' },
......
......@@ -163,8 +163,8 @@ const OrderList: React.FC<ListProps> = (props) => {
{
title: '对应订单号',
align: 'left',
dataIndex: 'invoicesNo',
key: 'invoicesNo'
dataIndex: 'relevanceOrderCode',
key: 'relevanceOrderCode'
},
{
title: '发货方',
......@@ -251,13 +251,6 @@ const OrderList: React.FC<ListProps> = (props) => {
})
}
//生命周期
useEffect(() => {
ref.current.reload()
return () => {
}
}, [TimeRange])
const handleDialog = (id: any) => {
setOrderid(id)
setvisible(true)
......
......@@ -4,9 +4,10 @@
* @Author: HJX
*/
import React, { useState, useEffect } from 'react';
import { Form, Input, Select } from 'antd';
import { Form, Input, Select, Button } from 'antd';
import styles from './index.less';
import moment from 'moment';
import { ColumnType } from 'antd/lib/table/interface'
import { ColumnType } from 'antd/lib/table/interface';
import { LinkOutlined } from '@ant-design/icons';
import { PublicApi } from '@/services/api';
import ModalTable from '@/components/ModalTable';
......@@ -259,6 +260,7 @@ const BasicInfo: React.FC<interfaceinfo> = (props) => {
<Form
{...layout}
form={form}
className={styles.revise_style}
>
<Form.Item label="单据摘要" name="digest" rules={[{ required: true, message: '请输入单据摘要' }]}>
<Input />
......@@ -273,13 +275,17 @@ const BasicInfo: React.FC<interfaceinfo> = (props) => {
</Select>
</Form.Item>
<Form.Item label="物流单号" name='receiverName1'><span></span></Form.Item>
<Form.Item label='对应发货单号' name='shipmentOrderCode'>
<Search disabled={!!addId} readOnly enterButton={<><LinkOutlined /> 选择</>} onSearch={() => setshippingvisible(true)} />
{/* <Button type='link'>查看单号详情</Button> */}
<Form.Item label='对应发货单号'>
<Form.Item noStyle name='shipmentOrderCode'>
<Search disabled={!!addId} readOnly enterButton={<><LinkOutlined /> 选择</>} onSearch={() => setshippingvisible(true)} />
</Form.Item>
{shippingRowCtl.selectRow.length > 0 && <Button type='link'>查看单号详情</Button>}
</Form.Item>
<Form.Item label='对应订单号/售后单' name='relevanceOrderCode'>
<Search disabled={!!addId} readOnly enterButton={<><LinkOutlined /> 选择</>} onSearch={() => setinvoicesvisible(true)} />
{/* <Button type='link'>查看单号详情</Button> */}
<Form.Item label='对应订单号/售后单'>
<Form.Item noStyle name='relevanceOrderCode'>
<Search disabled={!!addId} readOnly enterButton={<><LinkOutlined /> 选择</>} onSearch={() => setinvoicesvisible(true)} />
</Form.Item>
{invoicesRowCtl.selectRow.length > 0 && <Button type='link'>查看单号详情</Button>}
</Form.Item>
<Form.Item label="收货方" name='receiverName'><span>{set.receiverName}</span></Form.Item>
<Form.Item label="收货地址" name='receiverFullAddress'>
......@@ -322,8 +328,6 @@ const BasicInfo: React.FC<interfaceinfo> = (props) => {
relevanceType={set.relevanceType}
resetModal={{ destroyOnClose: true }}
tableProps={{ rowKey: 'id' }}
modalType='none'
searchName='invoicesNo'
rowSelection={invoicesRowSelection}
cancel={() => setinvoicesvisible(false)}
confirm={handleInvoices}
......
.revise_style {
:global {
.ant-form-item-label {
width: 174px;
label {
color:#6B778C
}
}
.ant-form-item-control {
width: 500px;
.ant-form-item-control-input-content {
position: relative;
.ant-btn-link {
position: absolute;
right: -120px;
}
.ant-picker {
width: 100%;
}
}
.ant-input-group-addon {
.ant-input-search-button {
background-color: #6B778C;
border-color: #6B778C;
}
}
}
.ant-radio-group-solid {
.ant-radio-button-wrapper-checked {
background: #6B778C;
border-color: #6B778C;
&:hover {
background: #6B778C;
border-color: #6B778C;
}
}
}
}
.upload_item {
padding: 5px 8px;
margin-bottom: 16px;
display: flex;
align-items: center;
justify-content: space-between;
background-color: #FAFBFC;
.upload_left {
display: flex;
align-items: center;
color: #303133;
:global {
.anticon-file-word {
color: #4279df;
font-size: 20px;
margin-right: 8px;
}
}
}
.upload_right {
color: #00B37A;
cursor: pointer;
:global {
.anticon-delete {
margin-left: 19px;
color: #C0C4CC;
}
}
}
}
}
\ No newline at end of file
......@@ -123,8 +123,8 @@ const OrderList: React.FC<ListProps> = (props) => {
{
title: '对应订单号',
align: 'left',
dataIndex: 'invoicesNo',
key: 'invoicesNo'
dataIndex: 'relevanceOrderCode',
key: 'relevanceOrderCode'
},
{
title: '物流服务商',
......
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