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
b5185f2b
Commit
b5185f2b
authored
Sep 02, 2021
by
前端-钟卫鹏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v2' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into v2
parents
8e828c96
ce53c2e0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
index.tsx
src/pages/contract/contractexecution/details/index.tsx
+1
-1
FormList.tsx
src/pages/contract/manage/add/components/FormList.tsx
+1
-1
No files found.
src/pages/contract/contractexecution/details/index.tsx
View file @
b5185f2b
...
...
@@ -178,7 +178,7 @@ const Details = (props: any) => {
return
(
<
div
>
<
EyePreview
url=
{
`/memberCenter/afterService/returnApplication/returnQuery/detail?id=${record.orderId}`
}
url=
{
record
.
orderType
===
1
?
`/memberCenter/tranactionAbility/purchaseOrder/orderList/preview?id=${record.orderId}`
:
`/memberCenter/afterService/returnApplication/returnQuery/detail?id=${record.orderId}`
}
>
{
text
}
</
EyePreview
>
...
...
src/pages/contract/manage/add/components/FormList.tsx
View file @
b5185f2b
...
...
@@ -120,7 +120,7 @@ const FormList = (props: any) => {
if
(
res
.
code
===
1000
)
{
let
data
=
res
.
data
.
data
.
map
((
item
,
index
)
=>
{
return
{
materielId
:
_filterArr
(
sourceType
,
item
,
[
''
,
'
product
Id'
,
'id'
,
''
]),
materielId
:
_filterArr
(
sourceType
,
item
,
[
''
,
'
goods
Id'
,
'id'
,
''
]),
code
:
_filter
(
sourceType
,
item
,
[
''
,
'number'
,
'code'
,
'number'
]),
// 物料编号
name
:
_filter
(
sourceType
,
item
,
[
''
,
'name'
,
'name'
,
'name'
]),
//物料名称
type
:
_filter
(
sourceType
,
item
,
[
''
,
'model'
,
'type'
,
'model'
]),
//物料规格
...
...
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