Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
lanbaoming
jiedao-app-operator-master
Commits
bd0fef39
Commit
bd0fef39
authored
Aug 13, 2024
by
chenwei
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/099_customer_filter' into 'dev'
礼品操作时间支持到天 See merge request
!4
parents
960a90c9
a2c56020
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
operatingGift.vue
src/views/ecw/giftManagement/components/operatingGift.vue
+1
-1
index.vue
src/views/ecw/giftManagement/index.vue
+4
-4
No files found.
src/views/ecw/giftManagement/components/operatingGift.vue
View file @
bd0fef39
...
...
@@ -104,7 +104,7 @@
<el-form-item
:label=
"$t('活动时间')"
prop=
"dateRangeCreateTime"
>
<el-date-picker
:disabled=
"isDisable"
type=
"date
time
range"
type=
"daterange"
clearable
placement=
"bottom-start"
v-model=
"queryParams.dateRangeCreateTime"
...
...
src/views/ecw/giftManagement/index.vue
View file @
bd0fef39
...
...
@@ -162,14 +162,14 @@
>
</
template
>
</el-table-column>
<el-table-column
width=
"1
6
0"
:label=
"$t('开始日期')"
>
<el-table-column
width=
"1
0
0"
:label=
"$t('开始日期')"
>
<
template
v-slot=
"{ row }"
>
{{
parseTime
(
row
.
createTime
)
||
"
/
"
}}
{{
parseTime
(
row
.
createTime
,
"
{y
}
-{m
}
-{d
}
"
)
||
"
/
"
}}
<
/template
>
<
/el-table-column
>
<el-table-column
width=
"1
6
0"
:label=
"$t('结束日期')"
>
<
el
-
table
-
column
width
=
"
1
0
0
"
:
label
=
"
$t('结束日期')
"
>
<
template
v
-
slot
=
"
{ row
}
"
>
{{
parseTime
(
row
.
endTime
)
||
"
/
"
}}
{{
parseTime
(
row
.
endTime
,
"
{y
}
-{m
}
-{d
}
"
)
||
"
/
"
}}
<
/template
>
<
/el-table-column
>
<
el
-
table
-
column
...
...
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