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
30633a98
Commit
30633a98
authored
Sep 02, 2022
by
huaying
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 核销记录
parent
a52d5659
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
hhrecord-list.vue
src/views/card/hhrecord-list.vue
+8
-3
writeOff.js
src/views/card/writeOff.js
+0
-1
writeOffCard.vue
src/views/card/writeOffCard.vue
+1
-1
No files found.
src/views/card/hhrecord-list.vue
View file @
30633a98
...
...
@@ -2,10 +2,10 @@
<div
class=
"hhBox"
>
<el-tabs
v-model=
"activeName"
>
<el-tab-pane
label=
"卡券核销"
name=
"first"
>
<write-off-card></write-off-card>
<write-off-card
:class=
"activeName == 'first' ? 'scroll_class' : ''"
></write-off-card>
</el-tab-pane>
<el-tab-pane
label=
"门店核销"
name=
"second"
>
<write-off-store></write-off-store>
<write-off-store
:class=
"activeName == 'second' ? 'scroll_class' : ''"
></write-off-store>
</el-tab-pane>
</el-tabs>
</div>
...
...
@@ -14,11 +14,16 @@
<
script
>
import
writeOffCard
from
'./writeOffCard.vue'
;
import
WriteOffStore
from
'./writeOffStore.vue'
;
import
sticky
from
'@/mixins/table-sticky.js'
;
export
default
{
components
:
{
writeOffCard
,
WriteOffStore
},
mixins
:
[
sticky
],
data
()
{
return
{
activeName
:
'first'
activeName
:
'first'
,
headerTop
:
'60px'
,
parent
:
'scroll_class'
,
scrollClass
:
'dm-layout-page'
};
},
methods
:
{}
...
...
src/views/card/writeOff.js
View file @
30633a98
...
...
@@ -33,7 +33,6 @@ export default {
},
mounted
()
{
this
.
dateTime
=
[
`
${
formatDateTimeByType
(
this
.
dateTime
[
0
],
'yyyy-MM-dd'
)}
00:00:00`
,
`
${
formatDateTimeByType
(
this
.
dateTime
[
1
],
'yyyy-MM-dd'
)}
23:59:59`
];
console
.
log
(
this
.
dateTime
,
'datadffa'
);
},
methods
:
{
getDateRange
(
setEndDate
)
{
...
...
src/views/card/writeOffCard.vue
View file @
30633a98
...
...
@@ -40,7 +40,7 @@
<div>
<img
class=
"vertical-middle table__avatar_40"
:src=
"scope.row.thirdimgurl || defaultAvatar"
width=
"40"
height=
"40"
/>
<div
class=
"inline-block vertical-middle"
>
<p
class=
"overflow-ellipsis"
>
{{
scope
.
row
.
member
Name
||
'--'
}}
</p>
<p
class=
"overflow-ellipsis"
>
{{
scope
.
row
.
third
Name
||
'--'
}}
</p>
<p
class=
"fz12 gray overflow-ellipsis"
>
{{
scope
.
row
.
phoneNum
||
'--'
}}
</p>
</div>
</div>
...
...
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