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
002e800a
Commit
002e800a
authored
Nov 04, 2019
by
chenxin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:e袋洗3.0迭代
parent
744c4a15
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
24 deletions
+10
-24
form.js
src/views/ewash/form.js
+1
-1
form.vue
src/views/ewash/form.vue
+2
-0
list.vue
src/views/ewash/list.vue
+5
-21
statements-detail.vue
src/views/ewash/statements-detail.vue
+1
-1
statements.vue
src/views/ewash/statements.vue
+1
-1
No files found.
src/views/ewash/form.js
View file @
002e800a
...
...
@@ -447,7 +447,7 @@ export default {
// add e袋洗使用类目
if
(
this
.
goods
.
edx
&&
this
.
form
.
edxGoodsList
.
length
===
0
)
{
this
.
$tips
({
type
:
'warning'
,
message
:
'
请选择e袋洗
适用类目'
});
this
.
$tips
({
type
:
'warning'
,
message
:
'
选择
适用类目'
});
return
;
}
...
...
src/views/ewash/form.vue
View file @
002e800a
...
...
@@ -49,6 +49,8 @@
<el-button
type=
"primary"
class=
"ml5"
@
click=
"ableCategoryVisible = true"
size=
"mini"
:disabled=
"isEdit || !goods.edx"
>
编辑
</el-button>
</div>
<div
class=
"sysp__content clearfix inline-block fl"
style=
"width:calc(100% - 440px);max-height: 100px;overflow-y: auto;"
>
<span
v-if=
"!goods.edx"
class=
"fz13 gray"
>
* 未勾选默认全部类目
</span>
<span
v-if=
"goods.edx && form.edxGoodsList.length === 0"
class=
"el-form-item__error"
>
至少选择一个类目
</span>
<template
v-for=
"(item, idx) in form.edxGoodsList"
>
<span
:key=
"idx"
class=
"item mr5"
>
{{
item
.
name
}}
</span>
</
template
>
...
...
src/views/ewash/list.vue
View file @
002e800a
...
...
@@ -13,8 +13,6 @@
</el-select>
<el-input
:disabled=
"!ewashDisable"
v-model=
"listParams.searchParam"
class=
"w200 vertical-middle"
placeholder=
"输入卡券名称/备注"
clearable
@
change=
"refresh"
><i
slot=
"prefix"
class=
"el-input__icon el-icon-search"
></i></el-input>
<div
class=
"fr"
>
<el-button
type=
"primary"
@
click=
"$router.push('/ewash/statements')"
:disabled=
"!ewashDisable"
>
查看账单
</el-button>
<el-button
type=
"primary"
@
click=
"handleDialogShow"
:disabled=
"!ewashDisable"
>
创建子账户
</el-button>
<el-button
type=
"primary"
@
click=
"$router.push('/ewash/add')"
:disabled=
"!ewashDisable"
>
新增卡券
</el-button>
</div>
</div>
...
...
@@ -27,18 +25,8 @@
</div>
<adjust-stock
:show
.
sync=
"adjustStock"
:totalCount=
"currentCard.couponStock"
:coupCardId=
"currentCard.coupCardId"
@
refresh=
"delayRefresh"
></adjust-stock>
<el-pagination
v-show=
"tableList.length"
background
class=
"dm-pagination"
@
size-change=
"handleSizeChange"
@
current-change=
"handleCurrentChange"
:current-page=
"listParams.currentPage"
:page-sizes=
"[20, 40, 60, 80]"
:page-size=
"listParams.pageSize"
layout=
"total, sizes, prev, pager, next"
:total=
"total"
></el-pagination>
<!-- 创建子账户dialog -->
<store-child
ref=
"storeChild"
:dialogVisible
.
sync=
"dialogVisible"
/>
<!-- 为创建e袋洗服务 -->
<el-dialog
title=
"提示"
:visible=
"ewashTipDialog"
width=
"400px"
>
<div
class=
"text-center pb20"
>
<i
class=
"el-icon-error red fz40 mb20 pb10"
></i>
<div
class=
"fz16"
>
请联系客服进行开通使用!
</div>
</div>
<div
class=
"text-center pb10 mt20"
>
<el-button
@
click=
"ewashTipDialog = false"
>
确 定
</el-button>
</div>
</el-dialog>
<!-- 未创建e袋洗服务 -->
<unable-tips
:ewashTipDialog=
"ewashTipDialog"
/>
</section>
</
template
>
<
script
>
...
...
@@ -46,7 +34,8 @@ import { cardPageList, deleteCard } from '@/service/api/cardApi.js';
import
adjustStock
from
'@/views/card/partials/adjust-Stock'
;
import
cardItem
from
'./partials/card-item'
;
import
tableMethods
from
'@/mixins/tableMethods.js'
;
import
storeChild
from
'./partials/store-child'
;
import
unableTips
from
'./partials/unable-tips'
;
export
default
{
name
:
'card-list'
,
mixins
:
[
tableMethods
],
...
...
@@ -77,7 +66,7 @@ export default {
components
:
{
'adjust-stock'
:
adjustStock
,
'card-item'
:
cardItem
,
storeChild
unableTips
},
created
()
{
window
.
scrollTo
(
0
,
0
);
...
...
@@ -85,11 +74,6 @@ export default {
this
.
$store
.
commit
(
'mutations_breadcrumb'
,
[{
name
:
'e袋洗服务'
,
path
:
''
},
{
name
:
'服务列表'
,
path
:
''
}]);
},
methods
:
{
// 创建子账户dialog
handleDialogShow
()
{
this
.
dialogVisible
=
true
;
this
.
$refs
.
storeChild
.
reload
();
},
//编辑库存 前置
preAdjustStock
(
val
)
{
this
.
currentCard
=
val
;
...
...
src/views/ewash/statements-detail.vue
View file @
002e800a
...
...
@@ -245,7 +245,7 @@ export default {
this
.
handleDetail
();
},
created
()
{
this
.
$store
.
commit
(
'mutations_breadcrumb'
,
[{
name
:
'e袋洗服务'
,
path
:
''
},
{
name
:
'
服务列表'
,
path
:
'/ewash/list
'
},
{
name
:
'e袋洗账单'
,
path
:
'/ewash/statements'
},
{
name
:
'账单详情'
,
path
:
''
}]);
this
.
$store
.
commit
(
'mutations_breadcrumb'
,
[{
name
:
'e袋洗服务'
,
path
:
''
},
{
name
:
'
门店管理'
,
path
:
'/ewash/store
'
},
{
name
:
'e袋洗账单'
,
path
:
'/ewash/statements'
},
{
name
:
'账单详情'
,
path
:
''
}]);
}
};
</
script
>
...
...
src/views/ewash/statements.vue
View file @
002e800a
...
...
@@ -83,7 +83,7 @@ export default {
this
.
getTableList
();
},
created
()
{
this
.
$store
.
commit
(
'mutations_breadcrumb'
,
[{
name
:
'e袋洗服务'
,
path
:
''
},
{
name
:
'
服务列表'
,
path
:
'/ewash/list
'
},
{
name
:
'e袋洗账单'
,
path
:
''
}]);
this
.
$store
.
commit
(
'mutations_breadcrumb'
,
[{
name
:
'e袋洗服务'
,
path
:
''
},
{
name
:
'
门店管理'
,
path
:
'/ewash/store
'
},
{
name
:
'e袋洗账单'
,
path
:
''
}]);
},
methods
:
{
formatDateTimeByType
,
...
...
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