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
ba61aced
Commit
ba61aced
authored
Jun 21, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增确认函审核,
parent
e28cf317
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
1565 additions
and
316 deletions
+1565
-316
addPassenger.vue
src/components/SalesModule/addPassenger.vue
+1
-1
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+1
-1
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+2
-2
groupTourOrderByTuanOne.vue
src/components/SalesModule/groupTourOrderByTuanOne.vue
+2
-2
groupTourOrderOne.vue
src/components/SalesModule/groupTourOrderOne.vue
+1
-1
ConfirmationAdui.vue
src/components/administrative/ConfirmationAdui.vue
+972
-0
confirmationOrder.vue
src/components/confirmationOrder.vue
+569
-308
config.js
src/router/config.js
+17
-1
No files found.
src/components/SalesModule/addPassenger.vue
View file @
ba61aced
...
...
@@ -1522,7 +1522,7 @@
}
},
savePassenger
(
type
)
{
if
((
this
.
LineId
===
14
||
this
.
LineId
===
2
)
&&
(
this
.
addMsg
.
IdCard
===
''
||
this
.
addMsg
.
IdCard
.
length
<
18
)
)
{
if
((
this
.
LineId
===
14
||
this
.
LineId
===
2
)
&&
this
.
addMsg
.
IdCard
===
''
)
{
return
this
.
$message
.
error
(
'请填写身份证号码!'
);
}
this
.
addMsg
.
EconomicCapabilityList
=
[];
...
...
src/components/SalesModule/groupTourOrder.vue
View file @
ba61aced
...
...
@@ -1703,7 +1703,7 @@
<el-tooltip
effect=
"dark"
content=
"更多"
placement=
"top-start"
style=
"float:left"
>
<el-popover
width=
'100'
trigger=
"hover"
>
<div
class=
"groupTourOrder_more"
>
<div
@
click=
"goUrlT('confirmationOrder',item.orderId)"
>
确认函
</div>
<div
@
click=
"goUrlT('confirmationOrder',item.orderId)"
>
确认函
{{
item
.
operationState
===
2
?
'(拒绝)'
:
item
.
operationState
===
1
?
'(通过)'
:
'(待审核)'
}}
</div>
<div
v-if=
"userId==1"
@
click=
"getSalerInfo(item)"
>
修改业务员
</div>
<div
v-if=
"item.isGuestOk=='1'&&item.outNotice==1"
@
click=
"toTrip(item)"
>
出团通知书
<span
v-if=
"item.outNotice==1"
>
(OK)
</span><span
v-else
>
(暂定)
</span></div>
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
ba61aced
...
...
@@ -1717,7 +1717,7 @@
<el-tooltip
effect=
"dark"
content=
"更多"
placement=
"top-start"
style=
"float:left"
>
<el-popover
width=
'100'
trigger=
"hover"
>
<div
class=
"groupTourOrder_more"
>
<div
@
click=
"goUrlT('confirmationOrder',item.orderId)"
>
确认函
</div>
<div
@
click=
"goUrlT('confirmationOrder',item.orderId)"
>
确认函
{{item.operationState === 2 ? '(拒绝)' : item.operationState === 1 ? '(通过)' : '(待审核)'}}
</div>
<div
v-if=
"userId==1"
@
click=
"getSalerInfo(item)"
>
修改业务员
</div>
<div
v-if=
"item.isGuestOk=='1'&&item.outNotice==1"
@
click=
"toTrip(item)"
>
出团通知书
<span
v-if=
"item.outNotice==1"
>
(OK)
</span><span
v-else
>
(暂定)
</span></div>
<div
v-if=
"item.orderState!='4'"
@
click=
"goUrlP('旅客名单','passengerSaleList',item)"
>
旅客名单
</div>
...
...
@@ -2013,7 +2013,7 @@
<el-tooltip
effect=
"dark"
content=
"更多"
placement=
"top-start"
style=
"float:left"
>
<el-popover
width=
'100'
trigger=
"hover"
>
<div
class=
"groupTourOrder_more"
>
<div
@
click=
"goUrlT('confirmationOrder',item.orderId)"
>
确
认函
</div>
<div
@
click=
"goUrlT('confirmationOrder',item.orderId)"
>
确
{{item.operationState}}认函{{item.operationState === 2 ? '(拒绝)' : item.operationState === 1 ? '(通过)' : '(待审核)'}}
</div>
<div
v-if=
"userId==1"
@
click=
"getSalerInfo(item)"
>
修改业务员
</div>
<div
v-if=
"item.isGuestOk=='1'&&item.outNotice==1"
@
click=
"toTrip(item)"
>
出团通知书
<span
v-if=
"item.outNotice==1"
>
(OK)
</span><span
v-else
>
(暂定)
</span></div>
<div
v-if=
"item.orderState!='4'"
@
click=
"goUrlP('旅客名单','passengerSaleList',item)"
>
旅客名单
</div>
...
...
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @
ba61aced
...
...
@@ -1731,7 +1731,7 @@
<el-tooltip
effect=
"dark"
content=
"更多"
placement=
"top-start"
style=
"float:left"
>
<el-popover
width=
'100'
trigger=
"hover"
>
<div
class=
"groupTourOrder_more"
>
<div
@
click=
"goUrlT('confirmationOrder',item.orderId)"
>
确认函
</div>
<div
@
click=
"goUrlT('confirmationOrder',item.orderId)"
>
确认函
{{item.operationState === 2 ? '(拒绝)' : item.operationState === 1 ? '(通过)' : '(待审核)'}}
</div>
<div
v-if=
"userId==1"
@
click=
"getSalerInfo(item)"
>
修改业务员
</div>
<div
v-if=
"item.isGuestOk=='1'&&item.outNotice==1"
@
click=
"toTrip(item)"
>
出团通知书
<span
v-if=
"item.outNotice==1"
>
(OK)
</span><span
v-else
>
(暂定)
</span></div>
<div
v-if=
"item.orderState!='4'"
@
click=
"goUrlP('旅客名单','passengerSaleList',item)"
>
旅客名单
</div>
...
...
@@ -2024,7 +2024,7 @@
<el-tooltip
effect=
"dark"
content=
"更多"
placement=
"top-start"
style=
"float:left"
>
<el-popover
width=
'100'
trigger=
"hover"
>
<div
class=
"groupTourOrder_more"
>
<div
@
click=
"goUrlT('confirmationOrder',item.orderId)"
>
确认函
</div>
<div
@
click=
"goUrlT('confirmationOrder',item.orderId)"
>
确认函
{{item.operationState === 2 ? '(拒绝)' : item.operationState === 1 ? '(通过)' : '(待审核)'}}
</div>
<div
v-if=
"userId==1"
@
click=
"getSalerInfo(item)"
>
修改业务员
</div>
<div
v-if=
"item.isGuestOk=='1'&&item.outNotice==1"
@
click=
"toTrip(item)"
>
出团通知书
<span
v-if=
"item.outNotice==1"
>
(OK)
</span><span
v-else
>
(暂定)
</span></div>
<div
v-if=
"item.orderState!='4'"
@
click=
"goUrlP('旅客名单','passengerSaleList',item)"
>
旅客名单
</div>
...
...
src/components/SalesModule/groupTourOrderOne.vue
View file @
ba61aced
...
...
@@ -1696,7 +1696,7 @@
<el-tooltip
effect=
"dark"
content=
"更多"
placement=
"top-start"
style=
"float:left"
>
<el-popover
width=
'100'
trigger=
"hover"
>
<div
class=
"groupTourOrder_more"
>
<div
@
click=
"goUrlT('confirmationOrder',item.orderId)"
>
确认函
</div>
<div
@
click=
"goUrlT('confirmationOrder',item.orderId)"
>
确认函
{{
item
.
operationState
===
2
?
'(拒绝)'
:
item
.
operationState
===
1
?
'(通过)'
:
'(待审核)'
}}
</div>
<div
v-if=
"userId==1"
@
click=
"getSalerInfo(item)"
>
修改业务员
</div>
<div
v-if=
"item.isGuestOk=='1'&&item.outNotice==1"
@
click=
"toTrip(item)"
>
出团通知书
<span
v-if=
"item.outNotice==1"
>
(OK)
</span><span
v-else
>
(暂定)
</span></div>
...
...
src/components/administrative/ConfirmationAdui.vue
0 → 100644
View file @
ba61aced
This diff is collapsed.
Click to expand it.
src/components/confirmationOrder.vue
View file @
ba61aced
This diff is collapsed.
Click to expand it.
src/router/config.js
View file @
ba61aced
...
...
@@ -3019,6 +3019,14 @@ export default {
title
:
'工作委托'
},
},
{
path
:
'/ConfirmationAdui'
,
name
:
'ConfirmationAdui'
,
component
:
resolve
=>
require
([
'@/components/administrative/ConfirmationAdui'
],
resolve
),
meta
:
{
title
:
'确认函审核'
},
},
{
path
:
'/WorkEntrustment'
,
name
:
'WorkEntrustment'
,
...
...
@@ -3431,6 +3439,14 @@ export default {
title
:
'领队报账'
}
},
{
path
:
'/confirmationOrder2'
,
name
:
'confirmationOrder2'
,
component
:
resolve
=>
require
([
'@/components/confirmationOrder2'
],
resolve
),
meta
:
{
title
:
'确认函'
},
},
{
path
:
'/supplierLogin'
,
//供应商登录
name
:
'supplierLogin'
,
...
...
@@ -3511,7 +3527,7 @@ export default {
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