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
f9bca494
Commit
f9bca494
authored
Jul 08, 2025
by
罗超
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
c61dfa23
e2259260
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
339 additions
and
32 deletions
+339
-32
fill.js
src/assets/common/lang/zhCN/fill.js
+1
-0
JumpReport.vue
src/components/FinancialModule/JumpReport.vue
+1
-1
AccountStatementDetail.vue
...ents/FinancialModule/accDetail/AccountStatementDetail.vue
+1
-1
CompanyAccDetail.vue
...components/FinancialModule/accDetail/CompanyAccDetail.vue
+1
-1
addFinancialDocuments.vue
src/components/FinancialModule/addFinancialDocuments.vue
+48
-7
invoicesManagerAdd.vue
src/components/FinancialModule/invoicesManagerAdd.vue
+9
-2
hotelSpider.vue
src/components/Hotel/hotelSpider.vue
+196
-0
MyCustomer.vue
src/components/SalesModule/MyCustomer.vue
+10
-10
editTeamInfo.vue
src/components/TravelManager/TravelTeam/editTeamInfo.vue
+55
-1
config.js
src/router/config.js
+17
-9
No files found.
src/assets/common/lang/zhCN/fill.js
View file @
f9bca494
...
@@ -8167,6 +8167,7 @@ export const obj = {
...
@@ -8167,6 +8167,7 @@ export const obj = {
kaihuzhih
:
'开户支行'
,
kaihuzhih
:
'开户支行'
,
xiaosousjkb
:
'销售数据看板'
,
xiaosousjkb
:
'销售数据看板'
,
},
},
seeMySelfCompany
:
'只查看自己填写的公司信息'
,
//#endregion
//#endregion
}
}
export
default
obj
;
export
default
obj
;
src/components/FinancialModule/JumpReport.vue
View file @
f9bca494
...
@@ -347,7 +347,7 @@
...
@@ -347,7 +347,7 @@
is-horizontal-resize
is-horizontal-resize
column-width-drag
column-width-drag
style=
"width:100%;max-height:600px;"
style=
"width:100%;max-height:600px;"
:style=
"total<=0?'height:200px':
'
'"
:style=
"total<=0?'height:200px':
total<=1?'height:200px':total<=2?'height:300px':total<=3?'height:400px':'height:500px
'"
:columns=
"columns"
:columns=
"columns"
:table-data=
"DataList"
:table-data=
"DataList"
:filter-method=
"filterMethod"
:filter-method=
"filterMethod"
...
...
src/components/FinancialModule/accDetail/AccountStatementDetail.vue
View file @
f9bca494
...
@@ -131,7 +131,7 @@
...
@@ -131,7 +131,7 @@
</el-col>
</el-col>
<el-col
:span=
"4"
:gutter=
"35"
>
<el-col
:span=
"4"
:gutter=
"35"
>
<el-form-item
label=
"$t('objFill.v101.FinancialModule.chunaishtg')"
>
<el-form-item
:
label=
"$t('objFill.v101.FinancialModule.chunaishtg')"
>
<el-switch
v-model=
"msg.IsSelectCNTG"
inactive-text=
""
active-value=
"true"
></el-switch>
<el-switch
v-model=
"msg.IsSelectCNTG"
inactive-text=
""
active-value=
"true"
></el-switch>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
...
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @
f9bca494
...
@@ -526,7 +526,7 @@ export default {
...
@@ -526,7 +526,7 @@ export default {
InMoney
:
0
,
InMoney
:
0
,
InMoneyB
:
0
,
InMoneyB
:
0
,
OutMoneyB
:
0
,
OutMoneyB
:
0
,
BillType
:
1
,
//1 收 2 支 ,
BillType
:
2
,
//1 收 2 支 ,
addChuNa
:
false
,
addChuNa
:
false
,
allLoading
:
false
,
allLoading
:
false
,
payMsgList
:[],
payMsgList
:[],
...
...
src/components/FinancialModule/addFinancialDocuments.vue
View file @
f9bca494
...
@@ -470,14 +470,18 @@
...
@@ -470,14 +470,18 @@
<el-option
:label=
'$t("fnc.lslingdui")'
:value=
'0'
:key=
'0'
>
</el-option>
<el-option
:label=
'$t("fnc.lslingdui")'
:value=
'0'
:key=
'0'
>
</el-option>
</el-select>
-->
</el-select>
-->
<template
v-if=
"msg.ClientType==7&&msg.IsPublic!=2&&msg.IsPublic!=3&&!showDisable"
>
<template
v-if=
"msg.ClientType==7&&msg.IsPublic!=2&&msg.IsPublic!=3&&!showDisable"
>
<el-select
v-if=
"msg.IsLeader==1"
filterable
v-model=
'msg.ClientID'
:placeholder=
"$t('fnc.khmingcheng')"
<el-select
v-if=
"msg.IsLeader==1"
filterable
v-model=
'msg.ClientID'
:placeholder=
"$t('pub.PleaseKeyWords')+'/'+$t('fnc.khmingcheng')"
remote
reserve-keyword
:remote-method=
"financeinfo_post_GetClientAccountListToKey"
@
change=
"GetClientAccountList(msg.ClientID)"
class=
"w135 _border_b_1"
>
@
change=
"GetClientAccountList(msg.ClientID)"
class=
"w135 _border_b_1"
>
<el-option
v-for=
'item in ClientAccountList'
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
<el-option
v-for=
'item in ClientAccountList'
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
</el-option>
</el-option>
</el-select>
</el-select>
</
template
>
</
template
>
<
template
v-if=
"msg.ClientType!=7&&msg.IsPublic!=2&&msg.IsPublic!=3&&!showDisable"
>
<
template
v-if=
"msg.ClientType!=7&&msg.IsPublic!=2&&msg.IsPublic!=3&&!showDisable"
>
<el-select
filterable
v-model=
'msg.ClientID'
:placeholder=
"$t('fnc.khmingcheng')"
<el-select
filterable
v-model=
'msg.ClientID'
:placeholder=
"$t('pub.PleaseKeyWords')+'/'+$t('fnc.khmingcheng')"
remote
reserve-keyword
:remote-method=
"financeinfo_post_GetClientAccountListToKey"
@
change=
"GetClientAccountList(msg.ClientID)"
class=
"w135 _border_b_1"
>
@
change=
"GetClientAccountList(msg.ClientID)"
class=
"w135 _border_b_1"
>
<el-option
v-for=
'item in ClientAccountList'
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
<el-option
v-for=
'item in ClientAccountList'
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
</el-option>
</el-option>
...
@@ -2316,7 +2320,9 @@
...
@@ -2316,7 +2320,9 @@
ID
:
0
,
ID
:
0
,
Type
:
t
,
Type
:
t
,
ObjID
:
0
,
ObjID
:
0
,
CardNum
:
''
CardNum
:
''
,
IsAddFinance
:
true
,
KeyWord
:
''
}
}
if
(
i
>=
0
)
{
if
(
i
>=
0
)
{
msg
.
ID
=
i
;
msg
.
ID
=
i
;
...
@@ -2361,15 +2367,50 @@
...
@@ -2361,15 +2367,50 @@
}
}
}
,
err
=>
{
}
)
}
,
err
=>
{
}
)
}
,
}
,
financeinfo_post_GetClientAccountListEdit
(
t
)
{
//获取付款 对象类型 修改用
financeinfo_post_GetClientAccountListToKey
(
query
)
{
//获取付款 对象类型 新增用
let
msg
=
{
ID
:
0
,
Type
:
this
.
msg
.
ClientType
,
ObjID
:
0
,
CardNum
:
''
,
IsAddFinance
:
true
,
KeyWord
:
query
}
this
.
apipost
(
'financeinfo_post_GetClientAccountList'
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
res
.
data
.
data
;
let
ClientAccountList
=
[];
data
.
forEach
(
x
=>
{
let
obj
=
{
ID
:
x
.
ID
,
Name
:
x
.
AccountHolder
+
`(${x.AccountAlias
}
)`
,
Nom
:
x
.
CardNum
,
OpenBankName
:
x
.
OpenBankName
,
ObjID
:
x
.
ObjID
,
ClientAccountType
:
x
.
ClientAccountType
,
}
ClientAccountList
.
push
(
obj
)
}
)
this
.
ClientAccountList
=
ClientAccountList
;
}
}
,
err
=>
{
}
)
}
,
financeinfo_post_GetClientAccountListEdit
(
t
,
id
)
{
//获取付款 对象类型 修改用
let
msg
=
{
let
msg
=
{
ID
:
0
,
Type
:
t
,
Type
:
t
,
ObjID
:
0
,
ObjID
:
0
,
CardNum
:
''
CardNum
:
''
,
IsAddFinance
:
true
,
}
if
(
id
&&
id
>
0
){
msg
.
ID
=
id
;
}
}
if
(
this
.
czmsg
&&
this
.
czmsg
.
ClientID
)
{
if
(
this
.
czmsg
&&
this
.
czmsg
.
ClientID
)
{
msg
.
ID
=
this
.
czmsg
.
ClientID
;
msg
.
ID
=
this
.
czmsg
.
ClientID
;
}
}
this
.
apipost
(
'financeinfo_post_GetClientAccountList'
,
msg
,
res
=>
{
this
.
apipost
(
'financeinfo_post_GetClientAccountList'
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
res
.
data
.
data
;
let
data
=
res
.
data
.
data
;
...
@@ -2567,7 +2608,7 @@
...
@@ -2567,7 +2608,7 @@
this
.
msg
.
PayDate
=
this
.
msg
.
PayDate
;
this
.
msg
.
PayDate
=
this
.
msg
.
PayDate
;
this
.
msg
.
detailList
=
[];
this
.
msg
.
detailList
=
[];
this
.
FinancialFlowTemplate_post_GetProcessList
(
data
.
TemplateId
);
this
.
FinancialFlowTemplate_post_GetProcessList
(
data
.
TemplateId
);
this
.
financeinfo_post_GetClientAccountListEdit
(
data
.
ClientType
);
this
.
financeinfo_post_GetClientAccountListEdit
(
data
.
ClientType
,
data
.
ClientID
);
this
.
Financial_post_GetCostTypeList
(
data
.
TemplateId
,
2
);
this
.
Financial_post_GetCostTypeList
(
data
.
TemplateId
,
2
);
let
allPrice
=
0
let
allPrice
=
0
let
yballPrice
=
0
let
yballPrice
=
0
...
...
src/components/FinancialModule/invoicesManagerAdd.vue
View file @
f9bca494
...
@@ -191,9 +191,10 @@
...
@@ -191,9 +191,10 @@
<template
v-else
>
<template
v-else
>
<span
style=
"display:flex;align-items: center;"
>
<span
style=
"display:flex;align-items: center;"
>
<el-input
placeholder
v-model=
"msg.CompanyName"
></el-input>
<el-input
placeholder
v-model=
"msg.CompanyName"
></el-input>
<el-checkbox
v-model=
"checked"
>
{{
$t
(
'objFill.v101.FinancialModule.baocunwcy'
)
}}
</el-checkbox>
<el-checkbox
v-model=
"checked"
>
{{
$t
(
'objFill.v101.FinancialModule.baocunwcy'
)
}}
</el-checkbox>
</span>
</span>
</
template
>
</
template
>
<el-checkbox
v-model=
"isQMySelf"
style=
"margin-top:10px;"
@
change=
"getCustomerInvoiceList()"
>
{{$t('objFill.seeMySelfCompany')}}
</el-checkbox>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
...
@@ -313,6 +314,7 @@
...
@@ -313,6 +314,7 @@
orderList
:
{},
orderList
:
{},
isChang
:
1
,
isChang
:
1
,
checked
:
true
,
checked
:
true
,
isQMySelf
:
false
,
CustomerList
:
[],
CustomerList
:
[],
CompanyID
:
""
,
CompanyID
:
""
,
images
:
[],
images
:
[],
...
@@ -559,10 +561,15 @@
...
@@ -559,10 +561,15 @@
);
);
},
},
getCustomerInvoiceList
:
function
()
{
getCustomerInvoiceList
:
function
()
{
let
Type
=
0
;
if
(
this
.
isQMySelf
){
Type
=
1
;
}
// 根据客户id 获取对应发票信息
// 根据客户id 获取对应发票信息
this
.
apipost
(
this
.
apipost
(
"InvoiceApply_get_GetCustomerInvoiceList"
,
{
"InvoiceApply_get_GetCustomerInvoiceList"
,
{
CustomerID
:
this
.
msg
.
CustomerId
CustomerID
:
this
.
msg
.
CustomerId
,
Type
:
Type
},
},
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
...
...
src/components/Hotel/hotelSpider.vue
0 → 100644
View file @
f9bca494
<
style
>
</
style
>
<
template
>
<div
class=
"flexOne"
>
<div
class=
"query-box"
>
<ul>
<li>
<span>
<em>
酒店名称:
</em>
<el-select
class=
"w180 multiple_input"
v-model=
"msg.HotelId"
clearable
filterable
>
<el-option
v-for=
"item in hotelList"
:key=
"item.HotelId"
:label=
"item.DiDaHotelName"
:value=
"item.HotelId"
>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>
入住时间
</em>
<el-date-picker
class=
"w135"
v-model=
"msg.QStartDate"
type=
"date"
:picker-options=
"beforeCheck"
value-format=
"yyyy-MM-dd"
:placeholder=
"$t('admin.admin_choDate')"
>
</el-date-picker>
<span
class=
"_ln"
>
-
</span>
<el-date-picker
class=
"w135"
v-model=
"msg.QEndDate"
type=
"date"
:picker-options=
"afterCheck"
value-format=
"yyyy-MM-dd"
:placeholder=
"$t('admin.admin_choDate')"
></el-date-picker>
</span>
</li>
<li>
<button
class=
"normalBtn"
type=
"button"
@
click=
"resetPageIndex()"
>
{{
$t
(
'pub.searchBtn'
)
}}
</button>
</li>
</ul>
</div>
<div>
<table
class=
"singeRowTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
'loading'
>
<tr>
<th
width=
"200"
>
酒店名称
</th>
<th
width=
"70"
>
类型
</th>
<template
v-if=
"dataList&&dataList.length>0"
>
<template
v-for=
"(hItem,hIndex) in dataList[0].SubList"
>
<th
:key=
"`d_h_`+hIndex"
>
{{
hItem
.
CheckInStr
}}
(
{{
hItem
.
WeekStr
}}
)
</th>
</
template
>
</template>
</tr>
<
template
v-for=
"(item,index) in dataList"
>
<tr
:key=
"`d_1_`+index"
>
<td
rowspan=
"2"
>
{{
item
.
DiDaHotelName
}}
</td>
<td>
直客价
</td>
<template
v-for=
"(hItem,hIndex) in item.SubList"
>
<td
:key=
"`d_1_`+index+`d1_`+hIndex"
>
<template
v-if=
"hItem.Price
<hItem
.
TeamPrice
"
>
<font
style=
"color:red;"
>
{{
hItem
.
Price
}}
</font>
</
template
>
<
template
v-else
>
{{
hItem
.
Price
}}
</
template
>
</td>
</template>
</tr>
<tr
:key=
"`d_2_`+index"
>
<td>
道旅价
</td>
<
template
v-for=
"(hItem,hIndex) in item.SubList"
>
<td
:key=
"`d_2_`+index+`d2_`+hIndex"
>
{{
hItem
.
TeamPrice
}}
</td>
</
template
>
</tr>
</template>
</table>
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"msg.pageIndex"
layout=
"total,prev, pager, next, jumper"
:page-size=
"msg.pageSize"
:total=
"msg.total"
></el-pagination>
</div>
</div>
</template>
<
script
>
export
default
{
data
()
{
return
{
beforeCheck
:
{
disabledDate
:
time
=>
{
if
(
this
.
msg
.
QEndDate
)
{
let
endTime
=
new
Date
(
this
.
msg
.
QEndDate
);
return
time
&&
endTime
.
getTime
()
<
time
.
getTime
();
}
else
{
return
false
;
}
}
},
afterCheck
:
{
disabledDate
:
time
=>
{
if
(
this
.
msg
.
QStartDate
)
{
let
startTime
=
new
Date
(
this
.
msg
.
QStartDate
);
//可以选择当天
return
(
time
&&
time
.
getTime
()
<
startTime
.
getTime
()
-
1
*
24
*
60
*
60
*
1000
);
}
else
{
return
false
;
}
}
},
msg
:
{
pageIndex
:
1
,
pageSize
:
14
,
HotelId
:
""
,
total
:
0
,
//总条数
QStartDate
:
""
,
QEndDate
:
""
,
},
userInfo
:
{},
//当前登录用户
dataList
:
[],
//数据列表
hotelList
:
[],
//酒店列表
loading
:
false
,
};
},
methods
:
{
//翻页功能按钮
handleCurrentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
getDataList
();
},
//查询初始化页码
resetPageIndex
()
{
this
.
msg
.
pageIndex
=
1
;
this
.
getDataList
();
},
//获取分页列表
getDataList
()
{
this
.
dataList
=
[];
this
.
loading
=
true
;
this
.
apipost
(
"AirTicket_post_GetSpiderHotelPage"
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
msg
.
total
=
res
.
data
.
data
.
count
;
this
.
dataList
=
res
.
data
.
data
.
pageData
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
}
);
},
getHotelList
()
{
this
.
apipost
(
"AirTicket_post_GetSpiderHotelList"
,
{},
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
hotelList
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
}
);
}
},
created
()
{
if
(
this
.
$route
.
query
)
{
// if (this.$route.query.AirticketId) {
// this.msg.AirticketId = this.$route.query.AirticketId;
// }
}
let
myDate
=
new
Date
();
let
nowDate
=
myDate
.
getFullYear
()
+
"-"
+
parseInt
(
myDate
.
getMonth
()
+
1
)
+
"-"
+
myDate
.
getDate
();
this
.
msg
.
QStartDate
=
nowDate
;
var
currentDate
=
new
Date
();
// 获取当前时间
currentDate
.
setMonth
(
currentDate
.
getMonth
()
+
1
);
// 将当前时间的月份加1
this
.
msg
.
QEndDate
=
currentDate
.
getFullYear
()
+
"-"
+
parseInt
(
currentDate
.
getMonth
()
+
1
)
+
"-"
+
currentDate
.
getDate
();
this
.
getHotelList
();
},
mounted
()
{
this
.
userInfo
=
this
.
getLocalStorage
();
this
.
getDataList
();
}
};
</
script
>
src/components/SalesModule/MyCustomer.vue
View file @
f9bca494
...
@@ -699,7 +699,7 @@
...
@@ -699,7 +699,7 @@
<el-input
v-model=
"addMsg.Email"
:placeholder=
"$t('pub.pleaseImport')"
maxlength=
"50"
></el-input>
<el-input
v-model=
"addMsg.Email"
:placeholder=
"$t('pub.pleaseImport')"
maxlength=
"50"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"6"
v-if=
"currentUserInfo&¤tUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252"
>
<el-col
:span=
"6"
v-if=
"currentUserInfo&¤tUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252
&& currentUserInfo.RB_Branch_id !=1257
"
>
<el-form-item
:label=
"$t('pub.area')"
prop=
"District"
>
<el-form-item
:label=
"$t('pub.area')"
prop=
"District"
>
<el-select
class=
"addMsgSW"
filterable
v-model=
'addMsg.Province'
@
change=
'getCity'
>
<el-select
class=
"addMsgSW"
filterable
v-model=
'addMsg.Province'
@
change=
'getCity'
>
<el-option
v-for=
'item in provinceList'
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
<el-option
v-for=
'item in provinceList'
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
...
@@ -715,7 +715,7 @@
...
@@ -715,7 +715,7 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"6"
v-if=
"currentUserInfo&&
currentUserInfo.RB_Branch_id ==1252
"
>
<el-col
:span=
"6"
v-if=
"currentUserInfo&&
(currentUserInfo.RB_Branch_id ==1252||currentUserInfo.RB_Branch_id ==1257)
"
>
<el-form-item
:label=
"$t('fnc.khleixing')"
prop=
"IsMember"
>
<el-form-item
:label=
"$t('fnc.khleixing')"
prop=
"IsMember"
>
<el-select
v-model=
"addMsg.IsMember"
:placeholder=
"$t('objFill.qingxuanzhekhlx')"
>
<el-select
v-model=
"addMsg.IsMember"
:placeholder=
"$t('objFill.qingxuanzhekhlx')"
>
<el-option
key=
"1"
:label=
"$t('salesModule.MemberCustomer')"
value=
"1"
></el-option>
<el-option
key=
"1"
:label=
"$t('salesModule.MemberCustomer')"
value=
"1"
></el-option>
...
@@ -762,7 +762,7 @@
...
@@ -762,7 +762,7 @@
</div>
</div>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"6"
v-if=
"currentUserInfo&& currentUserInfo.RB_Branch_id !=1252"
>
<el-col
:span=
"6"
v-if=
"currentUserInfo&& currentUserInfo.RB_Branch_id !=1252
&& currentUserInfo.RB_Branch_id !=1257
"
>
<el-form-item
:label=
"$t('objFill.pingtaiyhm')"
>
<el-form-item
:label=
"$t('objFill.pingtaiyhm')"
>
<div
style=
"display: flex;flex-wrap: nowrap;justify-content: space-between;"
>
<div
style=
"display: flex;flex-wrap: nowrap;justify-content: space-between;"
>
<div
style=
"display: flex; flex-wrap: wrap;align-items: center;"
>
<div
style=
"display: flex; flex-wrap: wrap;align-items: center;"
>
...
@@ -781,7 +781,7 @@
...
@@ -781,7 +781,7 @@
</div>
</div>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"4"
v-if=
"currentUserInfo&¤tUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252"
>
<el-col
:span=
"4"
v-if=
"currentUserInfo&¤tUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252
&& currentUserInfo.RB_Branch_id !=1257
"
>
<el-form-item
:label=
"$t('objFill.qianyueyjkh')"
prop=
"SigningType"
>
<el-form-item
:label=
"$t('objFill.qianyueyjkh')"
prop=
"SigningType"
>
<div
style=
"display: flex;flex-wrap: nowrap;"
>
<div
style=
"display: flex;flex-wrap: nowrap;"
>
<div>
<div>
...
@@ -818,7 +818,7 @@
...
@@ -818,7 +818,7 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"4"
v-if=
"currentUserInfo&¤tUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252"
>
<el-col
:span=
"4"
v-if=
"currentUserInfo&¤tUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252
&& currentUserInfo.RB_Branch_id !=1257
"
>
<el-form-item
:label=
"$t('salesModule.Belongbrand')"
prop=
"brandIds"
>
<el-form-item
:label=
"$t('salesModule.Belongbrand')"
prop=
"brandIds"
>
<el-select
filterable
class=
'multiple_input'
multiple
v-model=
'addMsg.brandIds'
<el-select
filterable
class=
'multiple_input'
multiple
v-model=
'addMsg.brandIds'
:placeholder=
"$t('pub.pleaseSel')"
>
:placeholder=
"$t('pub.pleaseSel')"
>
...
@@ -963,7 +963,7 @@
...
@@ -963,7 +963,7 @@
</span>
</span>
</p>
</p>
</el-col>
</el-col>
<el-col
:span=
"8"
v-if=
"currentUserInfo&¤tUserInfo.RB_Group_id==2&& currentUserInfo.RB_Branch_id !=1252"
>
<el-col
:span=
"8"
v-if=
"currentUserInfo&¤tUserInfo.RB_Group_id==2&& currentUserInfo.RB_Branch_id !=1252
&& currentUserInfo.RB_Branch_id !=1257
"
>
<el-form-item
:label=
"$t('system.quety_area')"
prop=
"District"
>
<el-form-item
:label=
"$t('system.quety_area')"
prop=
"District"
>
<el-select
class=
"updateMsgSw"
filterable
v-model=
'updateMsg.Province'
@
change=
'getCityNew'
>
<el-select
class=
"updateMsgSw"
filterable
v-model=
'updateMsg.Province'
@
change=
'getCityNew'
>
<el-option
v-for=
'item in provinceList'
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
<el-option
v-for=
'item in provinceList'
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
...
@@ -1018,7 +1018,7 @@
...
@@ -1018,7 +1018,7 @@
</div>
</div>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"8"
v-if=
"currentUserInfo&¤tUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252"
>
<el-col
:span=
"8"
v-if=
"currentUserInfo&¤tUserInfo.RB_Group_id==2 && currentUserInfo.RB_Branch_id !=1252
&& currentUserInfo.RB_Branch_id !=1257
"
>
<el-form-item
:label=
"$t('objFill.pingtaiyhm')"
>
<el-form-item
:label=
"$t('objFill.pingtaiyhm')"
>
<el-tag
:key=
"tag"
v-for=
"tag in updateMsg.PlatformUserNameList"
closable
:disable-transitions=
"false"
<el-tag
:key=
"tag"
v-for=
"tag in updateMsg.PlatformUserNameList"
closable
:disable-transitions=
"false"
@
close=
"handleClose(tag)"
size=
"small"
style=
"margin-right: 5px;margin-bottom: 3px;"
>
@
close=
"handleClose(tag)"
size=
"small"
style=
"margin-right: 5px;margin-bottom: 3px;"
>
...
@@ -1436,7 +1436,7 @@
...
@@ -1436,7 +1436,7 @@
}
}
}
}
this
.
updateMsg
.
SigningType
=
this
.
updateMsg
.
SigningType
?
1
:
0
this
.
updateMsg
.
SigningType
=
this
.
updateMsg
.
SigningType
?
1
:
0
if
(
this
.
currentUserInfo
&&
this
.
currentUserInfo
.
RB_Group_id
==
2
&&
this
.
currentUserInfo
.
RB_Branch_id
!=
1252
&&
(
this
.
updateMsg
.
Province
==
''
||
this
.
updateMsg
.
City
==
''
||
this
.
updateMsg
.
District
==
''
||!
this
.
updateMsg
.
District
))
{
if
(
this
.
currentUserInfo
&&
this
.
currentUserInfo
.
RB_Group_id
==
2
&&
this
.
currentUserInfo
.
RB_Branch_id
!=
1252
&&
currentUserInfo
.
RB_Branch_id
!=
1257
&&
(
this
.
updateMsg
.
Province
==
''
||
this
.
updateMsg
.
City
==
''
||
this
.
updateMsg
.
District
==
''
||!
this
.
updateMsg
.
District
))
{
this
.
$message
.
error
(
this
.
$t
(
'objFill.v101.LeaveGroupDownload.qingxzssq'
))
this
.
$message
.
error
(
this
.
$t
(
'objFill.v101.LeaveGroupDownload.qingxzssq'
))
return
return
}
}
...
@@ -1940,7 +1940,7 @@
...
@@ -1940,7 +1940,7 @@
this
.
$message
.
error
(
this
.
$t
(
'rule.EnterContratPerson'
))
this
.
$message
.
error
(
this
.
$t
(
'rule.EnterContratPerson'
))
return
return
}
}
if
(
this
.
currentUserInfo
.
RB_Branch_id
==
1252
&&
this
.
addMsg
.
IsMember
!=
1
&&
this
.
addMsg
.
IsMember
!=
2
){
if
(
this
.
currentUserInfo
.
RB_Branch_id
==
1252
&&
currentUserInfo
.
RB_Branch_id
!=
1257
&&
this
.
addMsg
.
IsMember
!=
1
&&
this
.
addMsg
.
IsMember
!=
2
){
this
.
$message
.
error
(
this
.
$t
(
'objFill.qingxuanzhekhlx'
))
this
.
$message
.
error
(
this
.
$t
(
'objFill.qingxuanzhekhlx'
))
return
return
}
}
...
@@ -1964,7 +1964,7 @@
...
@@ -1964,7 +1964,7 @@
return
return
}
}
}
}
if
(
this
.
currentUserInfo
&&
this
.
currentUserInfo
.
RB_Group_id
==
2
&&
this
.
currentUserInfo
.
RB_Branch_id
!=
1252
&&
(
this
.
addMsg
.
Province
==
''
||
this
.
addMsg
.
City
==
''
||
this
.
addMsg
.
District
==
''
||!
this
.
addMsg
.
District
))
{
if
(
this
.
currentUserInfo
&&
this
.
currentUserInfo
.
RB_Group_id
==
2
&&
this
.
currentUserInfo
.
RB_Branch_id
!=
1252
&&
currentUserInfo
.
RB_Branch_id
!=
1257
&&
(
this
.
addMsg
.
Province
==
''
||
this
.
addMsg
.
City
==
''
||
this
.
addMsg
.
District
==
''
||!
this
.
addMsg
.
District
))
{
this
.
$message
.
error
(
this
.
$t
(
'objFill.v101.LeaveGroupDownload.qingxzssq'
))
this
.
$message
.
error
(
this
.
$t
(
'objFill.v101.LeaveGroupDownload.qingxzssq'
))
return
return
}
}
...
...
src/components/TravelManager/TravelTeam/editTeamInfo.vue
View file @
f9bca494
...
@@ -452,6 +452,20 @@
...
@@ -452,6 +452,20 @@
<div
v-for=
"(fItem,fIndex) in editForm.SelfFlightList"
:key=
"'f_'+fIndex"
<div
v-for=
"(fItem,fIndex) in editForm.SelfFlightList"
:key=
"'f_'+fIndex"
style=
"border:1px solid #C0C4CC;margin-bottom:2px;border-radius:5px;"
>
style=
"border:1px solid #C0C4CC;margin-bottom:2px;border-radius:5px;"
>
<table
class=
"tFlightTab"
>
<table
class=
"tFlightTab"
>
<tr>
<td
colspan=
"4"
>
<el-form-item
:label=
"$t('salesModule.FlighInfo')"
>
<el-select
v-model=
"fItem.baseAlNameFlight_number"
@
change=
"handleCheckChange(fIndex)"
filterable
clearable
placeholder=
"请选择"
>
<el-option
v-for=
"item in baseTeamFlightList"
:key=
"item.Flight_number"
:label=
"item.Flight_number"
:value=
"item.Flight_number"
>
<!-- <span style="float: left">{{ item. Flight_number}}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.AlName }}</span> -->
</el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr>
<tr>
<td>
<td>
<el-form-item
:label=
"$t('system.query_type')"
>
<el-form-item
:label=
"$t('system.query_type')"
>
...
@@ -866,6 +880,7 @@
...
@@ -866,6 +880,7 @@
AirportNameList
:
[],
//去程航班列表
AirportNameList
:
[],
//去程航班列表
BackAirportNameList
:
[],
//回程航班列表
BackAirportNameList
:
[],
//回程航班列表
airlineList
:
[],
//航空公司列表
airlineList
:
[],
//航空公司列表
baseTeamFlightList
:
[],
//基础航班信息travelteam_GetBaseTeamFlightList
isVirtuallyFlight
:
0
,
//0-虚拟航班,1-绑定真实机票
isVirtuallyFlight
:
0
,
//0-虚拟航班,1-绑定真实机票
editForm
:
{
editForm
:
{
GTeamName
:
""
,
// 业务名称
GTeamName
:
""
,
// 业务名称
...
@@ -971,6 +986,7 @@
...
@@ -971,6 +986,7 @@
this
.
userInfo
=
this
.
getLocalStorage
();
this
.
userInfo
=
this
.
getLocalStorage
();
this
.
getLineList
();
this
.
getLineList
();
this
.
getCompanyList
();
this
.
getCompanyList
();
this
.
getBaseTeamFlightList
();
},
},
mounted
()
{
mounted
()
{
if
(
this
.
Q_GTeamId
)
{
if
(
this
.
Q_GTeamId
)
{
...
@@ -978,6 +994,43 @@
...
@@ -978,6 +994,43 @@
}
}
},
},
methods
:
{
methods
:
{
//获取基础航班信息
getBaseTeamFlightList
()
{
this
.
apipost
(
"travelteam_GetBaseTeamFlightList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
baseTeamFlightList
=
res
.
data
.
data
;
}
}
);
},
handleCheckChange
(
index
)
{
if
(
this
.
editForm
.
SelfFlightList
!=
null
&&
this
.
editForm
.
SelfFlightList
.
length
>
0
)
{
// 获取当前航班
const
currentFlight
=
this
.
editForm
.
SelfFlightList
[
index
];
// 创建深拷贝(避免引用问题)
const
newFlight
=
JSON
.
parse
(
JSON
.
stringify
(
currentFlight
));
this
.
baseTeamFlightList
.
forEach
(
item
=>
{
if
(
item
.
Flight_number
===
newFlight
.
baseAlNameFlight_number
)
{
// 修改拷贝后的对象
newFlight
.
AlName
=
item
.
AlName
;
newFlight
.
AIATA
=
item
.
AIATA
;
newFlight
.
ArrivalCityName
=
item
.
ArrivalCityName
;
newFlight
.
aName
=
item
.
aName
;
newFlight
.
Arrival_time
=
item
.
Arrival_time
;
newFlight
.
aDay
=
item
.
aDay
;
newFlight
.
DIATA
=
item
.
DIATA
;
newFlight
.
DepartureName
=
item
.
DepartureName
;
newFlight
.
Departure_time
=
item
.
Departure_time
;
newFlight
.
dName
=
item
.
dName
;
newFlight
.
Flight_number
=
item
.
Flight_number
;
// 替换原对象
this
.
$set
(
this
.
editForm
.
SelfFlightList
,
index
,
newFlight
);
}
});
}
},
//获取线路列表
//获取线路列表
getLineList
()
{
getLineList
()
{
this
.
apipost
(
this
.
apipost
(
...
@@ -1135,6 +1188,7 @@
...
@@ -1135,6 +1188,7 @@
dName
:
""
,
//到达机场名称
dName
:
""
,
//到达机场名称
FlightDate
:
""
,
//出发日期
FlightDate
:
""
,
//出发日期
Flight_number
:
""
,
//航班号
Flight_number
:
""
,
//航班号
baseAlNameFlight_number
:
""
,
};
};
this
.
editForm
.
SelfFlightList
.
push
(
seleFObj
);
this
.
editForm
.
SelfFlightList
.
push
(
seleFObj
);
},
},
...
@@ -1222,7 +1276,7 @@
...
@@ -1222,7 +1276,7 @@
}
}
);
);
},
},
//日期计算
//日期计算
daysCalculate
(
date
,
addDay
)
{
daysCalculate
(
date
,
addDay
)
{
var
date
=
new
Date
(
date
);
//获取当前时间
var
date
=
new
Date
(
date
);
//获取当前时间
date
.
setDate
(
date
.
getDate
()
+
addDay
);
date
.
setDate
(
date
.
getDate
()
+
addDay
);
...
...
src/router/config.js
View file @
f9bca494
...
@@ -2200,14 +2200,14 @@ export default {
...
@@ -2200,14 +2200,14 @@ export default {
title
:
'日本车行预订统计表'
title
:
'日本车行预订统计表'
},
},
},
},
//
{
{
//
path: '/HPTripPlan', //和平用车
path
:
'/HPTripPlan'
,
//和平用车
//
name: 'HPTripPlan',
name
:
'HPTripPlan'
,
//
component: resolve => require(['@/components/busManagement/HPTripPlan'], resolve),
component
:
resolve
=>
require
([
'@/components/busManagement/HPTripPlan'
],
resolve
),
//
meta: {
meta
:
{
//
title: '日本车行预订统计表'
title
:
'日本车行预订统计表'
//
},
},
//
},
},
{
{
path
:
'/JapanBusMonthFStatistics'
,
//用車單統計(財務單據)
path
:
'/JapanBusMonthFStatistics'
,
//用車單統計(財務單據)
name
:
'JapanBusMonthFStatistics'
,
name
:
'JapanBusMonthFStatistics'
,
...
@@ -3811,7 +3811,15 @@ export default {
...
@@ -3811,7 +3811,15 @@ export default {
name
:
'ticketSpider'
,
name
:
'ticketSpider'
,
component
:
resolve
=>
require
([
'@/components/Ticketing/ticketSpider'
],
resolve
),
component
:
resolve
=>
require
([
'@/components/Ticketing/ticketSpider'
],
resolve
),
meta
:
{
meta
:
{
title
:
'团控票务'
title
:
'散客机票查询'
},
},
{
//团控票务
path
:
'/hotelSpider'
,
name
:
'hotelSpider'
,
component
:
resolve
=>
require
([
'@/components/hotel/hotelSpider'
],
resolve
),
meta
:
{
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