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
30c21471
Commit
30c21471
authored
Sep 17, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
样式修改
parent
c04c6242
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
84 additions
and
89 deletions
+84
-89
TravelControlList.vue
...components/TravelManager/TravelList/TravelControlList.vue
+43
-81
TravelPrice.vue
...nents/newTravelmanager/TravelGroupControl/TravelPrice.vue
+41
-8
No files found.
src/components/TravelManager/TravelList/TravelControlList.vue
View file @
30c21471
This diff is collapsed.
Click to expand it.
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @
30c21471
...
@@ -461,6 +461,21 @@
...
@@ -461,6 +461,21 @@
v-if=
"IsDirect==1 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0"
/>
v-if=
"IsDirect==1 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0"
/>
</
template
>
</
template
>
</div>
</div>
<div
style=
"margin:0 0 20px 10px;height:34px;"
>
<div
style=
"display:inline-block;height:34px;line-height:34px;"
>
<el-checkbox
v-model=
"priceData.IsUseCompanyBus"
:true-label=
"CheckedVaule"
:false-label=
"UnCheckedLessPrice"
label=
"公司车辆"
>
</el-checkbox>
</div>
<
template
v-if=
"priceData.IsUseCompanyBus==1"
>
<el-select
v-model=
"priceData.BusPriceId"
>
<el-option
v-for=
"item in busPriceList"
:key=
"item.Id"
:label=
"item.BusNumber"
:value=
"item.Id"
>
<span
style=
"float: left"
>
{{
item
.
AreaTypeName
}}
(
{{
item
.
BusTypeStr
}}
)
</span>
<span
style=
"float: right; color: #8492a6; font-size: 13px"
>
{{
item
.
BusNumber
}}
</span>
</el-option>
</el-select>
</
template
>
</div>
<el-form-item
prop=
"B2BMemberPrice"
>
<el-form-item
prop=
"B2BMemberPrice"
>
<el-input
:placeholder=
"$t('pub.pleaseImport')"
class=
"w190 ComSeat"
<el-input
:placeholder=
"$t('pub.pleaseImport')"
class=
"w190 ComSeat"
v-model=
"priceData.B2BMemberPrice"
@
keyup
.
native=
"checkPrice(priceData,'B2BMemberPrice')"
>
v-model=
"priceData.B2BMemberPrice"
@
keyup
.
native=
"checkPrice(priceData,'B2BMemberPrice')"
>
...
@@ -840,10 +855,12 @@
...
@@ -840,10 +855,12 @@
</el-form-item>
</el-form-item>
<el-form-item
style=
"margin-top:1px;"
>
<el-form-item
style=
"margin-top:1px;"
>
<span
class=
"TP_Sendprepend"
style=
"margin:3px -1px 0 0"
>
报价单地址
</span>
<span
class=
"TP_Sendprepend"
style=
"margin:3px -1px 0 0"
>
报价单地址
</span>
<el-upload
class=
"upload-demo"
style=
"display:inline-block;position:relative;top:-1px;left:3px;"
:http-request=
"uploadFileBtn"
:multiple=
"true"
:show-file-list=
"false"
action=
""
>
<el-upload
class=
"upload-demo"
style=
"display:inline-block;position:relative;top:-1px;left:3px;"
:http-request=
"uploadFileBtn"
:multiple=
"true"
:show-file-list=
"false"
action=
""
>
<el-button
size=
"small"
type=
"primary"
>
上传
</el-button>
<el-button
size=
"small"
type=
"primary"
>
上传
</el-button>
</el-upload>
</el-upload>
<a
style=
"margin-left:20px;color:blue;"
:href=
"priceData.PriceOfferUrl"
v-if=
"priceData.PriceOfferUrl"
target=
"_blank"
>
预览
</a>
<a
style=
"margin-left:20px;color:blue;"
:href=
"priceData.PriceOfferUrl"
v-if=
"priceData.PriceOfferUrl"
target=
"_blank"
>
预览
</a>
</el-form-item>
</el-form-item>
</div>
</div>
</div>
</div>
...
@@ -1153,8 +1170,9 @@
...
@@ -1153,8 +1170,9 @@
//少价规则
//少价规则
lessPriceVisible
:
false
,
lessPriceVisible
:
false
,
lessPriceData
:
[],
lessPriceData
:
[],
SupplierList
:[],
//供应商列表
SupplierList
:
[],
//供应商列表
TeamListArr
:[],
TeamListArr
:
[],
busPriceList
:
[],
//车辆列表
};
};
},
},
methods
:
{
methods
:
{
...
@@ -1309,8 +1327,10 @@
...
@@ -1309,8 +1327,10 @@
ForeignPassportPrice
:
0
,
ForeignPassportPrice
:
0
,
UseFlightType
:
this
.
CurrentUserInfo
.
UseFlightType
,
UseFlightType
:
this
.
CurrentUserInfo
.
UseFlightType
,
SupplierId
:
0
,
//供应商编号
SupplierId
:
0
,
//供应商编号
PriceTeamType
:
1
,
//团队类型
PriceTeamType
:
1
,
//团队类型
PriceOfferUrl
:
''
//报价单地址
PriceOfferUrl
:
''
,
//报价单地址
IsUseCompanyBus
:
0
,
//是否使用公司车辆
BusPriceId
:
0
,
//公司车辆编号
};
};
}
}
this
.
returnPriceList
.
push
(
objItem
);
this
.
returnPriceList
.
push
(
objItem
);
...
@@ -1901,7 +1921,7 @@
...
@@ -1901,7 +1921,7 @@
}
}
},
},
//获取团队类型
//获取团队类型
getTeamList
(){
getTeamList
()
{
this
.
apipost
(
"travel_get_GetTravelPriceTeamTypeList"
,
{},
res
=>
{
this
.
apipost
(
"travel_get_GetTravelPriceTeamTypeList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
TeamListArr
=
res
.
data
.
data
;
this
.
TeamListArr
=
res
.
data
.
data
;
...
@@ -1919,8 +1939,20 @@
...
@@ -1919,8 +1939,20 @@
this
.
$message
.
info
(
this
.
$t
(
'tips.shangchuanzhong'
))
this
.
$message
.
info
(
this
.
$t
(
'tips.shangchuanzhong'
))
this
.
UploadSelfFileT
(
path
,
newArr
,
x
=>
{
this
.
UploadSelfFileT
(
path
,
newArr
,
x
=>
{
this
.
priceData
.
PriceOfferUrl
=
this
.
domainManager
().
ViittoFileUrl
+
x
.
data
.
FilePath
,
this
.
priceData
.
PriceOfferUrl
=
this
.
domainManager
().
ViittoFileUrl
+
x
.
data
.
FilePath
,
this
.
Success
(
this
.
$t
(
'tips.scchenggong'
))
this
.
Success
(
this
.
$t
(
'tips.scchenggong'
))
});
});
},
//获取车辆列表
getBusList
()
{
this
.
apipost
(
"bus_get_GetBusTypePriceList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
busPriceList
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{}
);
}
}
},
},
mounted
()
{
mounted
()
{
...
@@ -1931,6 +1963,7 @@
...
@@ -1931,6 +1963,7 @@
this
.
getCompanyList
();
this
.
getCompanyList
();
this
.
getTravelSupplier
();
this
.
getTravelSupplier
();
this
.
getTeamList
();
this
.
getTeamList
();
this
.
getBusList
();
},
},
watch
:
{
watch
:
{
priceList
:
{
priceList
:
{
...
...
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