Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
marketing
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
marketing-web
marketing
Commits
5ad1f888
Commit
5ad1f888
authored
Aug 30, 2022
by
huaying
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 核销记录明细路径
parent
019e5b00
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
12 deletions
+29
-12
card.js
src/router/modules/card.js
+2
-2
writeOff.js
src/views/card/writeOff.js
+18
-1
writeOffCard.vue
src/views/card/writeOffCard.vue
+3
-3
writeOffStore.vue
src/views/card/writeOffStore.vue
+4
-4
writeOffStoreDetail.vue
src/views/card/writeOffStoreDetail.vue
+2
-2
No files found.
src/router/modules/card.js
View file @
5ad1f888
...
...
@@ -276,12 +276,12 @@ export default {
children
:
[]
},
{
path
:
'storeDetails'
,
path
:
'
hhrecord/
storeDetails'
,
name
:
'核销明细'
,
component
:
()
=>
import
(
/* webpackChunkName: "card" */
'../../views/card/writeOffStoreDetail.vue'
),
meta
:
{
type
:
'info'
,
path
:
'/card/storeDetails'
path
:
'/card/
hhrecord/
storeDetails'
}
}
]
...
...
src/views/card/writeOff.js
View file @
5ad1f888
...
...
@@ -11,7 +11,24 @@ export default {
sortType
:
''
,
total
:
0
,
checkedM
:
false
,
checkedT
:
false
checkedT
:
false
,
pickerOptions
()
{
// let pickerMinDate;
return
{
onPick
(
obj
)
{
// pickerMinDate = obj.minDate;
},
disabledDate
(
time
)
{
let
start
=
new
Date
();
start
.
setFullYear
(
start
.
getFullYear
()
-
1
);
start
.
setDate
(
start
.
getDate
()
+
1
);
start
=
new
Date
(
`
${
start
.
getFullYear
()}
-
${
start
.
getMonth
()
+
1
}
-
${
start
.
getDate
()}
`
);
let
end
=
new
Date
();
end
=
new
Date
(
`
${
end
.
getFullYear
()}
-
${
end
.
getMonth
()
+
1
}
-
${
end
.
getDate
()}
23:59:59`
);
return
time
.
getTime
()
<
start
.
getTime
()
||
time
.
getTime
()
>
end
;
}
};
}
};
},
methods
:
{
...
...
src/views/card/writeOffCard.vue
View file @
5ad1f888
...
...
@@ -3,11 +3,11 @@
<div
class=
"searchBox"
>
<el-input
prefix-icon=
"el-icon-search"
placeholder=
"请输入会员信息/卡券信息/门店名称"
class=
"w261"
v-model=
"params.search"
@
change=
"refresh"
clearable
></el-input>
<span
class=
"spanBox"
>
核销时间
</span>
<el-date-picker
v-model=
"dateTime"
type=
"daterange"
range-separator=
"~"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
:default-time=
"['00:00:00', '23:59:59']"
@
change=
"refresh"
></el-date-picker>
<el-date-picker
v-model=
"dateTime"
type=
"daterange"
range-separator=
"~"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
:default-time=
"['00:00:00', '23:59:59']"
@
change=
"refresh"
:picker-options=
"pickerOptions()"
></el-date-picker>
<el-checkbox
class=
"ml16"
v-model=
"checkedM"
label=
"当月"
border
@
change=
"currentM"
/>
<el-checkbox
style=
"margin-left:6px;"
v-model=
"checkedT"
label=
"最近三个月"
border
@
change=
"reThree"
/>
<div
class=
"frmbt20"
>
<el-button
type=
"primary"
@
click=
"exportResult"
><i
class=
"iconfont icon-xiazai"
style=
"marginRight:
2
px;fontSize:12px"
/>
查询结果导出
</el-button>
<el-button
type=
"primary"
@
click=
"exportResult"
><i
class=
"iconfont icon-xiazai"
style=
"marginRight:
5
px;fontSize:12px"
/>
查询结果导出
</el-button>
</div>
</div>
<div
class=
"content"
>
...
...
@@ -57,7 +57,7 @@
<
script
>
import
{
getCardLogPage
}
from
'@/service/api/cardApi.js'
;
import
writeOff
from
'./writeOff'
;
import
writeOff
from
'./writeOff
.js
'
;
export
default
{
name
:
'writeOffCard'
,
mixins
:
[
writeOff
],
...
...
src/views/card/writeOffStore.vue
View file @
5ad1f888
...
...
@@ -3,11 +3,11 @@
<div
class=
"searchBox"
>
<el-input
prefix-icon=
"el-icon-search"
placeholder=
"请输入核销门店"
class=
"w261"
v-model=
"params.search"
@
change=
"refresh"
clearable
></el-input>
<span
class=
"spanBox"
>
核销时间
</span>
<el-date-picker
v-model=
"dateTime"
type=
"daterange"
range-separator=
"~"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
:default-time=
"['00:00:00', '23:59:59']"
@
change=
"refresh"
></el-date-picker>
<el-date-picker
v-model=
"dateTime"
type=
"daterange"
range-separator=
"~"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
:default-time=
"['00:00:00', '23:59:59']"
@
change=
"refresh"
:picker-options=
"pickerOptions()"
></el-date-picker>
<el-checkbox
class=
"ml16"
v-model=
"checkedM"
label=
"当月"
border
@
change=
"currentM"
/>
<el-checkbox
style=
"margin-left:6px;"
v-model=
"checkedT"
label=
"最近三个月"
border
@
change=
"reThree"
/>
<div
class=
"frmbt20"
>
<el-button
type=
"primary"
@
click=
"exportResult"
><i
class=
"iconfont icon-xiazai"
style=
"marginRight:
2
px;fontSize:12px"
/>
查询结果导出
</el-button>
<el-button
type=
"primary"
@
click=
"exportResult"
><i
class=
"iconfont icon-xiazai"
style=
"marginRight:
5
px;fontSize:12px"
/>
查询结果导出
</el-button>
</div>
</div>
<div
class=
"content"
>
...
...
@@ -30,7 +30,7 @@
<
script
>
import
{
getCardStorePage
}
from
'@/service/api/cardApi.js'
;
import
writeOff
from
'./writeOff'
;
import
writeOff
from
'./writeOff
.js
'
;
export
default
{
name
:
'writeOffCard'
,
mixins
:
[
writeOff
],
...
...
@@ -73,7 +73,7 @@ export default {
},
// 明细
details
(
row
)
{
this
.
$router
.
push
(
`/card/storeDetails?id=
${
row
.
storeId
}
`
);
this
.
$router
.
push
(
`/card/
hhrecord/
storeDetails?id=
${
row
.
storeId
}
`
);
},
// 导出数据
exportResult
()
{
...
...
src/views/card/writeOffStoreDetail.vue
View file @
5ad1f888
...
...
@@ -3,7 +3,7 @@
<div
class=
"searchBox"
>
<el-input
prefix-icon=
"el-icon-search"
placeholder=
"请输入卡券名称"
class=
"w261"
v-model=
"params.search"
@
change=
"refresh"
clearable
></el-input>
<span
class=
"spanBox"
>
核销时间
</span>
<el-date-picker
v-model=
"dateTime"
type=
"daterange"
range-separator=
"~"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
:default-time=
"['00:00:00', '23:59:59']"
@
change=
"refresh"
></el-date-picker>
<el-date-picker
v-model=
"dateTime"
type=
"daterange"
range-separator=
"~"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
:default-time=
"['00:00:00', '23:59:59']"
@
change=
"refresh"
:picker-options=
"pickerOptions()"
></el-date-picker>
<el-checkbox
class=
"ml16"
v-model=
"checkedM"
label=
"当月"
border
@
change=
"currentM"
/>
<el-checkbox
style=
"margin-left:6px;"
v-model=
"checkedT"
label=
"最近三个月"
border
@
change=
"reThree"
/>
</div>
...
...
@@ -23,7 +23,7 @@
<
script
>
import
{
getCardDetailPage
}
from
'@/service/api/cardApi.js'
;
import
writeOff
from
'./writeOff'
;
import
writeOff
from
'./writeOff
.js
'
;
export
default
{
name
:
'writeOffDetail'
,
mixins
:
[
writeOff
],
...
...
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