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
bf3e3f38
Commit
bf3e3f38
authored
Aug 21, 2024
by
liudong1993
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
3696bb7e
948cfd40
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
519 additions
and
7 deletions
+519
-7
ChangeProportion.vue
...odule/DataAnalysis/components/Echart/ChangeProportion.vue
+0
-1
restaurantRankingList.vue
src/components/Restaurant/restaurantRankingList.vue
+474
-0
CustomerAnalysis.vue
src/components/SalesModule/CustomerAnalysis.vue
+11
-1
customerTransfer.vue
src/components/SalesModule/customerTransfer.vue
+14
-0
enrollTotal.vue
src/components/SalesModule/enrollTotal.vue
+7
-1
config.js
src/router/config.js
+13
-4
No files found.
src/components/FinancialModule/DataAnalysis/components/Echart/ChangeProportion.vue
View file @
bf3e3f38
...
@@ -87,7 +87,6 @@ export default {
...
@@ -87,7 +87,6 @@ export default {
let
datas
=
[]
let
datas
=
[]
let
Stocklegend
=
{}
let
Stocklegend
=
{}
let
Newobj
=
{};
let
Newobj
=
{};
console
.
log
(
this
.
CostAnalysisData
,
'---------'
)
for
(
let
index
=
0
;
index
<
this
.
incomeTitles
.
length
;
index
++
){
for
(
let
index
=
0
;
index
<
this
.
incomeTitles
.
length
;
index
++
){
for
(
let
i
=
0
;
i
<
this
.
MonthList
.
length
;
i
++
){
for
(
let
i
=
0
;
i
<
this
.
MonthList
.
length
;
i
++
){
let
filter
=
this
.
CostAnalysisData
.
filter
(
z
=>
{
return
z
.
Month
==
this
.
MonthList
[
i
]})
let
filter
=
this
.
CostAnalysisData
.
filter
(
z
=>
{
return
z
.
Month
==
this
.
MonthList
[
i
]})
...
...
src/components/Restaurant/restaurantRankingList.vue
0 → 100644
View file @
bf3e3f38
This diff is collapsed.
Click to expand it.
src/components/SalesModule/CustomerAnalysis.vue
View file @
bf3e3f38
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<div
class=
"des"
>
<div
class=
"des"
>
<div
class=
"Img"
><img
style=
"width:31px;height:36px"
src=
"../../assets/img/saleRank/rt.png"
alt=
""
></div>
<div
class=
"Img"
><img
style=
"width:31px;height:36px"
src=
"../../assets/img/saleRank/rt.png"
alt=
""
></div>
<div>
<div>
<p
style=
"color:#34BFA3;font-size:24px"
><span
style=
"font-size:28px;font-weight:600"
>
{{
datainfo
.
TotalGuestNum
}}
</span>
人
</p>
<p
style=
"color:#34BFA3;font-size:24px"
><span
style=
"font-size:28px;font-weight:600"
@
click=
"getUrl()"
>
{{
datainfo
.
TotalGuestNum
}}
</span>
人
</p>
</div>
</div>
</div>
</div>
...
@@ -196,6 +196,16 @@ export default {
...
@@ -196,6 +196,16 @@ export default {
},
},
methods
:
{
methods
:
{
getUrl
()
{
this
.
$router
.
push
({
name
:
"enrollTotal"
,
query
:
{
"CustomerId"
:
this
.
customerId
,
"CustomerName"
:
this
.
datainfo
.
Contact
,
blank
:
'y'
}
})
},
goCoupons
(
id
){
goCoupons
(
id
){
this
.
$router
.
push
({
this
.
$router
.
push
({
name
:
'CouponsList'
,
name
:
'CouponsList'
,
...
...
src/components/SalesModule/customerTransfer.vue
View file @
bf3e3f38
...
@@ -80,6 +80,19 @@
...
@@ -80,6 +80,19 @@
<
treeselect
class
=
"w200 fl"
:
options
=
"departmentList"
@
select
=
"getEmployeeList"
v
-
model
=
"DepartmentId"
<
treeselect
class
=
"w200 fl"
:
options
=
"departmentList"
@
select
=
"getEmployeeList"
v
-
model
=
"DepartmentId"
:
placeholder
=
"$t('pub.unlimitedSel')"
:
normalizer
=
"normalizer"
/>
:
placeholder
=
"$t('pub.unlimitedSel')"
:
normalizer
=
"normalizer"
/>
<
/li
>
<
/li
>
<
li
>
<
span
class
=
"fl mt10"
>
<
em
><
el
-
switch
style
=
"display: block"
v
-
model
=
"msg.fanYong"
active
-
text
=
"特惠专案客户"
inactive
-
text
=
""
active
-
value
=
"1"
inactive
-
value
=
"0"
>
<
/el-switch></
em
>
<
/span
>
<
/li
>
<
li
style
=
"float:right;padding-top:10px;color:#111111"
>
{{
$t
(
'salesModule.JYETJ'
)
}}
:
{{
datainfo
.
sumMoney
}}
<
/li
>
<
li
style
=
"float:right;padding-top:10px;color:#111111"
>
{{
$t
(
'salesModule.JYETJ'
)
}}
:
{{
datainfo
.
sumMoney
}}
<
/li
>
<
li
>
<
li
>
<
input
type
=
"button"
class
=
"hollowFixedBtn"
:
value
=
"$t('ground.kehuditu')"
@
click
=
"getMap()"
>
<
input
type
=
"button"
class
=
"hollowFixedBtn"
:
value
=
"$t('ground.kehuditu')"
@
click
=
"getMap()"
>
...
@@ -445,6 +458,7 @@
...
@@ -445,6 +458,7 @@
rtsSort
:
''
,
rtsSort
:
''
,
orderBy
:
'TradeMoney desc'
,
orderBy
:
'TradeMoney desc'
,
ExceptionCount
:
0
,
ExceptionCount
:
0
,
fanYong
:
0
,
}
,
}
,
RecipientMsg
:
{
RecipientMsg
:
{
CustomerIdArr
:
[],
CustomerIdArr
:
[],
...
...
src/components/SalesModule/enrollTotal.vue
View file @
bf3e3f38
...
@@ -869,7 +869,7 @@
...
@@ -869,7 +869,7 @@
},
},
methods
:
{
methods
:
{
GetCustomerListByKeyWord
(
query
)
{
GetCustomerListByKeyWord
(
query
,
Type
)
{
if
(
query
!==
''
)
{
if
(
query
!==
''
)
{
// this.employeeMsg.KeyWord = query;
// this.employeeMsg.KeyWord = query;
this
.
apipost
(
this
.
apipost
(
...
@@ -878,6 +878,7 @@
...
@@ -878,6 +878,7 @@
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
customerList
=
res
.
data
.
data
;
this
.
customerList
=
res
.
data
.
data
;
if
(
this
.
customerList
.
length
>
0
&&
Type
)
this
.
msg
.
CustomerId
=
this
.
customerList
[
0
].
customerId
}
}
},
},
err
=>
{}
err
=>
{}
...
@@ -1191,6 +1192,7 @@
...
@@ -1191,6 +1192,7 @@
if
(
this
.
$route
.
query
.
OrderId
)
{
if
(
this
.
$route
.
query
.
OrderId
)
{
this
.
msg
.
tempOrderId
=
this
.
$route
.
query
.
OrderId
this
.
msg
.
tempOrderId
=
this
.
$route
.
query
.
OrderId
}
}
this
.
getCompany
();
this
.
getCompany
();
this
.
getCtlxList
();
this
.
getCtlxList
();
...
@@ -1228,6 +1230,10 @@
...
@@ -1228,6 +1230,10 @@
this
.
msg
.
QStartDate
=
""
;
this
.
msg
.
QStartDate
=
""
;
this
.
msg
.
QEndDate
=
""
;
this
.
msg
.
QEndDate
=
""
;
}
}
if
(
this
.
$route
.
query
.
CustomerName
){
this
.
GetCustomerListByKeyWord
(
this
.
$route
.
query
.
CustomerName
,
1
);
}
this
.
getList
();
this
.
getList
();
},
},
};
};
...
...
src/router/config.js
View file @
bf3e3f38
...
@@ -1512,12 +1512,21 @@ export default {
...
@@ -1512,12 +1512,21 @@ export default {
title
:
'餐厅套餐查询'
title
:
'餐厅套餐查询'
},
},
},
},
,
{
{
path
:
'/domesticRestaurantList'
,
//国内餐厅列表
path
:
'/RestaurantPackage'
,
//餐厅套餐查询
name
:
'domesticRestaurantList'
,
name
:
'RestaurantPackage'
,
component
:
resolve
=>
require
([
'@/components/Restaurant/domesticRestaurantList'
],
resolve
),
component
:
resolve
=>
require
([
'@/components/Restaurant/RestaurantPackage'
],
resolve
),
meta
:
{
title
:
'餐厅套餐查询'
},
},
{
path
:
'/restaurantRankingList'
,
//餐厅使用排行
name
:
'restaurantRankingList'
,
component
:
resolve
=>
require
([
'@/components/Restaurant/restaurantRankingList'
],
resolve
),
meta
:
{
meta
:
{
title
:
'
国内餐厅列表
'
title
:
'
餐厅使用排行
'
},
},
},
},
{
{
...
...
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