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
前端-黄佳鑫
jinfa-platform
Commits
65007226
Commit
65007226
authored
Jan 13, 2021
by
Bill
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 加工以及消息bug
parent
7f6b7e88
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
17 additions
and
16 deletions
+17
-16
columns.tsx
src/pages/handling/assign/detail/columns.tsx
+1
-1
index.tsx
src/pages/handling/assign/detail/index.tsx
+2
-0
index.tsx
src/pages/handling/assign/processStock/index.tsx
+1
-1
schema.tsx
src/pages/handling/components/ProcessOrder/schema.tsx
+1
-1
index.tsx
src/pages/handling/components/Query/index.tsx
+3
-1
schema.tsx
src/pages/handling/components/Query/schema.tsx
+3
-3
UploadFile.tsx
src/pages/handling/components/UploadFile/UploadFile.tsx
+1
-5
index.tsx
src/pages/handling/confirm/Query/index.tsx
+1
-0
index.tsx
src/pages/home/components/AdvertisementSpace/index.tsx
+3
-3
index.tsx
src/pages/systemSetting/message/index.tsx
+1
-1
No files found.
src/pages/handling/assign/detail/columns.tsx
View file @
65007226
...
@@ -13,7 +13,7 @@ export const columns: ColumnsType<any> = [
...
@@ -13,7 +13,7 @@ export const columns: ColumnsType<any> = [
render
:
(
text
,
record
)
=>
{
render
:
(
text
,
record
)
=>
{
// orderId, orderDetailId
// orderId, orderDetailId
return
(
return
(
<
EyePreview
url=
{
`/memberCenter/tranactionAbility/
sal
eOrder/orderList/preview?id=${record.orderId}`
}
>
<
EyePreview
url=
{
`/memberCenter/tranactionAbility/
purchas
eOrder/orderList/preview?id=${record.orderId}`
}
>
{
text
}
{
text
}
</
EyePreview
>
</
EyePreview
>
)
)
...
...
src/pages/handling/assign/detail/index.tsx
View file @
65007226
...
@@ -28,6 +28,7 @@ import {
...
@@ -28,6 +28,7 @@ import {
CONFIRM_PENDING_FIRST_DETAIL
,
CONFIRM_PENDING_FIRST_DETAIL
,
CONFIRM_PENDING_SECOND_DETAIL
,
CONFIRM_PENDING_SECOND_DETAIL
,
CONFIRM_PENDING_CONFIRM_DETAIL
,
CONFIRM_PENDING_CONFIRM_DETAIL
,
PROCESSING_INVOICE_TO_BE_ADD_PATH
,
PENDING_ADD_LOGISTICS_PATH
,
PENDING_ADD_LOGISTICS_PATH
,
PENDING_DELIVERD_PATH
,
PENDING_DELIVERD_PATH
,
PENDING_RECEIPT_PATH
,
PENDING_RECEIPT_PATH
,
...
@@ -49,6 +50,7 @@ const SERVICE_MAP = {
...
@@ -49,6 +50,7 @@ const SERVICE_MAP = {
[
`
${
PENDING_ADD_PROCESS_PATH
}
/detail`
]:
PublicApi
.
getEnhanceSupplierToBeAddStorageDetails
,
[
`
${
PENDING_ADD_PROCESS_PATH
}
/detail`
]:
PublicApi
.
getEnhanceSupplierToBeAddStorageDetails
,
[
`
${
ASSIGN_PENDING_RECEIVE_DETAIL
}
`
]:
PublicApi
.
getEnhanceSupplierToBeReceiveDetails
,
[
`
${
ASSIGN_PENDING_RECEIVE_DETAIL
}
`
]:
PublicApi
.
getEnhanceSupplierToBeReceiveDetails
,
[
`
${
CONFIRM_QUERY_DETAIL
}
`
]:
PublicApi
.
getEnhanceProcessAllDetails
,
[
`
${
CONFIRM_QUERY_DETAIL
}
`
]:
PublicApi
.
getEnhanceProcessAllDetails
,
[
`
${
PROCESSING_INVOICE_TO_BE_ADD_PATH
}
/detail`
]:
PublicApi
.
getEnhanceProcessToBeAddDeliveryDetails
,
[
`
${
CONFIRM_PENDING_SUBMIT_DETAIL
}
`
]:
PublicApi
.
getEnhanceProcessToBeSubmitExamDetails
,
[
`
${
CONFIRM_PENDING_SUBMIT_DETAIL
}
`
]:
PublicApi
.
getEnhanceProcessToBeSubmitExamDetails
,
[
`
${
CONFIRM_PENDING_FIRST_DETAIL
}
`
]:
PublicApi
.
getEnhanceProcessToBeFirstExamDetails
,
[
`
${
CONFIRM_PENDING_FIRST_DETAIL
}
`
]:
PublicApi
.
getEnhanceProcessToBeFirstExamDetails
,
[
`
${
CONFIRM_PENDING_SECOND_DETAIL
}
`
]:
PublicApi
.
getEnhanceProcessToBeSecondExamDetails
,
[
`
${
CONFIRM_PENDING_SECOND_DETAIL
}
`
]:
PublicApi
.
getEnhanceProcessToBeSecondExamDetails
,
...
...
src/pages/handling/assign/processStock/index.tsx
View file @
65007226
...
@@ -251,7 +251,7 @@ const processStock: React.FC<{}> = () => {
...
@@ -251,7 +251,7 @@ const processStock: React.FC<{}> = () => {
let
searchData
=
{
let
searchData
=
{
...
rest
,
...
rest
,
startTime
:
st
,
startTime
:
st
,
endT
t
ime
:
et
,
endTime
:
et
,
...
others
...
others
}
}
console
.
log
(
searchData
)
console
.
log
(
searchData
)
...
...
src/pages/handling/components/ProcessOrder/schema.tsx
View file @
65007226
...
@@ -105,7 +105,7 @@ export const schema = {
...
@@ -105,7 +105,7 @@ export const schema = {
}
}
}
}
},
},
supplyM
embersName
:
{
m
embersName
:
{
type
:
'string'
,
type
:
'string'
,
'x-component'
:
'Input'
,
'x-component'
:
'Input'
,
'x-component-props'
:
{
'x-component-props'
:
{
...
...
src/pages/handling/components/Query/index.tsx
View file @
65007226
...
@@ -138,7 +138,9 @@ const Query: React.FC<{}> = (props) => {
...
@@ -138,7 +138,9 @@ const Query: React.FC<{}> = (props) => {
render
:
(
text
,
record
:
any
)
=>
{
render
:
(
text
,
record
:
any
)
=>
{
const
url
=
pathname
+
'/detail'
;
const
url
=
pathname
+
'/detail'
;
const
actionMap
=
{
const
actionMap
=
{
[
ASSIGN_TO_BE_ADD_QUERY
]:
record
.
outerStatus
===
1
&&
record
.
innerStatus
===
1
?
(<
Spin
spinning=
{
submitLoadingID
===
record
.
id
}
><
a
onClick=
{
()
=>
handleUpdateOrDelete
(
'review'
,
{
id
:
record
.
id
})
}
>
{
"提交审核"
}
</
a
></
Spin
>)
:
null
,
[
ASSIGN_TO_BE_ADD_QUERY
]:
record
.
outerStatus
===
1
&&
record
.
innerStatus
===
1
?
(<
Spin
spinning=
{
submitLoadingID
===
record
.
id
}
><
a
onClick=
{
()
=>
handleUpdateOrDelete
(
'review'
,
{
id
:
record
.
id
})
}
>
{
"提交审核"
}
</
a
></
Spin
>)
:
null
,
[
ASSIGN_PENDING_FIRST
]:
<
Link
to
=
{
`
${
url
}
?id=
${
record
.
id
}
`
}
>
审核
<
/Link>
,
[
ASSIGN_PENDING_FIRST
]:
<
Link
to
=
{
`
${
url
}
?id=
${
record
.
id
}
`
}
>
审核
<
/Link>
,
[
ASSIGN_PENDING_SECOND
]:
<
Link
to
=
{
`
${
url
}
?id=
${
record
.
id
}
`
}
>
审核
<
/Link>
,
[
ASSIGN_PENDING_SECOND
]:
<
Link
to
=
{
`
${
url
}
?id=
${
record
.
id
}
`
}
>
审核
<
/Link>
,
[
ASSIGN_PENDING_SUBMIT
]:
(<
Spin
spinning=
{
submitLoadingID
===
record
.
id
}
><
a
onClick=
{
()
=>
handleUpdateOrDelete
(
'review'
,
{
id
:
record
.
id
})
}
>
{
"提交通知单"
}
</
a
></
Spin
>),
[
ASSIGN_PENDING_SUBMIT
]:
(<
Spin
spinning=
{
submitLoadingID
===
record
.
id
}
><
a
onClick=
{
()
=>
handleUpdateOrDelete
(
'review'
,
{
id
:
record
.
id
})
}
>
{
"提交通知单"
}
</
a
></
Spin
>),
...
...
src/pages/handling/components/Query/schema.tsx
View file @
65007226
...
@@ -18,7 +18,7 @@ export const querySchema: ISchema = {
...
@@ -18,7 +18,7 @@ export const querySchema: ISchema = {
type
:
'string'
,
type
:
'string'
,
'x-component'
:
'Search'
,
'x-component'
:
'Search'
,
'x-component-props'
:
{
'x-component-props'
:
{
placeholder
:
'搜索'
,
placeholder
:
'搜索
通知单号
'
,
align
:
'flex-left'
,
align
:
'flex-left'
,
tip
:
'输入通知单号进行搜索'
,
tip
:
'输入通知单号进行搜索'
,
},
},
...
@@ -112,7 +112,7 @@ export const tobeAddQuerySchema: ISchema = {
...
@@ -112,7 +112,7 @@ export const tobeAddQuerySchema: ISchema = {
type
:
'string'
,
type
:
'string'
,
'x-component'
:
'Search'
,
'x-component'
:
'Search'
,
'x-component-props'
:
{
'x-component-props'
:
{
placeholder
:
'搜索'
,
placeholder
:
'搜索
通知单号
'
,
},
},
},
},
},
},
...
@@ -206,7 +206,7 @@ export const pendingFirstQuerySchema: ISchema = {
...
@@ -206,7 +206,7 @@ export const pendingFirstQuerySchema: ISchema = {
type
:
'string'
,
type
:
'string'
,
'x-component'
:
'Search'
,
'x-component'
:
'Search'
,
'x-component-props'
:
{
'x-component-props'
:
{
placeholder
:
'搜索'
,
placeholder
:
'搜索
通知单号
'
,
},
},
},
},
},
},
...
...
src/pages/handling/components/UploadFile/UploadFile.tsx
View file @
65007226
...
@@ -13,11 +13,7 @@ const UploadFile = (props) => {
...
@@ -13,11 +13,7 @@ const UploadFile = (props) => {
if
(
!
isSizeLimit
)
{
if
(
!
isSizeLimit
)
{
message
.
error
(
`上传文件不超过
${
fileMaxSize
}
K!`
);
message
.
error
(
`上传文件不超过
${
fileMaxSize
}
K!`
);
}
}
const
isPdf
=
file
.
type
===
'application/pdf'
;
return
isSizeLimit
;
if
(
!
isPdf
)
{
message
.
error
(
'仅支持上传PDF文件!'
);
}
return
isSizeLimit
&&
isPdf
;
}
}
const
uploadProps
=
{
const
uploadProps
=
{
...
...
src/pages/handling/confirm/Query/index.tsx
View file @
65007226
...
@@ -203,6 +203,7 @@ const Query: React.FC<{}> = (props) => {
...
@@ -203,6 +203,7 @@ const Query: React.FC<{}> = (props) => {
*/
*/
const
handleSearch
=
useCallback
((
values
:
any
)
=>
{
const
handleSearch
=
useCallback
((
values
:
any
)
=>
{
const
{
docTime
,
...
rest
}
=
values
;
const
{
docTime
,
...
rest
}
=
values
;
console
.
log
(
docTime
);
const
{
st
,
et
}
=
timeRange
(
docTime
);
const
{
st
,
et
}
=
timeRange
(
docTime
);
let
searchData
=
{
let
searchData
=
{
...
rest
,
...
rest
,
...
...
src/pages/home/components/AdvertisementSpace/index.tsx
View file @
65007226
...
@@ -29,11 +29,11 @@ const AdvertisementContainer = () => {
...
@@ -29,11 +29,11 @@ const AdvertisementContainer = () => {
},
[])
},
[])
return
(
return
(
<
Row
gutter=
{
[
24
,
0
]
}
>
<
Row
>
{
{
data
.
map
((
item
,
key
)
=>
{
data
.
map
((
item
,
key
)
=>
{
return
(
return
(
<
Col
xxl=
{
24
}
xl=
{
8
}
lg=
{
8
}
md=
{
12
}
sm=
{
24
}
xs=
{
12
}
key=
{
key
}
>
<
Col
span=
{
24
}
key=
{
key
}
>
<
AdvertisementSpace
<
AdvertisementSpace
urlLink=
{
item
.
link
}
urlLink=
{
item
.
link
}
imageUrl=
{
item
.
imageUrl
}
imageUrl=
{
item
.
imageUrl
}
...
@@ -49,7 +49,7 @@ const AdvertisementContainer = () => {
...
@@ -49,7 +49,7 @@ const AdvertisementContainer = () => {
const
AdvertisementSpace
:
React
.
FC
<
Iprops
>
=
(
props
)
=>
{
const
AdvertisementSpace
:
React
.
FC
<
Iprops
>
=
(
props
)
=>
{
return
(
return
(
<
div
className=
{
styles
.
advertisementSpace
}
>
<
div
className=
{
styles
.
advertisementSpace
}
>
<
a
href=
{
props
.
urlLink
}
>
<
a
href=
{
props
.
urlLink
}
target=
"__blank"
>
<
img
src=
{
props
.
imageUrl
}
className=
{
styles
.
img
}
/>
<
img
src=
{
props
.
imageUrl
}
className=
{
styles
.
img
}
/>
</
a
>
</
a
>
</
div
>
</
div
>
...
...
src/pages/systemSetting/message/index.tsx
View file @
65007226
...
@@ -38,7 +38,7 @@ const Message: React.FC<{}> = () => {
...
@@ -38,7 +38,7 @@ const Message: React.FC<{}> = () => {
}
}
const
handleRead
=
(
id
,
url
:
string
)
=>
{
const
handleRead
=
(
id
,
url
:
string
)
=>
{
PublicApi
.
postReportMessageMemberRead
({
id
:
id
})
PublicApi
.
postReportMessageMemberRead
({
id
:
id
}
,
{
ctlType
:
'none'
}
)
.
then
((
data
)
=>
{
.
then
((
data
)
=>
{
if
(
url
)
{
if
(
url
)
{
if
(
/http/
.
test
(
url
))
{
if
(
/http/
.
test
(
url
))
{
...
...
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