Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
marketing-opeartion
Overview
Overview
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
gic-web
marketing-opeartion
Commits
ecc2a2e4
Commit
ecc2a2e4
authored
Mar 28, 2022
by
曾经
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
日期格式化
parent
7b025608
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
holiday-dialog.vue
src/views/activity/component/holiday-dialog.vue
+1
-1
holiday-manage.vue
src/views/activity/holiday-manage.vue
+3
-4
No files found.
src/views/activity/component/holiday-dialog.vue
View file @
ecc2a2e4
...
...
@@ -290,7 +290,7 @@ export default {
if
(
customFlag
==
1
)
{
params
.
holidaysDate
=
month
+
'-'
+
week
+
'-'
+
weekDay
;
}
else
{
params
.
holidaysDate
=
(
date
.
getMonth
()
+
1
)
+
'-'
+
date
.
getDate
();
params
.
holidaysDate
=
date
.
getMonth
()
+
1
+
'-'
+
date
.
getDate
();
}
addHoliday
(
params
).
then
(()
=>
{
this
.
$message
.
success
(
'添加成功'
);
...
...
src/views/activity/holiday-manage.vue
View file @
ecc2a2e4
...
...
@@ -47,10 +47,9 @@
<
script
>
import
fetch
from
'@/api/operation.js'
;
const
{
getPageHolidays
,
delHoliday
,
getHolidayCategoryList
}
=
fetch
;
import
{
formatDate
}
from
'@/utils'
;
import
holidayCategoryDialog
from
'./components/holiday-category-dialog.vue'
;
import
holidayCategoryDialog
from
'./component/holiday-category-dialog.vue'
;
import
holidayDialog
from
'./component
s
/holiday-dialog.vue'
;
import
holidayDialog
from
'./component/holiday-dialog.vue'
;
export
default
{
name
:
'FeeRuleManage'
,
components
:
{
...
...
@@ -128,7 +127,7 @@ export default {
}
},
filters
:
{
formatDate
,
formatDate
:
({
createTime
=
''
})
=>
this
.
$options
.
filters
.
formatDate
(
createTime
)
,
filterFee
(
value
)
{
if
(
value
===
null
||
value
===
undefined
)
{
return
'--'
;
...
...
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