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
a9d766ac
Commit
a9d766ac
authored
Dec 10, 2021
by
前端-黄佳鑫
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 营销能力拼团修改
parent
40af9550
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
add.tsx
...isticsAbility/logisticsAdminister/freightTemplate/add.tsx
+2
-3
add.tsx
...arketingAbility/selfManagement/readySubmitExamine/add.tsx
+6
-6
index.tsx
...ement/readySubmitExamine/components/rulesLayout/index.tsx
+2
-1
No files found.
src/pages/transaction/logisticsAbility/logisticsAdminister/freightTemplate/add.tsx
View file @
a9d766ac
...
...
@@ -332,10 +332,9 @@ const diaLogForm: React.FC<ListProps> = (props) => {
enum=
{
provinceList
}
x
-
component
-
props=
{
{
showSearch
:
true
,
mode
:
'tags'
,
//"multiple",
mode
:
'multiple'
,
//"multiple",
onSearch
:
()
=>
{
onSearch
},
// optionLabelProp:"value
"//指定回显
optionFilterProp
:
"children
"
//指定回显
}
}
/>
<
Field
name=
"weight"
...
...
src/pages/transaction/marketingAbility/selfManagement/readySubmitExamine/add.tsx
View file @
a9d766ac
...
...
@@ -114,9 +114,9 @@ const AddedMarketing = () => {
return
item
})
}
if
(
res
[
'activityDefined'
][
'assembleTime'
])
{
params
[
'activityDefined'
].
assembleTime
=
Number
(
moment
(
res
[
'activityDefined'
][
'assembleTime'
]).
format
(
'x'
));
}
//
if (res['activityDefined']['assembleTime']) {
//
params['activityDefined'].assembleTime = Number(moment(res['activityDefined']['assembleTime']).format('x'));
//
}
if
(
res
[
'activityDefined'
][
'startTime'
])
{
params
[
'activityDefined'
][
'startTime'
]
=
Number
(
moment
(
res
[
'activityDefined'
][
'startTime'
]).
format
(
'x'
));
}
...
...
@@ -172,9 +172,9 @@ const AddedMarketing = () => {
}
})[
0
]
focus$
.
emit
(
option
)
if
(
data
[
'activityDefined'
][
'assembleTime'
])
{
data
[
'activityDefined'
][
'assembleTime'
]
=
moment
(
data
[
'activityDefined'
][
'assembleTime'
]);
}
//
if (data['activityDefined']['assembleTime']) {
//
data['activityDefined']['assembleTime'] = moment(data['activityDefined']['assembleTime']);
//
}
if
(
data
[
'activityDefined'
][
'startTime'
])
{
data
[
'activityDefined'
][
'startTime'
]
=
moment
(
data
[
'activityDefined'
][
'startTime'
]);
}
...
...
src/pages/transaction/marketingAbility/selfManagement/readySubmitExamine/components/rulesLayout/index.tsx
View file @
a9d766ac
...
...
@@ -537,10 +537,11 @@ const RulesLayout: React.FC<RulesLayoutProps> = (props: any) => {
<
Form
.
Item
style=
{
{
margin
:
0
}
}
name=
{
[
'activityDefined'
,
'assembleStatus'
]
}
initialValue=
{
1
}
rules=
{
[{
required
:
true
,
message
:
`${intl.formatMessage({ id: 'selfManagement.pleaseSelectA'})}`
}]
}
>
<
Radio
.
Group
>
<
Radio
.
Button
value=
{
0
}
>
{
intl
.
formatMessage
({
id
:
'selfManagement.dontLimit'
})
}
</
Radio
.
Button
>
{
/* <Radio.Button value={0}>{ intl.formatMessage({ id: 'selfManagement.dontLimit'}) }</Radio.Button> */
}
<
Radio
.
Button
value=
{
1
}
>
{
intl
.
formatMessage
({
id
:
'selfManagement.limit'
})
}
</
Radio
.
Button
>
</
Radio
.
Group
>
</
Form
.
Item
>
...
...
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