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
3e0df9a5
Commit
3e0df9a5
authored
Nov 15, 2024
by
youjie
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
3a72112c
c91ace87
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
536 additions
and
160 deletions
+536
-160
en.js
src/assets/common/lang/en.js
+1
-0
jp.js
src/assets/common/lang/jp.js
+1
-0
zh-tw.js
src/assets/common/lang/zh-tw.js
+1
-1
zh.js
src/assets/common/lang/zh.js
+1
-0
fill.js
src/assets/common/lang/zhCN/fill.js
+1
-1
index.vue
src/components/FinancialModule/DataAnalysis/index.vue
+9
-5
czBillModule.vue
...nents/FinancialModule/FinancialSubmodule/czBillModule.vue
+1
-1
addFinancialDocuments.vue
src/components/FinancialModule/addFinancialDocuments.vue
+20
-1
leaderReimbursement.vue
src/components/LeaderManagement/leaderReimbursement.vue
+83
-31
TravelControlListSale.vue
...onents/TravelManager/TravelList/TravelControlListSale.vue
+2
-2
newQuotation.vue
...ponents/TravelManager/TravelNewQuotation/newQuotation.vue
+44
-5
classification.vue
src/components/WebSet/classification.vue
+332
-113
teamRevenueExpenditure.vue
src/components/dmc/manager/teamRevenueExpenditure.vue
+40
-0
No files found.
src/assets/common/lang/en.js
View file @
3e0df9a5
...
@@ -2694,6 +2694,7 @@ export const op = {
...
@@ -2694,6 +2694,7 @@ export const op = {
fgszjl
:
'Branch General Manager'
,
fgszjl
:
'Branch General Manager'
,
opszje
:
'OP set the amount'
,
opszje
:
'OP set the amount'
,
fgszjdb
:
'New Japanese impression'
,
fgszjdb
:
'New Japanese impression'
,
IsSelfGuidedTour
:
'Is it a free trip'
,
}
}
import
invoicesManager
from
'./EN/invoicesManager'
import
invoicesManager
from
'./EN/invoicesManager'
...
...
src/assets/common/lang/jp.js
View file @
3e0df9a5
...
@@ -2646,6 +2646,7 @@ export const op={
...
@@ -2646,6 +2646,7 @@ export const op={
fgszjl
:
'支社長'
,
fgszjl
:
'支社長'
,
opszje
:
'OP設定金額'
,
opszje
:
'OP設定金額'
,
fgszjdb
:
'日本印象を新たにする'
,
fgszjdb
:
'日本印象を新たにする'
,
IsSelfGuidedTour
:
'行を自由にするかどうか'
,
}
}
import
invoicesManager
from
'./Japan/invoicesManager'
import
invoicesManager
from
'./Japan/invoicesManager'
...
...
src/assets/common/lang/zh-tw.js
View file @
3e0df9a5
...
@@ -2676,7 +2676,7 @@ export const op={
...
@@ -2676,7 +2676,7 @@ export const op={
fgszjl
:
'分公司總經理'
,
fgszjl
:
'分公司總經理'
,
opszje
:
'OP設定金額'
,
opszje
:
'OP設定金額'
,
fgszjdb
:
'新增日本印象'
,
fgszjdb
:
'新增日本印象'
,
IsSelfGuidedTour
:
'是否自由行'
,
}
}
import
invoicesManager
from
'./zhTW/invoicesManager'
import
invoicesManager
from
'./zhTW/invoicesManager'
...
...
src/assets/common/lang/zh.js
View file @
3e0df9a5
...
@@ -2699,6 +2699,7 @@ export const op={
...
@@ -2699,6 +2699,7 @@ export const op={
opszje
:
'OP设置金额'
,
opszje
:
'OP设置金额'
,
fgszjdb
:
'新增日本印象'
,
fgszjdb
:
'新增日本印象'
,
yuankeyong
:
'元可用'
,
yuankeyong
:
'元可用'
,
IsSelfGuidedTour
:
'是否自由行'
,
}
}
import
invoicesManager
from
'./zhCN/invoicesManager'
import
invoicesManager
from
'./zhCN/invoicesManager'
...
...
src/assets/common/lang/zhCN/fill.js
View file @
3e0df9a5
...
@@ -6450,7 +6450,7 @@ export const obj = {
...
@@ -6450,7 +6450,7 @@ export const obj = {
zongrenssyrs
:
'总人数(剩余人数)'
,
zongrenssyrs
:
'总人数(剩余人数)'
,
qingshursjia
:
'请输入售价'
,
qingshursjia
:
'请输入售价'
,
qingshurgjia
:
'请输入国家'
,
qingshurgjia
:
'请输入国家'
,
shifouremen
:
'是否热门
"
'
,
shifouremen
:
'是否热门'
,
guojiatub
:
'国家图标'
,
guojiatub
:
'国家图标'
,
beijintup
:
'背景图片'
,
beijintup
:
'背景图片'
,
qingshangcgjtup
:
'请上传国家图片!'
,
qingshangcgjtup
:
'请上传国家图片!'
,
...
...
src/components/FinancialModule/DataAnalysis/index.vue
View file @
3e0df9a5
<
template
>
<
template
>
<div
style=
"height: 100%;"
>
<div
style=
"height: 100%;"
>
<el-tabs
v-model=
"activeName"
@
tab-click=
"handleClick"
>
<el-tabs
v-model=
"activeName"
@
tab-click=
"handleClick"
>
<el-tab-pane
v-if=
"PermissionState!=3"
:label=
"$t('objFill.v101.FinancialModule.xianlujyqk')"
name=
"1"
></el-tab-pane>
<el-tab-pane
v-if=
"PermissionState!=3
&&PermissionState!=4
"
:label=
"$t('objFill.v101.FinancialModule.xianlujyqk')"
name=
"1"
></el-tab-pane>
<el-tab-pane
v-if=
"PermissionState!=3"
:label=
"$t('objFill.v101.FinancialModule.gongsjyqk')"
name=
"2"
></el-tab-pane>
<el-tab-pane
v-if=
"PermissionState!=3
&&PermissionState!=4
"
:label=
"$t('objFill.v101.FinancialModule.gongsjyqk')"
name=
"2"
></el-tab-pane>
<el-tab-pane
v-if=
"PermissionState!=3"
:label=
"$t('objFill.v101.FinancialModule.ribenxborcg')"
name=
"3"
></el-tab-pane>
<el-tab-pane
v-if=
"PermissionState!=3
&&PermissionState!=4
"
:label=
"$t('objFill.v101.FinancialModule.ribenxborcg')"
name=
"3"
></el-tab-pane>
<el-tab-pane
v-if=
"PermissionState!=2"
:label=
"$t('objFill.v101.FinancialModule.gouwuyjqk')"
name=
"4"
></el-tab-pane>
<el-tab-pane
v-if=
"PermissionState!=2
&&PermissionState!=4
"
:label=
"$t('objFill.v101.FinancialModule.gouwuyjqk')"
name=
"4"
></el-tab-pane>
<el-tab-pane
v-if=
"PermissionState!=3"
:label=
"$t('objFill.v101.FinancialModule.yushiduibiqk')"
name=
"5"
></el-tab-pane>
<el-tab-pane
v-if=
"PermissionState!=3"
:label=
"$t('objFill.v101.FinancialModule.yushiduibiqk')"
name=
"5"
></el-tab-pane>
</el-tabs>
</el-tabs>
<div
class=
"query-box"
>
<div
class=
"query-box"
>
...
@@ -196,7 +196,7 @@ export default {
...
@@ -196,7 +196,7 @@ export default {
coinGetShow
:
false
,
coinGetShow
:
false
,
loading
:
false
,
loading
:
false
,
activeName
:
'1'
,
activeName
:
'1'
,
PermissionState
:
'0'
,
//权限状态 1管理员级 2各公司负责人 3地接OP查询佣金
PermissionState
:
'0'
,
//权限状态 1管理员级 2各公司负责人 3地接OP查询佣金
4操作OP
msg
:{
msg
:{
startDate
:
''
,
startDate
:
''
,
endDate
:
''
,
endDate
:
''
,
...
@@ -277,6 +277,10 @@ export default {
...
@@ -277,6 +277,10 @@ export default {
this
.
PermissionState
=
3
;
//地接OP
this
.
PermissionState
=
3
;
//地接OP
this
.
activeName
=
'4'
;
this
.
activeName
=
'4'
;
}
}
if
(
userInfo
.
RB_Post_Id
==
270
||
userInfo
.
RB_Post_Id
==
263
||
userInfo
.
RB_Post_Id
==
9
||
userInfo
.
RB_Post_Id
==
271
||
userInfo
.
RB_Post_Id
==
103
){
this
.
PermissionState
=
4
;
//操作OP
this
.
activeName
=
'5'
;
}
}
}
else
{
else
{
//分公司的 看各自公司的数据 佣金暂时不开
//分公司的 看各自公司的数据 佣金暂时不开
...
...
src/components/FinancialModule/FinancialSubmodule/czBillModule.vue
View file @
3e0df9a5
...
@@ -385,7 +385,7 @@ export default {
...
@@ -385,7 +385,7 @@ export default {
this
.
IsAdvanceFinance
=
this
.
GetDetail
.
IsAdvanceFinance
;
this
.
IsAdvanceFinance
=
this
.
GetDetail
.
IsAdvanceFinance
;
this
.
ECommerceGoodsModel
=
this
.
GetDetail
.
ECommerceGoodsModel
;
this
.
ECommerceGoodsModel
=
this
.
GetDetail
.
ECommerceGoodsModel
;
this
.
details
=
this
.
GetDetail
;
this
.
details
=
this
.
GetDetail
;
if
(
this
.
OtherType
==
7
||
this
.
details
.
MatchFrId
>
0
){
if
(
this
.
OtherType
==
7
||
this
.
OtherType
==
65
||
this
.
details
.
MatchFrId
>
0
){
this
.
getDetails
()
this
.
getDetails
()
if
(
this
.
OtherType
==
81
){
if
(
this
.
OtherType
==
81
){
this
.
getMatchTransferList
()
this
.
getMatchTransferList
()
...
...
src/components/FinancialModule/addFinancialDocuments.vue
View file @
3e0df9a5
...
@@ -530,7 +530,7 @@
...
@@ -530,7 +530,7 @@
</div>
</div>
<table
class=
"Receipt_table"
border=
"1"
bordercolor=
"#106BAF"
style=
"border-collapse:collapse;"
>
<table
class=
"Receipt_table"
border=
"1"
bordercolor=
"#106BAF"
style=
"border-collapse:collapse;"
>
<tr>
<tr>
<th
rowspan=
"2"
width=
"150"
>
{{$t('fnc.fyshuoming')}}
111
</th>
<th
rowspan=
"2"
width=
"150"
>
{{$t('fnc.fyshuoming')}}
</th>
<th
rowspan=
"2"
>
{{$t('restaurant.res_Number')}}
</th>
<th
rowspan=
"2"
>
{{$t('restaurant.res_Number')}}
</th>
<th
rowspan=
"2"
>
{{$t('fnc.danjia')}}
</th>
<th
rowspan=
"2"
>
{{$t('fnc.danjia')}}
</th>
<th
rowspan=
"2"
width=
"100"
>
{{$t('hotel.hotel_Currency')}}
</th>
<th
rowspan=
"2"
width=
"100"
>
{{$t('hotel.hotel_Currency')}}
</th>
...
@@ -2074,7 +2074,26 @@
...
@@ -2074,7 +2074,26 @@
}
);
}
);
}
else
{
}
else
{
this
.
resultCode
=
res
.
data
.
resultCode
;
this
.
resultCode
=
res
.
data
.
resultCode
;
if
(
res
.
data
.
resultCode
==
11020
){
//超预算提醒
this
.
$confirm
(
res
.
data
.
message
,
this
.
$t
(
'tips.tips'
),
{
confirmButtonText
:
this
.
$t
(
'objFill.ckbjd'
),
cancelButtonText
:
this
.
$t
(
'pub.cancelBtn'
),
type
:
'warning'
}
).
then
(()
=>
{
this
.
$router
.
push
({
name
:
'OfferChange'
,
query
:
{
'offerid'
:
res
.
data
.
data
,
'Qtype'
:
3
,
'blank'
:
'y'
,
}
}
);
}
).
catch
(()
=>
{
}
);
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
this
.
$message
.
error
(
res
.
data
.
message
);
}
}
}
this
.
loading
=
false
;
this
.
loading
=
false
;
}
,
err
=>
{
}
)
}
,
err
=>
{
}
)
...
...
src/components/LeaderManagement/leaderReimbursement.vue
View file @
3e0df9a5
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
<p
class=
"teamRevenueExpenditureTitle"
>
<p
class=
"teamRevenueExpenditureTitle"
>
{{
$t
(
'MarketingActi.car'
)
}}
{{
$t
(
'MarketingActi.car'
)
}}
<span
class=
"fr"
style=
"margin-top: -8px;"
>
<span
class=
"fr"
style=
"margin-top: -8px;"
>
<
input
type=
"button"
class=
"normalBtn"
:value=
"$t('objFill.xingzengfk')"
@
click=
"goUrl(5,2)"
/
>
<
!--
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('objFill.xingzengfk')"
@
click=
"goUrl(5,2)"
/>
--
>
</span>
</span>
</p>
</p>
<table
class=
"leaderReimbursementTable"
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
>
<table
class=
"leaderReimbursementTable"
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
>
...
@@ -257,7 +257,7 @@
...
@@ -257,7 +257,7 @@
<p
class=
"teamRevenueExpenditureTitle"
>
<p
class=
"teamRevenueExpenditureTitle"
>
{{$t('hotel.hotel')}}
{{$t('hotel.hotel')}}
<span
class=
"fr"
style=
"margin-top: -8px;"
>
<span
class=
"fr"
style=
"margin-top: -8px;"
>
<
input
type=
"button"
class=
"normalBtn"
:value=
"$t('objFill.xingzengfk')"
@
click=
"goUrl(1,2)"
/
>
<
!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(1,2)" /> --
>
</span>
</span>
</p>
</p>
<table
class=
"leaderReimbursementTable"
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
>
<table
class=
"leaderReimbursementTable"
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
>
...
@@ -569,7 +569,7 @@
...
@@ -569,7 +569,7 @@
<p
class=
"teamRevenueExpenditureTitle"
>
<p
class=
"teamRevenueExpenditureTitle"
>
{{$t('ground.canshi')}}
{{$t('ground.canshi')}}
<span
class=
"fr"
style=
"margin-top: -8px;"
>
<span
class=
"fr"
style=
"margin-top: -8px;"
>
<
input
type=
"button"
class=
"normalBtn"
:value=
"$t('objFill.xingzengfk')"
@
click=
"goUrl(2,2)"
/
>
<
!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(2,2)" /> --
>
</span>
</span>
</p>
</p>
<table
class=
"leaderReimbursementTable"
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
>
<table
class=
"leaderReimbursementTable"
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
>
...
@@ -721,7 +721,7 @@
...
@@ -721,7 +721,7 @@
<p
class=
"teamRevenueExpenditureTitle"
>
<p
class=
"teamRevenueExpenditureTitle"
>
{{$t('scen.sc_piao')}}
{{$t('scen.sc_piao')}}
<span
class=
"fr"
style=
"margin-top: -8px;"
>
<span
class=
"fr"
style=
"margin-top: -8px;"
>
<
input
type=
"button"
class=
"normalBtn"
:value=
"$t('objFill.xingzengfk')"
@
click=
"goUrl(3,2)"
/
>
<
!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(3,2)" /> --
>
</span>
</span>
</p>
</p>
<table
class=
"leaderReimbursementTable"
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
>
<table
class=
"leaderReimbursementTable"
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
>
...
@@ -891,7 +891,7 @@
...
@@ -891,7 +891,7 @@
<p
class=
"teamRevenueExpenditureTitle"
>
<p
class=
"teamRevenueExpenditureTitle"
>
{{$t('objFill.qita')}}
{{$t('objFill.qita')}}
<span
class=
"fr"
style=
"margin-top: -8px;"
>
<span
class=
"fr"
style=
"margin-top: -8px;"
>
<
input
type=
"button"
class=
"normalBtn"
:value=
"$t('objFill.xingzengfk')"
@
click=
"goUrl(8,2)"
/
>
<
!-- <input type="button" class="normalBtn" :value="$t('objFill.xingzengfk')" @click="goUrl(8,2)" /> --
>
</span>
</span>
</p>
</p>
<table
class=
"leaderReimbursementTable"
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
>
<table
class=
"leaderReimbursementTable"
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
>
...
@@ -1061,7 +1061,7 @@
...
@@ -1061,7 +1061,7 @@
<template
v-for=
"leadr in cur.LeaderGetPriceArr"
v-if=
" leadr.TCNUMS == item.TCNUMS"
>
<template
v-for=
"leadr in cur.LeaderGetPriceArr"
v-if=
" leadr.TCNUMS == item.TCNUMS"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"currencyTypeObj[leadr.CurrencyId]"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"currencyTypeObj[leadr.CurrencyId]"
placement=
"top"
>
<input
type=
"button"
:value=
"$t('objFill.preparedocument')"
class=
"normalBtn"
<input
type=
"button"
:value=
"$t('objFill.preparedocument')"
class=
"normalBtn"
@
click=
"goDiJieZhiDan(item,0,leadr,cur)"
/>
@
click=
"goDiJieZhiDan
Validate
(item,0,leadr,cur)"
/>
</el-tooltip>
</el-tooltip>
<template
v-if=
"item.CompanyAlipay==0&&leadr.CurrencyId===1"
>
<template
v-if=
"item.CompanyAlipay==0&&leadr.CurrencyId===1"
>
<el-tooltip
class=
"item"
effect=
"dark"
placement=
"top"
:content=
"currencyTypeObj[leadr.CurrencyId]"
>
<el-tooltip
class=
"item"
effect=
"dark"
placement=
"top"
:content=
"currencyTypeObj[leadr.CurrencyId]"
>
...
@@ -1081,11 +1081,11 @@
...
@@ -1081,11 +1081,11 @@
<div
style=
"margin:10px 0"
v-for=
"(cur,index2) in CurrencyListMoney"
>
<div
style=
"margin:10px 0"
v-for=
"(cur,index2) in CurrencyListMoney"
>
<template
v-for=
"leadr in cur.LeaderGetPriceArr"
v-if=
" leadr.TCNUMS == item.TCNUMS"
>
<template
v-for=
"leadr in cur.LeaderGetPriceArr"
v-if=
" leadr.TCNUMS == item.TCNUMS"
>
<input
type=
"button"
v-if=
"item.TeamType == 1 && index2==0"
:value=
"$t('objFill.ridang')"
<input
type=
"button"
v-if=
"item.TeamType == 1 && index2==0"
:value=
"$t('objFill.ridang')"
class=
"normalBtn"
@
click=
"goDiJieZhiDan(item, 2)"
/>
class=
"normalBtn"
@
click=
"goDiJieZhiDan
Validate
(item, 2)"
/>
<template
v-if=
"item.hideZDBtn "
>
<template
v-if=
"item.hideZDBtn "
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"currencyTypeObj[leadr.CurrencyId]"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"currencyTypeObj[leadr.CurrencyId]"
placement=
"top"
>
<input
type=
"button"
:value=
"$t('objFill.preparedocument')"
class=
"normalBtn"
<input
type=
"button"
:value=
"$t('objFill.preparedocument')"
class=
"normalBtn"
@
click=
"goDiJieZhiDan(item,0,leadr,cur)"
/>
@
click=
"goDiJieZhiDan
Validate
(item,0,leadr,cur)"
/>
</el-tooltip>
</el-tooltip>
<template
v-if=
"item.CompanyAlipay==0&&leadr.CurrencyId===1"
>
<!-- -->
<template
v-if=
"item.CompanyAlipay==0&&leadr.CurrencyId===1"
>
<!-- -->
<el-tooltip
class=
"item"
effect=
"dark"
placement=
"top"
:content=
"currencyTypeObj[leadr.CurrencyId]"
>
<el-tooltip
class=
"item"
effect=
"dark"
placement=
"top"
:content=
"currencyTypeObj[leadr.CurrencyId]"
>
...
@@ -1389,7 +1389,7 @@
...
@@ -1389,7 +1389,7 @@
}],
}],
},
},
allCurrencyList
:
[],
allCurrencyList
:
[],
OtherLoading
:
false
,
OtherLoading
:
false
};
};
},
},
components
:
{
components
:
{
...
@@ -1757,26 +1757,52 @@
...
@@ -1757,26 +1757,52 @@
);
);
},
},
ZhuiJiaTuanKuan
(
item
)
{
ZhuiJiaTuanKuan
(
item
)
{
let
TCIDARR
=
[
item
.
TCIDS
];
// [this.$route.query.id]
let
orderObj
=
{
this
.
apipost
(
'financestatistics_post_GetTravelPrerealContrast'
,
{
OrderID
:
0
,
TCID
:
item
.
TCIDS
OrderSource
:
8
,
},
res
=>
{
Obj
:
{},
if
(
res
.
data
.
resultCode
==
1
)
{
SourceID
:
0
,
if
(
res
.
data
.
data
.
State
==
1
){
TCIDList
:
TCIDARR
,
this
.
$confirm
(
res
.
data
.
data
.
Msg
,
this
.
$t
(
'tips.tips'
),
{
TravelReplenish
:
this
.
$route
.
query
.
id
,
confirmButtonText
:
this
.
$t
(
'objFill.ckbjd'
),
OtherType
:
1
cancelButtonText
:
this
.
$t
(
'pub.cancelBtn'
),
};
type
:
'warning'
this
.
$router
.
push
({
}).
then
(()
=>
{
name
:
"ChoiceAddFinancialDocuments"
,
this
.
$router
.
push
({
query
:
{
name
:
'OfferChange'
,
Type
:
2
,
query
:
{
companyID
:
item
.
companyID
,
'offerid'
:
res
.
data
.
data
.
OfferId
,
path
:
""
,
'Qtype'
:
3
,
blank
:
"y"
,
'blank'
:
'y'
,
orderObj
:
JSON
.
stringify
(
orderObj
)
}
});
}).
catch
(()
=>
{
});
}
else
{
let
TCIDARR
=
[
item
.
TCIDS
];
// [this.$route.query.id]
let
orderObj
=
{
OrderID
:
0
,
OrderSource
:
8
,
Obj
:
{},
SourceID
:
0
,
TCIDList
:
TCIDARR
,
TravelReplenish
:
this
.
$route
.
query
.
id
,
OtherType
:
1
};
this
.
$router
.
push
({
name
:
"ChoiceAddFinancialDocuments"
,
query
:
{
Type
:
2
,
companyID
:
item
.
companyID
,
path
:
""
,
blank
:
"y"
,
orderObj
:
JSON
.
stringify
(
orderObj
)
}
});
}
}
}
}
);
}
,
err
=>
{})
},
},
getzhuijiaList
()
{
getzhuijiaList
()
{
this
.
apipost
(
this
.
apipost
(
...
@@ -1855,6 +1881,34 @@
...
@@ -1855,6 +1881,34 @@
}
}
});
});
},
},
goDiJieZhiDanValidate
:
function
(
obj
,
num
,
leadr
,
cur
){
this
.
apipost
(
'financestatistics_post_GetTravelPrerealContrast'
,
{
TCID
:
obj
.
TCIDS
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
data
.
State
==
1
){
this
.
$confirm
(
res
.
data
.
data
.
Msg
,
this
.
$t
(
'tips.tips'
),
{
confirmButtonText
:
this
.
$t
(
'objFill.ckbjd'
),
cancelButtonText
:
this
.
$t
(
'pub.cancelBtn'
),
type
:
'warning'
}).
then
(()
=>
{
this
.
$router
.
push
({
name
:
'OfferChange'
,
query
:
{
'offerid'
:
res
.
data
.
data
.
OfferId
,
'Qtype'
:
3
,
'blank'
:
'y'
,
}
});
}).
catch
(()
=>
{
});
}
else
{
this
.
goDiJieZhiDan
(
obj
,
num
,
leadr
,
cur
);
}
}
},
err
=>
{})
},
goDiJieZhiDan
:
function
(
obj
,
num
,
leadr
,
cur
)
{
goDiJieZhiDan
:
function
(
obj
,
num
,
leadr
,
cur
)
{
let
totailMoney
=
(
Number
(
leadr
.
LeaderGetPriceT
)
+
Number
(
cur
.
yiLing
)).
toFixed
(
2
);
let
totailMoney
=
(
Number
(
leadr
.
LeaderGetPriceT
)
+
Number
(
cur
.
yiLing
)).
toFixed
(
2
);
let
leadrPlanPrice
=
0
;
let
leadrPlanPrice
=
0
;
...
@@ -2011,7 +2065,6 @@
...
@@ -2011,7 +2065,6 @@
var
D
=
(
nowStartDate
.
getDate
()
<
10
?
'0'
+
(
nowStartDate
.
getDate
())
:
nowStartDate
.
getDate
());
var
D
=
(
nowStartDate
.
getDate
()
<
10
?
'0'
+
(
nowStartDate
.
getDate
())
:
nowStartDate
.
getDate
());
this
.
TeamStartDateList
.
push
(
Y
+
M
+
D
);
this
.
TeamStartDateList
.
push
(
Y
+
M
+
D
);
this
.
UseTotalPrice
=
leadr
.
LeaderGetPriceT
;
this
.
UseTotalPrice
=
leadr
.
LeaderGetPriceT
;
console
.
log
(
"CompanyAlipayTCID222"
,
this
.
CompanyAlipayTCID
);
},
},
addOtherList
(
index
,
id
)
{
addOtherList
(
index
,
id
)
{
this
.
list
.
OtherOrderReportList
.
OtherList
.
push
({
this
.
list
.
OtherOrderReportList
.
OtherList
.
push
({
...
@@ -2466,8 +2519,7 @@
...
@@ -2466,8 +2519,7 @@
})
})
arrList
(
data
.
OtherOrderReportList
)
//其它
arrList
(
data
.
OtherOrderReportList
)
//其它
this
.
list
=
data
;
this
.
list
=
data
;
console
.
log
(
"this.list"
,
this
.
list
);
var
lineArray
=
[
168
];
//新欧洲线只显示标准间
var
lineArray
=
[
168
];
//新欧洲线只显示标准间
var
lineId
=
0
;
var
lineId
=
0
;
//转成数字类型
//转成数字类型
...
...
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @
3e0df9a5
...
@@ -143,7 +143,7 @@
...
@@ -143,7 +143,7 @@
<li>
<li>
<span>
<span>
<em>
{{
$t
(
'Operation.Op_TeamName'
)
}}
</em>
<em>
{{
$t
(
'Operation.Op_TeamName'
)
}}
</em>
<el-input
v-model=
"queryMsg.Title"
class=
"w150"
clearable
></el-input>
<el-input
v-model=
"queryMsg.Title"
@
keyup
.
native
.
enter=
"getControlList"
class=
"w150"
clearable
></el-input>
</span>
</span>
</li>
</li>
<li>
<li>
...
@@ -306,7 +306,7 @@
...
@@ -306,7 +306,7 @@
</span>
</span>
</div>
</div>
<button
class=
"normalBtn TC_SearchBtn"
<button
class=
"normalBtn TC_SearchBtn"
@
click=
"
getControlList(),resetPageIndex
(),queryCommonData.showHigradeSearch=false"
>
{{
$t
(
'pub.searchBtn'
)
}}
</button>
@
click=
"
resetPageIndex(),getControlList
(),queryCommonData.showHigradeSearch=false"
>
{{
$t
(
'pub.searchBtn'
)
}}
</button>
</div>
</div>
<span
class=
"advancedQuery"
slot=
"reference"
>
{{
$t
(
'visa.v_gjchaxun'
)
}}
<span
class=
"advancedQuery"
slot=
"reference"
>
{{
$t
(
'visa.v_gjchaxun'
)
}}
<i
class=
"iconfont icon-xiaotuziCduan_1"
></i>
<i
class=
"iconfont icon-xiaotuziCduan_1"
></i>
...
...
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @
3e0df9a5
...
@@ -84,10 +84,30 @@
...
@@ -84,10 +84,30 @@
</el-select>
</el-select>
</span>
</span>
</li>
</li>
<li>
<span>
<em>
{{
$t
(
'objFill.v101.baojiadanh'
)
}}
</em>
<el-input
type=
"text"
class=
"w200"
v-model=
"queryData.OfferId"
clearable
></el-input>
</span>
</li>
<li>
<span>
<em>
{{
$t
(
'visa.v_tuanhao'
)
}}
</em>
<el-input
type=
"text"
class=
"w200"
v-model=
"queryData.TCNUMS"
clearable
></el-input>
</span>
</li>
<li>
<span>
<em>
{{
$t
(
'hotel.hotel_StarDate'
)
}}
</em>
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"queryData.StartGroupDate"
:picker-options=
"pickerBeginDateBefore"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"queryData.EndGroupDate"
:picker-options=
"pickerBeginDateAfter"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
</span>
<li>
<li>
<span>
<span>
<em>
{{
$t
(
'objFill.v101.dmc.kaituanzt'
)
}}
</em>
<em>
{{
$t
(
'objFill.v101.dmc.kaituanzt'
)
}}
</em>
<el-select
v-model=
"queryData.OpenState"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
v-model=
"queryData.OpenState"
filterable
:placeholder=
"$t('pub.pleaseSel')"
class=
'w200'
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'noLimit'
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'noLimit'
></el-option>
<el-option
v-for=
'item in OpenStateList'
:key=
"item.Id"
:label=
"item.label"
:value=
"item.Id"
>
<el-option
v-for=
'item in OpenStateList'
:key=
"item.Id"
:label=
"item.label"
:value=
"item.Id"
>
</el-option>
</el-option>
...
@@ -96,11 +116,10 @@
...
@@ -96,11 +116,10 @@
</li>
</li>
<li>
<li>
<span>
<span>
<
span>
{{
$t
(
'visa.v_czuser'
)
}}
</span
>
<
em>
{{
$t
(
'visa.v_czuser'
)
}}
</em
>
<el-select
class=
"w150"
v-model=
"queryData.CreateBy"
filterable
:placeholder=
"$t('pub.pleaseSel')"
<el-select
v-model=
"queryData.CreateBy"
filterable
:placeholder=
"$t('pub.pleaseSel')"
class=
'w200'
clearable
>
clearable
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"0"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"0"
></el-option>
</el-option>
<el-option
v-for=
"(item,index) in EmployeeList"
:label=
"item.EmName"
:value=
"item.EmployeeId"
<el-option
v-for=
"(item,index) in EmployeeList"
:label=
"item.EmName"
:value=
"item.EmployeeId"
:key=
"index"
></el-option>
:key=
"index"
></el-option>
</el-select>
</el-select>
...
@@ -542,6 +561,26 @@
...
@@ -542,6 +561,26 @@
total
:
0
,
total
:
0
,
currentPage
:
1
,
currentPage
:
1
,
TeamType
:
0
,
//0常规,1-小包团,2-一日游,3-地接团
TeamType
:
0
,
//0常规,1-小包团,2-一日游,3-地接团
OfferId
:
""
,
//报价单号
TCNUMS
:
""
,
//团号
StartGroupDate
:
""
,
//开始时间
EndGroupDate
:
""
,
//结束时间
},
pickerBeginDateBefore
:
{
disabledDate
:
time
=>
{
if
(
this
.
queryData
.
EndGroupDate
==
null
)
{
return
false
;
}
else
{
let
endTime
=
new
Date
(
this
.
queryData
.
EndGroupDate
);
return
endTime
.
getTime
()
<
time
.
getTime
();
}
}
},
pickerBeginDateAfter
:
{
disabledDate
:
time
=>
{
let
startTime
=
new
Date
(
this
.
queryData
.
StartGroupDate
);
return
startTime
.
getTime
()
>=
time
.
getTime
();
}
},
},
loading
:
true
,
loading
:
true
,
//开团状态
//开团状态
...
...
src/components/WebSet/classification.vue
View file @
3e0df9a5
...
@@ -2,6 +2,11 @@
...
@@ -2,6 +2,11 @@
.icon
{
.icon
{
height
:
30px
;
height
:
30px
;
}
}
.ApprovalProcessBg
{
background
:
#f8f8f8
;
max-height
:
400px
;
overflow-y
:
auto
;
}
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"flexOne"
>
<div
class=
"flexOne"
>
...
@@ -30,11 +35,12 @@
...
@@ -30,11 +35,12 @@
</li>
</li>
<li>
<li>
<input
type=
"button"
class=
"hollowFixedBtn"
name=
""
id=
""
:value=
"$t('pub.searchBtn')"
@
click=
"resetPageIndex(),getList()"
/>
<input
type=
"button"
class=
"hollowFixedBtn"
name=
""
id=
""
:value=
"$t('pub.searchBtn')"
@
click=
"resetPageIndex(),getList()"
/>
<input
type=
"button"
@
click=
"outerVisible = true,dialogTitle=$t('objFill.v101.xinzengfl'),clearMessage();"
class=
"normalBtn"
:value=
"$t('pub.addBtn')"
/>
<input
type=
"button"
@
click=
"outerVisible = true,dialogTitle=$t('objFill.v101.xinzengfl'),clearMessage()
,getLineList(),getAllAreaTreeList(0),getLineTeamList()
;"
class=
"normalBtn"
:value=
"$t('pub.addBtn')"
/>
</li>
</li>
</ul>
</ul>
</div>
</div>
<el-table
:data=
"DataList"
style=
"width:100%"
border
v-loading=
'loading'
>
<el-table
:data=
"DataList"
style=
"width:100%"
v-loading=
'loading'
>
<el-table-column
fixed
:label=
"$t('ground.fenleimc')"
>
<el-table-column
fixed
:label=
"$t('ground.fenleimc')"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<div>
<div>
...
@@ -59,6 +65,39 @@
...
@@ -59,6 +65,39 @@
{{
scope
.
row
.
IsHot
===
1
?
$t
(
'pub.yes'
)
:
$t
(
'pub.no'
)
}}
</div>
{{
scope
.
row
.
IsHot
===
1
?
$t
(
'pub.yes'
)
:
$t
(
'pub.no'
)
}}
</div>
<div>
{{
scope
.
row
.
TotalInventory
}}
</div>
<div>
{{
scope
.
row
.
TotalInventory
}}
</div>
</
template
>
</
template
>
</el-table-column>
<el-table-column
fixed
:label=
"$t('op.IsSelfGuidedTour')"
>
<
template
slot-scope=
"scope"
>
<div>
{{
scope
.
row
.
IsSelfGuidedTour
===
1
?
$t
(
'pub.yes'
)
:
$t
(
'pub.no'
)
}}
</div>
</
template
>
</el-table-column>
<el-table-column
fixed
:label=
"$t('hotel.hotel_corrlelatition')"
>
<
template
slot-scope=
"scope"
>
<template
v-if=
"scope.row.AreaList&&scope.row.AreaList.length>0"
>
<div
>
<span
v-for=
"(file,fIndex) in scope.row.AreaList"
>
{{
file
.
Name
}}{{
(
fIndex
==
(
scope
.
row
.
AreaList
.
length
-
1
)
&&
scope
.
row
.
AreaList
.
length
>
1
)?
""
:
","
}}
</span>
</div>
</
template
>
<
template
v-if=
"scope.row.LineList&&scope.row.LineList.length>0"
>
<div
>
<span
v-for=
"(file,fIndex) in scope.row.LineList"
>
{{
file
.
Name
}}{{
(
fIndex
==
(
scope
.
row
.
LineList
.
length
-
1
)
&&
scope
.
row
.
LineList
.
length
>
1
)?
""
:
","
}}
</span>
</div>
</
template
>
<
template
v-if=
"scope.row.SeriesList&&scope.row.SeriesList.length>0"
>
<div
>
<span
v-for=
"(file,fIndex) in scope.row.SeriesList"
>
{{
file
.
Name
}}{{
(
fIndex
==
(
scope
.
row
.
SeriesList
.
length
-
1
)
&&
scope
.
row
.
SeriesList
.
length
>
1
)?
""
:
","
}}
</span>
</div>
</
template
>
</template>
</el-table-column>
</el-table-column>
<el-table-column
fixed
:label=
"$t('objFill.v101.paixuma')"
>
<el-table-column
fixed
:label=
"$t('objFill.v101.paixuma')"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
...
@@ -68,12 +107,14 @@
...
@@ -68,12 +107,14 @@
</el-table-column>
</el-table-column>
<el-table-column
fixed
:label=
"$t('objFill.v101.activity.col6.t8')"
>
<el-table-column
fixed
:label=
"$t('objFill.v101.activity.col6.t8')"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<img
class=
"icon"
@
click=
"showImage(scope.row.Icon)"
:src=
"scope.row.Icon"
/>
<!-- style="width: 100px; height: 100px" -->
<el-image
class=
"icon"
:src=
"scope.row.Icon"
:preview-src-list=
"[scope.row.Icon]"
>
</el-image>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
fixed
:label=
"$t('objFill.v101.Rest.beijintup')"
>
<el-table-column
fixed
:label=
"$t('objFill.v101.Rest.beijintup')"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<img
class=
"icon"
@
click=
"showImage(scope.row.BackgroundImage)"
:src=
"scope.row.BackgroundImage"
/>
<el-image
class=
"icon"
:src=
"scope.row.BackgroundImage"
:preview-src-list=
"[scope.row.BackgroundImage]"
>
</el-image>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
fixed
:label=
"$t('admin.admin_status')"
>
<el-table-column
fixed
:label=
"$t('admin.admin_status')"
>
...
@@ -82,7 +123,7 @@
...
@@ -82,7 +123,7 @@
{{
scope
.
row
.
Enable
===
1
?
$t
(
'fnc.qiyong'
)
:
$t
(
'active.ld_jinyong'
)
}}
</div>
{{
scope
.
row
.
Enable
===
1
?
$t
(
'fnc.qiyong'
)
:
$t
(
'active.ld_jinyong'
)
}}
</div>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('system.table_operation')"
header-align=
"center"
align=
"center"
>
<el-table-column
:label=
"$t('system.table_operation')"
header-align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('system.table_edit')"
placement=
"top-start"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('system.table_edit')"
placement=
"top-start"
>
<el-button
type=
"primary"
icon=
"el-icon-edit"
circle
@
click=
"outerVisible = true,dialogTitle=$t('objFill.v101.bianjifenl'),updateData(scope.row)"
>
<el-button
type=
"primary"
icon=
"el-icon-edit"
circle
@
click=
"outerVisible = true,dialogTitle=$t('objFill.v101.bianjifenl'),updateData(scope.row)"
>
...
@@ -94,6 +135,7 @@
...
@@ -94,6 +135,7 @@
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
<el-pagination
<el-pagination
background
background
@
current-change=
"handleCurrentChange"
@
current-change=
"handleCurrentChange"
...
@@ -104,75 +146,112 @@
...
@@ -104,75 +146,112 @@
</el-pagination>
</el-pagination>
<el-dialog
:title=
"dialogTitle"
:visible
.
sync=
"outerVisible"
center
width=
"1000px"
:before-close=
"closeChangeMachie"
>
<el-dialog
:title=
"dialogTitle"
:visible
.
sync=
"outerVisible"
center
width=
"1000px"
:before-close=
"closeChangeMachie"
>
<el-form
:model=
"addMsg"
:rules=
"rules"
ref=
"addMsg"
label-width=
"120px"
>
<el-form
:model=
"addMsg"
:rules=
"rules"
ref=
"addMsg"
label-width=
"120px"
>
<el-row>
<el-row>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('system.query_airName')"
prop=
"CategoryName"
>
<el-form-item
:label=
"$t('system.query_airName')"
prop=
"CategoryName"
>
<el-input
style=
"width:217px"
type=
"text"
:disabled=
"addMsg.IsLock === 1"
v-model=
"addMsg.CategoryName"
maxlength=
"50"
:placeholder=
"$t('system.query_airName')"
>
<el-input
style=
"width:217px"
type=
"text"
:disabled=
"addMsg.IsLock === 1"
v-model=
"addMsg.CategoryName"
maxlength=
"50"
:placeholder=
"$t('system.query_airName')"
>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('system.table_rank')"
prop=
"Sort"
>
<el-form-item
:label=
"$t('system.table_rank')"
>
<el-input
style=
"width:217px"
type=
"number"
v-model=
"addMsg.Sort"
maxlength=
"10"
:placeholder=
"$t('system.table_rank')"
>
<el-input
style=
"width:217px"
type=
"number"
v-model=
"addMsg.Sort"
maxlength=
"10"
:placeholder=
"$t('system.table_rank')"
>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
<el-row>
<el-row>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('objFill.cengji')"
prop=
"Level"
>
<el-form-item
:label=
"$t('objFill.cengji')"
prop=
"Level"
>
<el-select
:disabled=
"addMsg.IsLock === 1"
v-model=
"addMsg.Level"
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"handleLevelChange"
>
<el-select
:disabled=
"addMsg.IsLock === 1"
v-model=
"addMsg.Level"
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"handleLevelChange"
>
<el-option
:label=
"$t('objFill.jibies')[0]"
:value=
"1"
></el-option>
<el-option
:label=
"$t('objFill.jibies')[0]"
:value=
"1"
></el-option>
<el-option
:label=
"$t('objFill.jibies')[1]"
:value=
"2"
></el-option>
<el-option
:label=
"$t('objFill.jibies')[1]"
:value=
"2"
></el-option>
<el-option
:label=
"$t('objFill.jibies')[2]"
:value=
"3"
></el-option>
<el-option
:label=
"$t('objFill.jibies')[2]"
:value=
"3"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
:label=
"$t('objFill.v101.fujifenl')"
prop=
"ParentId"
>
<el-form-item
:label=
"$t('objFill.v101.fujifenl')"
>
<!-- <el-tree show-checkbox ref="tree" node-key="Id" :data="cateGoryTree" :props="{label: 'CategoryName', children: 'SubList'}"
<el-select
:disabled=
"addMsg.IsLock === 1"
filterable
v-model=
"addMsg.ParentId"
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"handleParentIdChange"
>
check-strictly highlight-current @check-change="handleClick"></el-tree> -->
<el-option
v-for=
"item in cateGoryList"
:key=
"item.Id"
:label=
"item.CategoryName"
<el-select
:disabled=
"addMsg.IsLock === 1"
filterable
v-model=
"addMsg.ParentId"
:placeholder=
"$t('pub.pleaseSel')"
>
:value=
"item.Id"
>
<el-option
v-for=
"item in cateGoryList"
:key=
"item.Id"
:label=
"item.CategoryName"
</el-option>
:value=
"item.Id"
>
</el-select>
</el-option>
</el-form-item>
</el-select>
</el-col>
</el-form-item>
</el-row>
</el-col>
<el-row>
</el-row>
<el-col
:span=
"12"
>
<el-row>
<el-form-item
:label=
"$t('objFill.v101.Rest.shifouremen')"
>
<el-col
:span=
"12"
>
<el-switch
v-model=
"addMsg.IsHot"
></el-switch>
<el-form-item
:label=
"$t('objFill.v101.Rest.shifouremen')"
prop=
"IsHot"
>
</el-form-item>
<el-switch
v-model=
"addMsg.IsHot"
></el-switch>
</el-col>
</el-form-item>
<el-col
:span=
"12"
><el-form-item
:label=
"$t('visa.v_shifouqiyong')"
>
</el-col>
<el-switch
:disabled=
"addMsg.IsLock === 1"
v-model=
"addMsg.Enable"
></el-switch>
<el-col
:span=
"12"
><el-form-item
:label=
"$t('visa.v_shifouqiyong')"
prop=
"Enable"
>
</el-form-item></el-col>
<el-switch
:disabled=
"addMsg.IsLock === 1"
v-model=
"addMsg.Enable"
></el-switch>
</el-row>
</el-form-item></el-col>
<el-row>
</el-row>
<el-col
:span=
"12"
>
<el-row>
<el-form-item
:label=
"$t('op.IsSelfGuidedTour')"
>
<el-col
:span=
"12"
><el-form-item
:label=
"$t('objFill.v101.activity.col6.t8')"
prop=
"Icon"
>
<el-checkbox
v-model=
"addMsg.IsSelfGuidedTour"
@
change=
"changeSelfGuidedTour()"
:true-label=
"1"
:false-label=
"0"
>
{{$t('pub.yes')}}
</el-checkbox>
<!-- <el-input :value="addMsg.Icon" style="dispaly: none;" /> -->
</el-form-item>
<uploadImg
:maxNum=
"1"
ref=
"Icon"
></uploadImg>
</el-col>
</el-form-item>
<el-col
:span=
"12"
>
</el-col>
<
template
v-if=
"addMsg.IsSelfGuidedTour==0"
>
<el-col
:span=
"12"
><el-form-item
:label=
"$t('objFill.v101.Rest.beijintup')"
prop=
"BackgroundImage"
>
<template
v-if=
"addMsg.Level==1"
>
<!-- <el-input :value="addMsg.BackgroundImage" style="dispaly: none;"/> -->
<el-form-item
:label=
"$t('system.table_ssLine')"
>
<uploadImg
:maxNum=
"1"
ref=
"BackgroundImage"
></uploadImg>
<el-select
:disabled=
"addMsg.IsLock === 1"
v-model=
"addMsg.LineIdList"
multiple
collapse-tags
:placeholder=
"$t('pub.pleaseSel')"
>
</el-form-item></el-col>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"queryCommonData.SelectDefaultValue"
></el-option>
</el-row>
<el-option
v-for=
"item in queryCommonData.LineList"
:label=
"item.LineName"
:value=
"item.LineID"
</el-form>
:key=
"item.LineID"
></el-option>
<div
slot=
"footer"
class=
"dialog-footer"
>
</el-select>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"submitForm('addMsg')"
>
{{$t('pub.saveBtn')}}
</button>
</el-form-item>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible = false"
>
{{$t('pub.cancelBtn')}}
</button>
</
template
>
</div>
<
template
v-else
>
</el-dialog>
<el-form-item
:label=
"$t('active.ad_xlmc')"
>
<viewer
:images=
"images"
:options=
'imageOptions'
@
inited=
"inited"
class=
"viewer"
ref=
"viewer"
>
<el-select
:disabled=
"addMsg.IsLock === 1"
v-model=
"addMsg.SeriesIdList"
multiple
collapse-tags
:placeholder=
"$t('pub.pleaseSel')"
>
<
template
slot-scope=
"scope"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
queryCommonData.SelectDefaultValue
></el-option>
<img
v-for=
"src in scope.images"
:src=
"src"
:key=
"src"
>
<el-option
v-for=
"item in queryCommonData.LineTeamList"
:label=
"item.LtName"
:value=
"item.LtID"
</
template
>
:key=
"item.LtID"
></el-option>
</viewer>
</el-select>
</el-form-item>
</
template
>
</template>
<
template
v-else
>
<el-form-item
:label=
"$t('pub.area')"
>
<el-select
v-model=
"showCategoryName"
:placeholder=
"$t('pub.pleaseSel')"
multiple
clearable
collapse-tags
@
change=
"selectChange"
>
<el-option
:value=
"chooseCategroyArray"
style=
"height: auto"
>
<el-tree
:data=
"queryCommonData.AreaList"
show-checkbox
node-key=
"Id"
ref=
"tree"
highlight-current
:props=
"
{label: 'Name', children: 'SubList'}"
:default-expanded-keys="addMsg.AreaIdList"
:default-checked-keys="addMsg.AreaIdList"
@check-change="handleNodeClick">
</el-tree>
</el-option>
</el-select>
</el-form-item>
</
template
>
</el-col>
</el-row>
<el-row>
<el-col
:span=
"12"
><el-form-item
:label=
"$t('objFill.v101.activity.col6.t8')"
>
<uploadImg
:maxNum=
"1"
ref=
"Icon"
></uploadImg>
</el-form-item>
</el-col>
<el-col
:span=
"12"
><el-form-item
:label=
"$t('objFill.v101.Rest.beijintup')"
>
<uploadImg
:maxNum=
"1"
ref=
"BackgroundImage"
></uploadImg>
</el-form-item></el-col>
</el-row>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"submitForm('addMsg')"
>
{{$t('pub.saveBtn')}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible = false"
>
{{$t('pub.cancelBtn')}}
</button>
</div>
</el-dialog>
</div>
</div>
</template>
</template>
...
@@ -186,6 +265,19 @@ import uploadImg from '../../pubComponents/uploadImg'
...
@@ -186,6 +265,19 @@ import uploadImg from '../../pubComponents/uploadImg'
navbar
:
false
,
navbar
:
false
,
title
:
false
title
:
false
},
},
chooseCategroyArray
:[],
showCategoryName
:
""
,
queryCommonData
:{
LineList
:[],
LineTeamList
:[],
AreaList
:[],
AreaAllList
:[],
SelectDefaultValue
:
''
},
defaultProps
:
{
children
:
'ChildList'
,
label
:
'DepartmentName'
,
},
images
:
[],
images
:
[],
dialogTitle
:
''
,
dialogTitle
:
''
,
loading
:
false
,
loading
:
false
,
...
@@ -197,19 +289,26 @@ import uploadImg from '../../pubComponents/uploadImg'
...
@@ -197,19 +289,26 @@ import uploadImg from '../../pubComponents/uploadImg'
currentPage
:
1
,
currentPage
:
1
,
outerVisible
:
false
,
outerVisible
:
false
,
msg
:
{
//列表查询请求数据
msg
:
{
//列表查询请求数据
"pageIndex"
:
1
,
pageIndex
:
1
,
'pageSize'
:
15
,
pageSize
:
15
,
Enable
:
'1'
Enable
:
'1'
},
},
addMsg
:
{
addMsg
:
{
'Level'
:
''
,
Level
:
''
,
'ParentId'
:
''
,
ParentId
:
''
,
'CategoryName'
:
''
,
CategoryName
:
''
,
'Icon'
:
''
,
Icon
:
''
,
'IsHot'
:
false
,
IsHot
:
false
,
'Sort'
:
''
,
Sort
:
''
,
'BackgroundImage'
:
''
,
BackgroundImage
:
''
,
'Enable'
:
true
,
Enable
:
true
,
AreaIds
:
""
,
LineIds
:
""
,
SeriesIds
:
""
,
AreaIdList
:[],
LineIdList
:[],
SeriesIdList
:[],
IsSelfGuidedTour
:
0
,
},
},
rules
:{
rules
:{
CategoryName
:[
CategoryName
:[
...
@@ -225,6 +324,78 @@ import uploadImg from '../../pubComponents/uploadImg'
...
@@ -225,6 +324,78 @@ import uploadImg from '../../pubComponents/uploadImg'
this
.
getList
();
this
.
getList
();
},
},
methods
:
{
methods
:
{
//商品分类下拉框改变
selectChange
(
e
)
{
var
arrNew
=
[];
var
dataLength
=
this
.
chooseCategroyArray
.
length
;
var
eleng
=
e
.
length
;
for
(
let
i
=
0
;
i
<
dataLength
;
i
++
)
{
for
(
let
j
=
0
;
j
<
eleng
;
j
++
)
{
if
(
e
[
j
]
===
this
.
chooseCategroyArray
[
i
].
Name
)
{
arrNew
.
push
(
this
.
chooseCategroyArray
[
i
])
}
}
}
this
.
$refs
.
tree
.
setCheckedNodes
(
arrNew
);
//设置勾选的值
},
handleNodeClick
()
{
let
res
=
this
.
$refs
.
tree
.
getCheckedNodes
(
true
,
true
);
let
arrLabel
=
[];
let
arr
=
[];
console
.
log
(
res
,
'---------'
);
res
.
forEach
(
item
=>
{
arrLabel
.
push
(
item
.
Name
);
arr
.
push
(
item
);
});
this
.
chooseCategroyArray
=
arr
;
this
.
showCategoryName
=
arrLabel
;
console
.
log
(
"this.chooseCategroyArray "
,
this
.
chooseCategroyArray
);
},
getLineList
()
{
//获取线路列表
this
.
apipost
(
"line_post_GetList"
,
{
LineDirection
:
2
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
queryCommonData
.
LineList
=
res
.
data
.
data
;
}
}
);
},
getAllAreaTreeList
(
type
)
{
//获取地区树形列表数据
this
.
apipost
(
"ws_get_GetAllAreaTreeList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
queryCommonData
.
AreaList
=
res
.
data
.
data
.
list
;
this
.
queryCommonData
.
AreaAllList
=
res
.
data
.
data
.
dataList
;
if
(
type
==
1
){
if
(
this
.
queryCommonData
.
AreaAllList
!=
null
&&
this
.
queryCommonData
.
AreaAllList
.
length
>
0
){
let
arrLabel
=
[];
this
.
queryCommonData
.
AreaAllList
.
forEach
((
item
,
index
)
=>
{
this
.
addMsg
.
AreaIdList
.
forEach
((
itemId
,
indexId
)
=>
{
if
(
item
.
Id
==
itemId
){
arrLabel
.
push
(
item
.
AreaName
);
}
});
});
this
.
showCategoryName
=
arrLabel
;
this
.
$forceUpdate
()
}
}
}
}
);
},
getLineTeamList
(
LineIds
)
{
//获取系列列表
this
.
apipost
(
"team_post_GetList"
,
{
LineIds
:
LineIds
,
lineID
:
0
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
queryCommonData
.
LineTeamList
=
res
.
data
.
data
;
}
});
},
showImage
(
src
)
{
showImage
(
src
)
{
this
.
$set
(
this
.
images
,
0
,
src
);
this
.
$set
(
this
.
images
,
0
,
src
);
setTimeout
(()
=>
{
setTimeout
(()
=>
{
...
@@ -253,9 +424,32 @@ import uploadImg from '../../pubComponents/uploadImg'
...
@@ -253,9 +424,32 @@ import uploadImg from '../../pubComponents/uploadImg'
handleLevelChange
()
{
handleLevelChange
()
{
this
.
addMsg
.
ParentId
=
''
this
.
addMsg
.
ParentId
=
''
if
(
this
.
addMsg
.
Level
<=
1
)
{
if
(
this
.
addMsg
.
Level
<=
1
)
{
this
.
cateGoryList
=
[]
this
.
cateGoryList
=
[];
this
.
addMsg
.
LineIdList
=
[];
this
.
addMsg
.
SeriesIdList
=
[];
this
.
addMsg
.
AreaIdList
=
[];
}
else
{
}
else
{
this
.
getCateGoryList
()
this
.
getCateGoryList
();
}
},
changeSelfGuidedTour
(){
this
.
addMsg
.
LineIdList
=
[];
this
.
addMsg
.
SeriesIdList
=
[];
this
.
addMsg
.
AreaIdList
=
[];
},
handleParentIdChange
(){
if
(
this
.
addMsg
.
ParentId
>
0
){
let
lineIds
=
''
;
let
index
=
this
.
cateGoryList
.
findIndex
(
item
=>
item
.
Id
===
this
.
addMsg
.
ParentId
);
this
.
addMsg
.
LineIdList
=
[];
this
.
addMsg
.
SeriesIdList
=
[];
this
.
addMsg
.
AreaIdList
=
[];
if
(
index
!=-
1
){
lineIds
=
this
.
cateGoryList
[
index
].
LineIds
;
}
this
.
getLineTeamList
(
lineIds
);
}
}
},
},
getCateGoryList
()
{
getCateGoryList
()
{
...
@@ -274,17 +468,26 @@ import uploadImg from '../../pubComponents/uploadImg'
...
@@ -274,17 +468,26 @@ import uploadImg from '../../pubComponents/uploadImg'
this
.
$message
.
error
(
this
.
$t
(
'objFill.v101.qingxzfujifl'
));
this
.
$message
.
error
(
this
.
$t
(
'objFill.v101.qingxzfujifl'
));
return
return
}
}
// if(!icon) {
// this.$message.error('请上传图标!');
// return
// }
// if(!background) {
// this.$message.error('请上传背景图片!');
// return
// }
let
params
=
{...
this
.
addMsg
}
let
params
=
{...
this
.
addMsg
}
params
.
IsHot
=
params
.
IsHot
?
1
:
2
params
.
IsHot
=
params
.
IsHot
?
1
:
2
params
.
Enable
=
params
.
Enable
?
1
:
2
params
.
Enable
=
params
.
Enable
?
1
:
2
if
(
params
.
LineIdList
&&
params
.
LineIdList
.
length
>
0
){
params
.
LineIds
=
params
.
LineIdList
.
toString
();
}
if
(
params
.
SeriesIdList
&&
params
.
SeriesIdList
.
length
>
0
){
params
.
SeriesIds
=
params
.
SeriesIdList
.
toString
();
}
var
tempCategory
=
""
;
if
(
this
.
chooseCategroyArray
&&
this
.
chooseCategroyArray
.
length
>
0
)
{
this
.
chooseCategroyArray
.
forEach
(
item
=>
{
tempCategory
+=
item
.
Id
+
","
;
})
}
params
.
AreaIds
=
tempCategory
.
substring
(
0
,
tempCategory
.
lastIndexOf
(
','
));
// if(params.AreaList&¶ms.AreaList.length>0){
// params.AreaIds=params.AreaList.toString();
// }
this
.
apipost
(
'ws_post_SetCategory'
,
params
,
res
=>
{
this
.
apipost
(
'ws_post_SetCategory'
,
params
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
if
(
res
.
data
.
resultCode
==
1
){
this
.
outerVisible
=
false
;
this
.
outerVisible
=
false
;
...
@@ -297,16 +500,25 @@ import uploadImg from '../../pubComponents/uploadImg'
...
@@ -297,16 +500,25 @@ import uploadImg from '../../pubComponents/uploadImg'
},
},
updateData
({
Id
})
{
//修改
updateData
({
Id
})
{
//修改
this
.
getLineList
();
this
.
apipost
(
'ws_post_GetCategory'
,{
Id
},
res
=>
{
this
.
apipost
(
'ws_post_GetCategory'
,{
Id
},
res
=>
{
let
params
=
res
.
data
.
data
let
params
=
res
.
data
.
data
params
.
IsHot
=
params
.
IsHot
===
1
params
.
IsHot
=
params
.
IsHot
===
1
params
.
Enable
=
params
.
Enable
===
1
params
.
Enable
=
params
.
Enable
===
1
this
.
addMsg
=
params
this
.
addMsg
=
params
;
this
.
$refs
.
Icon
.
ImageList
=
params
.
Icon
?
[
params
.
Icon
]
:
[]
this
.
$refs
.
Icon
.
ImageList
=
params
.
Icon
?
[
params
.
Icon
]
:
[];
this
.
$refs
.
BackgroundImage
.
ImageList
=
params
.
BackgroundImage
?
[
params
.
BackgroundImage
]
:
[]
this
.
$refs
.
BackgroundImage
.
ImageList
=
params
.
BackgroundImage
?
[
params
.
BackgroundImage
]
:
[];
if
(
this
.
addMsg
.
Level
>
1
)
{
console
.
log
(
params
,
'-----'
);
if
(
this
.
addMsg
.
IsSelfGuidedTour
==
1
){
this
.
getAllAreaTreeList
(
1
);
}
else
if
(
this
.
addMsg
.
IsSelfGuidedTour
==
0
&&
this
.
addMsg
.
Level
>
1
)
{
this
.
getCateGoryList
()
this
.
getCateGoryList
()
this
.
getLineTeamList
(
params
.
LineIds
);
}
}
else
{
this
.
getLineTeamList
();
}
},
err
=>
{})
},
err
=>
{})
},
},
//删除
//删除
...
@@ -335,28 +547,35 @@ import uploadImg from '../../pubComponents/uploadImg'
...
@@ -335,28 +547,35 @@ import uploadImg from '../../pubComponents/uploadImg'
},
},
clearMessage
()
{
clearMessage
()
{
this
.
addMsg
=
{
this
.
addMsg
=
{
'Level'
:
''
,
Level
:
''
,
'ParentId'
:
''
,
ParentId
:
''
,
'CategoryName'
:
''
,
CategoryName
:
''
,
'Icon'
:
''
,
Icon
:
''
,
'IsHot'
:
false
,
IsHot
:
false
,
'Sort'
:
''
,
Sort
:
''
,
'BackgroundImage'
:
''
,
BackgroundImage
:
''
,
'Enable'
:
true
,
Enable
:
true
,
AreaIds
:
""
,
LineIds
:
""
,
SeriesIds
:
""
,
AreaIdList
:[],
LineIdList
:[],
SeriesIdList
:[],
IsSelfGuidedTour
:
0
,
}
if
(
this
.
$refs
.
Icon
&&
this
.
$refs
.
Icon
.
ImageList
&&
this
.
$refs
.
Icon
.
ImageList
.
length
>
0
){
this
.
$refs
.
Icon
.
ImageList
=
[]
}
if
(
this
.
$refs
.
BackgroundImage
&&
this
.
$refs
.
BackgroundImage
.
ImageList
&&
this
.
$refs
.
Icon
.
BackgroundImage
.
ImageList
.
length
>
0
){
this
.
$refs
.
BackgroundImage
.
ImageList
=
[]
}
}
this
.
$refs
.
Icon
.
ImageList
=
[]
//this.$refs.tree.setCheckedKeys([]);
this
.
$refs
.
BackgroundImage
.
ImageList
=
[]
this
.
$refs
.
tree
.
setCheckedKeys
([]);
},
},
resetPageIndex
()
{
resetPageIndex
()
{
this
.
msg
.
pageIndex
=
1
this
.
msg
.
pageIndex
=
1
this
.
currentPage
=
1
this
.
currentPage
=
1
},
},
submitForm
(
addMsg
)
{
//提交创建、修改表单
submitForm
(
addMsg
)
{
//提交创建、修改表单
// const icon = this.$refs.Icon.ImageList[0]
// const background = this.$refs.BackgroundImage.ImageList[0]
// this.addMsg.Icon = icon
// this.addMsg.BackgroundImage = background
this
.
$refs
[
addMsg
].
validate
((
valid
)
=>
{
this
.
$refs
[
addMsg
].
validate
((
valid
)
=>
{
if
(
valid
)
{
if
(
valid
)
{
this
.
addData
()
this
.
addData
()
...
...
src/components/dmc/manager/teamRevenueExpenditure.vue
View file @
3e0df9a5
...
@@ -392,6 +392,9 @@
...
@@ -392,6 +392,9 @@
ticketPay
:
0
,
ticketPay
:
0
,
busPay
:
0
,
busPay
:
0
,
otherPay
:
0
,
otherPay
:
0
,
IsPrerealContrast
:
false
,
PrerealContrastMsg
:
''
,
PrerealContrastOfferId
:
0
}
}
},
},
methods
:
{
methods
:
{
...
@@ -518,6 +521,26 @@
...
@@ -518,6 +521,26 @@
this
.
picIsShow
=
true
;
this
.
picIsShow
=
true
;
},
},
goUrl
(
_orderSource
,
_type
,
Offset
)
{
goUrl
(
_orderSource
,
_type
,
Offset
)
{
if
(
this
.
IsPrerealContrast
){
this
.
$confirm
(
this
.
PrerealContrastMsg
,
this
.
$t
(
'tips.tips'
),
{
confirmButtonText
:
this
.
$t
(
'objFill.ckbjd'
),
cancelButtonText
:
this
.
$t
(
'pub.cancelBtn'
),
type
:
'warning'
}).
then
(()
=>
{
this
.
$router
.
push
({
name
:
'OfferChange'
,
query
:
{
'offerid'
:
this
.
PrerealContrastOfferId
,
'Qtype'
:
3
,
'blank'
:
'y'
,
}
});
}).
catch
(()
=>
{
});
return
;
}
let
TCIDARR
=
[]
let
TCIDARR
=
[]
let
id
=
[];
let
id
=
[];
if
(
this
.
msgList
&&
this
.
msgList
.
length
>
0
&&
this
.
msgList
[
0
].
LineId
==
this
.
LineId
){
if
(
this
.
msgList
&&
this
.
msgList
.
length
>
0
&&
this
.
msgList
[
0
].
LineId
==
this
.
LineId
){
...
@@ -632,6 +655,19 @@
...
@@ -632,6 +655,19 @@
this
.
Error
(
res
.
data
.
message
)
this
.
Error
(
res
.
data
.
message
)
}
}
},
err
=>
{})
},
err
=>
{})
},
getTravelPrerealContrast
(){
this
.
apipost
(
'financestatistics_post_GetTravelPrerealContrast'
,
{
TCID
:
this
.
$route
.
query
.
id
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
data
.
State
==
1
){
this
.
IsPrerealContrast
=
true
;
this
.
PrerealContrastMsg
=
res
.
data
.
data
.
Msg
;
this
.
PrerealContrastOfferId
=
res
.
data
.
data
.
OfferId
;
}
}
else
{}
},
err
=>
{})
}
}
},
},
mounted
()
{
mounted
()
{
...
@@ -642,6 +678,10 @@
...
@@ -642,6 +678,10 @@
this
.
getList
(
5
)
this
.
getList
(
5
)
this
.
getList
(
14
)
this
.
getList
(
14
)
this
.
getTuanMsg
()
this
.
getTuanMsg
()
let
userInfo
=
this
.
getLocalStorage
();
if
(
userInfo
.
RB_Group_id
==
2
&&
this
.
LineId
==
14
){
this
.
getTravelPrerealContrast
();
}
}
}
}
}
...
...
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