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
690520a4
Commit
690520a4
authored
Apr 09, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
签证
parent
2167bf8e
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
2095 additions
and
14 deletions
+2095
-14
Details.vue
src/components/Details.vue
+4
-1
EditTemplate.vue
src/components/EditTemplate.vue
+9
-2
VisaFinancialDocuments.vue
src/components/SalesModule/VisaFinancialDocuments.vue
+4
-0
ModifyVisaProduct.vue
src/components/SalesVisa/ModifyVisaProduct.vue
+1235
-0
VisaProduct.vue
src/components/SalesVisa/VisaProduct.vue
+41
-6
VisaProductCountryManager.vue
src/components/SalesVisa/VisaProductCountryManager.vue
+775
-0
TeamBalancePayment.vue
...omponents/TravelManager/TravelList/TeamBalancePayment.vue
+2
-2
index.vue
src/components/index.vue
+5
-1
config.js
src/router/config.js
+20
-2
No files found.
src/components/Details.vue
View file @
690520a4
...
...
@@ -820,7 +820,10 @@ export default {
filterRouter
(){
let
that
=
this
this
.
$router
.
beforeEach
((
to
,
from
,
next
)
=>
{
console
.
log
(
"to.query.blank && to.query.blank=='y'"
,
to
.
query
)
// console.log("to.query.blank && to.query.blank=='y'",to.query,"666")
if
(
to
.
path
==
"/ModifyVisaProduct"
){
this
.
reloadpage
();
}
if
(
that
.
openMode
==
1
){
let
isThreeNav
=
false
to
.
matched
.
forEach
(
x
=>
{
...
...
src/components/EditTemplate.vue
View file @
690520a4
...
...
@@ -506,7 +506,7 @@
<div
class=
"TNcontent"
v-else
>
<div
class=
"EtNodata"
>
暂无数据
</div>
</div>
<span
class=
"defaultAccount"
slot=
"reference"
>
默认叙述
</span>
<span
class=
"defaultAccount"
slot=
"reference"
v-if=
"defaultA"
>
默认叙述
</span>
</el-popover>
</span>
</div>
...
...
@@ -534,7 +534,7 @@
Quill
.
register
(
Font
,
true
);
export
default
{
name
:
'edit'
,
props
:
[
"editValue"
,
"toolbarShow"
,
"referenceList"
,
"placeholder"
],
props
:
[
"editValue"
,
"toolbarShow"
,
"referenceList"
,
"placeholder"
,
"defaultAccount"
],
data
()
{
return
{
myToolbar
:
''
,
...
...
@@ -542,6 +542,7 @@
myImageUploader
:
''
,
quillValue
:
this
.
editValue
,
popvisible
:
false
,
defaultA
:
true
,
//字体样式
fonts
:
[
"SimSun"
,
...
...
@@ -591,6 +592,12 @@
}
},
created
()
{
if
(
this
.
defaultAccount
==
undefined
){
this
.
defaultA
=
true
;
}
else
{
this
.
defaultA
=
this
.
defaultAccount
;
}
this
.
myToolbar
=
"toolbar_"
+
this
.
guid
();
this
.
editorOption
.
placeholder
=
this
.
placeholder
;
this
.
myQuillEditor
=
"editer_"
+
this
.
guid
();
...
...
src/components/SalesModule/VisaFinancialDocuments.vue
View file @
690520a4
...
...
@@ -528,6 +528,10 @@ export default {
}
})
})
if
(
userInfo
.
length
==
0
){
this
.
Error
(
"至少选择一人!"
);
return
;
}
sessionStorage
.
setItem
(
"saveGuestInfo"
,
JSON
.
stringify
(
userInfo
))
// this.$store.commit('saveGuestInfo',userInfo)
// console.log("getGuestInfo",this.$store.getters.getGuestInfo)
...
...
src/components/SalesVisa/ModifyVisaProduct.vue
0 → 100644
View file @
690520a4
This diff is collapsed.
Click to expand it.
src/components/SalesVisa/VisaProduct.vue
View file @
690520a4
...
...
@@ -28,14 +28,14 @@
.page_MyCustomer
._mc_edit
{
overflow
:
auto
;
display
:
none
;
position
:
absolute
;
position
:
fixed
;
z-index
:
50
;
bottom
:
0
;
left
:
0
;
left
:
50px
;
border-top
:
3px
solid
#38425d
;
background-color
:
#f9f9f9
;
padding
:
10px
;
width
:
100%
;
width
:
calc
(
100%
-
50px
)
;
min-width
:
1146px
;
}
.page_MyCustomer
.edHeight
{
...
...
@@ -291,7 +291,8 @@
</li>
<li>
<button
class=
"hollowFixedBtn"
@
click=
"getList()"
>
查询
</button>
<button
class=
"normalBtn"
@
click=
"cancelEdit(),addShow=true"
v-if=
"msg.isFinacial==1"
>
添加
</button>
<!--
<button
class=
"normalBtn"
@
click=
"cancelEdit(),addShow=true"
v-if=
"msg.isFinacial==1"
>
添加
</button>
-->
<button
class=
"normalBtn"
@
click=
"AddVisaProduct"
v-if=
"msg.isFinacial==1"
>
添加
</button>
</li>
</ul>
</div>
...
...
@@ -370,7 +371,7 @@
</td>
<td
class=
"groupTourOrderIcon"
>
<el-button-group>
<el-tooltip
<
!--
<
el-tooltip
class=
"item"
effect=
"dark"
content=
"修改"
...
...
@@ -383,6 +384,20 @@
icon=
"iconfont icon-img_bianji_small"
@
click=
"getDetail(item)"
></el-button>
</el-tooltip>
-->
<el-tooltip
class=
"item"
effect=
"dark"
content=
"修改"
placement=
"top-start"
v-if=
"item.SendVisaStatus==1&&msg.isFinacial==1"
>
<el-button
type=
"primary"
style=
"background:#409EFF; border-color:#409EFF"
icon=
"iconfont icon-img_bianji_small"
@
click=
"EditVisaProduct(item)"
></el-button>
</el-tooltip>
<el-tooltip
effect=
"dark"
content=
"查看"
placement=
"top-start"
v-if=
"msg.isFinacial==1"
>
<el-button
...
...
@@ -629,6 +644,27 @@ export default {
};
},
methods
:
{
// 修改签证产品
EditVisaProduct
(
item
){
this
.
$router
.
push
({
name
:
"ModifyVisaProduct"
,
query
:
{
Id
:
item
.
Id
,
blank
:
"y"
,
tab
:
"配置签证产品"
}
});
},
// 添加签证产品
AddVisaProduct
(){
this
.
$router
.
push
({
name
:
"ModifyVisaProduct"
,
query
:
{
blank
:
"y"
,
tab
:
"配置签证产品"
}
});
},
saveitem
(
tcid
)
{
this
.
uploadTCID
=
tcid
;
},
...
...
@@ -736,7 +772,6 @@ export default {
err
=>
{}
);
},
goUrl
(
obj
)
{
this
.
$router
.
push
({
name
:
"VisaProductOrder"
,
...
...
src/components/SalesVisa/VisaProductCountryManager.vue
0 → 100644
View file @
690520a4
This diff is collapsed.
Click to expand it.
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @
690520a4
...
...
@@ -1499,8 +1499,8 @@
// 车资
if
(
that
.
isExists
(
item
.
CostTypeList
,
'车资'
)){
this
.
moneyAll
.
z
heziyf
+=
item
.
Money
;
this
.
moneyAll
.
z
hezisf
+=
item
.
PayMoney
;
this
.
moneyAll
.
c
heziyf
+=
item
.
Money
;
this
.
moneyAll
.
c
hezisf
+=
item
.
PayMoney
;
}
// 机票款
if
(
that
.
isExists
(
item
.
CostTypeList
,
'国际段机票'
)
||
item
.
OrderSource
===
4
||
that
.
isExists
(
item
.
CostTypeList
,
'机票退税'
)
||
that
.
isExists
(
item
.
CostTypeList
,
'机票罚金'
)
||
that
.
isExists
(
item
.
CostTypeList
,
'机票税金'
)
||
that
.
isExists
(
item
.
CostTypeList
,
'国内联运段机票'
)){
...
...
src/components/index.vue
View file @
690520a4
...
...
@@ -608,7 +608,8 @@
</audio>
</div>
<div
class=
"temDivs"
>
<router-view></router-view>
<!-- :key="key" -->
<router-view
></router-view>
</div>
...
...
@@ -1061,6 +1062,9 @@ export default {
}
},
computed
:
{
key
(){
return
this
.
$route
.
path
+
Math
.
random
();
},
sysMsgUnread
()
{
let
temp
=
this
.
$store
.
state
.
sysMsgUnread
;
let
sysMsgUnread
=
temp
.
addFriend
||
0
;
...
...
src/router/config.js
View file @
690520a4
...
...
@@ -2482,11 +2482,29 @@ export default {
meta
:
{
title
:
'制作广告'
},
},
{
// 签证 签证产品
},
{
// 签证 签证产品
path
:
'/VisaProduct'
,
name
:
'VisaProduct'
,
component
:
resolve
=>
require
([
'@/components/SalesVisa/VisaProduct'
],
resolve
)
},
{
// 签证 常用航班
},
{
// 签证 签证产品国家
path
:
'/VisaProductCountryManager'
,
name
:
'VisaProductCountryManager'
,
component
:
resolve
=>
require
([
'@/components/SalesVisa/VisaProductCountryManager'
],
resolve
),
meta
:
{
title
:
'签证产品国家'
},
},
{
// 签证 签证产品配置
path
:
'/ModifyVisaProduct'
,
name
:
'ModifyVisaProduct'
,
component
:
resolve
=>
require
([
'@/components/SalesVisa/ModifyVisaProduct'
],
resolve
),
meta
:
{
title
:
'配置签证产品'
},
},
{
// 签证 常用航班
path
:
'/regularFlights'
,
name
:
'regularFlights'
,
component
:
resolve
=>
require
([
'@/components/SalesVisa/regularFlights'
],
resolve
),
...
...
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