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
0f442408
Commit
0f442408
authored
Dec 10, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
ae091b78
c85db5ae
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
3119 additions
and
144 deletions
+3119
-144
DomesticTravelcontract.vue
src/components/DomesticTravelcontract.vue
+1270
-0
planeTicketInquiry.vue
src/components/SalesModule/planeTicketInquiry.vue
+5
-0
planeTourOrder.vue
src/components/SalesModule/planeTourOrder.vue
+6
-5
busHandBook.vue
src/components/busManagement/busHandBook.vue
+236
-131
groundOperation.vue
src/components/dmc/manager/groundOperation.vue
+2
-0
groundOperation2.vue
src/components/dmc/manager/groundOperation2.vue
+7
-8
onedayTripContract.vue
src/components/onedayTripContract.vue
+1577
-0
config.js
src/router/config.js
+16
-0
No files found.
src/components/DomesticTravelcontract.vue
0 → 100644
View file @
0f442408
This diff is collapsed.
Click to expand it.
src/components/SalesModule/planeTicketInquiry.vue
View file @
0f442408
...
@@ -1183,6 +1183,11 @@
...
@@ -1183,6 +1183,11 @@
<el-input
v-model=
'addMsg.OldPeopleNum'
:disabled=
"addMsg.GroupType==='4'"
@
keyup
.
native=
"checkInteger(addMsg,'OldPeopleNum')"
@
input=
'getNumber();getHouseNo();getTotalPrice()'
></el-input>
<el-input
v-model=
'addMsg.OldPeopleNum'
:disabled=
"addMsg.GroupType==='4'"
@
keyup
.
native=
"checkInteger(addMsg,'OldPeopleNum')"
@
input=
'getNumber();getHouseNo();getTotalPrice()'
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"签证数量"
prop=
"VisaNum"
>
<el-input
v-model=
'addMsg.VisaNum'
@
keyup
.
native=
"checkInteger(addMsg,'VisaNum')"
@
input=
'getTotalPrice();'
></el-input>
</el-form-item>
</el-col>
<!--
<el-col
:span=
"4"
>
<!--
<el-col
:span=
"4"
>
<el-form-item
label=
"单地接数量"
prop=
"AirticketNum"
>
<el-form-item
label=
"单地接数量"
prop=
"AirticketNum"
>
<el-input
v-model=
'addMsg.AirticketNum'
@
keyup
.
native=
"checkInteger(addMsg,'AirticketNum')"
@
input=
'getNumber();getTotalPrice();getHouseNo()'
></el-input>
<el-input
v-model=
'addMsg.AirticketNum'
@
keyup
.
native=
"checkInteger(addMsg,'AirticketNum')"
@
input=
'getNumber();getTotalPrice();getHouseNo()'
></el-input>
...
...
src/components/SalesModule/planeTourOrder.vue
View file @
0f442408
...
@@ -647,6 +647,11 @@
...
@@ -647,6 +647,11 @@
<el-input
v-model=
'addMsg.OldPeopleNum'
@
keyup
.
native=
"checkInteger(addMsg,'OldPeopleNum')"
@
input=
'getNumber();getHouseNo();getTotalPrice()'
></el-input>
<el-input
v-model=
'addMsg.OldPeopleNum'
@
keyup
.
native=
"checkInteger(addMsg,'OldPeopleNum')"
@
input=
'getNumber();getHouseNo();getTotalPrice()'
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"签证数量"
prop=
"VisaNum"
>
<el-input
v-model=
'addMsg.VisaNum'
@
keyup
.
native=
"checkInteger(addMsg,'VisaNum')"
@
input=
'getTotalPrice();'
></el-input>
</el-form-item>
</el-col>
<!--
<el-col
:span=
"4"
>
<!--
<el-col
:span=
"4"
>
<el-form-item
label=
"单地接数量"
prop=
"AirticketNum"
>
<el-form-item
label=
"单地接数量"
prop=
"AirticketNum"
>
<el-input
v-model=
'addMsg.AirticketNum'
@
keyup
.
native=
"checkInteger(addMsg,'AirticketNum')"
@
input=
'getNumber();getTotalPrice();getHouseNo()'
></el-input>
<el-input
v-model=
'addMsg.AirticketNum'
@
keyup
.
native=
"checkInteger(addMsg,'AirticketNum')"
@
input=
'getNumber();getTotalPrice();getHouseNo()'
></el-input>
...
@@ -669,11 +674,7 @@
...
@@ -669,11 +674,7 @@
<el-input
v-model=
'addMsg.TripleRoomNum'
@
keyup
.
native=
"checkInteger(addMsg,'TripleRoomNum')"
@
input=
'yzBigBed1();getTotalPrice()'
></el-input>
<el-input
v-model=
'addMsg.TripleRoomNum'
@
keyup
.
native=
"checkInteger(addMsg,'TripleRoomNum')"
@
input=
'yzBigBed1();getTotalPrice()'
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"4"
>
<el-form-item
label=
"签证数量"
prop=
"VisaNum"
>
<el-input
v-model=
'addMsg.VisaNum'
@
keyup
.
native=
"checkInteger(addMsg,'VisaNum')"
@
input=
'getTotalPrice();yzVisaNum()'
></el-input>
</el-form-item>
</el-col>
<el-col
:span=
"4"
>
<el-col
:span=
"4"
>
<el-form-item
label=
"保险数量"
prop=
"SaleNum"
>
<el-form-item
label=
"保险数量"
prop=
"SaleNum"
>
<el-input
v-model=
'addMsg.SafeNum'
@
keyup
.
native=
"checkInteger(addMsg,'SafeNum')"
@
input=
'getTotalPrice();yzSafeNum()'
></el-input>
<el-input
v-model=
'addMsg.SafeNum'
@
keyup
.
native=
"checkInteger(addMsg,'SafeNum')"
@
input=
'getTotalPrice();yzSafeNum()'
></el-input>
...
...
src/components/busManagement/busHandBook.vue
View file @
0f442408
This diff is collapsed.
Click to expand it.
src/components/dmc/manager/groundOperation.vue
View file @
0f442408
...
@@ -201,6 +201,7 @@
...
@@ -201,6 +201,7 @@
<th>
{{ $t("ground.chepaihao") }}
</th>
<th>
{{ $t("ground.chepaihao") }}
</th>
<th>
{{ $t("ground.sijiName") }}
</th>
<th>
{{ $t("ground.sijiName") }}
</th>
<th>
{{ $t("ground.sijiPhone") }}
</th>
<th>
{{ $t("ground.sijiPhone") }}
</th>
<th>
司机住宿
</th>
<th>
{{ $t("pub.pubRemark") }}
</th>
<th>
{{ $t("pub.pubRemark") }}
</th>
</tr>
</tr>
<tr
v-for=
"item in DMCStaticsCommon.BusList"
>
<tr
v-for=
"item in DMCStaticsCommon.BusList"
>
...
@@ -209,6 +210,7 @@
...
@@ -209,6 +210,7 @@
<td>
{{ item.BusNum }}
</td>
<td>
{{ item.BusNum }}
</td>
<td>
{{ item.DriverName }}
</td>
<td>
{{ item.DriverName }}
</td>
<td>
{{ item.DriverTel }}
</td>
<td>
{{ item.DriverTel }}
</td>
<td>
{{ item.AccommodationTypeStr }}
</td>
<td
width=
"300"
>
{{ item.Remarks }}
</td>
<td
width=
"300"
>
{{ item.Remarks }}
</td>
</tr>
</tr>
</table>
</table>
...
...
src/components/dmc/manager/groundOperation2.vue
View file @
0f442408
...
@@ -453,15 +453,14 @@ export default {
...
@@ -453,15 +453,14 @@ export default {
msg
,
msg
,
res
=>
{
res
=>
{
this
.
loading2
=
false
;
this
.
loading2
=
false
;
console
.
log
(
"res.data"
,
res
.
data
.
data
);
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
//
this.BaseInfo = res.data.data.BaseInfo;
this
.
BaseInfo
=
res
.
data
.
data
.
BaseInfo
;
//
this.PrincipalList = res.data.data.PrincipalList;
this
.
PrincipalList
=
res
.
data
.
data
.
PrincipalList
;
//
this.JourneyTitle = res.data.data.JourneyTitle;
this
.
JourneyTitle
=
res
.
data
.
data
.
JourneyTitle
;
//
this.guestList = res.data.data.guestList;
this
.
guestList
=
res
.
data
.
data
.
guestList
;
//
this.DMCStaticsCommon = res.data.data.DMCStaticsCommon;
this
.
DMCStaticsCommon
=
res
.
data
.
data
.
DMCStaticsCommon
;
//
this.shopList = res.data.data.shopList;
this
.
shopList
=
res
.
data
.
data
.
shopList
;
//
this.PostConfig = res.data.data.DMCStaticsCommon.LeaderApply;
this
.
PostConfig
=
res
.
data
.
data
.
DMCStaticsCommon
.
LeaderApply
;
}
else
{
}
else
{
this
.
Error
(
res
.
data
.
message
);
this
.
Error
(
res
.
data
.
message
);
}
}
...
...
src/components/onedayTripContract.vue
0 → 100644
View file @
0f442408
This diff is collapsed.
Click to expand it.
src/router/config.js
View file @
0f442408
...
@@ -4241,6 +4241,22 @@ export default {
...
@@ -4241,6 +4241,22 @@ export default {
title
:
'单项合同'
title
:
'单项合同'
},
},
},
},
{
path
:
'/DomesticTravelcontract'
,
//境内合同
name
:
'DomesticTravelcontract'
,
component
:
resolve
=>
require
([
'@/components/DomesticTravelcontract'
],
resolve
),
meta
:
{
title
:
'单项合同'
},
},
{
path
:
'/onedayTripContract'
,
//一日游合同
name
:
'onedayTripContract'
,
component
:
resolve
=>
require
([
'@/components/onedayTripContract'
],
resolve
),
meta
:
{
title
:
'一日游合同'
},
},
{
{
path
:
'/TravelContractDetail'
,
//新电子合同详情
path
:
'/TravelContractDetail'
,
//新电子合同详情
name
:
'TravelContractDetail'
,
name
:
'TravelContractDetail'
,
...
...
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