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
2b781142
Commit
2b781142
authored
Jan 29, 2019
by
王悦
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
2e1256bb
e358b84d
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
866 additions
and
89 deletions
+866
-89
tripIndex.css
src/assets/css/tripIndex.css
+3
-2
Details.vue
src/components/Details.vue
+7
-1
addFinancialDocuments.vue
src/components/FinancialModule/addFinancialDocuments.vue
+1
-0
addReceivablesDocuments.vue
src/components/FinancialModule/addReceivablesDocuments.vue
+1
-0
MyCustomer.vue
src/components/SalesModule/MyCustomer.vue
+1
-1
MyCustomerDetail.vue
src/components/SalesModule/MyCustomerDetail.vue
+1
-1
SalesFinancialDetail.vue
src/components/SalesModule/SalesFinancialDetail.vue
+202
-0
addPassenger.vue
src/components/SalesModule/addPassenger.vue
+51
-23
customerTransfer.vue
src/components/SalesModule/customerTransfer.vue
+4
-4
enrollTotalTwo.vue
src/components/SalesModule/enrollTotalTwo.vue
+20
-20
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+8
-8
passengerSaleList.vue
src/components/SalesModule/passengerSaleList.vue
+7
-0
publicCustomer.vue
src/components/SalesModule/publicCustomer.vue
+1
-1
ShoppingReimbursement.vue
src/components/ShoppingStore/ShoppingReimbursement.vue
+1
-1
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+11
-8
TeamBalancePayment.vue
...omponents/TravelManager/TravelList/TeamBalancePayment.vue
+16
-4
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+4
-0
VisaPersonalForm.vue
src/components/VisaPersonalForm.vue
+22
-0
VisaPersonalFormSell.vue
src/components/VisaPersonalFormSell.vue
+476
-0
confirmationOrderDownLoad.vue
src/components/confirmationOrderDownLoad.vue
+12
-12
index.js
src/plug/index.js
+4
-3
config.js
src/router/config.js
+13
-0
No files found.
src/assets/css/tripIndex.css
View file @
2b781142
...
@@ -615,9 +615,10 @@
...
@@ -615,9 +615,10 @@
.travelControlTrip
.essential-item
p
.pkey
{
font-size
:
14px
;
color
:
#000
;
margin
:
10px
0
0
0
;
}
.travelControlTrip
.essential-item
p
.pkey
{
font-size
:
14px
;
color
:
#000
;
margin
:
10px
0
0
0
;
}
.travelControlTrip
.essential-item
p
.pvalue
{
font-size
:
18px
;
color
:
#000
;
margin-top
:
5px
;
}
.travelControlTrip
.essential-item
p
.pvalue
{
font-size
:
18px
;
color
:
#000
;
margin-top
:
5px
;
}
.travelControlTrip
.collection
{
margin-bottom
:
40px
;
width
:
100%
;}
.travelControlTrip
.collection
{
margin-bottom
:
40px
;
width
:
100%
;}
.travelControlTrip
.collection-item
{
width
:
400px
;
height
:
110px
;
line-height
:
110px
;
border-bottom
:
1px
solid
#ddd
;
margin-left
:
60px
;
box-sizing
:
border-box
;
color
:
#666
;}
.travelControlTrip
.collection-item
{
width
:
400px
;
height
:
110px
;
border-bottom
:
1px
solid
#ddd
;
margin-left
:
60px
;
box-sizing
:
border-box
;
color
:
#666
;}
.travelControlTrip
.collection-item
>
div
{
width
:
130px
;
float
:
left
;
padding-top
:
25px
;}
.travelControlTrip
.collection-item
img
{
vertical-align
:
sub
;
margin-right
:
12px
;}
.travelControlTrip
.collection-item
img
{
vertical-align
:
sub
;
margin-right
:
12px
;}
.travelControlTrip
.collection-item
span
{
font-size
:
18px
;
color
:
#000
;
margin-left
:
20
px
;}
.travelControlTrip
.collection-item
span
{
font-size
:
18px
;
color
:
#000
;
width
:
270px
;
display
:
inline-block
;
float
:
left
;
padding-top
:
25
px
;}
.travelControlTrip
.flight-table
{
width
:
960px
;
color
:
#666
;
margin-bottom
:
90px
;
background
:
#fff
;}
.travelControlTrip
.flight-table
{
width
:
960px
;
color
:
#666
;
margin-bottom
:
90px
;
background
:
#fff
;}
.travelControlTrip
.flight-table
td
.thClass
{
height
:
50px
;
background
:
#e2e2e2
;
font-size
:
16px
;
font-weight
:
normal
;
padding
:
0
!important
;}
.travelControlTrip
.flight-table
td
.thClass
{
height
:
50px
;
background
:
#e2e2e2
;
font-size
:
16px
;
font-weight
:
normal
;
padding
:
0
!important
;}
.travelControlTrip
.flight-table
tr
td
{
background
:
#f7f7f7
;
text-align
:
center
;
font-size
:
14px
;
padding
:
15px
10px
;
}
.travelControlTrip
.flight-table
tr
td
{
background
:
#f7f7f7
;
text-align
:
center
;
font-size
:
14px
;
padding
:
15px
10px
;
}
...
...
src/components/Details.vue
View file @
2b781142
...
@@ -533,6 +533,9 @@ export default {
...
@@ -533,6 +533,9 @@ export default {
case
"/AccountPageList"
:
//财务 下属账号页面
case
"/AccountPageList"
:
//财务 下属账号页面
path
=
"/institutionsManagement"
;
path
=
"/institutionsManagement"
;
break
;
break
;
case
"/SalesFinancialDetail"
:
//销售
path
=
"/groupTourOrder"
;
break
;
}
}
//找到Root
//找到Root
...
@@ -738,6 +741,9 @@ export default {
...
@@ -738,6 +741,9 @@ export default {
case
"/AccountPageList"
:
//财务 下属账号页面
case
"/AccountPageList"
:
//财务 下属账号页面
path
=
"/institutionsManagement"
;
path
=
"/institutionsManagement"
;
break
;
break
;
case
"/SalesFinancialDetail"
:
//销售
path
=
"/groupTourOrder"
;
break
;
}
}
//找到Root
//找到Root
...
@@ -787,7 +793,7 @@ export default {
...
@@ -787,7 +793,7 @@ export default {
},
},
getTitleByRouter
(
name
){
getTitleByRouter
(
name
){
let
obj
=
{}
let
obj
=
{}
routerConfig
.
routes
[
8
].
children
[
10
].
children
.
forEach
(
x
=>
{
routerConfig
.
routes
[
9
].
children
[
10
].
children
.
forEach
(
x
=>
{
if
(
x
.
name
==
name
){
if
(
x
.
name
==
name
){
obj
.
comp
=
x
.
component
obj
.
comp
=
x
.
component
if
(
x
.
meta
&&
x
.
meta
.
title
)
if
(
x
.
meta
&&
x
.
meta
.
title
)
...
...
src/components/FinancialModule/addFinancialDocuments.vue
View file @
2b781142
...
@@ -187,6 +187,7 @@
...
@@ -187,6 +187,7 @@
<el-radio
:label=
"2"
>
人民币现金
</el-radio>
<el-radio
:label=
"2"
>
人民币现金
</el-radio>
<el-radio
:label=
"3"
>
外币现金
</el-radio>
<el-radio
:label=
"3"
>
外币现金
</el-radio>
<el-radio
:label=
"4"
>
资金池
</el-radio>
<el-radio
:label=
"4"
>
资金池
</el-radio>
<el-radio
:label=
"5"
>
平台虚拟账户
</el-radio>
<!--
<el-radio
:label=
"3"
>
资金池
</el-radio>
-->
<!--
<el-radio
:label=
"3"
>
资金池
</el-radio>
-->
</el-radio-group>
</el-radio-group>
</div>
</div>
...
...
src/components/FinancialModule/addReceivablesDocuments.vue
View file @
2b781142
...
@@ -955,6 +955,7 @@ export default {
...
@@ -955,6 +955,7 @@ export default {
if
(
res
.
data
.
resultCode
==
1
){
if
(
res
.
data
.
resultCode
==
1
){
let
AccList
=
res
.
data
.
data
;
let
AccList
=
res
.
data
.
data
;
let
newAccList
=
[];
let
newAccList
=
[];
// if (typeof this.GetDetail.walist !== Array) return false
this
.
GetDetail
.
walist
.
forEach
(
x
=>
{
this
.
GetDetail
.
walist
.
forEach
(
x
=>
{
if
(
x
.
Type
===
1
){
if
(
x
.
Type
===
1
){
AccList
.
forEach
(
y
=>
{
AccList
.
forEach
(
y
=>
{
...
...
src/components/SalesModule/MyCustomer.vue
View file @
2b781142
...
@@ -153,7 +153,7 @@
...
@@ -153,7 +153,7 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<el-form-item
label=
"
客户
名称:"
prop=
"customerName"
>
<el-form-item
label=
"
门店
名称:"
prop=
"customerName"
>
<el-input
:disabled=
"isOldPerson"
v-model=
"addMsg.customerName"
placeholder=
"请输入"
maxlength=
"20"
></el-input>
<el-input
:disabled=
"isOldPerson"
v-model=
"addMsg.customerName"
placeholder=
"请输入"
maxlength=
"20"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
...
src/components/SalesModule/MyCustomerDetail.vue
View file @
2b781142
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
<el-form
label-width=
"80px"
>
<el-form
label-width=
"80px"
>
<el-row
:gutter=
"20"
>
<el-row
:gutter=
"20"
>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<el-form-item
label=
"
客户
名称:"
>
<el-form-item
label=
"
门店
名称:"
>
<el-input
class=
'w200'
v-model=
'updateMsg.CustomerName'
></el-input>
<el-input
class=
'w200'
v-model=
'updateMsg.CustomerName'
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
...
src/components/SalesModule/SalesFinancialDetail.vue
0 → 100644
View file @
2b781142
<
style
>
.page_SalesFinancialDetail
{}
.page_SalesFinancialDetail
p
.sfd_tit
{
border-left
:
3px
solid
#E95252
;
text-indent
:
10px
;
font-size
:
16px
;
line-height
:
30px
;
margin
:
20px
0
10px
0
;
}
.page_SalesFinancialDetail
.sfd_nav
{
margin
:
20px
0
0
0
;}
.page_SalesFinancialDetail
.sfd_nav
li
{
float
:
left
;
font-size
:
14px
;
color
:
#666666
;
padding
:
15px
20px
;
cursor
:
pointer
;
position
:
relative
;
background-color
:
#f1f1f1
;
margin-right
:
5px
}
.page_SalesFinancialDetail
.sfd_nav
li
._active
{
background-color
:
#FFFFFF
;
color
:
#333333
}
.page_SalesFinancialDetail
.sfd_nav
li
._active
::after
{
content
:
""
;
width
:
20px
;
height
:
3px
;
background-color
:
#E95252
;
display
:
inline-block
;
position
:
absolute
;
bottom
:
0
;
left
:
38%
;}
.page_SalesFinancialDetail
p
.sfd_tit
input
{
float
:
right
}
.page_SalesFinancialDetail
.sfd_header
{
position
:
relative
;
width
:
100%
;
margin-bottom
:
15px
;
}
.page_SalesFinancialDetail
.sfd_header
input
{
position
:
absolute
;
right
:
0
;
bottom
:
0
;
}
.page_SalesFinancialDetail
.sfd_header
>
ul
{
background-color
:
white
;
padding
:
15px
;
border-radius
:
4px
;
width
:
50%
;
}
.page_SalesFinancialDetail
.sfd_header
>
ul
>
li
{
float
:
left
;
width
:
33%
;
padding
:
5px
0
;
}
.page_SalesFinancialDetail
.sfd_header
>
ul
>
li
>
span
{
font-size
:
14px
;
color
:
#666
;
}
.page_SalesFinancialDetail
table
.teamRevenueExpenditureTable
{
background
:
#eee
;
width
:
100%
;
margin-bottom
:
30px
;
}
.page_SalesFinancialDetail
table
.teamRevenueExpenditureTable
th
{
background
:
#D1D1D1
;
font-weight
:
normal
!important
;
font-size
:
14px
;
height
:
30px
;
color
:
#333
;
}
.page_SalesFinancialDetail
table
.teamRevenueExpenditureTable
td
{
background
:
#fff
;
height
:
36px
;
text-align
:
center
;
font-size
:
12px
;
}
.page_SalesFinancialDetail
table
.teamRevenueExpenditureTable
td
:first-child
span
{
text-decoration
:
underline
;
cursor
:
pointer
;
}
.page_SalesFinancialDetail
td
.noDataNotice
p
.iconfont
{
font-size
:
120px
;
color
:
#ccc
;
}
.page_SalesFinancialDetail
td
.noDataNotice
p
.text
{
color
:
#999
;
margin-bottom
:
20px
;
}
.page_SalesFinancialDetail
.color_red
{
color
:
#e95252
!important
;
}
</
style
>
<
template
>
<div
class=
"page_SalesFinancialDetail"
>
<ul
class=
"sfd_nav clearfix"
>
<li
:class=
"activeTab==1?'_active':''"
@
click=
"activeTab=1,getList(1)"
>
收款单
</li>
<li
:class=
"activeTab==2?'_active':''"
@
click=
"activeTab=2,getList(2)"
>
付款单
</li>
</ul>
<div
v-loading=
"loading"
>
<div
class=
"sfd_header"
>
<ul
class=
"clearfix"
>
<li><span>
团队编号:
</span>
{{
tcnum
}}
</li>
<li><span>
订单号:
</span>
{{
orderId
}}
</li>
<li><span>
业务员:
</span>
{{
`王大毛`
}}
</li>
<li><span>
应收金额:
</span>
{{
moneyFormat
(
0
)
}}
</li>
<li><span>
实收金额:
</span>
{{
moneyFormat
(
0
)
}}
</li>
<li><span>
代收金额:
</span>
{{
moneyFormat
(
0
)
}}
</li>
</ul>
<input
type=
"button"
:value=
"`新增$
{activeTab===1 ? '收款' : '付款'}`" class="normalBtn" @click="addFinancialOrder()">
</div>
<table
border=
"0"
cellspacing=
"1"
cellpadding=
"0"
class=
"teamRevenueExpenditureTable"
>
<tr>
<th
width=
"100"
>
单号
</th>
<th
width=
"10%"
>
费用类型
</th>
<th
width=
"10%"
>
交易方式
</th>
<th
width=
"10%"
>
金额
</th>
<th
width=
"20%"
>
交易日期
</th>
<th
width=
"10%"
>
制单人员
</th>
<th
width=
"10%"
>
主管审核
</th>
<th>
出纳审核
</th>
<th
width=
"10%"
>
会计审核
</th>
</tr>
<tr>
<td
width=
"100"
@
click=
"goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')"
><span>
666
</span></th>
<td
width=
"10%"
>
吃饭
</td>
<td
width=
"10%"
>
现金
</td>
<td
width=
"10%"
>
{{
moneyFormat
(
0
)
}}
</td>
<td
width=
"20%"
>
2019-02-29
</td>
<td
width=
"10%"
>
王大毛
</td>
<td
width=
"10%"
>
王二毛
</td>
<td>
王三毛
</td>
<td
width=
"10%"
>
王四毛
</td>
</tr>
<tr
v-if=
"dataList.length===0"
>
<td
colspan=
"9"
class=
"noDataNotice"
>
<div>
<p
class=
"iconfont icon-kong"
></p>
<p
class=
"text"
>
{{
`暂无数据`
}}
</p>
</div>
</td>
</tr>
</table>
</div>
</div>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
orderId
:
0
,
dataList
:
[],
loading
:
true
,
noData
:
true
,
activeTab
:
1
,
tcnum
:
''
,
}
},
methods
:
{
goUrl
:
function
(
name
,
path
,
id
,
tcmun
)
{
this
.
$router
.
push
({
name
:
path
,
query
:
{
id
:
id
,
tcmun
:
tcmun
,
blank
:
'y'
,
tab
:
name
}
});
},
getList
:
function
(
type
)
{
this
.
loading
=
true
setTimeout
(()
=>
{
this
.
apipost
(
''
,
{
ID
:
this
.
orderId
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
dataList
=
res
.
data
.
data
}
else
{
this
.
$message
.
error
(
"数据获取失败!"
);
}
this
.
loading
=
false
},
null
)
},
2000
)
},
addFinancialOrder
:
function
()
{
// 新增单据方法
if
(
this
.
activeTab
===
1
)
{
let
orderObj
=
{
OrderID
:
obj
.
orderId
,
OrderSource
:
8
,
Obj
:
{},
SourceID
:
obj
.
ID
,
TCIDList
:
TCIDARR
}
this
.
$router
.
push
({
name
:
'ChoiceAddFinancialDocuments'
,
query
:{
"Type"
:
1
,
"companyID"
:
obj
.
outBranchId
,
"path"
:
""
,
'blank'
:
'y'
,
'orderObj'
:
JSON
.
stringify
(
orderObj
)
}
});
}
else
if
(
this
.
activeTab
===
2
)
{
let
orderObj
=
{
OrderID
:
obj
.
orderId
,
OrderSource
:
8
,
Obj
:
{},
SourceID
:
obj
.
ID
,
TCIDList
:
TCIDARR
}
this
.
$router
.
push
({
name
:
'ChoiceAddFinancialDocuments'
,
query
:{
"Type"
:
2
,
"companyID"
:
obj
.
outBranchId
,
"path"
:
""
,
'blank'
:
'y'
,
'orderObj'
:
JSON
.
stringify
(
orderObj
)
}
});
}
},
},
mounted
()
{
this
.
orderId
=
this
.
$route
.
query
.
orderId
this
.
tcnum
=
this
.
$route
.
query
.
tcnum
this
.
getList
(
1
)
}
}
</
script
>
src/components/SalesModule/addPassenger.vue
View file @
2b781142
...
@@ -139,10 +139,12 @@
...
@@ -139,10 +139,12 @@
</li>
</li>
<li>
<li>
<el-form-item
label=
"性别"
prop=
"Sex"
>
<el-form-item
label=
"性别"
prop=
"Sex"
>
<el-select
v-model=
'addMsg.Sex'
size=
mini
class=
"w230"
>
<el-checkbox
v-model=
"addMsg.Sex"
true-label=
'1'
false-label=
'2'
>
男
</el-checkbox>
<el-checkbox
v-model=
"addMsg.Sex"
true-label=
'2'
false-label=
'1'
>
女
</el-checkbox>
<!--
<el-select
v-model=
'addMsg.Sex'
size=
mini
class=
"w230"
>
<el-option
key=
"1"
label=
"男"
value=
"1"
>
</el-option>
<el-option
key=
"1"
label=
"男"
value=
"1"
>
</el-option>
<el-option
key=
"2"
label=
"女"
value=
"2"
>
</el-option>
<el-option
key=
"2"
label=
"女"
value=
"2"
>
</el-option>
</el-select>
</el-select>
-->
</el-form-item>
</el-form-item>
</li>
</li>
<li>
<li>
...
@@ -155,21 +157,32 @@
...
@@ -155,21 +157,32 @@
<el-input
v-model=
'addMsg.EName'
type=
"text"
size=
mini
class=
"w230"
maxlength=
"20"
placeholder=
"请输入英文"
></el-input>
<el-input
v-model=
'addMsg.EName'
type=
"text"
size=
mini
class=
"w230"
maxlength=
"20"
placeholder=
"请输入英文"
></el-input>
</el-form-item>
</el-form-item>
</li>
</li>
<li>
<el-form-item
label=
"手机号码"
prop=
"MobilePhone"
>
<el-input
v-model=
"addMsg.MobilePhone"
type=
"text"
size=
mini
class=
"w230"
maxlength=
"20"
placeholder=
"请填写"
></el-input>
</el-form-item>
</li>
<li>
<li>
<el-form-item
label=
"出生日期"
prop=
"Birthday"
>
<el-form-item
label=
"出生日期"
prop=
"Birthday"
>
<el-date-picker
v-model=
'addMsg.Birthday'
class=
"w230"
value-format=
"yyyy-MM-dd"
type=
"date"
placeholder=
"选择日期"
></el-date-picker>
<el-date-picker
v-model=
'addMsg.Birthday'
class=
"w230"
value-format=
"yyyy-MM-dd"
type=
"date"
placeholder=
"选择日期"
></el-date-picker>
</el-form-item>
</el-form-item>
</li>
</li>
<li>
<el-form-item
label=
"出生地"
prop=
"BirthdayAddress"
>
<el-input
v-model=
"addMsg.BirthdayAddress"
type=
"text"
size=
mini
class=
"w230"
maxlength=
"20"
placeholder=
"请填写"
></el-input>
</el-form-item>
</li>
<li>
<li>
<el-form-item
label=
"护照号"
prop=
"PassportNo"
>
<el-form-item
label=
"护照号"
prop=
"PassportNo"
>
<el-input
v-model=
'addMsg.PassportNo'
type=
"text"
size=
mini
class=
"w230"
maxlength=
"20"
placeholder=
"请填写护照号"
></el-input>
<el-input
v-model=
'addMsg.PassportNo'
type=
"text"
size=
mini
class=
"w230"
maxlength=
"20"
placeholder=
"请填写护照号"
></el-input>
</el-form-item>
</el-form-item>
</li>
</li>
<li>
<li>
<el-form-item
label=
"出生地"
prop=
"BirthdayAddress"
>
<el-input
v-model=
"addMsg.BirthdayAddress"
type=
"text"
size=
mini
class=
"w230"
maxlength=
"20"
placeholder=
"请填写"
></el-input>
<el-form-item
label=
"护照签发地"
prop=
"PassportAddress"
>
<el-input
v-model=
'addMsg.PassportAddress'
type=
"text"
size=
mini
class=
"w230"
maxlength=
"100"
placeholder=
"请填写"
></el-input>
</el-form-item>
</el-form-item>
</li>
</li>
<li>
<li>
<el-form-item
label=
"护照签发日期"
prop=
"PassportIssued"
>
<el-form-item
label=
"护照签发日期"
prop=
"PassportIssued"
>
<el-date-picker
v-model=
'addMsg.PassportIssued'
class=
"w230"
value-format=
"yyyy-MM-dd"
type=
"date"
placeholder=
"选择日期"
></el-date-picker>
<el-date-picker
v-model=
'addMsg.PassportIssued'
class=
"w230"
value-format=
"yyyy-MM-dd"
type=
"date"
placeholder=
"选择日期"
></el-date-picker>
...
@@ -192,17 +205,6 @@
...
@@ -192,17 +205,6 @@
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</li>
</li>
<li>
<el-form-item
label=
"护照签发地"
prop=
"PassportAddress"
>
<el-input
v-model=
'addMsg.PassportAddress'
type=
"text"
size=
mini
class=
"w230"
maxlength=
"100"
placeholder=
"请填写"
></el-input>
</el-form-item>
</li>
<li>
<el-form-item
label=
"手机号码"
prop=
"MobilePhone"
>
<el-input
v-model=
"addMsg.MobilePhone"
type=
"text"
size=
mini
class=
"w230"
maxlength=
"20"
placeholder=
"请填写"
></el-input>
</el-form-item>
</li>
<li>
<li>
<el-form-item
label=
"婚姻"
prop=
"Marriage"
>
<el-form-item
label=
"婚姻"
prop=
"Marriage"
>
<el-select
v-model=
"addMsg.Marriage"
filterable
size=
mini
class=
"w230"
>
<el-select
v-model=
"addMsg.Marriage"
filterable
size=
mini
class=
"w230"
>
...
@@ -745,7 +747,7 @@ export default {
...
@@ -745,7 +747,7 @@ export default {
PassportAddress
:
""
,
PassportAddress
:
""
,
PassportExpiry
:
""
,
PassportExpiry
:
""
,
PassportNo
:
""
,
PassportNo
:
""
,
Nationality
:
""
,
Nationality
:
2
,
Marriage
:
""
,
Marriage
:
""
,
Address
:
""
,
Address
:
""
,
AddressDetail
:
""
,
AddressDetail
:
""
,
...
@@ -768,14 +770,14 @@ export default {
...
@@ -768,14 +770,14 @@ export default {
UnitName
:
""
,
UnitName
:
""
,
UnitPhone
:
""
,
UnitPhone
:
""
,
UnitPost
:
""
,
UnitPost
:
""
,
Purpose
:
""
,
Purpose
:
"
观光
"
,
IsDepartureRecord
:
"2"
,
IsDepartureRecord
:
"2"
,
LastTime
:
""
,
LastTime
:
""
,
DeadlineTime
:
""
,
DeadlineTime
:
""
,
NCNationality
:
""
,
NCNationality
:
""
,
HotelTel
:
""
,
HotelTel
:
""
,
HotelAddress
:
""
,
HotelAddress
:
""
,
HotelName
:
""
,
HotelName
:
"
参照
\"
赴日予定表
\"
"
,
EmergencyContact
:
""
,
EmergencyContact
:
""
,
EmergencyAddress
:
""
,
EmergencyAddress
:
""
,
EmergencyTel
:
""
,
EmergencyTel
:
""
,
...
@@ -1964,7 +1966,7 @@ export default {
...
@@ -1964,7 +1966,7 @@ export default {
this
.
addMsg
.
PassportAddress
=
""
;
this
.
addMsg
.
PassportAddress
=
""
;
this
.
addMsg
.
PassportExpiry
=
""
;
this
.
addMsg
.
PassportExpiry
=
""
;
this
.
addMsg
.
PassportNo
=
""
;
this
.
addMsg
.
PassportNo
=
""
;
this
.
addMsg
.
Nationality
=
""
;
this
.
addMsg
.
Nationality
=
2
;
this
.
addMsg
.
Marriage
=
""
;
this
.
addMsg
.
Marriage
=
""
;
this
.
addMsg
.
Address
=
""
;
this
.
addMsg
.
Address
=
""
;
this
.
addMsg
.
AddressDetail
=
""
;
this
.
addMsg
.
AddressDetail
=
""
;
...
@@ -1987,14 +1989,14 @@ export default {
...
@@ -1987,14 +1989,14 @@ export default {
this
.
addMsg
.
UnitName
=
""
;
this
.
addMsg
.
UnitName
=
""
;
this
.
addMsg
.
UnitPhone
=
""
;
this
.
addMsg
.
UnitPhone
=
""
;
this
.
addMsg
.
UnitPost
=
""
;
this
.
addMsg
.
UnitPost
=
""
;
this
.
addMsg
.
Purpose
=
""
;
this
.
addMsg
.
Purpose
=
"
观光
"
;
this
.
addMsg
.
IsDepartureRecord
=
"2"
;
this
.
addMsg
.
IsDepartureRecord
=
"2"
;
this
.
addMsg
.
LastTime
=
""
;
this
.
addMsg
.
LastTime
=
""
;
this
.
addMsg
.
DeadlineTime
=
""
;
this
.
addMsg
.
DeadlineTime
=
""
;
this
.
addMsg
.
NCNationality
=
""
;
this
.
addMsg
.
NCNationality
=
""
;
this
.
addMsg
.
HotelTel
=
""
;
this
.
addMsg
.
HotelTel
=
""
;
this
.
addMsg
.
HotelAddress
=
""
;
this
.
addMsg
.
HotelAddress
=
""
;
this
.
addMsg
.
HotelName
=
""
;
this
.
addMsg
.
HotelName
=
"
参照
\"
赴日予定表
\"
"
;
this
.
addMsg
.
EmergencyContact
=
""
;
this
.
addMsg
.
EmergencyContact
=
""
;
this
.
addMsg
.
EmergencyAddress
=
""
;
this
.
addMsg
.
EmergencyAddress
=
""
;
this
.
addMsg
.
EmergencyTel
=
""
;
this
.
addMsg
.
EmergencyTel
=
""
;
...
@@ -2012,6 +2014,19 @@ export default {
...
@@ -2012,6 +2014,19 @@ export default {
this
.
addMsg
.
SafeReplaceId
=
"0"
;
this
.
addMsg
.
SafeReplaceId
=
"0"
;
this
.
GetGuestMustVisaAir
();
this
.
GetGuestMustVisaAir
();
let
userInfo
=
this
.
getLocalStorage
();
var
BranchName
=
userInfo
.
BranchName
;
if
(
BranchName
.
search
(
"武汉"
)
!=-
1
){
this
.
addMsg
.
BirthdayAddress
=
"湖北"
;
this
.
addMsg
.
PassportAddress
=
"湖北"
;
}
else
if
(
BranchName
.
search
(
"西安"
)
!=-
1
){
this
.
addMsg
.
BirthdayAddress
=
"陕西"
;
this
.
addMsg
.
PassportAddress
=
"陕西"
;
}
else
if
(
BranchName
.
search
(
"长沙"
)
!=-
1
){
this
.
addMsg
.
BirthdayAddress
=
"湖南"
;
this
.
addMsg
.
PassportAddress
=
"湖南"
;
}
this
.
addMsg
.
IssuingAuthority
=
"公安部出入境管理局"
;
}
}
},
},
mounted
()
{
mounted
()
{
...
@@ -2029,6 +2044,19 @@ export default {
...
@@ -2029,6 +2044,19 @@ export default {
this
.
getAccessToken
();
this
.
getAccessToken
();
this
.
addMsg
.
TCID
=
this
.
$route
.
query
.
TCID
;
this
.
addMsg
.
TCID
=
this
.
$route
.
query
.
TCID
;
this
.
addMsg
.
OrderId
=
this
.
$route
.
query
.
orderId
;
this
.
addMsg
.
OrderId
=
this
.
$route
.
query
.
orderId
;
let
userInfo
=
this
.
getLocalStorage
();
var
BranchName
=
userInfo
.
BranchName
;
if
(
BranchName
.
search
(
"武汉"
)
!=-
1
){
this
.
addMsg
.
BirthdayAddress
=
"湖北"
;
this
.
addMsg
.
PassportAddress
=
"湖北"
;
}
else
if
(
BranchName
.
search
(
"西安"
)
!=-
1
){
this
.
addMsg
.
BirthdayAddress
=
"陕西"
;
this
.
addMsg
.
PassportAddress
=
"陕西"
;
}
else
if
(
BranchName
.
search
(
"长沙"
)
!=-
1
){
this
.
addMsg
.
BirthdayAddress
=
"湖南"
;
this
.
addMsg
.
PassportAddress
=
"湖南"
;
}
this
.
addMsg
.
IssuingAuthority
=
"公安部出入境管理局"
;
}
}
};
};
</
script
>
</
script
>
\ No newline at end of file
src/components/SalesModule/customerTransfer.vue
View file @
2b781142
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
</el-select>
</el-select>
</li>
</li>
<li><span><em>
关键字
</em></span>
<li><span><em>
关键字
</em></span>
<el-input
v-model=
'msg.CustomerName'
placeholder=
"请输入
客户
名称或电话"
></el-input>
<el-input
v-model=
'msg.CustomerName'
placeholder=
"请输入
门店
名称或电话"
></el-input>
</li>
</li>
<li><input
type=
"button"
class=
"hollowFixedBtn"
value=
"查询"
@
click=
"resetPageIndex(),getList()"
/>
<li><input
type=
"button"
class=
"hollowFixedBtn"
value=
"查询"
@
click=
"resetPageIndex(),getList()"
/>
<el-popover
width=
'280'
v-model=
'layerShow'
popper-class=
'pd20'
trigger=
"click"
>
<el-popover
width=
'280'
v-model=
'layerShow'
popper-class=
'pd20'
trigger=
"click"
>
...
@@ -56,8 +56,8 @@
...
@@ -56,8 +56,8 @@
<table
class=
"customerTransferTable mt20"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
'loading'
>
<table
class=
"customerTransferTable mt20"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
'loading'
>
<tr>
<tr>
<th
width=
"15%"
>
<th
width=
"15%"
>
客户
名称
门店
名称
<!--
<label><input
type=
"checkbox"
v-model=
"isCkedAll"
@
click=
'checkedAll()'
style=
"vertical-align: middle;"
/>
客户
名称
</label>
-->
<!--
<label><input
type=
"checkbox"
v-model=
"isCkedAll"
@
click=
'checkedAll()'
style=
"vertical-align: middle;"
/>
门店
名称
</label>
-->
</th>
</th>
<th
width=
"10%"
>
<th
width=
"10%"
>
联系人
联系人
...
@@ -150,7 +150,7 @@
...
@@ -150,7 +150,7 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"6"
>
<el-col
:span=
"6"
>
<el-form-item
label=
"
客户
名称:"
prop=
"CustomerName"
>
<el-form-item
label=
"
门店
名称:"
prop=
"CustomerName"
>
<el-input
:disabled=
"isOldPerson"
v-model=
"addMsg.CustomerName"
placeholder=
"请输入"
maxlength=
"20"
></el-input>
<el-input
:disabled=
"isOldPerson"
v-model=
"addMsg.CustomerName"
placeholder=
"请输入"
maxlength=
"20"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
...
src/components/SalesModule/enrollTotalTwo.vue
View file @
2b781142
...
@@ -148,7 +148,7 @@
...
@@ -148,7 +148,7 @@
<div>
<div>
<i
class=
"groupTourOrder_count_green"
></i>
<i
class=
"groupTourOrder_count_green"
></i>
<span>
应收金额:
</span>
<span>
应收金额:
</span>
<span>
{{
countData
.
SumPreferPrice
}}
</span>
<span>
{{
moneyFormat
(
countData
.
SumPreferPrice
)
}}
</span>
</div>
</div>
</div>
</div>
</el-col>
</el-col>
...
@@ -157,7 +157,7 @@
...
@@ -157,7 +157,7 @@
<div>
<div>
<i
class=
"groupTourOrder_count_green"
></i>
<i
class=
"groupTourOrder_count_green"
></i>
<span>
已收金额:
</span>
<span>
已收金额:
</span>
<span>
{{
countData
.
SumIncome
}}
</span>
<span>
{{
moneyFormat
(
countData
.
SumIncome
)
}}
</span>
</div>
</div>
</div>
</div>
</el-col>
</el-col>
...
@@ -166,7 +166,7 @@
...
@@ -166,7 +166,7 @@
<div>
<div>
<i
class=
"groupTourOrder_count_green"
></i>
<i
class=
"groupTourOrder_count_green"
></i>
<span>
退款金额:
</span>
<span>
退款金额:
</span>
<span>
{{
countData
.
SumRefund
}}
</span>
<span>
{{
moneyFormat
(
countData
.
SumRefund
)
}}
</span>
</div>
</div>
</div>
</div>
</el-col>
</el-col>
...
@@ -175,7 +175,7 @@
...
@@ -175,7 +175,7 @@
<div>
<div>
<i
class=
"groupTourOrder_count_green"
></i>
<i
class=
"groupTourOrder_count_green"
></i>
<span>
平台税金:
</span>
<span>
平台税金:
</span>
<span>
{{
countData
.
SumPlatformTax
}}
</span>
<span>
{{
moneyFormat
(
countData
.
SumPlatformTax
)
}}
</span>
</div>
</div>
</div>
</div>
</el-col>
</el-col>
...
@@ -184,7 +184,7 @@
...
@@ -184,7 +184,7 @@
<div>
<div>
<i
class=
"groupTourOrder_count_green"
></i>
<i
class=
"groupTourOrder_count_green"
></i>
<span>
在途金额:
</span>
<span>
在途金额:
</span>
<span>
{{
countData
.
ZaiTu
}}
</span>
<span>
{{
moneyFormat
(
countData
.
ZaiTu
)
}}
</span>
</div>
</div>
</div>
</div>
</el-col>
</el-col>
...
@@ -193,7 +193,7 @@
...
@@ -193,7 +193,7 @@
<div>
<div>
<i
class=
"groupTourOrder_count_green"
></i>
<i
class=
"groupTourOrder_count_green"
></i>
<span>
未收金额:
</span>
<span>
未收金额:
</span>
<span>
{{
countData
.
DaiShou
}}
</span>
<span>
{{
moneyFormat
(
countData
.
DaiShou
)
}}
</span>
</div>
</div>
</div>
</div>
</el-col>
</el-col>
...
@@ -204,6 +204,7 @@
...
@@ -204,6 +204,7 @@
<table
class=
"enrollTotalSearchTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
'loading'
>
<table
class=
"enrollTotalSearchTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
'loading'
>
<tr>
<tr>
<th
width=
"120"
>
单号
&
团号
</th>
<th
width=
"120"
>
单号
&
团号
</th>
<th
width=
"90"
>
客户信息
</th>
<th
width=
"70"
>
类型
</th>
<th
width=
"70"
>
类型
</th>
<th
width=
"180"
>
系列
&
线路
</th>
<th
width=
"180"
>
系列
&
线路
</th>
<!--
<th
width=
"190"
style=
"display:none;"
>
日期
</th>
-->
<!--
<th
width=
"190"
style=
"display:none;"
>
日期
</th>
-->
...
@@ -217,7 +218,6 @@
...
@@ -217,7 +218,6 @@
<th
width=
"80"
>
在途
</th>
<th
width=
"80"
>
在途
</th>
<th
width=
"80"
>
未收
</th>
<th
width=
"80"
>
未收
</th>
<th
width=
"60"
>
状态
</th>
<th
width=
"60"
>
状态
</th>
<th
width=
"90"
>
客户信息
</th>
</tr>
</tr>
<tr>
<tr>
<td
v-show=
"list.length==0"
colspan=
"15"
align=
"center"
>
暂无数据
</td>
<td
v-show=
"list.length==0"
colspan=
"15"
align=
"center"
>
暂无数据
</td>
...
@@ -231,6 +231,10 @@
...
@@ -231,6 +231,10 @@
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{
item
.
createBy
}}
<span
v-if=
"item.leaveStr!=''"
style=
"color:red"
>
(
{{
item
.
leaveStr
}}
)
</span></p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{
item
.
createBy
}}
<span
v-if=
"item.leaveStr!=''"
style=
"color:red"
>
(
{{
item
.
leaveStr
}}
)
</span></p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{
item
.
commissionSPeopleName
==
'无'
?
''
:
item
.
commissionSPeopleName
}}
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{
item
.
commissionSPeopleName
==
'无'
?
''
:
item
.
commissionSPeopleName
}}
</p>
</td>
</td>
<td>
<p
class=
"over_ellipsis"
style=
"width: 150px;"
:title=
"item.contactName"
>
{{
item
.
contactName
}}
</p>
<p>
{{
item
.
contactMobile
}}
</p>
</td>
<td>
<td>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{
item
.
orderTypeName
}}
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{
item
.
orderTypeName
}}
</p>
</td>
</td>
...
@@ -242,29 +246,25 @@
...
@@ -242,29 +246,25 @@
</td>
</td>
<!--
<td
style=
"display:none;"
>
<!--
<td
style=
"display:none;"
>
<p>
下单:
{{
item
.
createDate
}}
</p>
<p>
下单:
{{
item
.
createDate
}}
</p>
<p>
发团:
{{
item
.
startDate
}}
</p>
<p>
发团:
{{
item
.
startDate
}}
</p>
</td>
-->
</td>
-->
<td>
<td>
{{
item
.
guestNum
}}
{{
item
.
guestNum
}}
</td>
</td>
<td
style=
"color:#FF9C00"
>
{{
item
.
tC_Price
}}
</td>
<td
style=
"color:#FF9C00"
>
{{
moneyFormat
(
item
.
tC_Price
)
}}
</td>
<td
style=
"color:#FF9C00"
>
¥
{{
item
.
unit_Price
}}
</td>
<td
style=
"color:#FF9C00"
>
¥
{{
moneyFormat
(
item
.
unit_Price
)
}}
</td>
<td>
<td>
<p
style=
"color:#FF9C00"
>
¥
{{
item
.
preferPrice
}}
</p>
<p
style=
"color:#FF9C00"
>
¥
{{
moneyFormat
(
item
.
preferPrice
)
}}
</p>
</td>
</td>
<td>
<td>
<span
v-if=
'item.isEnd==0'
style=
"cursor: pointer;"
>
{{
item
.
income
}}
</span>
<span
v-if=
'item.isEnd==0'
style=
"cursor: pointer;"
>
{{
moneyFormat
(
item
.
income
)
}}
</span>
<span
v-if=
'item.isEnd!=0'
style=
"cursor: pointer;color: #e95252;"
>
{{
item
.
income
}}
</span>
<span
v-if=
'item.isEnd!=0'
style=
"cursor: pointer;color: #e95252;"
>
{{
moneyFormat
(
item
.
income
)
}}
</span>
</td>
</td>
<td>
{{
item
.
refund
}}
</td>
<td>
{{
item
.
refund
}}
</td>
<td>
{{
item
.
platformTax
}}
</td>
<td>
{{
item
.
platformTax
}}
</td>
<td>
{{
item
.
zaiTuMoney
}}
</td>
<td>
{{
moneyFormat
(
item
.
zaiTuMoney
)
}}
</td>
<td>
{{
item
.
weiShouMoney
}}
</td>
<td>
{{
moneyFormat
(
item
.
weiShouMoney
)
}}
</td>
<td
class=
"fz12"
:style=
"item.orderState===3?'color: #e95252;':''"
>
{{
item
.
statsstr
}}
</td>
<td
class=
"fz12"
:style=
"item.orderState===3?'color: #e95252;':''"
>
{{
item
.
statsstr
}}
</td>
<td>
<p
class=
"over_ellipsis"
style=
"width: 150px;"
:title=
"item.contactName"
>
{{
item
.
contactName
}}
</p>
<p>
{{
item
.
contactMobile
}}
</p>
</td>
</tr>
</tr>
<tr>
<tr>
<td
colspan=
"8"
class=
"groupTourOrder_remarks"
style=
"height: 40px;"
>
<td
colspan=
"8"
class=
"groupTourOrder_remarks"
style=
"height: 40px;"
>
...
@@ -649,7 +649,7 @@
...
@@ -649,7 +649,7 @@
}
}
.enrollTotalSearchTable
tr
{
.enrollTotalSearchTable
tr
{
border-bottom
:
2px
solid
#333
;
/* border-bottom: 2px solid #333; */
}
}
.enrollTotalSearchTable
tr
th
{
.enrollTotalSearchTable
tr
th
{
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
2b781142
...
@@ -804,7 +804,7 @@
...
@@ -804,7 +804,7 @@
</el-col>
-->
</el-col>
-->
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<el-form-item
label=
"应收总额"
prop=
"PreferPrice"
>
<el-form-item
label=
"应收总额"
prop=
"PreferPrice"
>
<el-input
v-model=
'addMsg.PreferPrice'
:disabled=
"
true
"
></el-input>
<el-input
v-model=
'addMsg.PreferPrice'
:disabled=
"
!IsUpdateOrderMoney
"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
...
@@ -1118,7 +1118,7 @@
...
@@ -1118,7 +1118,7 @@
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<el-form-item
label=
"应收总额"
prop=
"PreferPrice"
>
<el-form-item
label=
"应收总额"
prop=
"PreferPrice"
>
<el-input
v-model=
'addMsg.PreferPrice'
:disabled=
"
true
"
></el-input>
<el-input
v-model=
'addMsg.PreferPrice'
:disabled=
"
!IsUpdateOrderMoney
"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
...
@@ -1406,7 +1406,7 @@
...
@@ -1406,7 +1406,7 @@
<p
v-if=
"item.isUnionOrder==1"
class=
"GO_union"
>
联
</p>
<p
v-if=
"item.isUnionOrder==1"
class=
"GO_union"
>
联
</p>
<p
class=
"fbold over_ellipsis"
style=
"width: 100%;"
:title=
"item.orderId"
>
{{
item
.
orderId
}}
</p>
<p
class=
"fbold over_ellipsis"
style=
"width: 100%;"
:title=
"item.orderId"
>
{{
item
.
orderId
}}
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{
item
.
commissionSPeopleName
==
'无'
?
''
:
item
.
commissionSPeopleName
}}
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{
item
.
commissionSPeopleName
==
'无'
?
''
:
item
.
commissionSPeopleName
}}
</p>
<p>
发团:
{{
item
.
start
Date
}}
</p>
<p>
下单时间:
{{
item
.
create
Date
}}
</p>
</td>
</td>
<td>
<td>
<img
v-if=
'!item.createPhoto'
src=
"../../assets/img/litheader.png"
/>
<img
v-if=
'!item.createPhoto'
src=
"../../assets/img/litheader.png"
/>
...
@@ -1454,8 +1454,7 @@
...
@@ -1454,8 +1454,7 @@
</el-popover>
</el-popover>
</td>
</td>
<td
style=
"color:#FF9C00"
>
<td
style=
"color:#FF9C00"
>
<span
v-if=
"item.isOwn==1||userId==1||userId==5||positionId==168"
>
{{
item
.
tC_Price
}}
</span>
<span>
{{
item
.
tC_Price
}}
</span>
<span
v-else
>
*****
</span>
</td>
</td>
<td
style=
"color:#FF9C00"
>
<td
style=
"color:#FF9C00"
>
<span
v-if=
"item.isOwn==1||userId==1||userId==5||positionId==168"
>
{{
item
.
unit_Price
}}
</span>
<span
v-if=
"item.isOwn==1||userId==1||userId==5||positionId==168"
>
{{
item
.
unit_Price
}}
</span>
...
@@ -1653,7 +1652,7 @@
...
@@ -1653,7 +1652,7 @@
<p
v-if=
"item.isUnionOrder==1"
class=
"GO_union"
>
联
</p>
<p
v-if=
"item.isUnionOrder==1"
class=
"GO_union"
>
联
</p>
<p
class=
"fbold over_ellipsis"
style=
"width: 100%;"
:title=
"item.orderId"
>
{{item.orderId}}
</p>
<p
class=
"fbold over_ellipsis"
style=
"width: 100%;"
:title=
"item.orderId"
>
{{item.orderId}}
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 100%;"
>
{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}
</p>
<p>
发团:{{item.start
Date}}
</p>
<p>
下单时间:{{item.create
Date}}
</p>
</td>
</td>
<td>
<td>
<img
v-if=
'!item.createPhoto'
src=
"../../assets/img/litheader.png"
/>
<img
v-if=
'!item.createPhoto'
src=
"../../assets/img/litheader.png"
/>
...
@@ -1701,8 +1700,7 @@
...
@@ -1701,8 +1700,7 @@
</el-popover>
</el-popover>
</td>
</td>
<td
style=
"color:#FF9C00"
>
<td
style=
"color:#FF9C00"
>
<span
v-if=
"item.isOwn==1||userId==1||userId==5||positionId==168"
>
{{item.tC_Price}}
</span>
<span>
{{item.tC_Price}}
</span>
<span
v-else
>
*****
</span>
</td>
</td>
<td
style=
"color:#FF9C00"
>
<td
style=
"color:#FF9C00"
>
<span
v-if=
"item.isOwn==1||userId==1||userId==5||positionId==168"
>
{{item.unit_Price}}
</span>
<span
v-if=
"item.isOwn==1||userId==1||userId==5||positionId==168"
>
{{item.unit_Price}}
</span>
...
@@ -2169,6 +2167,7 @@ export default {
...
@@ -2169,6 +2167,7 @@ export default {
TCNUM
:
''
TCNUM
:
''
}
}
},
},
IsUpdateOrderMoney
:
false
,
//订单编号及业务员信息
//订单编号及业务员信息
subInfo
:{
subInfo
:{
CreateBy
:
''
,
CreateBy
:
''
,
...
@@ -3386,6 +3385,7 @@ export default {
...
@@ -3386,6 +3385,7 @@ export default {
this
.
loading
=
false
;
this
.
loading
=
false
;
this
.
total
=
res
.
data
.
data
.
count
;
this
.
total
=
res
.
data
.
data
.
count
;
this
.
list
=
res
.
data
.
data
.
pageData
.
rtData
;
this
.
list
=
res
.
data
.
data
.
pageData
.
rtData
;
this
.
IsUpdateOrderMoney
=
res
.
data
.
data
.
pageData
.
isUpdateOrderMoney
this
.
cancelRtData
=
res
.
data
.
data
.
pageData
.
cancelRtData
[
0
].
list
;
this
.
cancelRtData
=
res
.
data
.
data
.
pageData
.
cancelRtData
[
0
].
list
;
this
.
seat
.
YSeat
=
res
.
data
.
data
.
pageData
.
ySeatNum
this
.
seat
.
YSeat
=
res
.
data
.
data
.
pageData
.
ySeatNum
this
.
seat
.
CSeat
=
res
.
data
.
data
.
pageData
.
eSeatNum
this
.
seat
.
CSeat
=
res
.
data
.
data
.
pageData
.
eSeatNum
...
...
src/components/SalesModule/passengerSaleList.vue
View file @
2b781142
...
@@ -53,6 +53,9 @@
...
@@ -53,6 +53,9 @@
<el-tooltip
class=
"item"
effect=
"dark"
content=
"删除"
placement=
"top-start"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"删除"
placement=
"top-start"
>
<el-button
type=
"primary"
style=
'background:#e95252; border-color:#e95252'
icon=
"iconfont icon-shanchu"
@
click=
"pal_del(item)"
></el-button>
<el-button
type=
"primary"
style=
'background:#e95252; border-color:#e95252'
icon=
"iconfont icon-shanchu"
@
click=
"pal_del(item)"
></el-button>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"下载申请表"
placement=
"top-start"
>
<el-button
type=
"primary"
style=
'background:#9E8DE3; border-color:#9E8DE3'
icon=
"iconfont icon-img_download"
@
click=
"goUrlB(item.Id)"
></el-button>
</el-tooltip>
</el-button-group>
</el-button-group>
</td>
</td>
</tr>
</tr>
...
@@ -113,6 +116,10 @@ export default {
...
@@ -113,6 +116,10 @@ export default {
goUrlA
:
function
(
guestId
){
goUrlA
:
function
(
guestId
){
this
.
$router
.
push
({
name
:
'addPassenger'
,
query
:{
"TCID"
:
this
.
msg
.
tcid
,
"orderId"
:
this
.
msg
.
id
,
'guestId'
:
guestId
}});
this
.
$router
.
push
({
name
:
'addPassenger'
,
query
:{
"TCID"
:
this
.
msg
.
tcid
,
"orderId"
:
this
.
msg
.
id
,
'guestId'
:
guestId
}});
},
},
goUrlB
:
function
(
guestId
){
let
routeData
=
this
.
$router
.
resolve
({
name
:
'VisaPersonalFormSell'
,
query
:
{
data
:
guestId
}});
window
.
open
(
routeData
.
href
,
'_blank'
);
},
goUrlP
:
function
()
{
goUrlP
:
function
()
{
this
.
$router
.
push
({
name
:
'passengerListSale'
,
query
:
{
id
:
this
.
msg
.
id
,
tcnum
:
this
.
msg
.
tcnum
,
blank
:
'y'
,
tab
:
'旅客分房'
}
});
this
.
$router
.
push
({
name
:
'passengerListSale'
,
query
:
{
id
:
this
.
msg
.
id
,
tcnum
:
this
.
msg
.
tcnum
,
blank
:
'y'
,
tab
:
'旅客分房'
}
});
},
},
...
...
src/components/SalesModule/publicCustomer.vue
View file @
2b781142
...
@@ -52,7 +52,7 @@
...
@@ -52,7 +52,7 @@
<table
class=
"publicCustomerTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
'loading'
>
<table
class=
"publicCustomerTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
'loading'
>
<tr>
<tr>
<th
width=
"20%"
>
<th
width=
"20%"
>
<label><input
type=
"checkbox"
v-model=
"isCkedAll"
@
click=
'checkedAll()'
style=
"vertical-align: middle;"
/>
客户
名称
</label>
<label><input
type=
"checkbox"
v-model=
"isCkedAll"
@
click=
'checkedAll()'
style=
"vertical-align: middle;"
/>
门店
名称
</label>
</th>
</th>
<th
width=
"10%"
>
联系电话
</th>
<th
width=
"10%"
>
联系电话
</th>
<th
width=
"20%"
>
地址
</th>
<th
width=
"20%"
>
地址
</th>
...
...
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @
2b781142
...
@@ -284,7 +284,6 @@
...
@@ -284,7 +284,6 @@
this
.
loading
=
true
this
.
loading
=
true
this
.
apipost
(
'dmcstatistics_post_GetUniteCombinationNumService'
,
this
.
msg
,
res
=>
{
this
.
apipost
(
'dmcstatistics_post_GetUniteCombinationNumService'
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
this
.
loading
=
false
console
.
log
(
"dmcstatistics_post_GetUniteCombinationNumService"
,
res
.
data
.
data
);
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
msg
.
total
=
res
.
data
.
data
.
count
;
this
.
msg
.
total
=
res
.
data
.
data
.
count
;
let
data
=
res
.
data
.
data
.
pageData
.
data
;
let
data
=
res
.
data
.
data
.
pageData
.
data
;
...
@@ -312,6 +311,7 @@
...
@@ -312,6 +311,7 @@
"-"
+
"-"
+
myDate
.
getDate
();
myDate
.
getDate
();
this
.
msg
.
StartDate
=
nowDate
;
this
.
msg
.
StartDate
=
nowDate
;
this
.
getLineTeamList
();
this
.
getList
()
this
.
getList
()
},
},
}
}
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
2b781142
...
@@ -888,8 +888,8 @@
...
@@ -888,8 +888,8 @@
</el-row>
</el-row>
<el-row
:gutter=
"20"
>
<el-row
:gutter=
"20"
>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<el-form-item
label=
"应收总额"
prop=
"PreferPrice"
>
<el-form-item
label=
"应收总额"
prop=
"PreferPrice"
>
<el-input
v-model=
'addMsg.PreferPrice'
:disabled=
"
true
"
></el-input>
<el-input
v-model=
'addMsg.PreferPrice'
:disabled=
"
!this.OrderDataList.IsUpdateOrderMoney
"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
...
@@ -1158,9 +1158,9 @@
...
@@ -1158,9 +1158,9 @@
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<el-form-item
label=
"应收总额"
prop=
"PreferPrice"
>
<el-form-item
label=
"应收总额"
prop=
"PreferPrice"
>
<el-input
v-model=
'addMsg.PreferPrice'
@
keyup
.
native=
"checkInteger(addMsg,'PreferPrice')"
@
input
.
native=
'getTicheng()'
<el-input
v-model=
'addMsg.PreferPrice'
@
keyup
.
native=
"checkInteger(addMsg,'PreferPrice')"
@
input
.
native=
'getTicheng()'
:disabled=
"
true&¬Update
"
></el-input>
:disabled=
"
!this.OrderDataList.IsUpdateOrderMoney
"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
...
@@ -1328,7 +1328,7 @@
...
@@ -1328,7 +1328,7 @@
<div
style=
"width: 100%; height: auto; overflow-x: auto;"
class=
"ownScrollbarStyle"
>
<div
style=
"width: 100%; height: auto; overflow-x: auto;"
class=
"ownScrollbarStyle"
>
<table
class=
"RegisTrationTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
'loading'
>
<table
class=
"RegisTrationTable"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
'loading'
>
<tr>
<tr>
<th
width=
"
13
0"
>
单号
</th>
<th
width=
"
24
0"
>
单号
</th>
<th
width=
"150"
>
客户信息
</th>
<th
width=
"150"
>
客户信息
</th>
<th
width=
"70"
>
人数/机位数
</th>
<th
width=
"70"
>
人数/机位数
</th>
<th
width=
"110"
>
单价
</th>
<th
width=
"110"
>
单价
</th>
...
@@ -1358,7 +1358,8 @@
...
@@ -1358,7 +1358,8 @@
</div>
</div>
<div
class=
"RL_CreatInfo"
>
{{
item
.
CreateBy
}}
<span
v-if=
"item.LeaveStr!=''"
style=
"color:red"
>
(
{{
item
.
LeaveStr
}}
)
</span></div>
<div
class=
"RL_CreatInfo"
>
{{
item
.
CreateBy
}}
<span
v-if=
"item.LeaveStr!=''"
style=
"color:red"
>
(
{{
item
.
LeaveStr
}}
)
</span></div>
<div
class=
"RL_CreatInfo"
>
关联销售:
{{
item
.
CommissionSPeopleName
}}
</div>
<div
class=
"RL_CreatInfo"
>
关联销售:
{{
item
.
CommissionSPeopleName
}}
</div>
<p>
发团:
{{
item
.
startDate
}}
</p>
<p>
下单时间:
{{
item
.
CreateDate
}}
</p>
</td>
</td>
<td>
<td>
<p
class=
"fz12 over_ellipsis"
style=
"width: 90%;"
>
领队控位
</p>
<p
class=
"fz12 over_ellipsis"
style=
"width: 90%;"
>
领队控位
</p>
...
@@ -1530,7 +1531,8 @@
...
@@ -1530,7 +1531,8 @@
</div>
</div>
<div
class=
"RL_CreatInfo"
>
{{
childItem
.
CreateBy
}}
<span
v-if=
"childItem.LeaveStr!=''"
style=
"color:red"
>
(
{{
childItem
.
LeaveStr
}}
)
</span></div>
<div
class=
"RL_CreatInfo"
>
{{
childItem
.
CreateBy
}}
<span
v-if=
"childItem.LeaveStr!=''"
style=
"color:red"
>
(
{{
childItem
.
LeaveStr
}}
)
</span></div>
<div
class=
"RL_CreatInfo"
>
关联销售:
{{
childItem
.
CommissionSPeopleName
}}
</div>
<div
class=
"RL_CreatInfo"
>
关联销售:
{{
childItem
.
CommissionSPeopleName
}}
</div>
<p>
发团:
{{
childItem
.
startDate
}}
</p>
<!--
<p>
发团:
{{
childItem
.
startDate
}}
</p>
-->
<p>
下单时间:
{{
childItem
.
CreateDate
}}
</p>
</td>
</td>
<td>
<td>
<p
v-if=
"childItem.IsOwn==1||userId==1||userId==5"
class=
"fz12 over_ellipsis"
style=
"width:90%;"
:title=
"childItem.ContactName"
>
<p
v-if=
"childItem.IsOwn==1||userId==1||userId==5"
class=
"fz12 over_ellipsis"
style=
"width:90%;"
:title=
"childItem.ContactName"
>
...
@@ -1744,7 +1746,8 @@
...
@@ -1744,7 +1746,8 @@
</div>
</div>
<div
class=
"RL_CreatInfo"
>
{{item.CreateBy}}
<span
v-if=
"item.LeaveStr!=''"
style=
"color:red"
>
({{item.LeaveStr}})
</span></div>
<div
class=
"RL_CreatInfo"
>
{{item.CreateBy}}
<span
v-if=
"item.LeaveStr!=''"
style=
"color:red"
>
({{item.LeaveStr}})
</span></div>
<div
class=
"RL_CreatInfo"
>
关联销售:{{item.CommissionSPeopleName}}
</div>
<div
class=
"RL_CreatInfo"
>
关联销售:{{item.CommissionSPeopleName}}
</div>
<p>
发团:{{item.StartDate}}
</p>
<!-- <p>发团:{{item.StartDate}}</p> -->
<p>
下单时间:{{item.CreateDate}}
</p>
</td>
</td>
<td>
<td>
<p
v-if=
"item.IsOwn==1||userId==1||userId==5"
class=
"fz12 over_ellipsis"
style=
"width:90%;"
:title=
"item.ContactName"
>
{{item.ContactName}}
</p>
<p
v-if=
"item.IsOwn==1||userId==1||userId==5"
class=
"fz12 over_ellipsis"
style=
"width:90%;"
:title=
"item.ContactName"
>
{{item.ContactName}}
</p>
...
...
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @
2b781142
...
@@ -123,7 +123,7 @@
...
@@ -123,7 +123,7 @@
<div
class=
"TB_comtitle"
>
团队收支明细
</div>
<div
class=
"TB_comtitle"
>
团队收支明细
</div>
<div
class=
"Team_Content"
>
<div
class=
"Team_Content"
>
<el-row
:gutter=
"12"
>
<el-row
:gutter=
"12"
>
<el-col
:span=
"
5
"
>
<el-col
:span=
"
4
"
>
<div
class=
"Team_DList"
>
<div
class=
"Team_DList"
>
<div
class=
"Team_firstTitle"
>
收客情况
</div>
<div
class=
"Team_firstTitle"
>
收客情况
</div>
<div>
团队编号:
{{
TCID
}}
</div>
<div>
团队编号:
{{
TCID
}}
</div>
...
@@ -133,7 +133,7 @@
...
@@ -133,7 +133,7 @@
<div>
系列:
{{
DataList
.
TeamBalance
.
LtName
}}
</div>
<div>
系列:
{{
DataList
.
TeamBalance
.
LtName
}}
</div>
</div>
</div>
</el-col>
</el-col>
<el-col
:span=
"
5
"
>
<el-col
:span=
"
4
"
>
<div
class=
"Team_DList"
>
<div
class=
"Team_DList"
>
<div
class=
"Team_firstTitle"
>
<div
class=
"Team_firstTitle"
>
<span
class=
"Team_comCoinType Team_shou"
>
<span
class=
"Team_comCoinType Team_shou"
>
...
@@ -147,7 +147,7 @@
...
@@ -147,7 +147,7 @@
</div>
</div>
</div>
</div>
</el-col>
</el-col>
<el-col
:span=
"
5
"
>
<el-col
:span=
"
4
"
>
<div
class=
"Team_DList"
>
<div
class=
"Team_DList"
>
<div
class=
"Team_firstTitle"
>
<div
class=
"Team_firstTitle"
>
<span
class=
"Team_comCoinType Team_zhichu"
>
<span
class=
"Team_comCoinType Team_zhichu"
>
...
@@ -161,7 +161,7 @@
...
@@ -161,7 +161,7 @@
</div>
</div>
</div>
</div>
</el-col>
</el-col>
<el-col
:span=
"
5
"
>
<el-col
:span=
"
4
"
>
<div
class=
"Team_DList"
>
<div
class=
"Team_DList"
>
<div
class=
"Team_firstTitle"
>
<div
class=
"Team_firstTitle"
>
<span
class=
"Team_comCoinType Team_lirun"
>
<span
class=
"Team_comCoinType Team_lirun"
>
...
@@ -174,6 +174,18 @@
...
@@ -174,6 +174,18 @@
</div>
</div>
</div>
</div>
</el-col>
</el-col>
<el-col
:span=
"4"
>
<div
class=
"Team_DList"
>
<div
class=
"Team_firstTitle"
>
<span
class=
"Team_comCoinType Team_lirun"
>
<i
class=
"iconfont icon-qian"
></i>
</span>
提成
</div>
<div
class=
"Team_Incontent"
>
<div>
预计提成
<span>
¥
{{
DataList
.
ExpectedCut
}}
</span></div>
</div>
</div>
</el-col>
</el-row>
</el-row>
</div>
</div>
</div>
</div>
...
...
src/components/TravelManager/TravelList/TravelControlList.vue
View file @
2b781142
...
@@ -1078,6 +1078,10 @@
...
@@ -1078,6 +1078,10 @@
this
.
queryCommonData
.
checkDialogAll
=
false
;
this
.
queryCommonData
.
checkDialogAll
=
false
;
this
.
queryCommonData
.
ckedplat
=
[];
this
.
queryCommonData
.
ckedplat
=
[];
}
}
else
{
this
.
Info
(
res
.
data
.
message
);
}
});
});
},
},
//单团设置上架
//单团设置上架
...
...
src/components/VisaPersonalForm.vue
View file @
2b781142
...
@@ -173,6 +173,28 @@
...
@@ -173,6 +173,28 @@
<p>
<p>
<span>
国籍(或公民身份)及签证种类
<input
style=
"width: 100%;"
type=
"text"
></span>
<span>
国籍(或公民身份)及签证种类
<input
style=
"width: 100%;"
type=
"text"
></span>
</p>
</p>
<p>
在日邀请人(如保证人和邀请人是同一个人,请写“同上”)
</p>
<p>
<span>
姓名
<input
style=
"width: 48%;"
type=
"text"
value=
'同上'
></span>
<span>
电话
<input
style=
"width: 100%;"
type=
"text"
></span>
</p>
<p
style=
" margin-top: 20px;"
>
<span>
地址
<input
style=
"width: 100%;"
type=
"text"
></span>
</p>
<p
class=
"_mb0"
>
<span>
出生日期
<input
style=
"width: 11%;"
type=
"text"
></span>
<span
class=
"_sex"
>
性别:
<span>
男
<i></i></span><span>
女
<i></i></span></span>
</p>
<p
class=
"_tips _date"
style=
"text-align: left;padding-left: 120px;"
><span>
(年)/(月)/(日)
</span></p>
<p>
<span>
与申请人的关系
<input
style=
"width: 100%;"
type=
"text"
></span>
</p>
<p>
<span>
职业和职务
<input
style=
"width: 100%;"
type=
"text"
></span>
</p>
<p>
<span>
国籍(或公民身份)及签证种类
<input
style=
"width: 100%;"
type=
"text"
></span>
</p>
<p>
<p>
<span>
*备注/其他需特殊声明的事项(如有)
<input
style=
"width: 100%;"
type=
"text"
></span>
<span>
*备注/其他需特殊声明的事项(如有)
<input
style=
"width: 100%;"
type=
"text"
></span>
</p>
</p>
...
...
src/components/VisaPersonalFormSell.vue
0 → 100644
View file @
2b781142
This diff is collapsed.
Click to expand it.
src/components/confirmationOrderDownLoad.vue
View file @
2b781142
...
@@ -68,15 +68,15 @@
...
@@ -68,15 +68,15 @@
<table
v-if=
'vshowL'
class=
"collection"
>
<table
v-if=
'vshowL'
class=
"collection"
>
<tr>
<tr>
<td>
<td>
<div
class=
"collection-item"
>
<div
class=
"collection-item
clearfix
"
>
<
img
src=
"../assets/img/TravelControlTripIcon9.png"
/>
本团领队
<
div><img
src=
"../assets/img/TravelControlTripIcon9.png"
/>
本团领队
</div>
<span>
{{
orderTripdiff
!=
null
?
orderTripdiff
.
leaderInfo
:
<span>
{{
orderTripdiff
!=
null
?
orderTripdiff
.
leaderInfo
:
orderMsg
.
leaderName
+
(
orderMsg
.
leaderMobile
!=
null
?
"/"
+
orderMsg
.
leaderMobile
:
""
)
}}
</span>
orderMsg
.
leaderName
+
(
orderMsg
.
leaderMobile
!=
null
?
"/"
+
orderMsg
.
leaderMobile
:
""
)
}}
</span>
</div>
</div>
</td>
</td>
<td>
<td>
<div
class=
"collection-item"
>
<div
class=
"collection-item
clearfix
"
>
<
img
src=
"../assets/img/TravelControlTripIcon10.png"
/>
集合时间
<
div><img
src=
"../assets/img/TravelControlTripIcon10.png"
/>
集合时间
</div>
<span>
{{
orderTripdiff
!=
null
?
orderTripdiff
.
gatheringTime
:
<span>
{{
orderTripdiff
!=
null
?
orderTripdiff
.
gatheringTime
:
orderMsg
.
gatheringTime
}}
</span>
orderMsg
.
gatheringTime
}}
</span>
</div>
</div>
...
@@ -84,15 +84,15 @@
...
@@ -84,15 +84,15 @@
</tr>
</tr>
<tr>
<tr>
<td>
<td>
<div
class=
"collection-item"
>
<div
class=
"collection-item
clearfix
"
>
<
img
src=
"../assets/img/TravelControlTripIcon11.png"
/>
机场服务
<
div><img
src=
"../assets/img/TravelControlTripIcon11.png"
/>
机场服务
</div>
<span>
{{
orderTripdiff
!=
null
?
orderTripdiff
.
airportService
:
orderMsg
.
airportServicePerson
+
"/"
+
<span>
{{
orderTripdiff
!=
null
?
orderTripdiff
.
airportService
:
orderMsg
.
airportServicePerson
+
"/"
+
orderMsg
.
airportServicePhone
}}
</span>
orderMsg
.
airportServicePhone
}}
</span>
</div>
</div>
</td>
</td>
<td>
<td>
<div
class=
"collection-item"
>
<div
class=
"collection-item
clearfix
"
>
<
img
src=
"../assets/img/TravelControlTripIcon12.png"
/>
集合标识
<
div><img
src=
"../assets/img/TravelControlTripIcon12.png"
/>
集合标识
</div>
<span>
{{
orderTripdiff
!=
null
?
orderTripdiff
.
gatherIdent
:
<span>
{{
orderTripdiff
!=
null
?
orderTripdiff
.
gatherIdent
:
orderMsg
.
bName
}}
</span>
orderMsg
.
bName
}}
</span>
</div>
</div>
...
@@ -100,8 +100,8 @@
...
@@ -100,8 +100,8 @@
</tr>
</tr>
<tr>
<tr>
<td>
<td>
<div
class=
"collection-item"
>
<div
class=
"collection-item
clearfix
"
>
<
img
src=
"../assets/img/TravelControlTripIcon13.png"
/>
紧急联系人
<
div><img
src=
"../assets/img/TravelControlTripIcon13.png"
/>
紧急联系人
</div>
<template>
<template>
<span
v-if=
'vshowLLR'
>
{{
orderTripdiff
!=
null
?
<span
v-if=
'vshowLLR'
>
{{
orderTripdiff
!=
null
?
orderTripdiff
.
emergencyContact
:
orderMsg
.
branchManager
+
"/"
+
orderMsg
.
mobilePhone
}}
</span>
orderTripdiff
.
emergencyContact
:
orderMsg
.
branchManager
+
"/"
+
orderMsg
.
mobilePhone
}}
</span>
...
@@ -111,8 +111,8 @@
...
@@ -111,8 +111,8 @@
</div>
</div>
</td>
</td>
<td>
<td>
<div
class=
"collection-item"
>
<div
class=
"collection-item
clearfix
"
>
<
img
src=
"../assets/img/TravelControlTripIcon14.png"
/>
集合地点
<
div><img
src=
"../assets/img/TravelControlTripIcon14.png"
/>
集合地点
</div>
<span>
{{orderTripdiff!=null? orderTripdiff.gatheringAddress :
<span>
{{orderTripdiff!=null? orderTripdiff.gatheringAddress :
orderMsg.gatheringAddress}}
</span>
orderMsg.gatheringAddress}}
</span>
</div>
</div>
...
...
src/plug/index.js
View file @
2b781142
...
@@ -115,13 +115,13 @@ export default {
...
@@ -115,13 +115,13 @@ export default {
Vue
.
prototype
.
domainManager
=
function
()
{
Vue
.
prototype
.
domainManager
=
function
()
{
let
domainUrl
=
''
;
let
domainUrl
=
''
;
let
locationName
=
window
.
location
.
hostname
;
let
locationName
=
window
.
location
.
hostname
;
//
domainUrl = "http://192.168.2.214:8082"; //214主域名
domainUrl
=
"http://192.168.2.214:8082"
;
//214主域名
// domainUrl = "http://192.168.2.88"; //王悦主域名
// domainUrl = "http://192.168.2.88"; //王悦主域名
// domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://192.168.2.16:8083"; //
王悦
主域名
// domainUrl = "http://192.168.2.16:8083"; //
刘东
主域名
// domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://192.168.2.65:8025"; //吴春主域名
// domainUrl = "http://192.168.2.65:8025"; //吴春主域名
domainUrl
=
"http://192.168.2.214
:8082"
;
//罗超主域名
// domainUrl = "http://192.168.2.106
:8082"; //罗超主域名
if
(
locationName
.
indexOf
(
'oytour'
)
!==-
1
)
{
if
(
locationName
.
indexOf
(
'oytour'
)
!==-
1
)
{
domainUrl
=
"https://reborn.oytour.com"
;
domainUrl
=
"https://reborn.oytour.com"
;
}
else
if
(
locationName
.
indexOf
(
'viitto'
)
!==-
1
)
{
}
else
if
(
locationName
.
indexOf
(
'viitto'
)
!==-
1
)
{
...
@@ -525,6 +525,7 @@ export default {
...
@@ -525,6 +525,7 @@ export default {
//价钱格式化,三位数逗号分隔,保留两位小数 duanjun
//价钱格式化,三位数逗号分隔,保留两位小数 duanjun
Vue
.
prototype
.
moneyFormat
=
function
(
value
)
{
Vue
.
prototype
.
moneyFormat
=
function
(
value
)
{
if
(
!
value
)
return
(
'0.00'
)
let
nStr
=
Number
(
value
).
toFixed
(
2
)
let
nStr
=
Number
(
value
).
toFixed
(
2
)
nStr
+=
''
;
nStr
+=
''
;
let
x
=
nStr
.
split
(
'.'
);
let
x
=
nStr
.
split
(
'.'
);
...
...
src/router/config.js
View file @
2b781142
...
@@ -22,6 +22,11 @@ export default {
...
@@ -22,6 +22,11 @@ export default {
name
:
'VisaPersonalFormTuan'
,
name
:
'VisaPersonalFormTuan'
,
component
:
resolve
=>
require
([
'@/components/VisaPersonalFormTuan'
],
resolve
),
component
:
resolve
=>
require
([
'@/components/VisaPersonalFormTuan'
],
resolve
),
},
},
{
//签证个人申请表信息
path
:
'/VisaPersonalFormSell'
,
name
:
'VisaPersonalFormSell'
,
component
:
resolve
=>
require
([
'@/components/VisaPersonalFormSell'
],
resolve
),
},
{
//财务打印页面
{
//财务打印页面
path
:
'/PrintPage'
,
path
:
'/PrintPage'
,
name
:
'PrintPage'
,
name
:
'PrintPage'
,
...
@@ -1766,6 +1771,14 @@ export default {
...
@@ -1766,6 +1771,14 @@ export default {
title
:
'跟团游订单'
title
:
'跟团游订单'
},
},
},
},
{
// 销售 跟团游订单
path
:
'/SalesFinancialDetail'
,
name
:
'SalesFinancialDetail'
,
component
:
resolve
=>
require
([
'@/components/SalesModule/SalesFinancialDetail'
],
resolve
),
meta
:
{
title
:
'销售财务单据'
},
},
{
// 销售 拜访月历
{
// 销售 拜访月历
path
:
'/visitMonthStatistics'
,
path
:
'/visitMonthStatistics'
,
name
:
'visitMonthStatistics'
,
name
:
'visitMonthStatistics'
,
...
...
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