Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
welfare
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
达摩4.0重构
welfare
Commits
0998fbec
Commit
0998fbec
authored
Mar 29, 2021
by
黑潮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update: 卡券库ui调整
parent
d6fd686f
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
100 additions
and
59 deletions
+100
-59
dialog.vue
src/components/stock-list/dialog.vue
+3
-4
index.vue
src/components/stock-list/index.vue
+3
-3
index.vue
src/components/stock-upload-record/index.vue
+2
-3
form.vue
src/views/card/card-package/form.vue
+2
-3
list.vue
src/views/card/card-package/list.vue
+14
-9
send-list.vue
src/views/card/card-package/send-list.vue
+30
-6
card-list.vue
src/views/card/gic-card/card-list.vue
+13
-12
member-get.vue
src/views/card/gic-card/member-get.vue
+8
-7
destory-dialog.vue
src/views/card/gic-card/module/destory-dialog.vue
+14
-3
send-list.vue
src/views/card/gic-card/send-list.vue
+11
-9
No files found.
src/components/stock-list/dialog.vue
View file @
0998fbec
<
template
>
<el-dialog
title=
"活动统计"
:visible
.
sync=
"dialogVisible"
width=
"800px"
@
close=
"close"
>
<div
class=
"mb20"
>
<el-select
v-model=
"appCodes"
class=
"w140 mr10"
multiple
placeholder=
"全部
来源
"
clearable
@
change=
"changeAppCode"
>
<el-select
v-model=
"appCodes"
class=
"w140 mr10"
multiple
placeholder=
"全部
应用
"
clearable
@
change=
"changeAppCode"
>
<el-option
v-for=
"item in appList"
:key=
"item.appCode"
:label=
"item.appName"
:value=
"item.appCode"
></el-option>
</el-select>
<el-input
class=
"mr10 w300"
v-model=
"listParams.activityName"
clearable
placeholder=
"请输入活动名称
搜索
"
@
change=
"refresh"
><i
slot=
"prefix"
class=
"el-input__icon el-icon-search"
></i></el-input>
<el-input
class=
"mr10 w300"
v-model=
"listParams.activityName"
clearable
placeholder=
"请输入活动名称"
@
change=
"refresh"
><i
slot=
"prefix"
class=
"el-input__icon el-icon-search"
></i></el-input>
</div>
<el-table
max-height=
"500"
tooltip-effect=
"dark"
v-loading=
"loading"
:data=
"tableList"
style=
"width:100%"
>
<el-table-column
prop=
"appName"
label=
"活动应用名称"
min-width=
"120"
>
</el-table-column>
...
...
@@ -113,4 +113,4 @@ export default {
}
}
};
</
script
>
\ No newline at end of file
</
script
>
src/components/stock-list/index.vue
View file @
0998fbec
...
...
@@ -10,13 +10,13 @@
<el-select
class=
"mr10 w160"
v-if=
"type == 1"
clearable
v-model=
"listParams.welfareSkuId"
placeholder=
"全部SKU"
@
change=
"refresh"
>
<el-option
v-for=
"(item, idx) in skuList"
:key=
"idx"
:label=
"item.giftSkuName"
:value=
"item.giftSkuId"
></el-option>
</el-select>
<el-select
class=
"mr10 w160"
clearable
v-model=
"listParams.modifyType"
placeholder=
"
全部操作
类型"
@
change=
"refresh"
>
<el-select
class=
"mr10 w160"
clearable
v-model=
"listParams.modifyType"
placeholder=
"
所有
类型"
@
change=
"refresh"
>
<el-option
v-for=
"item in stockAdjustType"
:key=
"item.value"
:label=
"item.label"
:value=
"item.value"
></el-option>
</el-select>
<el-select
v-model=
"appCodes"
class=
"w160 mr10"
multiple
placeholder=
"
全部来源
"
clearable
@
change=
"changeAppCode"
>
<el-select
v-model=
"appCodes"
class=
"w160 mr10"
multiple
placeholder=
"
所有应用
"
clearable
@
change=
"changeAppCode"
>
<el-option
v-for=
"item in appList"
:key=
"item.appCode"
:label=
"item.appName"
:value=
"item.appCode"
></el-option>
</el-select>
<el-input
class=
"mr10 w260"
v-model=
"listParams.activityName"
clearable
placeholder=
"请输入活动名称
搜索
"
@
change=
"refresh"
><i
slot=
"prefix"
class=
"el-input__icon el-icon-search"
></i></el-input>
<el-input
class=
"mr10 w260"
v-model=
"listParams.activityName"
clearable
placeholder=
"请输入活动名称"
@
change=
"refresh"
><i
slot=
"prefix"
class=
"el-input__icon el-icon-search"
></i></el-input>
<el-date-picker
class=
"w350 mr10"
v-model=
"dateTime"
type=
"daterange"
range-separator=
"~"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
@
change=
"refresh"
></el-date-picker>
</div>
</div>
...
...
src/components/stock-upload-record/index.vue
View file @
0998fbec
...
...
@@ -11,7 +11,7 @@
class=
"mr10 w260"
v-model=
"listParams.creatorName"
clearable
placeholder=
"请输入操作人姓名
搜索
"
placeholder=
"请输入操作人姓名"
@
change=
"refresh"
><i
slot=
"prefix"
class=
"el-input__icon el-icon-search"
></i></el-input>
<el-date-picker
class=
"w350 mr10"
...
...
@@ -199,4 +199,4 @@ export default {
.w260
{
width
:
260px
;
}
</
style
>
\ No newline at end of file
</
style
>
src/views/card/card-package/form.vue
View file @
0998fbec
...
...
@@ -17,7 +17,7 @@
<el-date-picker
:disabled=
"canEdit"
class=
"w400"
v-model=
"dateTime"
type=
"daterange"
range-separator=
"至"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
:picker-options=
"pickerOptions"
></el-date-picker>
</el-form-item>
<el-form-item
label=
"卡券包库存"
prop=
"packageStock"
>
<el-input-number
class=
"w400
"
v-model=
"ruleForm.packageStock"
controls-position=
"right"
:min=
"1"
:max=
"1000000"
></el-input-number>
<el-input-number
style=
"width:115px
"
v-model=
"ruleForm.packageStock"
controls-position=
"right"
:min=
"1"
:max=
"1000000"
></el-input-number>
</el-form-item>
<el-form-item
label=
"库存消耗方式"
class=
"is-required"
prop=
"stockType"
>
<el-checkbox-group
:disabled=
"canEdit"
v-model=
"stockType"
>
...
...
@@ -391,4 +391,4 @@ export default {
color
:
#F5222D
;
}
}
</
style
>
\ No newline at end of file
</
style
>
src/views/card/card-package/list.vue
View file @
0998fbec
...
...
@@ -2,22 +2,22 @@
<div
class=
"p20"
v-loading=
"loading"
>
<div
class=
"clearfix flex-center pb20"
>
<el-input
prefix-icon=
"el-icon-search"
placeholder=
"请输入卡券名称/备注名"
class=
"w300 mr10"
v-model=
"listParams.search"
clearable
@
change=
"refresh"
/>
<el-select
v-model=
"listParams.useStatus"
class=
"w160 mr10"
placeholder=
"
全部
状态"
clearable
@
change=
"refresh"
>
<el-select
v-model=
"listParams.useStatus"
class=
"w160 mr10"
placeholder=
"
所有卡券包
状态"
clearable
@
change=
"refresh"
>
<el-option
label=
"已生效"
:value=
"1"
></el-option>
<el-option
label=
"已过期"
:value=
"2"
></el-option>
<el-option
label=
"未生效"
:value=
"3"
></el-option>
</el-select>
<el-button
type=
"text"
@
click=
"isOpen = !isOpen"
>
{{
isOpen
?
'收起'
:
'展开'
}}
<i
:class=
"`$
{isOpen ? 'el-icon-arrow-up' : 'el-icon-arrow-down'} el-icon--right ml5`">
</i></el-button>
<
dm-perm-button
:disabled=
"$itemPerm($itemCode.gicAddPackage)"
type=
"primary"
class=
"mlAuto"
@
click=
"$router.push('/card-package/add')"
>
新建卡券包
</dm-perm
-button>
<
el-button
class=
"specter"
:disabled=
"!multipleSelection.length"
type=
"danger"
@
click=
"mutiDel"
>
批量删除
</el
-button>
<
el-button
class=
"specter mlAuto"
:disabled=
"!multipleSelection.length"
type=
"danger"
@
click=
"mutiDel"
>
批量删除
</el
-button>
<
dm-perm-button
:disabled=
"$itemPerm($itemCode.gicAddPackage)"
type=
"primary"
@
click=
"$router.push('/card-package/add')"
>
新建卡券包
</dm-perm
-button>
</div>
<div
v-show=
"isOpen"
class=
"filter-block"
>
<div
class=
"mb20"
>
<label
class=
"mr8"
>
福利成本:
</label>
<!-- listParams.costPriceBegin -->
<
el-input-number
:controls=
"false"
class=
"prefix-amount w140"
@
change=
"refresh"
v-model=
"listParams.costPriceBegin"
controls-position=
"right"
:precision=
"2"
:max=
"listParams.costPriceEnd"
:min=
"0"
placeholder=
"请输入"
/>
<
dm-input-amount
:controls=
"false"
class=
"prefix-amount w140"
@
change=
"refresh"
v-model=
"listParams.costPriceBegin"
controls-position=
"right"
:precision=
"2"
:max=
"listParams.costPriceEnd"
:min=
"0"
placeholder=
"请输入"
/>
<span>
至
</span>
<
el-input-number
:controls=
"false"
class=
"prefix-amount w140"
@
change=
"refresh"
v-model=
"listParams.costPriceEnd"
controls-position=
"right"
:precision=
"2"
:min=
"listParams.costPriceBegin"
:max=
"100000"
placeholder=
"请输入"
/>
<
dm-input-amount
:controls=
"false"
class=
"prefix-amount w140"
@
change=
"refresh"
v-model=
"listParams.costPriceEnd"
controls-position=
"right"
:precision=
"2"
:min=
"listParams.costPriceBegin"
:max=
"100000"
placeholder=
"请输入"
/>
<label
class=
"mr8 ml40 w100 inline-block"
>
更新时间:
</label>
<el-select
v-model=
"listParams.sortOrder"
@
change=
"refresh"
placeholder=
"默认筛选"
>
<el-option
label=
"由近及远"
value=
"desc"
></el-option>
...
...
@@ -126,7 +126,12 @@
<!-- 调整库存 -->
<p
class=
"mt20 mb15 gray01"
>
卡券明细
</p>
<el-table
v-loading=
"tableCardPackageLoading"
:data=
"tableCardPackage"
style=
"width: 100%"
>
<el-table-column
prop=
"cardName"
label=
"卡券名称"
></el-table-column>
<el-table-column
prop=
"cardName"
label=
"卡券名称"
:min-width=
"160"
show-overflow-tooltip
>
<
template
slot-scope=
"{row}"
>
<el-tag
class=
"mr5"
>
{{
cardType
[
row
.
cardType
].
label
}}
</el-tag>
{{
row
.
cardName
}}
</
template
>
</el-table-column>
<el-table-column
prop=
"date"
label=
"使用有效期"
>
<
template
slot-scope=
"scope"
>
<span
v-html=
"effectiveDateFormate(scope.row)"
></span>
...
...
@@ -135,9 +140,9 @@
<el-table-column
prop=
"date"
label=
"领取限制"
>
<
template
slot-scope=
"scope"
>
{{
scope
.
row
.
getLimit
}}
张/人
</
template
>
</el-table-column>
<el-table-column
prop=
"date"
label=
"卡券类型"
>
<
!-- <
el-table-column prop="date" label="卡券类型">
<template slot-scope="scope">{{ cardType[scope.row.cardType].label || '--' }}</template>
</el-table-column>
</el-table-column>
-->
<el-table-column
prop=
"remainedStock"
label=
"当前可占库存"
></el-table-column>
</el-table>
</adjust-stock>
...
...
@@ -202,7 +207,7 @@ export default {
effectiveDateFormate
(
item
=
{})
{
const
{
cardEffectiveMode
,
startDate
,
expireDate
,
effectTimeMode
,
expireTimeCount
,
effectTimeCount
}
=
item
;
if
(
cardEffectiveMode
===
0
)
{
return
`<p>
${
formatDateTimeByType
(
startDate
,
'yyyy-MM-dd'
)}
~
</p><p>
${
formatDateTimeByType
(
expireDate
,
'yyyy-MM-dd'
)
}
</p>`
;
return
`<p>
${
formatDateTimeByType
(
startDate
,
'yyyy-MM-dd'
)}
至
</p><p>
${
formatDateTimeByType
(
expireDate
,
'yyyy-MM-dd'
)
}
</p>`
;
}
if
(
cardEffectiveMode
===
1
)
{
// 领取后第{{ info.effectTimeCount }}{{ info.effectTimeMode ? '月' : '天' }} - 第{{ info.expireTimeCount + info.effectTimeCount - 1 }}{{ info.effectTimeMode ? '月' : '天' }}
...
...
src/views/card/card-package/send-list.vue
View file @
0998fbec
<
template
>
<div
class=
"p20"
v-loading=
"loading"
>
<div
class=
"pb20 clearfix flex-center"
>
<el-select
v-model=
"listParams.appCode"
class=
"w140 mr10"
placeholder=
"
全部
来源"
clearable
@
change=
"refresh"
>
<el-select
v-model=
"listParams.appCode"
class=
"w140 mr10"
placeholder=
"
所有应用
来源"
clearable
@
change=
"refresh"
>
<el-option
v-for=
"item in appList"
:key=
"item.appCode"
:label=
"item.appName"
:value=
"item.appCode"
></el-option>
</el-select>
<el-input
placeholder=
"请输入关键字搜索"
class=
"w400 mr10"
v-model=
"listParams.search"
clearable
@
change=
"refresh"
>
<el-input
prefix-icon=
"el-icon-search"
placeholder=
"请输入活动名称"
class=
"w300 mr10"
v-model=
"listParams.activityName"
clearable
@
change=
"refresh"
/>
<el-input
placeholder=
"请输入关键字"
class=
"w400 mr10"
v-model=
"listParams.search"
clearable
@
change=
"refresh"
>
<el-select
v-model=
"listParams.searchType"
slot=
"prepend"
style=
"width:120px;"
placeholder=
"请选择"
@
change=
"refresh"
>
<el-option
label=
"福利ID"
:value=
"1"
></el-option>
<el-option
label=
"卡券包名称"
:value=
"2"
></el-option>
...
...
@@ -14,14 +15,15 @@
<el-option
label=
"会员卡号"
:value=
"6"
></el-option>
</el-select>
</el-input>
<el-button
class=
"ml10"
type=
"text"
@
click=
"isOpen = !isOpen"
>
{{
isOpen
?
'收起'
:
'展开'
}}
<i
:class=
"`$
{isOpen ? 'el-icon-arrow-up' : 'el-icon-arrow-down'} el-icon--right ml5`">
</i></el-button>
</div>
<div
class=
"table-search-head
"
>
<div
v-show=
"isOpen"
class=
"table-search-head p20
"
>
<el-tooltip
content=
"数据量较大,最多支持筛选7日,请耐心等待"
placement=
"bottom"
open-delay=
"200"
>
<span
class=
"tooltip-icon"
>
发放时间
</span>
</el-tooltip>
:
<el-date-picker
class=
"w350 mr10"
v-model=
"dateTime"
type=
"daterange"
range-separator=
"~"
start-placeholder=
"领取开始日期"
end-placeholder=
"领取结束日期"
@
change=
"changeTime"
:clearable=
"false"
></el-date-picker>
</div>
<el-table
tooltip-effect=
"dark"
:data=
"tableList"
style=
"width:100%"
:default-sort=
"
{prop: 'createTime', order: ''}" @sort-change="sortChange">
<el-table
class=
"mt20"
tooltip-effect=
"dark"
:data=
"tableList"
style=
"width:100%"
:default-sort=
"
{prop: 'createTime', order: ''}" @sort-change="sortChange">
<el-table-column
label=
"会员信息"
fixed=
"left"
min-width=
"120px"
>
<template
slot-scope=
"scope"
>
<member-info
:member-name=
"scope.row.memberName"
:member-image=
"scope.row.memberImage"
:member-phone=
"scope.row.memberPhone || scope.row.memberCardNo"
></member-info>
...
...
@@ -41,7 +43,27 @@
</el-tooltip>
</
template
>
<
template
slot-scope=
"scope"
>
<el-button
type=
"text"
@
click=
"showDetail(scope.row)"
>
{{
scope
.
row
.
receiveCount
||
0
}}
</el-button>
<el-popover
placement=
"top"
width=
"500"
trigger=
"click"
>
<el-table
tooltip-effect=
"dark"
:data=
"packageLogList"
style=
"width:100%"
max-height=
"400px"
>
<el-table-column
prop=
"couponName"
label=
"卡券名称"
show-overflow-tooltip
:min-width=
"140"
>
<template
slot-scope=
"
{row}">
<el-tag
class=
"mr5"
>
{{
cardType
[
row
.
cardType
].
label
}}
</el-tag>
{{
row
.
couponName
}}
</
template
>
</el-table-column>
<!-- <el-table-column prop="cardType" label="卡券类型">
<span slot-scope="scope">{{ cardType[scope.row.cardType].label }}</span>
</el-table-column> -->
<el-table-column
prop=
"statusFlag"
label=
"领取状态"
>
<span
slot-scope=
"scope"
:class=
"scope.row.statusFlag == 4 ? 'state-point state-point-success' : ''"
>
{{ scope.row.statusFlag == 4 ? '已领取' : '--' }}
</span>
</el-table-column>
<el-table-column
prop=
"couponLogId"
label=
"卡券代码"
></el-table-column>
</el-table>
<el-button
slot=
"reference"
type=
"text"
@
click=
"showDetail(scope.row)"
>
{{ scope.row.receiveCount || 0 }}
</el-button>
</el-popover>
</template>
</el-table-column>
<el-table-column
label=
"来源"
min-width=
"150px"
>
...
...
@@ -92,6 +114,7 @@ export default {
dateTime
:
[
Date
.
now
(),
Date
.
now
()
],
// 默认当天
dateTimeCopy
:
[
Date
.
now
(),
Date
.
now
()
],
listParams
:
{
activityName
:
''
,
appCode
:
''
,
beginTime
:
''
,
endTime
:
''
,
...
...
@@ -107,6 +130,7 @@ export default {
dialogVisible
:
false
,
packageLogLoading
:
false
,
packageLogList
:
[],
isOpen
:
false
};
},
created
()
{
...
...
@@ -137,7 +161,7 @@ export default {
});
},
showDetail
({
packageLogId
})
{
this
.
dialogVisible
=
true
;
//
this.dialogVisible = true;
this
.
packageLogLoading
=
true
;
listCouponByPackageId
({
packageLogId
}).
then
(
res
=>
{
this
.
packageLogLoading
=
false
;
...
...
src/views/card/gic-card/card-list.vue
View file @
0998fbec
...
...
@@ -10,7 +10,7 @@
</el-col>
</el-row>
<div
class=
"clearfix flex-center pb20"
>
<el-input
placeholder=
"请输入关键字
搜索
"
class=
"w400 mr10"
v-model=
"listParams.search"
clearable
@
change=
"refresh"
>
<el-input
placeholder=
"请输入关键字"
class=
"w400 mr10"
v-model=
"listParams.search"
clearable
@
change=
"refresh"
>
<el-select
v-model=
"listParams.searchType"
slot=
"prepend"
style=
"width:120px;"
placeholder=
"请选择"
@
change=
"refresh"
>
<el-option
label=
"卡券名称"
:value=
"1"
></el-option>
<el-option
label=
"备注名"
:value=
"2"
></el-option>
...
...
@@ -21,24 +21,24 @@
<el-select
class=
"dm-select mr10 w160"
clearable
v-model=
"listParams.cardType"
placeholder=
"所有卡券类型"
@
change=
"refresh"
>
<el-option
v-for=
"(v, i) in cardType"
:key=
"i"
:label=
"v.label"
:value=
"v.value"
></el-option>
</el-select>
<el-button
type=
"text"
@
click=
"isOpen = !isOpen"
>
{{
isOpen
?
'收起'
:
'展开'
}}
<i
:class=
"`$
{isOpen ? 'el-icon-arrow-up' : 'el-icon-arrow-down'} el-icon--right ml5`">
</i></el-button>
<!-- ui没要这个字段 -->
<el-select
v-model=
"listParams.couponStatus"
class=
"w160"
placeholder=
"
全部
状态"
clearable
@
change=
"refresh"
>
<el-select
v-model=
"listParams.couponStatus"
class=
"w160"
placeholder=
"
所有
状态"
clearable
@
change=
"refresh"
>
<el-option
label=
"使用中"
:value=
"1"
></el-option>
<el-option
label=
"已过期"
:value=
"2"
></el-option>
<el-option
label=
"已禁用"
:value=
"3"
></el-option>
</el-select>
<el-button
class=
"ml10"
type=
"text"
@
click=
"isOpen = !isOpen"
>
{{
isOpen
?
'收起'
:
'展开'
}}
<i
:class=
"`$
{isOpen ? 'el-icon-arrow-up' : 'el-icon-arrow-down'} el-icon--right ml5`">
</i></el-button>
<el-select
class=
"more-select mr10 mlAuto"
@
change=
"mutiOption"
placeholder=
"批量操作"
>
<el-option
:disabled=
"!multipleSelection.length"
:value=
"0"
>
批量
设置
</el-option>
<el-option
:disabled=
"!multipleSelection.length"
:value=
"0"
>
批量
禁用
</el-option>
<el-option
:disabled=
"!multipleSelection.length"
:value=
"1"
>
批量删除
</el-option>
</el-select>
</div>
<div
v-show=
"isOpen"
class=
"filter-block"
>
<div
class=
"mb20"
>
<label
class=
"mr8"
>
福利成本:
</label>
<
el-input-number
:controls=
"false"
class=
"prefix-amount w140"
@
change=
"refresh"
v-model=
"listParams.costPriceBegin"
controls-position=
"right"
:precision=
"2"
:max=
"listParams.costPriceBegin"
:min=
"0"
placeholder=
"请输入"
/>
<
dm-input-amount
:controls=
"false"
class=
"prefix-amount w140"
@
change=
"refresh"
v-model=
"listParams.costPriceBegin"
controls-position=
"right"
:precision=
"2"
:max=
"listParams.costPriceBegin"
:min=
"0"
placeholder=
"请输入"
/>
<span>
至
</span>
<
el-input-number
:controls=
"false"
class=
"prefix-amount w140"
@
change=
"refresh"
v-model=
"listParams.costPriceEnd"
controls-position=
"right"
:precision=
"2"
:min=
"1"
:max=
"100000"
placeholder=
"请输入"
/>
<
dm-input-amount
:controls=
"false"
class=
"prefix-amount w140"
@
change=
"refresh"
v-model=
"listParams.costPriceEnd"
controls-position=
"right"
:precision=
"2"
:min=
"1"
:max=
"100000"
placeholder=
"请输入"
/>
<label
class=
"mr8 ml40 w100 inline-block"
>
更新时间:
</label>
<el-select
v-model=
"listParams.sortOrder"
@
change=
"refresh"
placeholder=
"默认筛选"
>
<el-option
label=
"由近及远"
value=
"desc"
></el-option>
...
...
@@ -346,8 +346,9 @@ export default {
},
// 批量禁用
stopData
(
ids
,
isMuti
=
false
)
{
const
warnTxt
=
isMuti
?
'禁用卡券将在福利组件不展示,并且该卡券参加的活动将全部失效,确认禁用?'
:
'禁用卡券将在福利组件不展示,并且该卡券参加的活动将全部失效,确认禁用选中数据?'
;
showConfirm
(
`<div>
${
warnTxt
}
</div>`
,
()
=>
{
const
warnTitle
=
isMuti
?
'确认批量禁用选中的卡券吗?'
:
'确认禁用卡券?'
;
const
warnTxt
=
'禁用卡券将在福利组件不展示,并且该卡券参加的活动将全部失效'
;
showConfirm
(
`<div>
${
warnTitle
}
</div><div>
${
warnTxt
}
</div>`
,
()
=>
{
this
.
loading
=
true
;
disableCard
({
couponIds
:
ids
}).
then
(
res
=>
{
this
.
$tips
({
type
:
'success'
,
message
:
'禁用成功!'
});
...
...
@@ -360,8 +361,9 @@ export default {
},
// 批量删除
delData
(
ids
,
isMuti
=
false
)
{
const
warnTxt
=
isMuti
?
'删除后卡券不可找回,已添加被删除卡券的活动将会失效,确认删除?'
:
'删除后卡券不可找回,确认删除该卡券?'
;
showConfirm
(
`<div>
${
warnTxt
}
</div>`
,
()
=>
{
const
warnTitle
=
isMuti
?
'确认批量删除选中的卡券吗?'
:
'确认删除卡券?'
;
const
warnTxt
=
'删除后卡券不可找回,已添加被删除卡券的活动将会失效'
;
showConfirm
(
`<div>
${
warnTitle
}
</div><div>
${
warnTxt
}
</div>`
,
()
=>
{
this
.
loading
=
true
;
deleteCard
({
couponIds
:
ids
}).
then
(
res
=>
{
this
.
$tips
({
type
:
'success'
,
message
:
'删除成功!'
});
...
...
@@ -442,4 +444,4 @@ export default {
line-height
:
20px
;
}
}
</
style
>
\ No newline at end of file
</
style
>
src/views/card/gic-card/member-get.vue
View file @
0998fbec
...
...
@@ -4,10 +4,10 @@
<el-select
class=
"dm-select mr10 w140"
clearable
v-model=
"listParams.cardType"
placeholder=
"所有卡券类型"
@
change=
"refresh"
>
<el-option
v-for=
"(v, i) in cardType"
:key=
"i"
:label=
"v.label"
:value=
"v.value"
></el-option>
</el-select>
<el-select
class=
"dm-select mr10 w140"
clearable
v-model=
"listParams.status"
placeholder=
"所有
卡券
状态"
@
change=
"refresh"
>
<el-select
class=
"dm-select mr10 w140"
clearable
v-model=
"listParams.status"
placeholder=
"所有
使用
状态"
@
change=
"refresh"
>
<el-option
v-for=
"(v, i) in status"
:key=
"i"
:label=
"v.label"
:value=
"v.value"
></el-option>
</el-select>
<el-input
placeholder=
"请输入关键字
搜索
"
class=
"w400 mr10"
v-model=
"listParams.search"
clearable
@
change=
"refresh"
>
<el-input
placeholder=
"请输入关键字"
class=
"w400 mr10"
v-model=
"listParams.search"
clearable
@
change=
"refresh"
>
<el-select
v-model=
"listParams.searchType"
slot=
"prepend"
style=
"width:120px;"
placeholder=
"请选择"
@
change=
"refresh"
>
<el-option
label=
"卡券名称"
:value=
"1"
></el-option>
<el-option
label=
"备注名"
:value=
"2"
></el-option>
...
...
@@ -21,16 +21,17 @@
<el-option
label=
"会员领取记录"
:value=
"0"
></el-option>
<el-option
label=
"非会员领取记录"
:value=
"1"
></el-option>
</el-select>
<el-button
class=
"ml10"
type=
"text"
@
click=
"isOpen = !isOpen"
>
{{
isOpen
?
'收起'
:
'展开'
}}
<i
:class=
"`$
{isOpen ? 'el-icon-arrow-up' : 'el-icon-arrow-down'} el-icon--right ml5`">
</i></el-button>
<!--
<dm-perm-button
class=
"mlAuto"
:disabled=
"$itemPerm($itemCode.gicCardMemberGetExport)"
type=
"primary"
icon=
"iconfont-market4 mr5 icon-icon_yunxiazai"
@
click=
"showExport"
>
数据导出
</dm-perm-button>
-->
</div>
<div
class=
"table-search-head
"
>
<div
v-show=
"isOpen"
class=
"table-search-head p20
"
>
<el-tooltip
content=
"数据量较大,最多支持筛选7日,请耐心等待"
placement=
"bottom"
open-delay=
"200"
>
<span
class=
"tooltip-icon"
>
领取时间
</span>
</el-tooltip>
:
<el-date-picker
class=
"w250 mr10"
v-model=
"dateTime"
type=
"daterange"
range-separator=
"~"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
@
change=
"changeTime"
:clearable=
"false"
></el-date-picker>
核销时间:
<el-date-picker
class=
"w250"
v-model=
"dateTime2"
type=
"daterange"
range-separator=
"~"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
@
change=
"refresh"
></el-date-picker>
</div>
<el-table
tooltip-effect=
"dark"
:data=
"tableList"
style=
"width:100%"
:max-height=
"mainHeight(54 + 50)"
>
<el-table
class=
"mt20"
tooltip-effect=
"dark"
:data=
"tableList"
style=
"width:100%"
:max-height=
"mainHeight(54 + 50)"
>
<el-table-column
label=
"领取时间"
min-width=
"120"
fixed=
"left"
>
<span
slot-scope=
"scope"
v-html=
"listTime(scope.row.receiveTime)"
></span>
</el-table-column>
...
...
@@ -152,7 +153,8 @@ export default {
fields
:
[{
label
:
'领取时间'
,
value
:
'receiveTimeRemark'
,
sensKey
:
false
},{
label
:
'会员头像'
,
value
:
'memberImage'
,
sensKey
:
false
},{
label
:
'会员名称'
,
value
:
'memberName'
,
sensKey
:
false
},{
label
:
'会员手机号'
,
value
:
'memberPhone'
,
sensKey
:
true
},{
label
:
'卡券类型'
,
value
:
'cardTypeRemark'
,
sensKey
:
false
},{
label
:
'卡券名称'
,
value
:
'cardName'
,
sensKey
:
false
},{
label
:
'卡券代码'
,
value
:
'wxCardCode'
,
sensKey
:
false
},{
label
:
'卡券状态'
,
value
:
'statusRemark'
,
sensKey
:
false
},{
label
:
'发放来源'
,
value
:
'appName'
,
sensKey
:
false
},{
label
:
'来源明细'
,
value
:
'appActivityName'
,
sensKey
:
false
},{
label
:
'核销时间'
,
value
:
'verifyTimeRemark'
,
sensKey
:
false
},{
label
:
'核销方式'
,
value
:
'verifyTypeRemark'
,
sensKey
:
false
},{
label
:
'核销渠道'
,
value
:
'verifyOrderType'
,
sensKey
:
false
},{
label
:
'核销门店'
,
value
:
'verifyStoreName'
,
sensKey
:
false
},{
label
:
'订单号'
,
value
:
'verifyOrderNumber'
,
sensKey
:
false
}],
sensKey
:
'sensKey'
,
label
:
'label'
,
value
:
'value'
value
:
'value'
,
isOpen
:
false
};
},
created
()
{
...
...
@@ -269,4 +271,4 @@ export default {
}
}
}
</
style
>
\ No newline at end of file
</
style
>
src/views/card/gic-card/module/destory-dialog.vue
View file @
0998fbec
...
...
@@ -17,11 +17,12 @@
<div>
<div
v-if=
"ruleForm.fileId"
class=
"inline-block"
>
已导入
</div>
<dm-upload-file
class=
"btn-upload"
:disabled=
"!ruleForm.destroyMode"
v-if=
"!ruleForm.fileId"
action=
"/api-welfare/destroy-plugin/import-destroy-code"
width=
"
12
0px"
trigger-text=
"
点击
上传"
width=
"
8
0px"
trigger-text=
"上传"
accept=
".csv"
:show-file-list=
"false"
:limit=
"1"
...
...
@@ -30,7 +31,7 @@
style="display:inline-block;">
<span
slot=
"tip"
style=
"display:none;"
>
tips
</span>
</dm-upload-file>
<el-button
type=
"text"
class=
"ml10"
@
click=
"download"
>
点击
下载文件模板
</el-button>
<el-button
type=
"text"
class=
"ml10"
@
click=
"download"
>
下载文件模板
</el-button>
</div>
<p
class=
"gray03 fz12 line-height1 mt10"
>
券码数量单次最多不超过 5000 条
</p>
<p
class=
"gray03 fz12 line-height1 mt10"
>
填写示例:‘123456(英文单引号'+券码编号文本形式)
</p>
...
...
@@ -192,4 +193,14 @@ export default {
color
:
#c0c4cc
;
}
}
.btn-upload
{
/deep/
{
.el-upload
.el-button
{
background-color
:
#fff
;
color
:
#303133
;
border-style
:
dashed
;
border-color
:
#C4C6CF
;
}
}
}
</
style
>
src/views/card/gic-card/send-list.vue
View file @
0998fbec
<
template
>
<div
class=
"p20"
v-loading=
"loading"
>
<div
class=
"pb20 clearfix flex-center"
>
<el-input
placeholder=
"请输入关键字搜索"
class=
"w400 mr10"
v-model=
"listParams.search"
clearable
@
change=
"refresh"
>
<el-select
class=
"dm-select mr10 w140"
clearable
v-model=
"listParams.statusFlag"
placeholder=
"所有转赠状态"
@
change=
"refresh"
>
<el-option
v-for=
"(v, i) in statusFlag"
:key=
"i"
:label=
"v.label"
:value=
"v.value"
></el-option>
</el-select>
<el-input
placeholder=
"请输入关键字"
class=
"w400 mr10"
v-model=
"listParams.search"
clearable
@
change=
"refresh"
>
<el-select
v-model=
"listParams.searchColumn"
slot=
"prepend"
style=
"width:140px;"
placeholder=
"请选择"
@
change=
"refresh"
>
<el-option
label=
"卡券名称"
value=
"cardName"
></el-option>
<el-option
label=
"卡券代码"
value=
"couponCode"
></el-option>
...
...
@@ -11,16 +14,14 @@
<el-option
label=
"受赠会员卡号"
value=
"giveMemberCardNo"
></el-option>
</el-select>
</el-input>
<el-button
class=
"ml10"
type=
"text"
@
click=
"isOpen = !isOpen"
>
{{
isOpen
?
'收起'
:
'展开'
}}
<i
:class=
"`$
{isOpen ? 'el-icon-arrow-up' : 'el-icon-arrow-down'} el-icon--right ml5`">
</i></el-button>
<!--
<dm-perm-button
:disabled=
"$itemPerm($itemCode.gicCardGiveLogExport)"
type=
"primary"
icon=
"iconfont-market4 icon-icon_yunxiazai mr5"
@
click=
"showExport"
>
数据导出
</dm-perm-button>
-->
</div>
<div
class=
"table-search-head"
>
<el-select
class=
"dm-select mr10 w140"
clearable
v-model=
"listParams.statusFlag"
placeholder=
"所有转赠状态"
@
change=
"refresh"
>
<el-option
v-for=
"(v, i) in statusFlag"
:key=
"i"
:label=
"v.label"
:value=
"v.value"
></el-option>
</el-select>
领取时间:
<el-date-picker
class=
"w250 mr10"
v-model=
"dateTime2"
type=
"daterange"
range-separator=
"~"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
@
change=
"refresh"
></el-date-picker>
转赠时间:
<el-date-picker
class=
"w250"
v-model=
"dateTime"
type=
"daterange"
range-separator=
"~"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
@
change=
"refresh"
></el-date-picker>
<div
v-show=
"isOpen"
class=
"table-search-head p20"
>
转赠时间:
<el-date-picker
class=
"w250 mr10"
v-model=
"dateTime"
type=
"daterange"
range-separator=
"~"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
@
change=
"refresh"
></el-date-picker>
领取时间:
<el-date-picker
class=
"w250"
v-model=
"dateTime2"
type=
"daterange"
range-separator=
"~"
start-placeholder=
"开始日期"
end-placeholder=
"结束日期"
@
change=
"refresh"
></el-date-picker>
</div>
<el-table
tooltip-effect=
"dark"
:data=
"tableList"
:max-height=
"mainHeight(54 + 50)"
style=
"width:100%"
:default-sort=
"
{prop: 'giveTime', order: ''}" @sort-change="sortChange">
<el-table
class=
"mt20"
tooltip-effect=
"dark"
:data=
"tableList"
:max-height=
"mainHeight(54 + 50)"
style=
"width:100%"
:default-sort=
"
{prop: 'giveTime', order: ''}" @sort-change="sortChange">
<el-table-column
label=
"转赠会员"
min-width=
"120"
fixed=
"left"
>
<template
slot-scope=
"scope"
>
<member-info
:member-name=
"scope.row.memberName"
:member-image=
"scope.row.memberImage"
:member-phone=
"scope.row.memberPhone"
></member-info>
...
...
@@ -101,7 +102,8 @@ export default {
sensKey
:
'sensKey'
,
// sensValue: '',
label
:
'label'
,
value
:
'value'
value
:
'value'
,
isOpen
:
false
,
};
},
created
()
{
...
...
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