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
5146404e
Commit
5146404e
authored
Jul 05, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
cfc67b9b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
9 deletions
+25
-9
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+1
-1
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+2
-2
groupTourOrderOne.vue
src/components/SalesModule/groupTourOrderOne.vue
+1
-1
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+1
-1
orderlist.vue
src/components/orderCommon/orderlist.vue
+4
-4
config.js
src/router/config.js
+16
-0
No files found.
src/components/SalesModule/groupTourOrder.vue
View file @
5146404e
...
@@ -2934,7 +2934,7 @@
...
@@ -2934,7 +2934,7 @@
cid
=
sItem
.
id
;
cid
=
sItem
.
id
;
}
}
let
routeData
=
this
.
$router
.
resolve
({
let
routeData
=
this
.
$router
.
resolve
({
name
:
"TravelContractNew
"
,
name
:
item
.
lineId
!=
14
?
"TravelContractNew"
:
"TravelContractNewRB
"
,
query
:
{
query
:
{
TCID
:
item
.
tcid
,
TCID
:
item
.
tcid
,
guestId
:
sItem
.
guestId
,
guestId
:
sItem
.
guestId
,
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
5146404e
...
@@ -2180,7 +2180,7 @@
...
@@ -2180,7 +2180,7 @@
<
template
v-if=
"item.lineId==90"
>
<
template
v-if=
"item.lineId==90"
>
<div
v-if=
"item.outNotice == 1"
@
click=
"toTrip(item)"
>
<div
v-if=
"item.outNotice == 1"
@
click=
"toTrip(item)"
>
{{
$t
(
"Operation.Op_teamNotice"
)
{{
$t
(
"Operation.Op_teamNotice"
)
}}
<span
v-if=
"item.outNotice == 1"
>
(OK)
</span><span
v-else
>
(
{{
$t
(
"visa.v_zanding"
)
}}
)
</span>
}}
<span
v-if=
"item.outNotice == 1"
>
(OK)
</span><span
v-else
>
(
{{
$t
(
"visa.v_zanding"
)
}}
)
</span>
</div>
</div>
</
template
>
</
template
>
...
@@ -5579,7 +5579,7 @@
...
@@ -5579,7 +5579,7 @@
//跳转至领取合同
//跳转至领取合同
goContract
(
item
,
sItem
)
{
goContract
(
item
,
sItem
)
{
let
routeData
=
this
.
$router
.
resolve
({
let
routeData
=
this
.
$router
.
resolve
({
name
:
"TravelContractNew
"
,
name
:
item
.
lineId
!=
14
?
"TravelContractNew"
:
"TravelContractNewRB
"
,
query
:
{
query
:
{
TCID
:
item
.
tcid
,
TCID
:
item
.
tcid
,
guestId
:
sItem
.
guestId
,
guestId
:
sItem
.
guestId
,
...
...
src/components/SalesModule/groupTourOrderOne.vue
View file @
5146404e
...
@@ -2277,7 +2277,7 @@
...
@@ -2277,7 +2277,7 @@
//跳转至领取合同
//跳转至领取合同
goContract
(
item
,
sItem
)
{
goContract
(
item
,
sItem
)
{
let
routeData
=
this
.
$router
.
resolve
({
let
routeData
=
this
.
$router
.
resolve
({
name
:
"TravelContractNew
"
,
name
:
item
.
lineId
!=
14
?
"TravelContractNew"
:
"TravelContractNewRB
"
,
query
:
{
query
:
{
TCID
:
item
.
tcid
,
TCID
:
item
.
tcid
,
guestId
:
sItem
.
guestId
,
guestId
:
sItem
.
guestId
,
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
5146404e
...
@@ -6362,7 +6362,7 @@
...
@@ -6362,7 +6362,7 @@
// window.open(routeData.href, '_blank')
// window.open(routeData.href, '_blank')
// } else {
// } else {
let
routeData
=
this
.
$router
.
resolve
({
let
routeData
=
this
.
$router
.
resolve
({
name
:
"TravelContractNew
"
,
name
:
item
.
lineId
!=
14
?
"TravelContractNew"
:
"TravelContractNewRB
"
,
query
:
{
query
:
{
TCID
:
item
.
TCID
,
TCID
:
item
.
TCID
,
guestId
:
sItem
.
GuestId
,
guestId
:
sItem
.
GuestId
,
...
...
src/components/orderCommon/orderlist.vue
View file @
5146404e
...
@@ -1413,7 +1413,7 @@
...
@@ -1413,7 +1413,7 @@
IsChargeLossOrders
:
0
,
IsChargeLossOrders
:
0
,
Unit_PriceList
:
[],
//成交单价下拉数据
Unit_PriceList
:
[],
//成交单价下拉数据
LessMoney
:
0
,
LessMoney
:
0
,
uploadLloading
:
false
,
uploadLloading
:
false
,
fileFujianList
:
[],
fileFujianList
:
[],
RemarksRules
:
{
RemarksRules
:
{
...
@@ -1444,7 +1444,7 @@
...
@@ -1444,7 +1444,7 @@
minpay
:
"0"
,
minpay
:
"0"
,
//显示修改业务员
//显示修改业务员
showChangeSales
:
false
,
showChangeSales
:
false
,
showID
:
-
1
,
showID
:
-
1
,
// 订单转团
// 订单转团
transferData
:
{
transferData
:
{
...
@@ -2237,7 +2237,7 @@
...
@@ -2237,7 +2237,7 @@
//跳转至领取合同
//跳转至领取合同
goContract
(
item
,
sItem
)
{
goContract
(
item
,
sItem
)
{
let
routeData
=
this
.
$router
.
resolve
({
let
routeData
=
this
.
$router
.
resolve
({
name
:
"TravelContractNew
"
,
name
:
item
.
lineId
!=
14
?
"TravelContractNew"
:
"TravelContractNewRB
"
,
query
:
{
query
:
{
TCID
:
item
.
tcid
,
TCID
:
item
.
tcid
,
guestId
:
sItem
.
guestId
,
guestId
:
sItem
.
guestId
,
...
@@ -2381,4 +2381,4 @@
...
@@ -2381,4 +2381,4 @@
this
.
canEditUnitPrice
();
this
.
canEditUnitPrice
();
},
},
}
}
</
script
>
</
script
>
\ No newline at end of file
src/router/config.js
View file @
5146404e
...
@@ -5863,6 +5863,14 @@ export default {
...
@@ -5863,6 +5863,14 @@ export default {
title
:
'电子合同'
title
:
'电子合同'
}
}
},
},
{
path
:
'/TravelContractNewRB'
,
//新日本线电子合同
name
:
'TravelContractNewRB'
,
component
:
resolve
=>
require
([
'@/components/TravelContractNewRB'
],
resolve
),
meta
:
{
title
:
'日本线电子合同'
}
},
{
{
path
:
'/SingleContract'
,
//单项合同
path
:
'/SingleContract'
,
//单项合同
...
@@ -5920,6 +5928,14 @@ export default {
...
@@ -5920,6 +5928,14 @@ export default {
title
:
'电子合同'
title
:
'电子合同'
}
}
},
},
{
path
:
'/TravelContractDetailRB'
,
//新日本线电子合同详情
name
:
'TravelContractDetailRB'
,
component
:
resolve
=>
require
([
'@/components/TravelContractDetailRB'
],
resolve
),
meta
:
{
title
:
'日本线电子合同'
}
},
{
{
path
:
'/magiContract'
,
//麦子Erp使用合同
path
:
'/magiContract'
,
//麦子Erp使用合同
name
:
'magiContract'
,
name
:
'magiContract'
,
...
...
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