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
shenshaokai
jinfa-platform
Commits
f05048e5
Commit
f05048e5
authored
May 11, 2022
by
wuting
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: bug
parent
854fba20
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
17 deletions
+8
-17
FormList.tsx
src/pages/contract/manage/add/components/FormList.tsx
+0
-2
schema.tsx
src/pages/contract/manage/add/components/schema.tsx
+2
-3
index.tsx
src/pages/contract/manage/purchaseRequisition/index.tsx
+1
-6
index.ts
src/pages/contract/manage/schema/index.ts
+2
-3
add.tsx
src/pages/transaction/contractManagementRules/add.tsx
+3
-3
No files found.
src/pages/contract/manage/add/components/FormList.tsx
View file @
f05048e5
...
@@ -20,7 +20,6 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
...
@@ -20,7 +20,6 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
purchaseSchema
}
from
'./schema'
;
import
{
purchaseSchema
}
from
'./schema'
;
import
{
PurchaseContractListSchema
}
from
'./schema'
;
import
{
PurchaseContractListSchema
}
from
'./schema'
;
import
DateRangePickerUnix
from
'@/components/NiceForm/components/DateRangePickerUnix'
;
import
Submit
from
'@/components/NiceForm/components/Submit'
import
Submit
from
'@/components/NiceForm/components/Submit'
const
intl
=
getIntl
();
const
intl
=
getIntl
();
...
@@ -617,7 +616,6 @@ const FormList = (props: any) => {
...
@@ -617,7 +616,6 @@ const FormList = (props: any) => {
);
);
},
},
components
:
{
components
:
{
DateRangePickerUnix
,
Submit
Submit
},
},
},
},
...
...
src/pages/contract/manage/add/components/schema.tsx
View file @
f05048e5
...
@@ -112,9 +112,8 @@ export const PurchaseContractListSchema: any = {
...
@@ -112,9 +112,8 @@ export const PurchaseContractListSchema: any = {
placeholder
:
intl
.
formatMessage
({
id
:
'contract.qingshuru'
})
+
intl
.
formatMessage
({
id
:
'contract.purchase.member'
})
placeholder
:
intl
.
formatMessage
({
id
:
'contract.qingshuru'
})
+
intl
.
formatMessage
({
id
:
'contract.purchase.member'
})
}
}
},
},
"[startTime,endTime]"
:
{
"[startDate,endDate]"
:
{
type
:
'array'
,
"type"
:
"daterange"
,
"x-component"
:
'DateRangePickerUnix'
,
'x-component-props'
:
{
'x-component-props'
:
{
placeholder
:
[
intl
.
formatMessage
({
id
:
'contract.qingshuru'
}),
intl
.
formatMessage
({
id
:
'contract.jieshushijian'
})],
placeholder
:
[
intl
.
formatMessage
({
id
:
'contract.qingshuru'
}),
intl
.
formatMessage
({
id
:
'contract.jieshushijian'
})],
},
},
...
...
src/pages/contract/manage/purchaseRequisition/index.tsx
View file @
f05048e5
...
@@ -7,14 +7,12 @@ import { ColumnType } from 'antd/lib/table/interface';
...
@@ -7,14 +7,12 @@ import { ColumnType } from 'antd/lib/table/interface';
import
StandardTable
from
'@/components/StandardTable'
;
import
StandardTable
from
'@/components/StandardTable'
;
import
EyePreview
from
'@/components/EyePreview'
import
EyePreview
from
'@/components/EyePreview'
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
{
FORM_FILTER_PATH
}
from
'@/formSchema/const'
;
import
StatusTag
from
'@/components/StatusTag'
;
import
{
PurchaseContractListSchema
}
from
'../schema'
import
{
PurchaseContractListSchema
}
from
'../schema'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
{
useStateFilterSearchLinkageEffect
}
from
'@/formSchema/effects/useFilterSearch'
import
Submit
from
'@/components/NiceForm/components/Submit'
import
Submit
from
'@/components/NiceForm/components/Submit'
import
DateRangePickerUnix
from
'@/components/NiceForm/components/DateRangePickerUnix'
import
{
getIntl
,
history
}
from
'umi'
;
import
{
getIntl
,
history
}
from
'umi'
;
import
moment
from
'moment'
;
import
moment
from
'moment'
;
import
{
getContractPurchase
InviteBidPageToBeCreate
,
getContractPurchase
RequisitionPageToBeCreate
}
from
'@/services/ContractV2Api'
import
{
getContractPurchaseRequisitionPageToBeCreate
}
from
'@/services/ContractV2Api'
import
AuthButton
from
'@/components/AuthButton'
import
AuthButton
from
'@/components/AuthButton'
import
{
InfoCircleFilled
,
PlusCircleOutlined
}
from
'@ant-design/icons'
;
import
{
InfoCircleFilled
,
PlusCircleOutlined
}
from
'@ant-design/icons'
;
const
intl
=
getIntl
();
const
intl
=
getIntl
();
...
@@ -142,8 +140,6 @@ const BiddingList = () => {
...
@@ -142,8 +140,6 @@ const BiddingList = () => {
}
}
// 列表数据
// 列表数据
const
fetchData
=
(
params
?:
any
)
=>
{
const
fetchData
=
(
params
?:
any
)
=>
{
params
.
startTime
=
params
.
startTime
?
moment
(
Number
(
params
.
startTime
)).
format
(
'YYYY-MM-DD'
)
:
''
;
params
.
endTime
=
params
.
endTime
?
moment
(
Number
(
params
.
endTime
)).
format
(
'YYYY-MM-DD'
)
:
''
;
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
getContractPurchaseRequisitionPageToBeCreate
({
getContractPurchaseRequisitionPageToBeCreate
({
...
params
,
...
params
,
...
@@ -246,7 +242,6 @@ const BiddingList = () => {
...
@@ -246,7 +242,6 @@ const BiddingList = () => {
);
);
},
},
components
:
{
components
:
{
DateRangePickerUnix
,
Submit
Submit
},
},
},
},
...
...
src/pages/contract/manage/schema/index.ts
View file @
f05048e5
...
@@ -481,9 +481,8 @@ export const PurchaseContractListSchema: any = {
...
@@ -481,9 +481,8 @@ export const PurchaseContractListSchema: any = {
placeholder
:
intl
.
formatMessage
({
id
:
'contract.qingshuru'
})
+
intl
.
formatMessage
({
id
:
'contract.purchase.member'
})
placeholder
:
intl
.
formatMessage
({
id
:
'contract.qingshuru'
})
+
intl
.
formatMessage
({
id
:
'contract.purchase.member'
})
}
}
},
},
"[startTime,endTime]"
:
{
"[startDate,endDate]"
:
{
type
:
'array'
,
"type"
:
"daterange"
,
"x-component"
:
'DateRangePickerUnix'
,
'x-component-props'
:
{
'x-component-props'
:
{
placeholder
:
[
intl
.
formatMessage
({
id
:
'contract.qingshuru'
}),
intl
.
formatMessage
({
id
:
'contract.jieshushijian'
})],
placeholder
:
[
intl
.
formatMessage
({
id
:
'contract.qingshuru'
}),
intl
.
formatMessage
({
id
:
'contract.jieshushijian'
})],
},
},
...
...
src/pages/transaction/contractManagementRules/add.tsx
View file @
f05048e5
...
@@ -192,18 +192,18 @@ const Add = () => {
...
@@ -192,18 +192,18 @@ const Add = () => {
};
};
}
}
const
{
materials
,
baseProcessId
,
members
,
...
rest
}
=
values
;
const
{
materials
,
baseProcessId
,
members
,
name
,
...
rest
}
=
values
;
const
defaultPostData
=
{
const
defaultPostData
=
{
allMembers
:
values
.
suitableMaterialType
===
1
,
allMembers
:
values
.
suitableMaterialType
===
1
,
processId
:
baseProcessId
,
processId
:
baseProcessId
,
...
rest
,
name
:
name
,
...
tempData
,
...
tempData
,
};
};
const
postData
=
isAdd
const
postData
=
isAdd
?
defaultPostData
?
defaultPostData
:
{
:
{
...
defaultPostData
,
...
defaultPostData
,
processSubId
:
id
,
processSubId
:
Number
(
id
)
,
};
};
const
service
=
isAdd
const
service
=
isAdd
...
...
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