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
396e0d6b
Commit
396e0d6b
authored
Aug 16, 2024
by
liudong1993
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
15945fef
13917e66
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
422 additions
and
303 deletions
+422
-303
corporationChart.vue
...ancialModule/DataAnalysis/components/corporationChart.vue
+1
-1
lineChart.vue
...nts/FinancialModule/DataAnalysis/components/lineChart.vue
+2
-2
RestaurantPackage.vue
src/components/Restaurant/RestaurantPackage.vue
+2
-2
RestaurantPrice.vue
src/components/Restaurant/RestaurantPrice.vue
+8
-1
bookDinnerStatisticsDetails.vue
src/components/Restaurant/bookDinnerStatisticsDetails.vue
+16
-5
restaurantList.vue
src/components/Restaurant/restaurantList.vue
+23
-16
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+1
-0
AuditDan.vue
src/components/TravelManager/TravelGroupControl/AuditDan.vue
+1
-0
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+4
-2
CostNewPriceAudit.vue
...ts/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
+10
-6
CostNewPriceCC.vue
...nents/TravelManager/TravelNewQuotation/CostNewPriceCC.vue
+1
-0
CostNewPriceMun.vue
...ents/TravelManager/TravelNewQuotation/CostNewPriceMun.vue
+56
-22
QuotationAduit.vue
...nents/TravelManager/TravelNewQuotation/QuotationAduit.vue
+4
-0
QuotationNewPrice.vue
...ts/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
+4
-1
newQuotation.vue
...ponents/TravelManager/TravelNewQuotation/newQuotation.vue
+2
-1
priceDialog.vue
...mponents/TravelManager/TravelNewQuotation/priceDialog.vue
+4
-0
commonDinnerInfo.vue
src/components/commonPage/commonDinnerInfo.vue
+21
-9
systemVersion.vue
src/components/platformModule/systemVersion.vue
+262
-235
No files found.
src/components/FinancialModule/DataAnalysis/components/corporationChart.vue
View file @
396e0d6b
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<div
style=
"margin-left: 20px;"
>
<div
style=
"margin-left: 20px;"
>
<el-tag
size=
"small"
effect=
"dark"
<el-tag
size=
"small"
effect=
"dark"
style=
"margin-right: 5px;cursor: pointer;"
style=
"margin-right: 5px;cursor: pointer;"
:type=
"Current==item.ID?'danger':'info'"
v-for=
"(item,index) in types"
:type=
"Current==item.ID?'danger':'info'"
v-for=
"(item,index) in types"
:key=
"item.ID"
@
click=
"Current=item.ID,BranchChart()"
>
{{
item
.
Name
}}
</el-tag>
@
click=
"Current=item.ID,BranchChart()"
>
{{
item
.
Name
}}
</el-tag>
</div>
</div>
...
...
src/components/FinancialModule/DataAnalysis/components/lineChart.vue
View file @
396e0d6b
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<div
style=
"margin-left: 20px;"
>
<div
style=
"margin-left: 20px;"
>
<el-tag
size=
"small"
effect=
"dark"
<el-tag
size=
"small"
effect=
"dark"
style=
"margin-right: 5px;cursor: pointer;"
style=
"margin-right: 5px;cursor: pointer;"
:type=
"Current==item.ID?'danger':'info'"
v-for=
"(item,index) in types"
:type=
"Current==item.ID?'danger':'info'"
v-for=
"(item,index) in types"
:key=
"item.ID"
@
click=
"Current=item.ID,LineChart()"
>
{{
item
.
Name
}}
</el-tag>
@
click=
"Current=item.ID,LineChart()"
>
{{
item
.
Name
}}
</el-tag>
</div>
</div>
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
<div
style=
"margin-left: 20px;"
>
<div
style=
"margin-left: 20px;"
>
<el-tag
size=
"small"
effect=
"dark"
<el-tag
size=
"small"
effect=
"dark"
style=
"margin-right: 5px;cursor: pointer;"
style=
"margin-right: 5px;cursor: pointer;"
:type=
"costCurrent==item.ID?'danger':'info'"
v-for=
"(item,index) in costTypes"
:type=
"costCurrent==item.ID?'danger':'info'"
v-for=
"(item,index) in costTypes"
:key=
"item.ID"
@
click=
"costCurrent=item.ID,CostChart()"
>
{{
item
.
Name
}}
</el-tag>
@
click=
"costCurrent=item.ID,CostChart()"
>
{{
item
.
Name
}}
</el-tag>
</div>
</div>
...
...
src/components/Restaurant/RestaurantPackage.vue
View file @
396e0d6b
...
@@ -146,9 +146,9 @@
...
@@ -146,9 +146,9 @@
<p
class=
"Ldata"
>
{{
item
.
HDate
}}
</p>
<p
class=
"Ldata"
>
{{
item
.
HDate
}}
</p>
</td>
</td>
<td>
<td>
<el-tooltip
class=
"item"
effect=
"dark"
v-if=
"item.
MealDesc"
:content=
"item.MealDesc
"
placement=
"top-start"
<el-tooltip
class=
"item"
effect=
"dark"
v-if=
"item.
Remark"
:content=
"item.Remark
"
placement=
"top-start"
popper-class=
"max-w250"
>
popper-class=
"max-w250"
>
<span
class=
"descripTion"
>
{{
item
.
MealDesc
}}
</span>
<span
class=
"descripTion"
>
{{
item
.
Remark
}}
</span>
</el-tooltip>
</el-tooltip>
</td>
</td>
<td>
<td>
...
...
src/components/Restaurant/RestaurantPrice.vue
View file @
396e0d6b
...
@@ -402,6 +402,10 @@
...
@@ -402,6 +402,10 @@
<label>
{{
$t
(
'hotel.hotel_SalesPrice'
)
}}
:
{{
dayobject
.
SalesPrice
}}
</label>
<label>
{{
$t
(
'hotel.hotel_SalesPrice'
)
}}
:
{{
dayobject
.
SalesPrice
}}
</label>
<label>
{{
$t
(
'hotel.hotel_B2CPrice'
)
}}
:
{{
dayobject
.
B2CPrice
}}
</label>
<label>
{{
$t
(
'hotel.hotel_B2CPrice'
)
}}
:
{{
dayobject
.
B2CPrice
}}
</label>
</div>
</div>
<div
class=
"popList"
>
<label>
最低价格:
{{
dayobject
.
MinPrice
}}
</label>
<label>
最高价格:
{{
dayobject
.
MaxPrice
}}
</label>
</div>
<div
class=
"HT_supplier"
v-if=
"IsSelfBook"
>
<div
class=
"HT_supplier"
v-if=
"IsSelfBook"
>
<label>
{{
$t
(
'hotel.hotel_Supplier'
)
}}
:
{{
dayobject
.
SupplierName
}}
</label>
<label>
{{
$t
(
'hotel.hotel_Supplier'
)
}}
:
{{
dayobject
.
SupplierName
}}
</label>
</div>
</div>
...
@@ -431,7 +435,8 @@
...
@@ -431,7 +435,8 @@
</span>
</span>
</div>
</div>
<div
class=
"resDiv"
>
<div
class=
"resDiv"
>
<el-form-item
:label=
"$t('hotel.hotel_CostPrice')"
prop=
"CostPrice"
>
<!--prop="CostPrice"-->
<el-form-item
:label=
"$t('hotel.hotel_CostPrice')"
>
<el-input
type=
"text"
class=
"w210"
v-model=
"addMsg.CostPrice"
<el-input
type=
"text"
class=
"w210"
v-model=
"addMsg.CostPrice"
@
keyup
.
native=
"checkPrice(addMsg,'CostPrice')"
></el-input>
@
keyup
.
native=
"checkPrice(addMsg,'CostPrice')"
></el-input>
</el-form-item>
</el-form-item>
...
@@ -652,6 +657,8 @@
...
@@ -652,6 +657,8 @@
dayItem
.
B2BPrice
=
tableinfo
[
j
].
B2BPrice
;
dayItem
.
B2BPrice
=
tableinfo
[
j
].
B2BPrice
;
dayItem
.
B2CPrice
=
tableinfo
[
j
].
B2CPrice
;
dayItem
.
B2CPrice
=
tableinfo
[
j
].
B2CPrice
;
dayItem
.
SalesPrice
=
tableinfo
[
j
].
SalesPrice
;
dayItem
.
SalesPrice
=
tableinfo
[
j
].
SalesPrice
;
dayItem
.
MinPrice
=
tableinfo
[
j
].
MinPrice
;
dayItem
.
MaxPrice
=
tableinfo
[
j
].
MaxPrice
;
dayItem
.
checkState
=
this
.
$calendarUtils
.
checkState
.
hasValue
;
dayItem
.
checkState
=
this
.
$calendarUtils
.
checkState
.
hasValue
;
dayItem
.
SupplierName
=
tableinfo
[
j
].
SupplierName
;
dayItem
.
SupplierName
=
tableinfo
[
j
].
SupplierName
;
dayItem
.
ID
=
tableinfo
[
j
].
ID
;
dayItem
.
ID
=
tableinfo
[
j
].
ID
;
...
...
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @
396e0d6b
...
@@ -223,14 +223,13 @@
...
@@ -223,14 +223,13 @@
</el-select>
</el-select>
</td>
</td>
</tr>
</tr>
<
template
v-if=
"subItem.OrderState==1"
>
<
template
v-if=
"subItem.OrderState==1"
>
<tr>
<tr>
<td
width=
"60"
style=
"text-align:right;"
>
<td
width=
"60"
style=
"text-align:right;"
>
确认时间:
确认时间:
</td>
</td>
<td
style=
"text-align:left;"
>
<td
style=
"text-align:left;"
>
<el-date-picker
class=
'w135'
v-model=
"subItem.SureTime"
type=
"date"
placeholder=
"
选择
确认时间"
<el-date-picker
class=
'w135'
v-model=
"subItem.SureTime"
type=
"date"
placeholder=
"确认时间"
value-format=
"yyyy-MM-dd"
>
value-format=
"yyyy-MM-dd"
>
</el-date-picker>
</el-date-picker>
</td>
</td>
...
@@ -240,8 +239,20 @@
...
@@ -240,8 +239,20 @@
预约时间:
预约时间:
</td>
</td>
<td
style=
"text-align:left;"
>
<td
style=
"text-align:left;"
>
<el-input
class=
'w135'
v-model=
'subItem.BookTime'
@
keyup
.
native=
"checkTime(subItem,'BookTime')"
<!--午餐-->
type=
"text"
></el-input>
<template
v-if=
"subItem.UseDinnerType==2"
>
<el-time-select
class=
'w135'
placeholder=
"预约时间"
v-model=
"subItem.BookTime"
:picker-options=
"
{ start: '11:00',step: '00:15',end: '14:00'}"
@keyup.native="checkTime(subItem,'BookTime')">
</el-time-select>
</
template
>
<!--晚餐-->
<
template
v-if=
"subItem.UseDinnerType==3"
>
<el-time-select
class=
'w135'
placeholder=
"预约时间"
v-model=
"subItem.BookTime"
:picker-options=
"
{ start: '17:00',step: '00:15', end: '20:00'}"
@keyup.native="checkTime(subItem,'BookTime')">
</el-time-select>
</
template
>
</td>
</td>
</tr>
</tr>
</template>
</template>
...
@@ -271,7 +282,7 @@
...
@@ -271,7 +282,7 @@
<el-input
type=
'textarea'
rows=
"6"
class=
'w120'
v-model=
'subItem.Remarks'
></el-input>
<el-input
type=
'textarea'
rows=
"6"
class=
'w120'
v-model=
'subItem.Remarks'
></el-input>
</td>
</td>
</tr>
</tr>
<tr
style=
"display:none;"
>
<tr>
<td
width=
"80"
style=
"text-align:right;"
>
<td
width=
"80"
style=
"text-align:right;"
>
{{$t('ground.canpeibz')}}:
{{$t('ground.canpeibz')}}:
</td>
</td>
...
...
src/components/Restaurant/restaurantList.vue
View file @
396e0d6b
...
@@ -321,6 +321,7 @@
...
@@ -321,6 +321,7 @@
<li>
<li>
<button
class=
"hollowFixedBtn"
type=
"button"
<button
class=
"hollowFixedBtn"
type=
"button"
@
click=
"resetPageIndex(),selectResource()"
>
{{
$t
(
'pub.searchBtn'
)
}}
</button>
@
click=
"resetPageIndex(),selectResource()"
>
{{
$t
(
'pub.searchBtn'
)
}}
</button>
<!--v-if="IsEditDmcSource==1"-->
<button
class=
"normalBtn"
type=
"button"
<button
class=
"normalBtn"
type=
"button"
@
click=
"$router.push('restaurantInfoManage')"
>
{{
$t
(
'pub.addBtn'
)
}}
</button>
@
click=
"$router.push('restaurantInfoManage')"
>
{{
$t
(
'pub.addBtn'
)
}}
</button>
</li>
</li>
...
@@ -341,7 +342,8 @@
...
@@ -341,7 +342,8 @@
</div>
</div>
<div
class=
"starSu"
>
<div
class=
"starSu"
>
<div
class=
"star"
>
<div
class=
"star"
>
<span
class=
"foodList"
v-for=
"(items,index) in item.FoodTagArr"
:key=
"index"
>
{{
items
}}
</span>
<span
class=
"foodList"
>
{{
item
.
DiningTypeName
}}
</span>
<!--
<span
class=
"foodList"
v-for=
"(items,index) in item.FoodTagArr"
:key=
"index"
>
{{
items
}}
</span>
-->
</div>
</div>
<span
v-if=
"item.Star==8"
class=
"sushe"
>
{{
$t
(
'restaurant.res_homeFacility'
)
}}
</span>
<span
v-if=
"item.Star==8"
class=
"sushe"
>
{{
$t
(
'restaurant.res_homeFacility'
)
}}
</span>
<span
v-if=
"item.Star==9"
class=
"sushe"
>
{{
$t
(
'restaurant.res_SpringHotel'
)
}}
</span>
<span
v-if=
"item.Star==9"
class=
"sushe"
>
{{
$t
(
'restaurant.res_SpringHotel'
)
}}
</span>
...
@@ -382,6 +384,7 @@
...
@@ -382,6 +384,7 @@
{{
item
.
UpdateTimeStr
}}
{{
item
.
UpdateTimeStr
}}
</div>
</div>
<div
class=
"btnList"
>
<div
class=
"btnList"
>
<!--v-if="IsEditDmcSource==1"-->
<button
@
click=
"goSubInfo('restaurantInfoManage',item.ID)"
class=
"hotelBtn"
>
{{
$t
(
'pub.updateMsg'
)
}}
</button>
<button
@
click=
"goSubInfo('restaurantInfoManage',item.ID)"
class=
"hotelBtn"
>
{{
$t
(
'pub.updateMsg'
)
}}
</button>
<button
v-if=
"IsHotelPriceStock==1"
@
click=
"goUrl('RestaurantPackage',item.ID)"
<button
v-if=
"IsHotelPriceStock==1"
@
click=
"goUrl('RestaurantPackage',item.ID)"
class=
"hotelBtn"
>
{{
$t
(
'restaurant.res_package'
)
}}
</button>
class=
"hotelBtn"
>
{{
$t
(
'restaurant.res_package'
)
}}
</button>
...
@@ -397,16 +400,13 @@
...
@@ -397,16 +400,13 @@
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
IsHotelPriceStock
:
0
,
//1-有获取餐厅与报价添加修改权限
total
:
0
,
total
:
0
,
currentPage
:
1
,
currentPage
:
1
,
countryList
:
""
,
countryList
:
""
,
provinceList
:
""
,
provinceList
:
""
,
cityList
:
""
,
cityList
:
""
,
district
:
""
,
district
:
""
,
Ids
:
[],
tableData
:
""
,
tableData
:
""
,
deleteID
:
""
,
EmployeeList
:
[],
//员工列表
EmployeeList
:
[],
//员工列表
DiningTypeList
:
[],
DiningTypeList
:
[],
DiningPriceTypeList
:
[],
DiningPriceTypeList
:
[],
...
@@ -420,7 +420,6 @@
...
@@ -420,7 +420,6 @@
label
:
this
.
$t
(
'system.table_delete'
)
label
:
this
.
$t
(
'system.table_delete'
)
}
}
],
],
isDeleteNote
:
true
,
loading
:
true
,
loading
:
true
,
defaultImg
:
'this.src="'
+
require
(
"../../assets/img/bg_z1@2x.png"
)
+
'"'
,
defaultImg
:
'this.src="'
+
require
(
"../../assets/img/bg_z1@2x.png"
)
+
'"'
,
msg
:
{
msg
:
{
...
@@ -439,7 +438,9 @@
...
@@ -439,7 +438,9 @@
currentPage
:
1
,
currentPage
:
1
,
ID
:
0
,
ID
:
0
,
UpdateBy
:
0
,
//操作人
UpdateBy
:
0
,
//操作人
}
},
IsHotelPriceStock
:
0
,
//1-有获取餐厅与报价添加修改权限
IsEditDmcSource
:
0
,
//是否有新增修改权限
};
};
},
},
methods
:
{
methods
:
{
...
@@ -592,15 +593,21 @@
...
@@ -592,15 +593,21 @@
},
},
//获取酒店修改与报价添加修改权限
//获取酒店修改与报价添加修改权限
GetHotelPirceStockAuth
()
{
GetHotelPirceStockAuth
()
{
this
.
apipost
(
let
isStock
=
"IsHotelPriceStock"
;
"hotel_post_GetHotelPriceStockAuthService"
,
{},
let
editDmcSource
=
"F_EditDmcSource"
;
res
=>
{
this
.
apipost
(
'userauth_get_CheckUserAuthNewService'
,
''
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
IsHotelPriceStock
=
res
.
data
.
data
;
var
tempData
=
res
.
data
.
data
;
if
(
tempData
&&
tempData
.
length
>
0
)
{
if
(
tempData
.
includes
(
isStock
))
{
this
.
IsHotelPriceStock
=
1
;
}
}
},
if
(
tempData
.
includes
(
editDmcSource
))
{
err
=>
{}
this
.
IsEditDmcSource
=
1
;
);
}
}
}
});
},
},
//根据当前员工所在部门获取该部门及子部门员工信息
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList
()
{
getEmployeeList
()
{
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
396e0d6b
...
@@ -2347,6 +2347,7 @@
...
@@ -2347,6 +2347,7 @@
"
>
"
>
<span
v-for=
"childItem in item.guestList"
style=
"color: blue"
>
<span
v-for=
"childItem in item.guestList"
style=
"color: blue"
>
{{childItem.userName}}
{{childItem.userName}}
<span
:style=
"childItem.isBed==1?'color:#d332e5':'color:#67c23a' "
>
({{childItem.isBed==1?'占床':'不占床'}})
</span>
<span
style=
"color:#f56c6c"
>
{{childItem.visaType==1?'(个签)':''}}
</span>
<span
style=
"color:#f56c6c"
>
{{childItem.visaType==1?'(个签)':''}}
</span>
<span
style=
"color:#f56c6c"
>
{{childItem.ticketOutTypeStr}}
</span>
<span
style=
"color:#f56c6c"
>
{{childItem.ticketOutTypeStr}}
</span>
<span
style=
"cursor:pointer;"
<span
style=
"cursor:pointer;"
...
...
src/components/TravelManager/TravelGroupControl/AuditDan.vue
View file @
396e0d6b
...
@@ -124,6 +124,7 @@
...
@@ -124,6 +124,7 @@
<
template
v-else
>
<
template
v-else
>
{{
item
.
TeamTypeName
}}
{{
item
.
TeamTypeName
}}
</
template
>
</
template
>
<
template
v-if=
"item.PriceTeamTypeName&&item.PriceTeamTypeName.length>0"
>
/
{{
item
.
PriceTeamTypeName
}}
</
template
>
</div>
</div>
</div>
</div>
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
396e0d6b
...
@@ -2129,8 +2129,9 @@
...
@@ -2129,8 +2129,9 @@
<span
class=
"RL-remarkTitle"
v-if=
"item.GuestList.length > 0"
>
{{ $t("salesModule.MD") }}:
</span>
<span
class=
"RL-remarkTitle"
v-if=
"item.GuestList.length > 0"
>
{{ $t("salesModule.MD") }}:
</span>
<p
class=
"RL-redType RL-remarkCon"
v-if=
"item.GuestList.length > 0"
>
<p
class=
"RL-redType RL-remarkCon"
v-if=
"item.GuestList.length > 0"
>
<span
style=
"color: blue !important"
v-for=
"(childItem,childIndex) in item.GuestList"
:key=
"childIndex"
<span
style=
"color: blue !important"
v-for=
"(childItem,childIndex) in item.GuestList"
:key=
"childIndex"
@
click=
"goToPassenger(childItem, 2)"
>
{{ childItem.userName }}
<span
@
click=
"goToPassenger(childItem, 2)"
>
{{ childItem.userName }}
style=
"color:#f56c6c"
>
{{childItem.VisaType==1?'(个签)':''}}
</span>
<span
:style=
"childItem.IsBed==1?'color:#d332e5':'color:#67c23a' "
>
({{childItem.IsBed==1?'占床':'不占床'}})
</span>
<span
style=
"color:#f56c6c"
>
{{childItem.VisaType==1?'(个签)':''}}
</span>
<span
style=
"color:#f56c6c"
>
{{childItem.TicketOutTypeStr}}
<span
style=
"color:#f56c6c"
>
{{childItem.TicketOutTypeStr}}
</span>
</span>
</span>
</span>
...
@@ -2676,6 +2677,7 @@
...
@@ -2676,6 +2677,7 @@
<
template
v-for=
"(fourthItem,fourthIndex) in childItem.GuestList"
>
<
template
v-for=
"(fourthItem,fourthIndex) in childItem.GuestList"
>
<span
style=
"color: blue !important"
:key=
"fourthIndex"
<span
style=
"color: blue !important"
:key=
"fourthIndex"
@
click=
"goToPassenger2(msg.TCID, fourthItem.OrderId, 2)"
>
{{
fourthItem
.
userName
}}
@
click=
"goToPassenger2(msg.TCID, fourthItem.OrderId, 2)"
>
{{
fourthItem
.
userName
}}
<span
:style=
"fourthItem.IsBed==1?'color:#d332e5':'color:#67c23a' "
>
(
{{
fourthItem
.
IsBed
==
1
?
'占床'
:
'不占床'
}}
)
</span>
<span
style=
"color:#f56c6c"
>
{{
fourthItem
.
VisaType
==
1
?
'(个签)'
:
''
}}
<span
style=
"color:#f56c6c"
>
{{
fourthItem
.
VisaType
==
1
?
'(个签)'
:
''
}}
</span>
</span>
<span
v-if=
"fourthItem.TicketOutType==1"
style=
"color:#409EFF;"
>
{{
fourthItem
.
TicketOutTypeStr
}}
<span
v-if=
"fourthItem.TicketOutType==1"
style=
"color:#409EFF;"
>
{{
fourthItem
.
TicketOutTypeStr
}}
...
...
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @
396e0d6b
...
@@ -93,7 +93,7 @@
...
@@ -93,7 +93,7 @@
<td
width=
"300"
>
<td
width=
"300"
>
{{
postConfig
.
Title
}}
{{
postConfig
.
Title
}}
</td>
</td>
<td
width=
"80"
class=
"txtRightCost"
>
团队
类型
</td>
<td
width=
"80"
class=
"txtRightCost"
>
出团
类型
</td>
<td
width=
"300"
>
<td
width=
"300"
>
<template
v-if=
"postConfig.TeamType==1"
>
<template
v-if=
"postConfig.TeamType==1"
>
<span
style=
"color:red;font-weight:bold;"
>
{{
postConfig
.
TeamTypeName
}}
</span>
<span
style=
"color:red;font-weight:bold;"
>
{{
postConfig
.
TeamTypeName
}}
</span>
...
@@ -102,9 +102,9 @@
...
@@ -102,9 +102,9 @@
{{
postConfig
.
TeamTypeName
}}
{{
postConfig
.
TeamTypeName
}}
</
template
>
</
template
>
</td>
</td>
<td
width=
"80"
class=
"txtRightCost"
>
行程天数
</td>
<td
width=
"80"
class=
"txtRightCost"
>
团队类型
</td>
<td>
<td>
{{postConfig.
DayNum
}}
{{postConfig.
PriceTeamTypeName
}}
</td>
</td>
</tr>
</tr>
<tr>
<tr>
...
@@ -113,9 +113,13 @@
...
@@ -113,9 +113,13 @@
</tr>
</tr>
<tr>
<tr>
<td
width=
"80"
class=
"txtRightCost"
>
出团公司
</td>
<td
width=
"80"
class=
"txtRightCost"
>
出团公司
</td>
<td
colspan=
"3"
>
<td
>
{{postConfig.OutBranchName}}
{{postConfig.OutBranchName}}
</td>
</td>
<td
width=
"80"
class=
"txtRightCost"
>
行程天数
</td>
<td>
{{postConfig.DayNum}}
</td>
<td
width=
"80"
class=
"txtRightCost"
>
出发日期
</td>
<td
width=
"80"
class=
"txtRightCost"
>
出发日期
</td>
<td>
<td>
{{postConfig.OutDateTime}}
{{postConfig.OutDateTime}}
...
@@ -546,7 +550,7 @@
...
@@ -546,7 +550,7 @@
</
template
>
</
template
>
</td>
</td>
<td
colspan=
"3"
>
<td
colspan=
"3"
>
当前
团队
类型:
<
template
v-if=
"postConfig.TeamTypeName=='小包团'"
>
当前
出团
类型:
<
template
v-if=
"postConfig.TeamTypeName=='小包团'"
>
<span
style=
"color:red;font-weight:bold;"
>
{{
postConfig
.
TeamTypeName
}}
</span>
<span
style=
"color:red;font-weight:bold;"
>
{{
postConfig
.
TeamTypeName
}}
</span>
</
template
>
</
template
>
<
template
v-else
>
<
template
v-else
>
...
@@ -554,7 +558,7 @@
...
@@ -554,7 +558,7 @@
</
template
>
</
template
>
</td>
</td>
<td
colspan=
"4"
>
<td
colspan=
"4"
>
<el-form-item
label=
"更改
团队
类型"
>
<el-form-item
label=
"更改
出团
类型"
>
<el-select
class=
"multiple_input"
v-model=
"postConfig.TeamType"
>
<el-select
class=
"multiple_input"
v-model=
"postConfig.TeamType"
>
<el-option
v-for=
'item in teamList'
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
<el-option
v-for=
'item in teamList'
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-option>
...
...
src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue
View file @
396e0d6b
...
@@ -458,6 +458,7 @@
...
@@ -458,6 +458,7 @@
<
template
v-else
>
<
template
v-else
>
{{
postConfig
.
TeamTypeName
}}
{{
postConfig
.
TeamTypeName
}}
</
template
>
</
template
>
<
template
v-if=
"postConfig.PriceTeamTypeName&&postConfig.PriceTeamTypeName.length>0"
>
/
{{
postConfig
.
PriceTeamTypeName
}}
</
template
>
</td>
</td>
</tr>
</tr>
...
...
src/components/TravelManager/TravelNewQuotation/CostNewPriceMun.vue
View file @
396e0d6b
...
@@ -97,21 +97,25 @@
...
@@ -97,21 +97,25 @@
<el-option
v-for=
'item in teamList'
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
<el-option
v-for=
'item in teamList'
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-option>
</el-select>
</el-select>
</td>
</td>
<td
width=
"80"
class=
"txtRightCost"
>
线路
</td>
<td
width=
"80"
class=
"txtRightCost"
>
团队类型
</td>
<td>
<td>
<el-select
style=
"width:100%"
v-model=
"postConfig.LineId"
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"changeLine()"
filterable
>
<el-select
class=
"multiple_input"
v-model=
"postConfig.PriceTeamType"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'0'
></el-option>
<el-option
:label=
"$t('pub.pleaseSel')"
:value=
'0'
></el-option>
<el-option
v-for=
"item in getLineList"
:label=
'item.LineName'
:value=
'item.LineID'
:key=
'item.LineID'
>
<template
v-for=
"item in TeamListArr"
>
<el-option
v-if=
"item.Id==1||item.Id==2||item.Id==3||item.Id==4||item.Id==9"
:key=
"item.Id"
:label=
"item.Name"
:value=
"item.Id"
>
</el-option>
</el-option>
</
template
>
</el-select>
</el-select>
</td>
</td>
<td
width=
"
60"
class=
"txtRightCost"
>
系列
</td>
<td
width=
"
80"
class=
"txtRightCost"
>
线路
</td>
<td>
<td>
<el-select
class=
"w300"
v-model=
"postConfig.LineteamId"
:placeholder=
"$t('pub.pleaseSel')"
filterable
>
<el-select
style=
"width:100%"
v-model=
"postConfig.LineId"
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"changeLine()"
filterable
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'0'
></el-option>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'0'
></el-option>
<el-option
v-for=
"item in
LineTeamList"
:label=
'item.LtName'
:value=
'item.LtID'
:key=
'item.Lt
ID'
>
<el-option
v-for=
"item in
getLineList"
:label=
'item.LineName'
:value=
'item.LineID'
:key=
'item.Line
ID'
>
</el-option>
</el-option>
</el-select>
</el-select>
</td>
</td>
...
@@ -121,20 +125,18 @@
...
@@ -121,20 +125,18 @@
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td
width=
"80"
class=
"txtRightCost"
>
团队标题
</td>
<td
width=
"80"
class=
"txtRightCost"
>
系列
</td>
<td
colspan=
"3"
>
<td
colspan=
"3"
>
<el-input
v-model=
"postConfig.Title"
type=
"textarea"
:autosize=
"
{minRows: 1, maxRows: 2 }" resize="none"
<el-select
style=
"width:100%;"
v-model=
"postConfig.LineteamId"
:placeholder=
"$t('pub.pleaseSel')"
filterable
>
placeholder="请填写团队标题" maxlength="200">
</el-input>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'0'
></el-option>
<el-option
v-for=
"item in LineTeamList"
:label=
'item.LtName'
:value=
'item.LtID'
:key=
'item.LtID'
>
</el-option>
</el-select>
</td>
</td>
<td
width=
"80"
class=
"txtRightCost"
>
行程天数
</td>
<td
width=
"80"
class=
"txtRightCost"
>
客户名称
</td>
<td>
<td>
<el-input
class=
"w240 LowNum"
v-model=
"postConfig.DayNum"
<el-input
v-model=
"postConfig.CustomerName"
type=
"text"
placeholder=
"客户名称"
maxlength=
"200"
>
@
keyup
.
native=
"checkInteger(postConfig,'DayNum');createDayTripPrice()"
maxlength=
"2"
>
<template
slot=
"append"
>
天
</
template
>
</el-input>
<el-input
class=
"w120 LowNum"
v-model=
"postConfig.NightNum"
style=
"display:none;"
@
keyup
.
native=
"checkInteger(postConfig,'NightNum')"
maxlength=
"2"
>
<
template
slot=
"append"
>
晚
</
template
>
</el-input>
</el-input>
</td>
</td>
</tr>
</tr>
...
@@ -142,6 +144,8 @@
...
@@ -142,6 +144,8 @@
<td
colspan=
"6"
style=
"height:20px;"
>
<td
colspan=
"6"
style=
"height:20px;"
>
</td>
</td>
</tr>
</tr>
<tr>
<tr>
<td
width=
"80"
class=
"txtRightCost"
>
出团公司
</td>
<td
width=
"80"
class=
"txtRightCost"
>
出团公司
</td>
<td>
<td>
...
@@ -155,11 +159,29 @@
...
@@ -155,11 +159,29 @@
<el-date-picker
type=
"date"
v-model=
"postConfig.OutDateTime"
value-format=
"yyyy-MM-dd"
placeholder
>
<el-date-picker
type=
"date"
v-model=
"postConfig.OutDateTime"
value-format=
"yyyy-MM-dd"
placeholder
>
</el-date-picker>
</el-date-picker>
</td>
</td>
<td
width=
"80"
class=
"txtRightCost"
>
客户名称
</td>
<td
width=
"80"
class=
"txtRightCost"
>
行程天数
</td>
<td>
<td>
<el-input
v-model=
"postConfig.CustomerName"
type=
"text"
placeholder=
"客户名称"
maxlength=
"200"
>
<el-input
class=
"w240 LowNum"
v-model=
"postConfig.DayNum"
@
keyup
.
native=
"checkInteger(postConfig,'DayNum');createDayTripPrice()"
maxlength=
"2"
>
<
template
slot=
"append"
>
天
</
template
>
</el-input>
</el-input>
<el-input
class=
"w120 LowNum"
v-model=
"postConfig.NightNum"
style=
"display:none;"
@
keyup
.
native=
"checkInteger(postConfig,'NightNum')"
maxlength=
"2"
>
<
template
slot=
"append"
>
晚
</
template
>
</el-input>
</td>
</tr>
<tr>
<td
colspan=
"6"
style=
"height:20px;"
>
</td>
</tr>
<tr>
<td
width=
"80"
class=
"txtRightCost"
>
团队标题
</td>
<td
colspan=
"5"
>
<el-input
v-model=
"postConfig.Title"
type=
"textarea"
:autosize=
"{minRows: 1, maxRows: 2 }"
resize=
"none"
placeholder=
"请填写团队标题"
maxlength=
"200"
></el-input>
</td>
</td>
</tr>
</tr>
</table>
</table>
</div>
</div>
...
@@ -205,7 +227,8 @@
...
@@ -205,7 +227,8 @@
},
},
OtherPrice
:
{},
OtherPrice
:
{},
teamPrice
:
{},
teamPrice
:
{},
CostNumberList
:
[]
CostNumberList
:
[],
TeamListArr
:[]
},
},
orderList
:
[],
orderList
:
[],
queryMsg
:
{
queryMsg
:
{
...
@@ -328,6 +351,16 @@
...
@@ -328,6 +351,16 @@
this
.
LineTeamList
=
res
.
data
.
data
;
this
.
LineTeamList
=
res
.
data
.
data
;
}
}
});
});
},
//获取团队类型
getPriceTeamList
()
{
this
.
apipost
(
"travel_get_GetTravelPriceTeamTypeList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
TeamListArr
=
res
.
data
.
data
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{});
},
},
createDayTripPrice
()
{
createDayTripPrice
()
{
for
(
let
i
=
0
;
i
<
this
.
orderList
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
this
.
orderList
.
length
;
i
++
)
{
...
@@ -455,6 +488,7 @@
...
@@ -455,6 +488,7 @@
this
.
getAllCurrency
();
this
.
getAllCurrency
();
this
.
getCompanyList
();
this
.
getCompanyList
();
this
.
getTeamList
();
this
.
getTeamList
();
this
.
getPriceTeamList
();
this
.
getLineTeamList
();
this
.
getLineTeamList
();
if
(
!
this
.
OfferArray
.
length
)
{
if
(
!
this
.
OfferArray
.
length
)
{
this
.
createOrderList
();
this
.
createOrderList
();
...
...
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @
396e0d6b
...
@@ -75,6 +75,8 @@
...
@@ -75,6 +75,8 @@
ManagerAduitStatus
:
0
,
//欧洲线审核状态(1-通过,2-驳回)
ManagerAduitStatus
:
0
,
//欧洲线审核状态(1-通过,2-驳回)
OPName
:
""
,
//主OP
OPName
:
""
,
//主OP
AssistantList
:
[],
//助理OP
AssistantList
:
[],
//助理OP
PriceTeamType
:
0
,
//团队类型,
PriceTeamTypeName
:
""
,
//团队类型,
},
},
dayCostPriceList
:
[],
//报价列表
dayCostPriceList
:
[],
//报价列表
isSubmit
:
true
,
isSubmit
:
true
,
...
@@ -286,6 +288,8 @@
...
@@ -286,6 +288,8 @@
this
.
postData
.
OutBranchName
=
tempData
.
OutBranchName
;
this
.
postData
.
OutBranchName
=
tempData
.
OutBranchName
;
this
.
postData
.
TeamTypeName
=
tempData
.
TeamTypeName
;
this
.
postData
.
TeamTypeName
=
tempData
.
TeamTypeName
;
this
.
postData
.
TeamType
=
tempData
.
TeamType
;
this
.
postData
.
TeamType
=
tempData
.
TeamType
;
this
.
postData
.
PriceTeamTypeName
=
tempData
.
PriceTeamTypeName
;
this
.
postData
.
PriceTeamType
=
tempData
.
PriceTeamType
;
if
(
tempData
.
OfferArray
)
{
if
(
tempData
.
OfferArray
)
{
tempData
.
OfferArray
.
forEach
(
item
=>
{
tempData
.
OfferArray
.
forEach
(
item
=>
{
this
.
OfferArray
.
push
(
item
)
this
.
OfferArray
.
push
(
item
)
...
...
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @
396e0d6b
...
@@ -56,7 +56,8 @@
...
@@ -56,7 +56,8 @@
StartCityId
:
0
,
StartCityId
:
0
,
ReturnArriveCityId
:
0
,
//返回抵达城市
ReturnArriveCityId
:
0
,
//返回抵达城市
CustomerName
:
""
,
//客户名称
CustomerName
:
""
,
//客户名称
TeamType
:
0
,
//团队类型
TeamType
:
0
,
//出团类型
PriceTeamType
:
0
,
//团队类型
TravelState
:
1
,
//团控状态(1-草稿,2-待审核,3-审核通过,4-审核拒绝,5已撤销)
TravelState
:
1
,
//团控状态(1-草稿,2-待审核,3-审核通过,4-审核拒绝,5已撤销)
OutBranchId
:
""
,
//出团公司
OutBranchId
:
""
,
//出团公司
OutDateTime
:
""
,
//出发时间
OutDateTime
:
""
,
//出发时间
...
@@ -205,6 +206,7 @@
...
@@ -205,6 +206,7 @@
item
.
currencyNumberList
=
item
.
CostCurrencyList
;
item
.
currencyNumberList
=
item
.
CostCurrencyList
;
item
.
OtherPrice
.
CurrencyNumberList
=
item
.
CostCurrencyList
;
item
.
OtherPrice
.
CurrencyNumberList
=
item
.
CostCurrencyList
;
item
.
TeamType
=
this
.
postData
.
TeamType
;
item
.
TeamType
=
this
.
postData
.
TeamType
;
item
.
PriceTeamType
=
this
.
postData
.
PriceTeamType
;
item
.
OutBranchId
=
this
.
postData
.
OutBranchId
;
item
.
OutBranchId
=
this
.
postData
.
OutBranchId
;
item
.
TravelState
=
this
.
postData
.
TravelState
;
item
.
TravelState
=
this
.
postData
.
TravelState
;
item
.
OutDateTime
=
this
.
postData
.
OutDateTime
;
item
.
OutDateTime
=
this
.
postData
.
OutDateTime
;
...
@@ -305,6 +307,7 @@
...
@@ -305,6 +307,7 @@
this
.
postData
.
OutBranchId
=
Number
(
tempData
.
OutBranchId
);
this
.
postData
.
OutBranchId
=
Number
(
tempData
.
OutBranchId
);
}
}
this
.
postData
.
TeamType
=
tempData
.
TeamType
;
this
.
postData
.
TeamType
=
tempData
.
TeamType
;
this
.
postData
.
PriceTeamType
=
tempData
.
PriceTeamType
;
this
.
postData
.
TravelState
=
tempData
.
TravelState
;
this
.
postData
.
TravelState
=
tempData
.
TravelState
;
this
.
LineList
=
tempData
.
LineList
;
this
.
LineList
=
tempData
.
LineList
;
if
(
tempData
.
OfferArray
&&
tempData
.
OfferArray
.
length
>
0
)
{
if
(
tempData
.
OfferArray
&&
tempData
.
OfferArray
.
length
>
0
)
{
...
...
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @
396e0d6b
...
@@ -132,6 +132,7 @@
...
@@ -132,6 +132,7 @@
<
template
v-else
>
<
template
v-else
>
{{
item
.
TeamTypeName
}}
{{
item
.
TeamTypeName
}}
</
template
>
</
template
>
<
template
v-if=
"item.PriceTeamTypeName&&item.PriceTeamTypeName.length>0"
>
/
{{
item
.
PriceTeamTypeName
}}
</
template
>
</div>
</div>
</div>
</div>
</div>
</div>
...
...
src/components/TravelManager/TravelNewQuotation/priceDialog.vue
View file @
396e0d6b
...
@@ -182,6 +182,8 @@
...
@@ -182,6 +182,8 @@
ManagerAduitStatus
:
0
,
//欧洲线审核状态(1-通过,2-驳回)
ManagerAduitStatus
:
0
,
//欧洲线审核状态(1-通过,2-驳回)
OPName
:
""
,
//主OP
OPName
:
""
,
//主OP
AssistantList
:
[],
//助理OP
AssistantList
:
[],
//助理OP
PriceTeamType
:
0
,
//团队类型,
PriceTeamTypeName
:
""
,
//团队类型,
},
},
dayCostPriceList
:
[],
//报价列表
dayCostPriceList
:
[],
//报价列表
...
@@ -312,6 +314,8 @@
...
@@ -312,6 +314,8 @@
this
.
postData
.
OutBranchId
=
tempData
.
OutBranchId
;
this
.
postData
.
OutBranchId
=
tempData
.
OutBranchId
;
this
.
postData
.
OutDateTime
=
tempData
.
OutDateTime
;
this
.
postData
.
OutDateTime
=
tempData
.
OutDateTime
;
this
.
postData
.
TeamTypeName
=
tempData
.
TeamTypeName
;
this
.
postData
.
TeamTypeName
=
tempData
.
TeamTypeName
;
this
.
postData
.
PriceTeamType
=
tempData
.
PriceTeamType
,
//团队类型,
this
.
postData
.
PriceTeamTypeName
=
tempData
.
PriceTeamTypeName
,
//团队类型,
this
.
LineList
=
tempData
.
LineList
;
this
.
LineList
=
tempData
.
LineList
;
if
(
tempData
.
OfferArray
&&
tempData
.
OfferArray
.
length
>
0
)
{
if
(
tempData
.
OfferArray
&&
tempData
.
OfferArray
.
length
>
0
)
{
var
offerObj
=
tempData
.
OfferArray
[
0
];
var
offerObj
=
tempData
.
OfferArray
[
0
];
...
...
src/components/commonPage/commonDinnerInfo.vue
View file @
396e0d6b
...
@@ -54,21 +54,21 @@
...
@@ -54,21 +54,21 @@
<template
v-if=
" DiningObj&& DiningObj.length>0"
>
<template
v-if=
" DiningObj&& DiningObj.length>0"
>
<tr
v-for=
"(hotelSubItem,hotelSubIndex) in DiningObj"
>
<tr
v-for=
"(hotelSubItem,hotelSubIndex) in DiningObj"
>
<td>
<td>
{{
hotelSubItem
.
UseTime
}}
{{
hotelSubItem
.
UseTime
}}
(
{{
getDayByDate
(
hotelSubItem
.
UseTime
)
}}
)
</td>
</td>
<td
style=
"text-align:left;padding-left:3px;"
>
<td
style=
"text-align:left;padding-left:3px;"
>
<template
v-if=
"hotelSubItem.DinnerName!=hotelSubItem.NewDinnerName && hotelSubItem.NewDinnerName!=''"
>
<span
style=
"text-decoration:line-through"
>
{{
hotelSubItem
.
DinnerName
}}
</span>
<el-link
style=
"font-size:12px;"
@
click=
"goDinnerDetails('restaurantInfoManage', hotelSubItem.OldDiningID ) "
><template
v-if=
"hotelSubItem.DinnerRealName!=hotelSubItem.NewDinnerRealName && hotelSubItem.NewDinnerRealName!=''"
>
<span
style=
"text-decoration:line-through;"
>
{{
hotelSubItem
.
DinnerRealName
}}
</span>
</
template
>
</
template
>
<
template
v-else
>
<
template
v-else
>
{{
hotelSubItem
.
DinnerName
}}
{{
hotelSubItem
.
DinnerRealName
}}
</
template
>
</
template
></el-link>
</td>
</td>
<td
style=
"text-align:left;padding-left:3px;color:red"
>
<td
style=
"text-align:left;padding-left:3px;color:red"
>
{{hotelSubItem.DinnerName!=hotelSubItem.NewDinnerName?""+hotelSubItem.NewDinnerName:""}}
<el-link
style=
"font-size:12px;"
@
click=
"goDinnerDetails('restaurantInfoManage', hotelSubItem.NewDiningID ) "
>
{{hotelSubItem.DinnerRealName!=hotelSubItem.NewDinnerRealName?""+hotelSubItem.NewDinnerRealName:""}}
</el-link>
</td>
</td>
<td
>
<td
>
<
template
v-if=
"showHotelObj.showPrice&&hotelSubItem.PriceList&&hotelSubItem.PriceList.length>0"
>
<
template
v-if=
"showHotelObj.showPrice&&hotelSubItem.PriceList&&hotelSubItem.PriceList.length>0"
>
<span
v-for=
"(priceSubItem,priceSubIndex) in hotelSubItem.PriceList"
:key=
"`din`+priceSubIndex"
>
<span
v-for=
"(priceSubItem,priceSubIndex) in hotelSubItem.PriceList"
:key=
"`din`+priceSubIndex"
>
...
@@ -140,7 +140,19 @@
...
@@ -140,7 +140,19 @@
date
=
new
Date
(
dateArray
[
0
],
parseInt
(
dateArray
[
1
]
-
1
),
dateArray
[
2
]);
date
=
new
Date
(
dateArray
[
0
],
parseInt
(
dateArray
[
1
]
-
1
),
dateArray
[
2
]);
return
"日一二三四五六"
.
charAt
(
date
.
getDay
());
return
"日一二三四五六"
.
charAt
(
date
.
getDay
());
}
}
}
},
// 跳转餐厅详情页 restaurantInfoManage ///#/restaurantInfoManage?id=4688&blank=y&cache=true
goDinnerDetails
:
function
(
path
,
id
)
{
this
.
$router
.
push
({
name
:
path
,
query
:
{
id
:
id
,
blank
:
"y"
,
cache
:
true
,
},
});
},
},
},
mounted
()
{}
mounted
()
{}
};
};
...
...
src/components/platformModule/systemVersion.vue
View file @
396e0d6b
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
.versionList
{
.versionList
{
padding
:
20px
;
padding
:
20px
;
}
}
.versionList
li
{
.versionList
li
{
float
:
left
;
float
:
left
;
margin
:
0
30px
30px
0
;
margin
:
0
30px
30px
0
;
...
@@ -13,7 +14,8 @@
...
@@ -13,7 +14,8 @@
border-radius
:
4px
;
border-radius
:
4px
;
position
:
relative
;
position
:
relative
;
}
}
.versionListLayer
{
.versionListLayer
{
position
:
absolute
;
position
:
absolute
;
z-index
:
50
;
z-index
:
50
;
width
:
260px
;
width
:
260px
;
...
@@ -21,8 +23,9 @@
...
@@ -21,8 +23,9 @@
left
:
0
;
left
:
0
;
top
:
0
;
top
:
0
;
border-radius
:
4px
;
border-radius
:
4px
;
background
:
rgba
(
0
,
0
,
0
,
.6
);
background
:
rgba
(
0
,
0
,
0
,
.6
);
}
}
.versionList
li
p
.title
{
.versionList
li
p
.title
{
text-align
:
center
;
text-align
:
center
;
font-size
:
14px
;
font-size
:
14px
;
...
@@ -73,9 +76,11 @@
...
@@ -73,9 +76,11 @@
.addVersion
{
.addVersion
{
width
:
800px
;
width
:
800px
;
}
}
.insideDialog
{
.insideDialog
{
width
:
300px
;
width
:
300px
;
}
}
.remarkVersion
{
.remarkVersion
{
width
:
350px
;
width
:
350px
;
height
:
60px
;
height
:
60px
;
...
@@ -84,29 +89,36 @@
...
@@ -84,29 +89,36 @@
line-height
:
18px
;
line-height
:
18px
;
padding
:
10px
22px
;
padding
:
10px
22px
;
}
}
.ql-editor
{
height
:
200px
!important
;}
.ql-editor
{
height
:
200px
!important
;
}
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"flexOne"
>
<div
class=
"flexOne"
>
<div
class=
"versionList"
>
<div
class=
"versionList"
>
<ul>
<ul>
<li
v-for=
"(item,index) in dataList"
>
<template
v-for=
"(item,index) in dataList"
>
<li
:key=
"`vl_`+index"
>
<div
v-if=
'item.Status==1'
class=
"versionListLayer"
>
<div
v-if=
'item.Status==1'
class=
"versionListLayer"
>
<div
@
click=
"outerVisible = true;dialogTitle='修改系统版本',updateDate(item.Id)"
style=
"width: 90px; height: 30px;margin: 260px 0 0 85px; cursor: pointer; text-align: center; line-height: 30px;font-size: 14px; border-radius: 15px; border: 1px solid #fff;"
>
<div
@
click=
"outerVisible = true;dialogTitle='修改系统版本',updateDate(item.Id)"
style=
"width: 90px; height: 30px;margin: 260px 0 0 85px; cursor: pointer; text-align: center; line-height: 30px;font-size: 14px; border-radius: 15px; border: 1px solid #fff;"
>
<i
class=
"iconfont icon-img_bianji_small"
style=
"font-size: 14px;"
></i>
<i
class=
"iconfont icon-img_bianji_small"
style=
"font-size: 14px;"
></i>
编辑
编辑
</div>
</div>
</div>
</div>
<p
class=
"title"
>
{{
item
.
VersionsName
}}
(
{{
item
.
EmployeeNum
==
'0'
?
'不限'
:
item
.
EmployeeNum
}}
)
</p>
<p
class=
"title"
>
{{
item
.
VersionsName
}}
(
{{
item
.
EmployeeNum
==
'0'
?
'不限'
:
item
.
EmployeeNum
}}
)
</p>
<pre
v-html=
"item.Description"
></pre>
<pre
v-html=
"item.Description"
></pre>
<!--
<pre
>
{{
item
.
Description
}}
</pre>
-->
<p
class=
"btm"
>
<p
class=
"btm"
>
<input
class=
"versionBtn"
@
click=
"outerVisible = true;dialogTitle='修改系统版本',updateDate(item.Id)"
type=
"button"
value=
"修改"
/>
<input
class=
"versionBtn"
@
click=
"outerVisible = true;dialogTitle='修改系统版本',updateDate(item.Id)"
type=
"button"
value=
"修改"
/>
<input
class=
"versionBtn"
@
click=
"goUrl('versionspermissionList',item.Id)"
type=
"button"
value=
"ERP菜单"
/>
<input
class=
"versionBtn"
@
click=
"goUrl('versionspermissionList',item.Id)"
type=
"button"
value=
"ERP菜单"
/>
<input
class=
"versionBtn"
@
click=
"goUrlApp('appversionsPermissionList',item.Id)"
type=
"button"
value=
"APP菜单"
/>
<input
class=
"versionBtn"
@
click=
"goUrlApp('appversionsPermissionList',item.Id)"
type=
"button"
value=
"APP菜单"
/>
</p>
</p>
</li>
</li>
</
template
>
<li
class=
"addli"
@
click=
"outerVisible = true;dialogTitle='添加系统版本',clearMessage()"
>
<li
class=
"addli"
@
click=
"outerVisible = true;dialogTitle='添加系统版本',clearMessage()"
>
<i
class=
"iconfont icon-plus"
style=
"font-size: 80px;color:#E1E1E1"
></i>
<i
class=
"iconfont icon-plus"
style=
"font-size: 80px;color:#E1E1E1"
></i>
</li>
</li>
...
@@ -118,7 +130,7 @@
...
@@ -118,7 +130,7 @@
<table
class=
"layerTable"
>
<table
class=
"layerTable"
>
<tr>
<tr>
<td><span>
版本名称:
</span></td>
<td><span>
版本名称:
</span></td>
<td><input
maxlength=
"14"
class=
"layerText"
v-model=
"addMsg.VersionsName"
type=
"text"
></td>
<td><el-input
maxlength=
"14"
class=
"w150"
v-model=
"addMsg.VersionsName"
type=
"text"
/
></td>
</tr>
</tr>
<tr>
<tr>
<td><span
class=
"fl"
>
版本描述:
</span></td>
<td><span
class=
"fl"
>
版本描述:
</span></td>
...
@@ -129,7 +141,8 @@
...
@@ -129,7 +141,8 @@
</tr>
</tr>
<tr>
<tr>
<td><span>
账户数量:
</span></td>
<td><span>
账户数量:
</span></td>
<td><input
@
keyup
.
native=
"checkInteger(addMsg,'EmployeeNum')"
class=
"layerText"
v-model=
"addMsg.EmployeeNum"
type=
"text"
></td>
<td><el-input
@
keyup
.
native=
"checkInteger(addMsg,'EmployeeNum')"
class=
"w150"
v-model=
"addMsg.EmployeeNum"
type=
"text"
/></td>
</tr>
</tr>
<tr>
<tr>
<td><span>
是否开启:
</span></td>
<td><span>
是否开启:
</span></td>
...
@@ -144,7 +157,6 @@
...
@@ -144,7 +157,6 @@
<button
class=
"normalBtn"
type=
"primary"
@
click=
"innerVisible=true,addData()"
>
保存
</button>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"innerVisible=true,addData()"
>
保存
</button>
</div>
</div>
</el-dialog>
</el-dialog>
</div>
</div>
</template>
</template>
...
@@ -156,19 +168,19 @@
...
@@ -156,19 +168,19 @@
insideDialogTxt
:
'保存成功!'
,
insideDialogTxt
:
'保存成功!'
,
outerVisible
:
false
,
outerVisible
:
false
,
innerVisible
:
false
,
innerVisible
:
false
,
isRight
:
true
,
isRight
:
true
,
dataList
:
{},
dataList
:
{},
form
:
{},
form
:
{},
msg
:
{
msg
:
{
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
99
,
pageSize
:
99
,
"Status"
:
-
1
,
"Status"
:
-
1
,
"VersionsName"
:
''
,
"VersionsName"
:
''
,
},
},
addMsg
:
{
addMsg
:
{
EmployeeNum
:
''
,
EmployeeNum
:
''
,
id
:
''
,
id
:
''
,
Status
:
'0'
,
Status
:
'0'
,
VersionsName
:
''
,
VersionsName
:
''
,
Description
:
''
Description
:
''
}
}
...
@@ -180,45 +192,45 @@
...
@@ -180,45 +192,45 @@
methods
:
{
methods
:
{
getList
()
{
getList
()
{
this
.
apipost
(
"admin_get_SysVersionsGetPageList"
,
this
.
msg
,
res
=>
{
this
.
apipost
(
"admin_get_SysVersionsGetPageList"
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
dataList
=
res
.
data
.
data
.
pageData
;
}
else
{
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
)
this
.
$message
.
error
(
res
.
data
.
message
)
}
}
},
err
=>
{})
},
err
=>
{})
},
},
addData
()
{
addData
()
{
if
(
this
.
addMsg
.
EmployeeNum
==
''
)
{
if
(
this
.
addMsg
.
EmployeeNum
==
''
)
{
this
.
$message
.
warning
(
'请输入账户数量'
)
this
.
$message
.
warning
(
'请输入账户数量'
)
return
return
}
}
if
(
this
.
addMsg
.
VersionsName
==
''
)
{
if
(
this
.
addMsg
.
VersionsName
==
''
)
{
this
.
$message
.
warning
(
'请输入版本名称'
)
this
.
$message
.
warning
(
'请输入版本名称'
)
return
return
}
}
this
.
apipost
(
"admin_post_SysVersionsSet"
,
this
.
addMsg
,
res
=>
{
this
.
apipost
(
"admin_post_SysVersionsSet"
,
this
.
addMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
if
(
res
.
data
.
resultCode
==
1
)
{
{
this
.
$message
.
success
(
res
.
data
.
message
)
this
.
$message
.
success
(
res
.
data
.
message
)
this
.
outerVisible
=
false
;
this
.
outerVisible
=
false
;
this
.
getList
()
this
.
getList
()
}
else
{
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
)
this
.
$message
.
error
(
res
.
data
.
message
)
}
}
},
err
=>
{})
},
err
=>
{})
},
},
updateDate
(
id
){
updateDate
(
id
)
{
this
.
addMsg
.
id
=
id
;
this
.
addMsg
.
id
=
id
;
this
.
apipost
(
'admin_get_SysVersionsGet'
,{
VersionsId
:
id
},
res
=>
{
this
.
apipost
(
'admin_get_SysVersionsGet'
,
{
if
(
res
.
data
.
resultCode
==
1
)
VersionsId
:
id
{
},
res
=>
{
this
.
addMsg
.
Status
=
res
.
data
.
data
.
Status
.
toString
()
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
addMsg
.
VersionsName
=
res
.
data
.
data
.
VersionsName
;
this
.
addMsg
.
Status
=
res
.
data
.
data
.
Status
.
toString
()
this
.
addMsg
.
Description
=
res
.
data
.
data
.
Description
;
this
.
addMsg
.
VersionsName
=
res
.
data
.
data
.
VersionsName
;
this
.
addMsg
.
EmployeeNum
=
res
.
data
.
data
.
EmployeeNum
this
.
addMsg
.
Description
=
res
.
data
.
data
.
Description
;
}
else
{}
this
.
addMsg
.
EmployeeNum
=
res
.
data
.
data
.
EmployeeNum
},
err
=>
{})
}
else
{}
},
err
=>
{})
},
},
clearMessage
()
{
clearMessage
()
{
...
@@ -228,15 +240,30 @@
...
@@ -228,15 +240,30 @@
Description
:
''
Description
:
''
}
}
},
},
goUrl
(
path
,
id
)
{
goUrl
(
path
,
id
)
{
this
.
$router
.
push
({
name
:
path
,
query
:{
"id"
:
id
,
blank
:
'y'
,
tab
:
'ERP菜单'
}
})
this
.
$router
.
push
({
name
:
path
,
query
:
{
"id"
:
id
,
blank
:
'y'
,
tab
:
'ERP菜单'
}
})
},
},
goUrlApp
(
path
,
id
)
{
goUrlApp
(
path
,
id
)
{
this
.
$router
.
push
({
name
:
path
,
query
:{
"id"
:
id
,
blank
:
'y'
,
tab
:
'APP菜单'
}
})
this
.
$router
.
push
({
name
:
path
,
query
:
{
"id"
:
id
,
blank
:
'y'
,
tab
:
'APP菜单'
}
})
}
}
},
},
}
}
</
script
>
:
</
script
>
:
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