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
303edb84
Commit
303edb84
authored
Jun 23, 2021
by
前端-许佳敏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-srm' of
http://10.0.0.22:3000/lingxi/lingxi-business-paltform
into dev-srm
parents
1bca5776
51cb1e48
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
34 additions
and
34 deletions
+34
-34
500.tsx
src/pages/500.tsx
+3
-3
index.tsx
src/pages/contract/funds/addbill/index.tsx
+13
-13
index.ts
src/pages/contract/funds/schema/index.ts
+17
-17
fromtable.tsx
src/pages/contract/manage/editing/components/fromtable.tsx
+1
-1
ModelType.ts
src/types/ModelType.ts
+0
-0
No files found.
src/pages/500.tsx
View file @
303edb84
...
@@ -14,7 +14,7 @@ const InternetError: React.FC<{}> = () => {
...
@@ -14,7 +14,7 @@ const InternetError: React.FC<{}> = () => {
return
(
return
(
<
div
className=
{
styles
.
wrapper
}
>
<
div
className=
{
styles
.
wrapper
}
>
<
UserHeader
logo=
{
GlobalConfig
.
global
.
siteInfo
.
logo
}
/>
<
UserHeader
logo=
{
GlobalConfig
.
global
.
siteInfo
.
logo
}
/>
<
div
className=
{
styles
.
errorBox
}
>
<
div
className=
{
styles
.
errorBox
}
>
<
Row
>
<
Row
>
<
Col
span=
{
12
}
>
<
Col
span=
{
12
}
>
...
@@ -26,13 +26,13 @@ const InternetError: React.FC<{}> = () => {
...
@@ -26,13 +26,13 @@ const InternetError: React.FC<{}> = () => {
<
Button
<
Button
type=
"primary"
type=
"primary"
size=
"large"
size=
"large"
style=
{
{
marginTop
:
100
}
}
style=
{
{
marginTop
:
100
}
}
onClick=
{
handleReload
}
onClick=
{
handleReload
}
>
刷新页面试试
</
Button
>
>
刷新页面试试
</
Button
>
</
div
>
</
div
>
</
Col
>
</
Col
>
<
Col
span=
{
12
}
>
<
Col
span=
{
12
}
>
<
img
className=
{
styles
.
image
}
src=
{
Img
}
alt=
"数商云服务"
/>
<
img
className=
{
styles
.
image
}
src=
{
Img
}
alt=
"数商云服务"
/>
</
Col
>
</
Col
>
</
Row
>
</
Row
>
</
div
>
</
div
>
...
...
src/pages/contract/funds/addbill/index.tsx
View file @
303edb84
...
@@ -162,15 +162,15 @@ const AddbillList: React.FC<{}> = () => {
...
@@ -162,15 +162,15 @@ const AddbillList: React.FC<{}> = () => {
};
};
const
fetchOptions
=
(
service
)
=>
{
//
const fetchOptions = (service) => {
return
async
function
()
{
//
return async function () {
const
res
=
await
service
();
//
const res = await service();
if
(
res
.
code
===
1000
)
{
//
if (res.code === 1000) {
return
res
.
data
.
map
((
item
)
=>
{
return
{
label
:
item
.
name
,
value
:
item
.
status
}
})
//
return res.data.map((item) => { return { label: item.name, value: item.status } })
}
//
}
return
[];
//
return [];
}
//
}
}
//
}
return
(
return
(
...
@@ -199,10 +199,10 @@ const AddbillList: React.FC<{}> = () => {
...
@@ -199,10 +199,10 @@ const AddbillList: React.FC<{}> = () => {
'applyNo'
,
'applyNo'
,
FORM_FILTER_PATH
,
FORM_FILTER_PATH
,
);
);
useAsyncSelect
(
//
useAsyncSelect(
"status"
,
//
"status",
fetchOptions
(
PublicApi
.
getContractApplyAmountGetStatusList
)
//
fetchOptions(PublicApi.getContractApplyAmountGetStatusList)
)
//
)
},
},
components
:
{
components
:
{
DateRangePickerUnix
,
DateRangePickerUnix
,
...
...
src/pages/contract/funds/schema/index.ts
View file @
303edb84
import
{
ISchema
}
from
'@formily/antd'
;
import
{
ISchema
}
from
'@formily/antd'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
OrderTypeMap
,
PurchaseOrderInsideWorkStateTexts
,
PurchaseOrderOutWorkStateTexts
}
from
'@/constants'
;
//
import { OrderTypeMap, PurchaseOrderInsideWorkStateTexts, PurchaseOrderOutWorkStateTexts } from '@/constants';
export
const
SchemaBli
:
any
=
{
export
const
SchemaBli
:
any
=
{
type
:
'object'
,
type
:
'object'
,
...
@@ -51,14 +51,14 @@ export const SchemaBli: any = {
...
@@ -51,14 +51,14 @@ export const SchemaBli: any = {
}
}
},
},
},
},
status
:
{
//
status: {
type
:
'string'
,
//
type: 'string',
enum
:
[],
//
enum: [],
"x-component-props"
:
{
//
"x-component-props": {
placeholder
:
'请选择内部状态'
//
placeholder: '请选择内部状态'
},
//
},
title
:
'请选择外部状态'
,
//
title: '请选择外部状态',
},
//
},
submit
:
{
submit
:
{
'x-component'
:
'Submit'
,
'x-component'
:
'Submit'
,
'x-component-props'
:
{
'x-component-props'
:
{
...
@@ -113,14 +113,14 @@ export const addSchemaBli: ISchema = {
...
@@ -113,14 +113,14 @@ export const addSchemaBli: ISchema = {
}
}
},
},
},
},
status
:
{
//
status: {
type
:
'string'
,
//
type: 'string',
enum
:
[],
//
enum: [],
"x-component-props"
:
{
//
"x-component-props": {
placeholder
:
'请选择内部状态'
//
placeholder: '请选择内部状态'
},
//
},
title
:
'请选择外部状态'
,
//
title: '请选择外部状态',
},
//
},
submit
:
{
submit
:
{
'x-component'
:
'Submit'
,
'x-component'
:
'Submit'
,
'x-component-props'
:
{
'x-component-props'
:
{
...
...
src/pages/contract/manage/editing/components/fromtable.tsx
View file @
303edb84
...
@@ -127,7 +127,7 @@ const FormList = (props: any) => {
...
@@ -127,7 +127,7 @@ const FormList = (props: any) => {
payRatio
:
''
,
payRatio
:
''
,
payAmount
:
''
,
payAmount
:
''
,
payWay
:
'1'
,
payWay
:
'1'
,
payParam
:
''
,
payParam
:
'
1
'
,
id
:
0
,
id
:
0
,
},
},
)
)
...
...
src/types/ModelType.ts
View file @
303edb84
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