Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
jinfa-platform
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linweijiong
jinfa-platform
Commits
f014ecc4
Commit
f014ecc4
authored
Dec 15, 2020
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改物流模块列表字段被修改导致没显示的问题
parent
0b6a43e4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
93 additions
and
22 deletions
+93
-22
orderSearchDetail.tsx
src/pages/logistics/components/orderSearchDetail.tsx
+1
-1
orderSearchList.tsx
src/pages/logistics/components/orderSearchList.tsx
+0
-0
toOrderComfirmList.tsx
src/pages/logistics/logisticsResult/toOrderComfirmList.tsx
+2
-9
ModalTableOrder.tsx
...ics/logisticsSubmit/detail/components/ModalTableOrder.tsx
+0
-0
basicInfo.tsx
...logistics/logisticsSubmit/detail/components/basicInfo.tsx
+14
-10
index.less
...es/logistics/logisticsSubmit/detail/components/index.less
+74
-0
toOrderSumitList.tsx
src/pages/logistics/logisticsSubmit/toOrderSumitList.tsx
+2
-2
No files found.
src/pages/logistics/components/orderSearchDetail.tsx
View file @
f014ecc4
...
...
@@ -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
||
''
},
...
...
src/pages/logistics/components/orderSearchList.tsx
View file @
f014ecc4
This diff is collapsed.
Click to expand it.
src/pages/logistics/logisticsResult/toOrderComfirmList.tsx
View file @
f014ecc4
...
...
@@ -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
)
...
...
src/pages/logistics/logisticsSubmit/detail/components/ModalTableOrder.tsx
View file @
f014ecc4
This diff is collapsed.
Click to expand it.
src/pages/logistics/logisticsSubmit/detail/components/basicInfo.tsx
View file @
f014ecc4
...
...
@@ -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
}
...
...
src/pages/logistics/logisticsSubmit/detail/components/index.less
0 → 100644
View file @
f014ecc4
.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
src/pages/logistics/logisticsSubmit/toOrderSumitList.tsx
View file @
f014ecc4
...
...
@@ -123,8 +123,8 @@ const OrderList: React.FC<ListProps> = (props) => {
{
title
:
'对应订单号'
,
align
:
'left'
,
dataIndex
:
'
invoicesNo
'
,
key
:
'
invoicesNo
'
dataIndex
:
'
relevanceOrderCode
'
,
key
:
'
relevanceOrderCode
'
},
{
title
:
'物流服务商'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment