Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-3
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
office
haoban-3
Commits
ee662558
Commit
ee662558
authored
Jun 20, 2022
by
caoyanzhi
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/4月-菜单和权限' into test
parents
9a7a528e
4b3fec7e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
18 deletions
+21
-18
cardList.vue
src/views/apps/card/cardList.vue
+1
-1
cardRecord.vue
src/views/apps/card/cardRecord.vue
+14
-15
dailyRecord.vue
src/views/apps/cloudDaily/dailyRecord.vue
+6
-2
No files found.
src/views/apps/card/cardList.vue
View file @
ee662558
...
...
@@ -35,7 +35,7 @@
<div>
{{
scope
.
row
.
couponStock
}}
</div>
</
template
>
</el-table-column>
<el-table-column
label=
"卡券状态"
prop=
"cardStatus"
min-width=
"90px"
>
<el-table-column
label=
"卡券
库
状态"
prop=
"cardStatus"
min-width=
"90px"
>
<
template
slot-scope=
"{ row }"
>
<!-- 0删除1有效 2已过期 3未开始 -->
<span
class=
"state-point state-point-error"
v-if=
"row.cardStatus == 0"
>
已删除
</span>
...
...
src/views/apps/card/cardRecord.vue
View file @
ee662558
...
...
@@ -84,9 +84,20 @@
{{
scope
.
row
.
templateValidity
}}
</
template
>
</el-table-column>
<el-table-column
width=
"100"
label=
"卡券状态"
>
<
template
slot-scope=
"scope"
>
<span
:style=
"scope.row.statusCode == 2 ? 'color:#F5222D' : ''"
>
{{
scope
.
row
.
statusCode
|
formatStatusCode
}}
</span>
<el-table-column
label=
"卡券库状态"
prop=
"cardStatus"
width=
"100"
>
<
template
slot-scope=
"{ row }"
>
<!-- 0删除1有效 2已过期 3未开始 -->
<span
class=
"state-point state-point-error"
v-if=
"row.cardStatus == 0"
>
已删除
</span>
<span
class=
"state-point state-point-success"
v-if=
"row.cardStatus == 1"
>
正常
</span>
<span
class=
"state-point state-point-error"
v-if=
"row.cardStatus == 2"
>
已过期
</span>
<span
class=
"state-point state-point-default"
v-if=
"row.cardStatus == 3"
>
未生效
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"活动状态"
prop=
"status"
width=
"80"
>
<
template
slot-scope=
"{ row }"
>
<!-- 0删除1有效 -->
<span
class=
"state-point state-point-error"
v-if=
"row.status == 0"
>
已删除
</span>
<span
class=
"state-point state-point-success"
v-if=
"row.status == 1"
>
正常
</span>
</
template
>
</el-table-column>
<el-table-column
prop=
""
width=
"200"
label=
"操作"
fixed=
"right"
v-if=
"$getButtonLimit($buttonCode.sendCardLog) || $getButtonLimit($buttonCode.getCardLog)"
>
...
...
@@ -147,18 +158,6 @@ export default {
filters
:
{
percenteNum
(
val
)
{
return
val
>
0
?
Number
(
val
*
100
).
toFixed
(
2
)
+
'%'
:
Number
(
val
).
toFixed
(
2
)
+
'%'
;
},
formatStatusCode
(
value
)
{
let
val
=
'--'
;
switch
(
value
)
{
case
1
:
val
=
'正常'
;
break
;
case
2
:
val
=
'已删除'
;
break
;
}
return
val
;
}
},
watch
:
{
...
...
src/views/apps/cloudDaily/dailyRecord.vue
View file @
ee662558
...
...
@@ -377,12 +377,16 @@ export default {
search
:
that
.
conditionObj
.
searchInput
||
''
,
// 搜索字段
storeGroupIds
:
storeGroups
.
join
(
','
)
||
''
,
// 门店分组,分组
storeType
:
that
.
conditionObj
.
storeType
||
''
,
//门店类型
startDate
:
that
.
conditionObj
.
dateRange
[
0
]
||
''
,
endDate
:
that
.
conditionObj
.
dateRange
[
1
]
||
''
,
//
startDate: that.conditionObj.dateRange[0] || '',
//
endDate: that.conditionObj.dateRange[1] || '',
currentPage
:
that
.
currentPage
,
// 当前页
pageSize
:
that
.
pageSize
,
// 一页显示个数
enterpriseId
:
that
.
activeBrand
};
if
(
Array
(
this
.
conditionObj
.
dateRange
)
&&
this
.
conditionObj
.
dateRange
.
length
>
0
)
{
para
.
startDate
=
`
${
this
.
conditionObj
.
dateRange
[
0
]}
00:00:00`
;
para
.
endDate
=
`
${
this
.
conditionObj
.
dateRange
[
1
]}
23:59:59`
;
}
getRequest
(
'/haoban-app-daily-three-web/daily/page-brand-task'
,
para
)
.
then
(
res
=>
{
let
resData
=
res
.
data
;
...
...
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