Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
7ef2a6b3
Commit
7ef2a6b3
authored
Sep 07, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
86fc708c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
200 additions
and
17 deletions
+200
-17
bookDinnerStatisticsDetails.vue
src/components/Restaurant/bookDinnerStatisticsDetails.vue
+27
-17
goodlist.vue
src/components/mall/goodlist.vue
+173
-0
No files found.
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @
7ef2a6b3
...
@@ -4,8 +4,10 @@
...
@@ -4,8 +4,10 @@
<ul>
<ul>
<li>
<li>
<template
v-if=
"IsOperation != 1"
>
<template
v-if=
"IsOperation != 1"
>
<input
v-if=
"IsEditDinner==1"
type=
"button"
class=
"fr normalBtn mb30"
:value=
"$t('pub.saveBtn')"
@
click=
"saveList(1)"
:disabled=
"IsDisabled"
/>
<input
v-if=
"IsEditDinner==1"
type=
"button"
class=
"fr normalBtn mb30"
:value=
"$t('pub.saveBtn')"
<input
v-if=
"IsEditDinner==0"
type=
"button"
class=
"fr normalBtn mb30"
:value=
"$t('ground.baocuncaogao')"
@
click=
"saveList(0)"
:disabled=
"IsDisabled"
/>
@
click=
"saveList(1)"
:disabled=
"IsDisabled"
/>
<input
v-if=
"IsEditDinner==0"
type=
"button"
class=
"fr normalBtn mb30"
:value=
"$t('ground.baocuncaogao')"
@
click=
"saveList(0)"
:disabled=
"IsDisabled"
/>
</
template
>
</
template
>
<
template
v-else
>
<
template
v-else
>
<span
style=
"color:red;font-size:14px;"
>
{{
$t
(
'ground.yizhidbnxg'
)
}}
!
</span>
<span
style=
"color:red;font-size:14px;"
>
{{
$t
(
'ground.yizhidbnxg'
)
}}
!
</span>
...
@@ -54,9 +56,9 @@
...
@@ -54,9 +56,9 @@
<td
colspan=
"2"
>
<td
colspan=
"2"
>
<span
style=
"padding-left:5px;"
class=
"link"
<span
style=
"padding-left:5px;"
class=
"link"
@
click=
"goUrlR('restaurantList',subItem.DiningID,'餐厅列表')"
>
{{
subItem
.
DiningName
}}
@
click=
"goUrlR('restaurantList',subItem.DiningID,'餐厅列表')"
>
{{
subItem
.
DiningName
}}
<br
/>
<br
/>
{{
$t
(
'ground.zhenshimingcheng'
)
}}
:
{{
subItem
.
DiningRealName
}}
{{
$t
(
'ground.zhenshimingcheng'
)
}}
:
{{
subItem
.
DiningRealName
}}
</span>
</span>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
...
@@ -84,7 +86,7 @@
...
@@ -84,7 +86,7 @@
<el-option
v-for=
'itemHotel in item.DinnerList'
:label=
'itemHotel.RealName'
:value=
'itemHotel.ID'
<el-option
v-for=
'itemHotel in item.DinnerList'
:label=
'itemHotel.RealName'
:value=
'itemHotel.ID'
:key=
'itemHotel.ID'
></el-option>
:key=
'itemHotel.ID'
></el-option>
</el-select>
</el-select>
<span
style=
"color:green"
>
{{
subItem
.
NewDiningRealName
}}
</span><br/>
<span
style=
"color:green"
>
{{
subItem
.
NewDiningRealName
}}
</span><br
/>
<el-popover
placement=
"right"
width=
"540"
trigger=
"click"
v-model=
"subItem.isShowPop"
>
<el-popover
placement=
"right"
width=
"540"
trigger=
"click"
v-model=
"subItem.isShowPop"
>
<comCheckDinner
:ref=
"'comCheckDinner'+index+subIndex+''"
:UseDate=
"item.UseTimeStr"
<comCheckDinner
:ref=
"'comCheckDinner'+index+subIndex+''"
:UseDate=
"item.UseTimeStr"
v-on:childDinner=
"childDinnerList"
:Country=
"651"
>
v-on:childDinner=
"childDinnerList"
:Country=
"651"
>
...
@@ -112,11 +114,18 @@
...
@@ -112,11 +114,18 @@
{{
childItem
.
PeopleNum
}}
{{
childItem
.
PeopleNum
}}
</td>
</td>
<td>
<td>
<span
class=
"spanlink"
v-if=
'childItem.PeoplePrice==0'
<template
v-if=
"EditBtn"
>
@
click=
"goUrl('RestaurantPackage',subItem,'套餐查询')"
>
{{
$t
(
'leader.leader_Set'
)
}}
</span>
<el-input
class=
'w135'
v-model=
'childItem.PeoplePrice'
@
keyup
.
native=
"checkPrice(childItem,'PeoplePrice')"
type=
"text"
></el-input>
</
template
>
<
template
v-else
>
<
template
v-else
>
<el-input
class=
'w50 tcenter'
@
input=
'calculationPrice(subItem)'
v-model=
'childItem.PeoplePrice'
@
keyup
.
native=
"checkInteger(childItem,'PeoplePrice')"
></el-input>
<span
class=
"spanlink"
v-if=
'childItem.PeoplePrice==0'
@
click=
"goUrl('RestaurantPackage',subItem,'套餐查询')"
>
{{
$t
(
'leader.leader_Set'
)
}}
</span>
<template
v-else
>
<el-input
class=
'w50 tcenter'
@
input=
'calculationPrice(subItem)'
v-model=
'childItem.PeoplePrice'
@
keyup
.
native=
"checkInteger(childItem,'PeoplePrice')"
></el-input>
</
template
>
</template>
</template>
</td>
</td>
<td>
<td>
...
@@ -162,7 +171,8 @@
...
@@ -162,7 +171,8 @@
<el-option
:label=
'$t("ground.qiandan")'
:value=
'2'
v-if=
"subItem.PayStyleExt==2"
></el-option>
<el-option
:label=
'$t("ground.qiandan")'
:value=
'2'
v-if=
"subItem.PayStyleExt==2"
></el-option>
<el-option
:label=
'$t("ground.shiwudk")'
:value=
'3'
v-if=
"subItem.PayStyleExt==3"
></el-option>
<el-option
:label=
'$t("ground.shiwudk")'
:value=
'3'
v-if=
"subItem.PayStyleExt==3"
></el-option>
<el-option
:label=
'$t("ground.yufu")'
:value=
'4'
v-if=
"subItem.PayStyleExt==4"
></el-option>
<el-option
:label=
'$t("ground.yufu")'
:value=
'4'
v-if=
"subItem.PayStyleExt==4"
></el-option>
<el-option
:label=
'$t("ground.yufukuandk")'
:value=
'5'
v-if=
"subItem.PayStyleExt==5"
></el-option>
<el-option
:label=
'$t("ground.yufukuandk")'
:value=
'5'
v-if=
"subItem.PayStyleExt==5"
>
</el-option>
<el-option
:label=
'$t("ground.lingduidydf")'
:value=
'10'
></el-option>
<el-option
:label=
'$t("ground.lingduidydf")'
:value=
'10'
></el-option>
<el-option
:label=
'$t("ground.gongsihetzf")'
:value=
'6'
></el-option>
<el-option
:label=
'$t("ground.gongsihetzf")'
:value=
'6'
></el-option>
<el-option
:label=
'$t("ground.shuaka")'
:value=
'11'
></el-option>
<el-option
:label=
'$t("ground.shuaka")'
:value=
'11'
></el-option>
...
@@ -192,7 +202,7 @@
...
@@ -192,7 +202,7 @@
</tr>
</tr>
<tr>
<tr>
<td
width=
"60"
style=
"text-align:right;"
>
<td
width=
"60"
style=
"text-align:right;"
>
{{$t('ground.dingtuanhao')}}:
{{$t('ground.dingtuanhao')}}:
</td>
</td>
<td
style=
"text-align:left;"
>
<td
style=
"text-align:left;"
>
<el-input
class=
'w135 tcenter'
v-model=
'subItem.ReserveNo'
></el-input>
<el-input
class=
'w135 tcenter'
v-model=
'subItem.ReserveNo'
></el-input>
...
@@ -230,7 +240,7 @@
...
@@ -230,7 +240,7 @@
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
EditBtn
:
false
,
//房餐景点修改权限
EditBtn
:
false
,
//房餐景点修改权限
IsEditDinner
:
0
,
//1有权限操作餐配
IsEditDinner
:
0
,
//1有权限操作餐配
defaultSelectValue
:
0
,
defaultSelectValue
:
0
,
list
:
[],
list
:
[],
...
@@ -266,7 +276,7 @@
...
@@ -266,7 +276,7 @@
oldData
.
PayStyleExt
=
obj
.
PayStyle
;
oldData
.
PayStyleExt
=
obj
.
PayStyle
;
oldData
.
NewDiningID
=
obj
.
ID
;
oldData
.
NewDiningID
=
obj
.
ID
;
oldData
.
NewDiningName
=
obj
.
Name
;
oldData
.
NewDiningName
=
obj
.
Name
;
oldData
.
NewDiningRealName
=
obj
.
RealName
;
oldData
.
NewDiningRealName
=
obj
.
RealName
;
this
.
list
.
forEach
(
x
=>
{
this
.
list
.
forEach
(
x
=>
{
x
.
DiningSummaryList
.
forEach
(
y
=>
{
x
.
DiningSummaryList
.
forEach
(
y
=>
{
y
.
isShowPop
=
false
;
y
.
isShowPop
=
false
;
...
@@ -343,7 +353,7 @@
...
@@ -343,7 +353,7 @@
}
}
})
})
});
});
this
.
list
=
resultArray
;
this
.
list
=
resultArray
;
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
}
}
...
@@ -461,7 +471,7 @@
...
@@ -461,7 +471,7 @@
}
}
})
})
},
},
GetAuth
()
{
GetAuth
()
{
this
.
apipost
(
'dmcstatistics_get_GetGetDmcTotalTablePageAuth'
,
{},
res
=>
{
this
.
apipost
(
'dmcstatistics_get_GetGetDmcTotalTablePageAuth'
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
IsEditDinner
=
res
.
data
.
data
.
IsEditDinner
;
this
.
IsEditDinner
=
res
.
data
.
data
.
IsEditDinner
;
...
@@ -470,7 +480,7 @@
...
@@ -470,7 +480,7 @@
}
}
},
err
=>
{})
},
err
=>
{})
},
},
CheckAuth
()
{
CheckAuth
()
{
var
actionCode
=
this
.
$AuthCode
.
EditRoomDinnerTIcket
;
var
actionCode
=
this
.
$AuthCode
.
EditRoomDinnerTIcket
;
this
.
CheckUserAuth
(
actionCode
,
res
=>
{
this
.
CheckUserAuth
(
actionCode
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
&&
res
.
data
.
data
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
&&
res
.
data
.
data
==
1
)
{
...
...
src/components/mall/goodlist.vue
0 → 100644
View file @
7ef2a6b3
<
style
scope
>
.circle
{
width
:
20px
;
height
:
20px
;
display
:
inline-block
;
text-align
:
center
;
background
:
grey
;
border-radius
:
20px
;
margin-right
:
5px
;
}
.circle.red
{
background
:
#fe4433
;
}
.circle.green
{
background
:
green
;
}
.circle.black
{
background
:
black
;
}
.remark
{
margin-right
:
20px
;
font-size
:
12px
;
display
:
inline-block
;
vertical-align
:
text-top
;
}
.wd100
{
width
:
100%
!important
;
}
.el-tag
+
.el-tag
{
margin-left
:
10px
;
}
.button-new-tag
{
margin-left
:
10px
;
height
:
32px
;
line-height
:
30px
;
padding-top
:
0
;
padding-bottom
:
0
;
}
.input-new-tag
{
width
:
90px
;
margin-left
:
10px
;
vertical-align
:
bottom
;
}
</
style
>
<
template
>
<div
class=
"flexOne companyManagement"
>
<div
class=
"query-box"
>
<ul>
<li>
<span>
<em>
分类
</em>
<el-select
v-model=
"statusValue"
placeholder=
"请选择"
>
</el-select>
</span>
</li>
<li>
<span>
<em>
名称
</em>
<el-input
v-model=
"msg.Name"
class=
"w150"
clearable
></el-input>
</span>
</li>
<li>
<input
type=
"button"
class=
"hollowFixedBtn"
value=
"查询"
@
click=
"resetPageIndex"
/>
</li>
</ul>
</div>
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"msg.currentPage"
layout=
"total,prev, pager, next, jumper"
:page-size=
"msg.pageSize"
:total=
"msg.total"
>
</el-pagination>
<table>
<thead>
<tr>
<th
style=
"width:100px;"
>
编号
</th>
<th
style=
"width:250px;"
>
商品名称
</th>
<th
style=
"width:150px;"
>
售价
</th>
<th
style=
"width:200px;"
>
操作
</th>
</tr>
</thead>
<tbody
v-for=
"(item,index) in DataList"
:key=
"index"
>
<tr>
<td>
{{
item
.
id
}}
</td>
<td>
{{
item
.
name
}}
</td>
<td>
{{
item
.
price
}}
起
</td>
<td>
<a>
下单
</a>
</td>
</tr>
</tbody>
</table>
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"msg.currentPage"
layout=
"total,prev, pager, next, jumper"
:page-size=
"msg.pageSize"
:total=
"msg.total"
>
</el-pagination>
</div>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
statusValue
:
0
,
//请选择
//数据列表
DataList
:
[],
//查询参数
msg
:
{
currentPage
:
1
,
//总条数
total
:
0
,
pageIndex
:
1
,
pageSize
:
10
,
Name
:
""
,
//商品名称
CategoryIds
:
""
,
//商品分类
IsGetShare
:
1
,
//获取分销
},
};
},
methods
:
{
//获取商品列表
getGoodList
()
{
this
.
DataList
=
[];
this
.
mallapipost
(
"/api/AppletGoods/GetAppletGoodsPageListForZY"
,
this
.
msg
,
res
=>
{
console
.
log
(
"res.data.data"
,
res
.
data
);
if
(
res
.
data
.
resultCode
==
1
)
{
var
tempArray
=
res
.
data
.
data
.
pageData
;
this
.
DataList
=
tempArray
;
this
.
msg
.
total
=
res
.
data
.
data
.
count
;
}
});
},
//分页
handleCurrentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
getGoodList
();
},
//重新查询
resetPageIndex
()
{
this
.
msg
.
pageIndex
=
1
;
this
.
msg
.
currentPage
=
1
;
this
.
getGoodList
();
},
},
mounted
()
{
console
.
log
(
"aaa"
)
this
.
getGoodList
();
}
};
</
script
>
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