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
429898f3
Commit
429898f3
authored
Apr 04, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复签证成本制单
parent
aca883b8
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
22 additions
and
21 deletions
+22
-21
HotelOrderList.vue
src/components/Hotel/reservation/HotelOrderList.vue
+0
-1
enrollTotal.vue
src/components/SalesModule/enrollTotal.vue
+6
-0
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+0
-5
groupTourOrderOne.vue
src/components/SalesModule/groupTourOrderOne.vue
+1
-5
VisaProductEditOrder.vue
src/components/SalesVisa/VisaProductEditOrder.vue
+3
-2
VisaProductEditOrderOP.vue
src/components/SalesVisa/VisaProductEditOrderOP.vue
+6
-0
VisaProductOrder.vue
src/components/SalesVisa/VisaProductOrder.vue
+3
-3
order.vue
src/components/busManagement/BookAcar/order.vue
+1
-2
orderOP.vue
src/components/busManagement/BookAcar/orderOP.vue
+2
-2
ReservationOrder.vue
src/components/scenicSpot/reservation/ReservationOrder.vue
+0
-1
No files found.
src/components/Hotel/reservation/HotelOrderList.vue
View file @
429898f3
...
...
@@ -373,7 +373,6 @@
if
(
this
.
$route
.
query
.
crmOrderObj
){
let
crmOrderObj
=
JSON
.
parse
(
this
.
$route
.
query
.
crmOrderObj
)
this
.
msg
.
OrderId
=
crmOrderObj
.
OrderId
console
.
log
(
crmOrderObj
.
OrderId
,
'======酒店订单'
)
}
this
.
getEmployee
()
this
.
GetList
();
...
...
src/components/SalesModule/enrollTotal.vue
View file @
429898f3
...
...
@@ -1513,6 +1513,12 @@ export default {
this
.
GetEditOrderCreateByAuth
();
this
.
getCompanyMsg
.
RB_Group_Id
=
this
.
getDepartmentMsg
.
RB_Group_Id
=
userInfo
.
RB_Group_id
;
//集团
// crm自动登陆传过来的参数
if
(
this
.
$route
.
query
.
crmOrderObj
){
let
crmOrderObj
=
JSON
.
parse
(
this
.
$route
.
query
.
crmOrderObj
)
this
.
msg
.
tempOrderId
=
crmOrderObj
.
OrderId
}
this
.
getCompany
();
this
.
getCtlxList
();
...
...
src/components/SalesModule/groupTourOrder.vue
View file @
429898f3
...
...
@@ -4786,11 +4786,6 @@
}
else
{
this
.
msg
.
QStartDate
=
new
Date
().
Format
(
"yyyy-MM-dd"
);
}
// crm自动登陆传过来的参数
if
(
this
.
$route
.
query
.
crmOrderObj
){
let
crmOrderObj
=
JSON
.
parse
(
this
.
$route
.
query
.
crmOrderObj
)
console
.
log
(
crmOrderObj
.
OrderId
,
'======跟团订单'
)
}
this
.
getEmployee
();
this
.
getList
();
this
.
getLineList
();
...
...
src/components/SalesModule/groupTourOrderOne.vue
View file @
429898f3
...
...
@@ -4076,11 +4076,7 @@
this
.
msg
.
tempOrderId
=
this
.
$route
.
query
.
id
}
this
.
msg
.
QStartDate
=
new
Date
().
Format
(
'yyyy-MM-dd'
)
// crm自动登陆传过来的参数
if
(
this
.
$route
.
query
.
crmOrderObj
){
let
crmOrderObj
=
JSON
.
parse
(
this
.
$route
.
query
.
crmOrderObj
)
console
.
log
(
crmOrderObj
.
OrderId
,
'======一日游订单'
)
}
this
.
getEmployee
()
this
.
getList
()
this
.
getLineList
()
...
...
src/components/SalesVisa/VisaProductEditOrder.vue
View file @
429898f3
...
...
@@ -492,7 +492,8 @@
SendEndDate
:
''
,
Name
:
''
,
VisaTCNUM
:
''
,
VisaOrderStatus
:
'0'
VisaOrderStatus
:
'0'
,
OrderId
:
''
},
addMsg
:
{
Id
:
0
,
...
...
@@ -830,7 +831,7 @@
// crm自动登陆传过来的参数
if
(
this
.
$route
.
query
.
crmOrderObj
){
let
crmOrderObj
=
JSON
.
parse
(
this
.
$route
.
query
.
crmOrderObj
)
console
.
log
(
crmOrderObj
.
OrderId
,
'======签证订单'
)
this
.
msg
.
OrderId
=
crmOrderObj
.
OrderId
}
this
.
qjGroupId
=
this
.
QjGroupId
();
this
.
userInfo
=
this
.
getLocalStorage
();
...
...
src/components/SalesVisa/VisaProductEditOrderOP.vue
View file @
429898f3
...
...
@@ -511,6 +511,7 @@
VisaOrderStatus
:
'0'
,
CreateBy
:
0
,
RB_Branch_Id
:
-
1
,
OrderId
:
''
},
addMsg
:
{
Id
:
0
,
...
...
@@ -875,6 +876,11 @@
},
},
mounted
()
{
// crm自动登陆传过来的参数
if
(
this
.
$route
.
query
.
crmOrderObj
){
let
crmOrderObj
=
JSON
.
parse
(
this
.
$route
.
query
.
crmOrderObj
)
this
.
msg
.
OrderId
=
crmOrderObj
.
OrderId
}
this
.
qjGroupId
=
this
.
QjGroupId
();
this
.
userInfo
=
this
.
getLocalStorage
();
this
.
getEmployee
()
...
...
src/components/SalesVisa/VisaProductOrder.vue
View file @
429898f3
...
...
@@ -1003,7 +1003,7 @@
<el-tooltip
v-if=
"item.visaOrderStatus!=2"
class=
""
effect=
"dark"
content=
"制单"
placement=
"top"
>
<i
class=
"el-icon-circle-plus cursor-pointer c059FF6"
@
click=
"makeAdocument(item, index,
3
)"
></i>
@
click=
"makeAdocument(item, index,
1
)"
></i>
</el-tooltip>
</div>
</div>
...
...
@@ -1037,11 +1037,11 @@
<el-tooltip
class=
""
effect=
"dark"
content=
"制单"
placement=
"top"
>
<i
class=
"el-icon-circle-plus cursor-pointer c059FF6"
@
click=
"makeAdocument(item, index,
2
)"
></i>
@
click=
"makeAdocument(item, index,
3
)"
></i>
</el-tooltip>
<el-tooltip
class=
""
effect=
"dark"
content=
"冲抵"
placement=
"top"
>
<i
class=
"el-icon-circle-plus cursor-pointer c3FC4FF"
@
click=
"isOffset(item, index,
2
)"
></i>
@
click=
"isOffset(item, index,
3
)"
></i>
</el-tooltip>
</div>
</div>
...
...
src/components/busManagement/BookAcar/order.vue
View file @
429898f3
...
...
@@ -66,11 +66,10 @@
let
crmOrderObj
=
JSON
.
parse
(
this
.
$route
.
query
.
crmOrderObj
)
this
.
dataObj
.
OrderId
=
crmOrderObj
.
OrderId
if
(
crmOrderObj
.
Type
<
4
){
this
.
dataObj
.
tab
=
this
.
$route
.
query
.
Type
this
.
dataObj
.
tab
=
String
(
crmOrderObj
.
Type
)
}
else
{
this
.
dataObj
.
tab
=
'0'
}
console
.
log
(
crmOrderObj
.
OrderId
,
'======包车订单销售'
)
}
else
{
this
.
dataObj
.
OrderId
=
''
this
.
dataObj
.
tab
=
'0'
...
...
src/components/busManagement/BookAcar/orderOP.vue
View file @
429898f3
...
...
@@ -68,11 +68,11 @@
let
crmOrderObj
=
JSON
.
parse
(
this
.
$route
.
query
.
crmOrderObj
)
this
.
dataObj
.
OrderId
=
crmOrderObj
.
OrderId
if
(
crmOrderObj
.
Type
<
4
){
this
.
dataObj
.
tab
=
this
.
$route
.
query
.
Type
this
.
dataObj
.
tab
=
String
(
crmOrderObj
.
Type
)
}
else
{
this
.
dataObj
.
tab
=
'0'
}
console
.
log
(
crmOrderObj
.
OrderId
,
'======包车订单OP'
)
}
else
{
this
.
dataObj
.
OrderId
=
''
this
.
dataObj
.
tab
=
'0'
...
...
src/components/scenicSpot/reservation/ReservationOrder.vue
View file @
429898f3
...
...
@@ -473,7 +473,6 @@ export default {
if
(
this
.
$route
.
query
.
crmOrderObj
){
let
crmOrderObj
=
JSON
.
parse
(
this
.
$route
.
query
.
crmOrderObj
)
this
.
msg
.
OrderId
=
crmOrderObj
.
OrderId
console
.
log
(
crmOrderObj
.
OrderId
,
'======门票订单'
)
}
},
mounted
()
{
...
...
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