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
dc709103
Commit
dc709103
authored
May 06, 2023
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
5988ef99
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
86 additions
and
172 deletions
+86
-172
GnHotelManagement.vue
src/components/Hotel/GnHotelManagement.vue
+1
-10
HotelManagement.vue
src/components/Hotel/HotelManagement.vue
+55
-30
roomReservationsDetailsNew.vue
src/components/Hotel/roomReservationsDetailsNew.vue
+0
-3
TravelContractConfirm.vue
src/components/TravelContractConfirm.vue
+1
-92
TravelContractNew.vue
src/components/TravelContractNew.vue
+0
-1
CostNewPriceAudit.vue
...ts/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
+15
-17
DirectNewQuotation.vue
...s/TravelManager/TravelNewQuotation/DirectNewQuotation.vue
+14
-13
QuotationAduit.vue
...nents/TravelManager/TravelNewQuotation/QuotationAduit.vue
+0
-1
newQuotation.vue
...ponents/TravelManager/TravelNewQuotation/newQuotation.vue
+0
-1
leaderPay2.vue
src/components/leaderPay2.vue
+0
-3
order-form.vue
src/components/orderCommon/order-form.vue
+0
-1
No files found.
src/components/Hotel/GnHotelManagement.vue
View file @
dc709103
...
@@ -259,16 +259,7 @@
...
@@ -259,16 +259,7 @@
</el-select>
</el-select>
</span>
</span>
</li>
</li>
<li
style=
"display:none;"
>
<span>
<em>
{{
$t
(
'Operation.Op_price'
)
}}
</em>
<el-select
v-model=
"msg.HotelPirceType"
class=
"w210"
:placeholder=
"$t('pub.unlimitedSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
value=
"-1"
></el-option>
<el-option
v-for=
"item in HotelPirceTypeList"
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-select>
</span>
</li>
<li>
<li>
<span><em>
{{
$t
(
'visa.v_czuser'
)
}}
</em></span>
<span><em>
{{
$t
(
'visa.v_czuser'
)
}}
</em></span>
<el-select
class=
"w150"
v-model=
"msg.CreateBy"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-select
class=
"w150"
v-model=
"msg.CreateBy"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
...
...
src/components/Hotel/HotelManagement.vue
View file @
dc709103
...
@@ -234,28 +234,37 @@
...
@@ -234,28 +234,37 @@
display
:
flex
;
display
:
flex
;
justify-content
:
center
;
justify-content
:
center
;
}
}
.hotelmanagement
.comCursorUrl
{
cursor
:
pointer
;
.hotelmanagement
.comCursorUrl
{
}
cursor
:
pointer
;
.editInfo
{
}
padding
:
2px
!important
;
}
.editInfo
{
.list-item
{
padding
:
2px
!important
;
margin
:
20px
0
;
}
}
.file-title
{
.list-item
{
font-size
:
16px
;
margin
:
20px
0
;
font-weight
:
bold
;
}
}
.submit-box
{
.file-title
{
display
:
flex
;
font-size
:
16px
;
justify-content
:
center
;
font-weight
:
bold
;
}
}
.yellow
{
color
:
orange
!important
;}
.submit-box
{
.green
{
display
:
flex
;
color
:
green
!important
;
justify-content
:
center
;
}
}
.yellow
{
color
:
orange
!important
;
}
.green
{
color
:
green
!important
;
}
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"flexOne hotelmanagement"
>
<div
class=
"flexOne hotelmanagement"
>
...
@@ -324,6 +333,23 @@
...
@@ -324,6 +333,23 @@
:key=
"item.EmployeeId"
></el-option>
:key=
"item.EmployeeId"
></el-option>
</el-select>
</el-select>
</li>
</li>
<li>
<span><em>
报价信息
</em></span>
<el-select
class=
"w150"
v-model=
"msg.IsUpFile"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
"0"
>
</el-option>
<el-option
label=
"已上传"
:value=
"1"
>
</el-option>
<el-option
label=
"未上传"
:value=
"2"
>
</el-option>
</el-select>
</li>
<li>
<span>
<em>
上传时间
</em>
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"msg.QFileStartDate"
value-format=
"yyyy-MM-dd"
placeholder
>
</el-date-picker>
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"msg.QFileEndDate"
value-format=
"yyyy-MM-dd"
placeholder
>
</el-date-picker>
</span>
</li>
<li>
<li>
<button
class=
"hollowFixedBtn"
type=
"button"
@
click=
"resetPageIndex(), selectResource()"
>
<button
class=
"hollowFixedBtn"
type=
"button"
@
click=
"resetPageIndex(), selectResource()"
>
{{
$t
(
"pub.searchBtn"
)
}}
{{
$t
(
"pub.searchBtn"
)
}}
...
@@ -363,13 +389,7 @@
...
@@ -363,13 +389,7 @@
}}
</span>
}}
</span>
</div>
</div>
</div>
</div>
<el-tooltip
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"item.Name"
placement=
"top-start"
popper-class=
"max-w250"
>
class=
"item"
effect=
"dark"
:content=
"item.Name"
placement=
"top-start"
popper-class=
"max-w250"
>
<div
class=
"hotelTitle"
:class=
"['','red','yellow','green','',][item.PriceDayStage]"
>
{{
item
.
Name
}}
</div>
<div
class=
"hotelTitle"
:class=
"['','red','yellow','green','',][item.PriceDayStage]"
>
{{
item
.
Name
}}
</div>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"item.HotelRealName"
placement=
"top-start"
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"item.HotelRealName"
placement=
"top-start"
...
@@ -433,6 +453,9 @@
...
@@ -433,6 +453,9 @@
class=
"hotelBtnMan"
>
class=
"hotelBtnMan"
>
上传报价
上传报价
</button>
</button>
<template
v-if=
"item.MaxFileDate&&item.MaxFileDate!=''"
>
<span
style=
"color:red"
>
最近一次上传时间:
{{
item
.
MaxFileDate
}}
</span>
</
template
>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -534,6 +557,9 @@
...
@@ -534,6 +557,9 @@
ID
:
0
,
ID
:
0
,
UpdateBy
:
0
,
//操作人
UpdateBy
:
0
,
//操作人
ProductType
:
1
,
//国际酒店
ProductType
:
1
,
//国际酒店
QFileStartDate
:
""
,
//报价上传开始日期
QFileEndDate
:
""
,
//报价上传结束日期
IsUpFile
:
0
,
//是否上传报价(1-已上传,2-未上传)
},
},
};
};
},
},
...
@@ -549,7 +575,6 @@
...
@@ -549,7 +575,6 @@
},
},
downloadFile
(
hotel
)
{
downloadFile
(
hotel
)
{
this
.
hotel
=
hotel
;
this
.
hotel
=
hotel
;
console
.
log
(
'downloadFile'
,
hotel
)
this
.
getFilelist
();
this
.
getFilelist
();
this
.
showFilelist
=
true
;
this
.
showFilelist
=
true
;
},
},
...
...
src/components/Hotel/roomReservationsDetailsNew.vue
View file @
dc709103
...
@@ -1021,7 +1021,6 @@
...
@@ -1021,7 +1021,6 @@
})
})
});
});
this
.
list
=
list
;
this
.
list
=
list
;
console
.
log
(
'this.list'
,
this
.
list
)
this
.
$forceUpdate
();
this
.
$forceUpdate
();
}
}
}
else
{
}
else
{
...
@@ -1031,7 +1030,6 @@
...
@@ -1031,7 +1030,6 @@
},
err
=>
{})
},
err
=>
{})
},
},
calculationPrice
(
obj
)
{
calculationPrice
(
obj
)
{
console
.
log
(
'chacalculationPrice>>>nge'
,
obj
)
let
totalPrice
=
0
;
let
totalPrice
=
0
;
//获取当前选中的对象
//获取当前选中的对象
let
currentObj
=
{};
let
currentObj
=
{};
...
@@ -1089,7 +1087,6 @@
...
@@ -1089,7 +1087,6 @@
this
.
$forceUpdate
();
this
.
$forceUpdate
();
},
},
changeTotalPrice
(
obj
)
{
changeTotalPrice
(
obj
)
{
console
.
log
(
'changeTotalPrice'
,
obj
,
obj
.
TotalPrice
)
obj
.
TotalPrice
=
Number
(
obj
.
OrderDetailsList
[
0
].
TotalPrice
).
toFixed
(
2
);
obj
.
TotalPrice
=
Number
(
obj
.
OrderDetailsList
[
0
].
TotalPrice
).
toFixed
(
2
);
},
},
saveList
(
type
)
{
saveList
(
type
)
{
...
...
src/components/TravelContractConfirm.vue
View file @
dc709103
...
@@ -869,7 +869,7 @@
...
@@ -869,7 +869,7 @@
<li>
<li>
<el-row>
<el-row>
<el-col
:span=
"24"
style=
"text-align:left;"
>
<el-col
:span=
"24"
style=
"text-align:left;"
>
<p>
共计:
<font>
{{CtObj.HotelTotal}}
</font>
间
、
晚
</p>
<p>
共计:
<font>
{{CtObj.HotelTotal}}
</font>
间
/
晚
</p>
</el-col>
</el-col>
</el-row>
</el-row>
</li>
</li>
...
@@ -1136,97 +1136,6 @@
...
@@ -1136,97 +1136,6 @@
</el-row>
</el-row>
</li>
</li>
</ul>
</ul>
<!-- <table class="ZTable">
<tbody>
<tr>
<td width="70%">
<p>1.机票预订 </p>
<template v-if="CtObj.ContractTicketList && CtObj.ContractTicketList.length>0" v-for="item in CtObj.ContractTicketList">
<p><font>{{getDate(item.TicketTime)}}</font> <font>{{item.StartPlace}}</font> / <font>{{item.ArrivePlace}}</font> 航班号<font>{{item.FlightNum}}</font></p>
<p>机票金额<font>{{item.TicketPrice}}</font>元/张</p>
<p>机场建设费<font>{{item.AirportPirce}}</font>元/张</p>
<p>定金<font>{{item.DepositPrice}}</font>元/张</p>
</template>
</td>
<td><p>共计:<font>{{CtObj.TicketTotalNum}}</font>张机票</p>
<p>合同签订后 <font>{{CtObj.TicketOutDayNum}}</font>日内出票,本机票出票后不得退票、改签。由于旅游者原因退、改签机票款全部损失,由旅游者自行承担。</p>
<p>机票预定费用总额: <font>{{CtObj.TicketTotalDepositPrice}}</font>元</p>
</td>
</tr>
<tr>
<td>
<p>2.酒店预订</p>
<template v-if="CtObj.ContractHotelList && CtObj.ContractHotelList.length>0" v-for="item in CtObj.ContractHotelList">
<p>酒店名称:<font>{{item.HotelName}}</font>(酒店)</p>
<p>房型:标准间<font>{{item.DoubleRoom}}</font>/单人间<font>{{item.SingleRoom}}</font>三人间<font>{{item.ThirdRoom}}</font></p>
<p>人数:成人人数:<font>{{item.AdultNum}}</font>人 儿童人数:<font>{{item.ChildrenNum}}</font>人(不占床位、不加床位)</p>
<p>房费:<font>{{item.RoomPrice}}</font>元/间/晚</p>
<p>定金:<font>{{item.DepositPrice}}</font>元/间/晚</p>
<p>入住日期:<font>{{item.CheckInDate}}</font>/离店日期:<font>{{item.OutDate}}</font></p>
</template>
</td>
<td>
<p>共计: <font>{{CtObj.HotelTotal}}</font>间、晚</p>
<p>酒店入住的方式:<font>{{CtObj.HotelCheckInType}}</font></p>
<p>下订单后通知旅游者的方式:<font>{{CtObj.HotelNotice}}</font></p>
<p>该酒店一经下订单不退、不改,如因客人原因退、改房,房费全损,由旅游者承担。</p>
<p>费用共计:<font>{{CtObj.HotelTotalPrice}}</font>元</p>
</td>
</tr>
<tr>
<td><p>3.接送服务 </p>
<template v-if="CtObj.ContractPickUpList && CtObj.ContractPickUpList.length>0" v-for="item in CtObj.ContractPickUpList">
<p>用车日期:<font>{{item.UseTime}}</font> 乘客人数<font>{{item.UseNum}}</font></p>
<p>从<font>{{item.StartPlace}}</font>至<font>{{item.ArrivePlace}}</font> <font>{{item.UseBusType}}</font></p>
</template>
</td>
<td>
<p>费用合计:<font>{{CtObj.PickUpTotalPrice}}</font>元</p>
</td>
</tr>
<tr>
<td><p>4.代办签证</p>
<template v-if="CtObj.ContractVisaList && CtObj.ContractVisaList.length>0" v-for="item in CtObj.ContractVisaList">
<p><font>{{item.Country}}</font>国家的个人签证 希望停留时间<font>{{item.StopTime}}</font></p>
<p>代办签证费用:<font>{{item.VisaPrice}}</font>元/人 交付保证金:<font>{{item.DepositPrice}}</font>元/人</p>
</template>
</td>
<td>
<p>合计金额:<font>{{CtObj.VisaTotalPrice}}</font>元</p>
</td>
</tr>
<tr>
<td><p>5.服务组合( 机票与酒店)</p>
<template v-if="CtObj.ContractTicketAndHotel && CtObj.ContractTicketAndHotel.ContractTickets && CtObj.ContractTicketAndHotel.ContractTickets.length>0" v-for="item in CtObj.ContractTicketAndHotel.ContractTickets">
<p>a. 机票预订:</p>
<p><font>{{item.TicketTime}}</font> <font>{{item.StartPlace}}</font> / <font>{{item.ArrivePlace}}</font> 航班号<font>{{item.FlightNum}}</font></p>
<p>舱位<font>{{item.TicketSpace}}</font></p>
<p>机票金额<font>{{item.TicketPrice}}</font>元/张</p>
<p>机场建设费<font>{{item.AirportPirce}}</font>元/张</p>
</template>
<template v-if="CtObj.ContractTicketAndHotel && CtObj.ContractTicketAndHotel.ContractHotels && CtObj.ContractTicketAndHotel.ContractHotels.length>0" v-for="item in CtObj.ContractTicketAndHotel.ContractHotels">
<p>b. 酒店预订:</p>
<p>酒店名称:<font>{{item.HotelName}}</font>(酒店)</p>
<p>房型:标准间<font>{{item.DoubleRoom}}</font>/单人间<font>{{item.SingleRoom}}</font>/三人间<font>{{item.ThirdRoom}}</font></p>
<p>入住日期:<font>{{item.CheckInDate}}</font>/离店日期:<font>{{item.OutDate}}</font></p>
<p>费用:成人费用:<font>{{item.AdultPrice}}</font>元/人 儿童费用:<font>{{item.ChildrenPrice}}</font>元/人(不占床位、不加床位)</p>
</template>
</td>
<td>
<p>费用合计:<font>{{CtObj.TicketAndHotelTotalPrice}}</font>元</p>
</td>
</tr>
<tr>
<td><p>6.其他单项服务事宜</p>
<div class="userDiv"><p>本人已阅读了本合同所有条款,乙方(旅行社)已就合同条款对本人进行了真实、准确、完整的说明,本人已完全了解合同条款的内容及含义并同意本合同条款包括行程中有关自愿购物活动以及自愿参加另付费旅游项目的说明,同时本人悉知自身身体适宜此次旅行。</p><p>烦请务必携带自身常用药品,如有身体不适必须第一时间告知随团导游或领队,并及时到当地医院做检查,如因个人原因耽误病情,一切后果均由客人自行承担。</p><p>旅游意外伤害险:若旅行社购买赠送客人,如有出险理赔视为旅行社责任风险分摊,保险公司赔偿金额为最终赔付,旅行社不再进行赔偿。</p><p>签约委托授权书:本人已征得其余全体委托人同意作为本次旅游出行签约代表(全体委托人名单详见游客名单),全体委托人享受本合同约定的权利,履行本合同约定的义务,受托人在旅游合同及其附件上的签字全体委托人均予以认可。</p><p>健康承诺书:在旅游过程中,如本人未按贵社要求如实告知相关健康情况,本人承担因此而产生的全部后果,并承担给贵社造成损失的赔偿责任。本人自愿放弃不适宜本人身体状况参加的相应景点或相应活动;若因本人坚持参加而所产生的全部后果均由本人自行承担。本人因自身过错,造成的一切其他损失由本人承担。本人作为此次出行的签约代表,已就此承诺告知了全体委托人及其直系亲属并得到他们的同意。</p><p>如其他游客不予认可本合同或者本人未取得授权、未告知本合同及相关告知书内容的,由本人承担相应责任。</p></div>
</td>
<td>
<p>费用合计:<font>{{CtObj.OtherConventionPrice}}</font>元</p>
</td>
</tr>
</tbody>
</table> -->
<br>
<br>
<p><b>
三、费用计算:
</b></p>
<p><b>
三、费用计算:
</b></p>
<p>
旅游者委托旅行社提供上述 1
<p>
旅游者委托旅行社提供上述 1
...
...
src/components/TravelContractNew.vue
View file @
dc709103
...
@@ -1505,7 +1505,6 @@
...
@@ -1505,7 +1505,6 @@
this
.
apiJavaPost
(
"/api/contract/getContractInfo"
,
this
.
msg
,
res
=>
{
this
.
apiJavaPost
(
"/api/contract/getContractInfo"
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
var
tempObj
=
res
.
data
.
data
;
var
tempObj
=
res
.
data
.
data
;
console
.
log
(
"tempObj"
,
tempObj
);
this
.
CtObj
=
tempObj
;
this
.
CtObj
=
tempObj
;
this
.
guestList
=
res
.
data
.
data
.
guestList
;
this
.
guestList
=
res
.
data
.
data
.
guestList
;
this
.
CtObj
.
tcid
=
this
.
$route
.
query
.
TCID
;
this
.
CtObj
.
tcid
=
this
.
$route
.
query
.
TCID
;
...
...
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @
dc709103
...
@@ -119,11 +119,11 @@
...
@@ -119,11 +119,11 @@
</table>
</table>
</div>
</div>
<br
/>
<br
/>
<el-tag
v-for=
"(item, index) in orderList"
:key=
"index"
style=
"margin-right: 10px;margin-bottom: 10px; cursor: pointer;"
:type=
"index ===tabsActive ? '':'info'
"
<el-tag
v-for=
"(item, index) in orderList"
:key=
"index
"
@
click=
"selectTag(index)
"
style=
"margin-right: 10px;margin-bottom: 10px; cursor: pointer;"
:type=
"index ===tabsActive ? '':'info'
"
:disable-transitions=
"false"
>
@
click=
"selectTag(index)"
:disable-transitions=
"false"
>
{{
`报价单${index + 1
}
${item.IsDefault ? '(默认)' : ''
}
`
}}
{{
`报价单${index + 1
}
${item.IsDefault ? '(默认)' : ''
}
`
}}
<
/el-tag
>
<
/el-tag
>
<
table
class
=
"CostPriceTable CostNewTable"
>
<
table
class
=
"CostPriceTable CostNewTable"
>
<
thead
>
<
thead
>
<
tr
>
<
tr
>
...
@@ -344,7 +344,7 @@
...
@@ -344,7 +344,7 @@
<
/td
>
<
/td
>
<
td
>
<
td
>
<
template
v
-
if
=
"CostNumberList&&CostNumberList.length>0"
>
<
template
v
-
if
=
"CostNumberList&&CostNumberList.length>0"
>
{{
CostNumberList
[
0
].
PeopleNumber
}}
{{
CostNumberList
[
0
].
PeopleNumber
}}
<
/template
>
<
/template
>
<
/td
>
<
/td
>
<
td
>
<
td
>
...
@@ -864,7 +864,7 @@
...
@@ -864,7 +864,7 @@
<
/template
>
<
/template
>
<
script
>
<
script
>
export
default
{
export
default
{
props
:
[
"OfferArray"
,
"postConfig"
,
"IsEdit"
],
props
:
[
"OfferArray"
,
"postConfig"
,
"IsEdit"
],
data
()
{
data
()
{
return
{
return
{
tabsActive
:
0
,
tabsActive
:
0
,
...
@@ -873,23 +873,21 @@
...
@@ -873,23 +873,21 @@
AduitMsg
:
{
AduitMsg
:
{
}
,
}
,
OtherPrice
:
{
}
,
OtherPrice
:
{
}
,
dayCostPrice
:
[],
dayCostPrice
:
[],
CostCurrencyList
:
[],
CostCurrencyList
:
[],
CostNumberList
:
[],
CostNumberList
:
[],
teamPrice
:
{
}
teamPrice
:
{
}
}
}
}
,
}
,
methods
:
{
methods
:
{
selectTag
(
index
)
{
selectTag
(
index
)
{
console
.
log
(
'selectTag'
,
index
)
this
.
tabsActive
=
index
this
.
tabsActive
=
index
this
.
changeTabs
()
this
.
changeTabs
()
}
,
}
,
changeTabs
()
{
changeTabs
()
{
this
.
currentData
=
this
.
orderList
[
this
.
tabsActive
]
this
.
currentData
=
this
.
orderList
[
this
.
tabsActive
]
console
.
log
(
'this.orderList[this.tabsActive]'
,
this
.
orderList
,
this
.
tabsActive
,
this
.
currentData
)
if
(
!
this
.
currentData
)
{
if
(
!
this
.
currentData
)
{
return
return
}
}
this
.
OtherPrice
=
this
.
currentData
.
otherPrice
this
.
OtherPrice
=
this
.
currentData
.
otherPrice
...
@@ -1149,8 +1147,8 @@ teamPrice: {}
...
@@ -1149,8 +1147,8 @@ teamPrice: {}
}
}
}
,
}
,
mounted
()
{
mounted
()
{
this
.
orderList
=
this
.
OfferArray
this
.
orderList
=
this
.
OfferArray
this
.
changeTabs
()
this
.
changeTabs
()
}
,
}
,
created
()
{
}
,
created
()
{
}
,
watch
:
{
watch
:
{
...
...
src/components/TravelManager/TravelNewQuotation/DirectNewQuotation.vue
View file @
dc709103
...
@@ -103,9 +103,11 @@
...
@@ -103,9 +103,11 @@
right
:
-27px
;
right
:
-27px
;
top
:
-18px
;
top
:
-18px
;
}
}
.w875
{
width
:
875px
!important
;
.w875
{
width
:
875px
!important
;
}
}
</
style
>
</
style
>
<
template
>
<
template
>
...
@@ -114,11 +116,10 @@
...
@@ -114,11 +116,10 @@
<div
class=
"switchDiv clearfix"
style=
"width:98%;"
>
<div
class=
"switchDiv clearfix"
style=
"width:98%;"
>
<div
class=
"DirectPriceCenter"
>
<div
class=
"DirectPriceCenter"
>
<div
class=
"singlePrice clearfix"
>
<div
class=
"singlePrice clearfix"
>
<CostNewPriceMun
ref=
"CostNewPrice"
:OfferArray=
"OfferArray"
:postConfig=
"postConfig"
:OtherPrice=
"otherPrice"
<CostNewPriceMun
ref=
"CostNewPrice"
:OfferArray=
"OfferArray"
:postConfig=
"postConfig"
:dayCostPrice=
"dayCostPrice"
:LineList=
"LineList"
:CostCurrencyList=
"CostCurrencyList"
:OtherPrice=
"otherPrice"
:dayCostPrice=
"dayCostPrice"
:LineList=
"LineList"
:CostNumberList=
"CostNumberList"
:CurrencyNumberListExt=
"CurrencyNumberListExt"
:CostCurrencyList=
"CostCurrencyList"
:CostNumberList=
"CostNumberList"
:teamPrice=
"teamPrice"
:CurrencyNumberListExt=
"CurrencyNumberListExt"
:teamPrice=
"teamPrice"
></CostNewPriceMun>
></CostNewPriceMun>
</div>
</div>
</div>
</div>
<div
class=
"DirectRightPrice"
style=
"margin-left:20px; display:none;"
>
<div
class=
"DirectRightPrice"
style=
"margin-left:20px; display:none;"
>
...
@@ -225,7 +226,7 @@
...
@@ -225,7 +226,7 @@
</el-form-item>
</el-form-item>
</div>
</div>
</div>
</div>
<div
class=
"clearfix"
v-show=
"IsShow"
>
<div
class=
"clearfix"
v-show=
"IsShow"
>
<div
class=
"Dleftname"
>
备注
</div>
<div
class=
"Dleftname"
>
备注
</div>
<div
class=
"DrightList"
>
<div
class=
"DrightList"
>
<el-form-item>
<el-form-item>
...
@@ -243,7 +244,8 @@
...
@@ -243,7 +244,8 @@
import
CostNewPriceMun
from
"../TravelNewQuotation/CostNewPriceMun"
;
import
CostNewPriceMun
from
"../TravelNewQuotation/CostNewPriceMun"
;
export
default
{
export
default
{
props
:
[
"OfferArray"
,
"postConfig"
,
"dayCostPrice"
,
"otherPrice"
,
"teamPrice"
,
"LineList"
,
"CostCurrencyList"
,
"CostNumberList"
,
props
:
[
"OfferArray"
,
"postConfig"
,
"dayCostPrice"
,
"otherPrice"
,
"teamPrice"
,
"LineList"
,
"CostCurrencyList"
,
"CostNumberList"
,
"CurrencyNumberListExt"
"CurrencyNumberListExt"
],
],
data
()
{
data
()
{
...
@@ -254,10 +256,9 @@
...
@@ -254,10 +256,9 @@
};
};
},
},
methods
:
{
methods
:
{
getData
()
{
getData
()
{
console
.
log
(
'this.$refs.CostNewPrice'
,
this
.
$refs
.
CostNewPrice
)
return
this
.
$refs
.
CostNewPrice
.
getData
()
return
this
.
$refs
.
CostNewPrice
.
getData
()
}
}
},
},
created
()
{
created
()
{
...
...
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @
dc709103
...
@@ -234,7 +234,6 @@
...
@@ -234,7 +234,6 @@
this
.
postData
.
OutBranchName
=
tempData
.
OutBranchName
this
.
postData
.
OutBranchName
=
tempData
.
OutBranchName
this
.
postData
.
TeamTypeName
=
tempData
.
TeamTypeName
this
.
postData
.
TeamTypeName
=
tempData
.
TeamTypeName
if
(
tempData
.
OfferArray
)
{
if
(
tempData
.
OfferArray
)
{
console
.
log
(
'getData'
,
tempData
.
OfferArray
)
tempData
.
OfferArray
.
forEach
(
item
=>
{
tempData
.
OfferArray
.
forEach
(
item
=>
{
this
.
OfferArray
.
push
(
item
)
this
.
OfferArray
.
push
(
item
)
})
})
...
...
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @
dc709103
...
@@ -696,7 +696,6 @@
...
@@ -696,7 +696,6 @@
GetAuth
()
{
GetAuth
()
{
var
actionCode
=
this
.
$AuthCode
.
EditQuotation
;
var
actionCode
=
this
.
$AuthCode
.
EditQuotation
;
this
.
CheckUserAuth
(
actionCode
,
res
=>
{
this
.
CheckUserAuth
(
actionCode
,
res
=>
{
console
.
log
(
'GetAuth'
,
res
)
if
(
res
.
data
.
resultCode
==
1
&&
res
.
data
.
data
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
&&
res
.
data
.
data
==
1
)
{
this
.
EditBtn
=
true
;
this
.
EditBtn
=
true
;
}
}
...
...
src/components/leaderPay2.vue
View file @
dc709103
...
@@ -2178,7 +2178,6 @@
...
@@ -2178,7 +2178,6 @@
this
.
apipost
(
'dmcstatistics_post_GetNewLeaderPayStatics_V1'
,
this
.
msg
,
res
=>
{
this
.
apipost
(
'dmcstatistics_post_GetNewLeaderPayStatics_V1'
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
;
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
'dmcstatistics_post_GetNewLeaderPayStatics_V1'
,
res
.
data
.
data
)
this
.
list
=
res
.
data
.
data
;
this
.
list
=
res
.
data
.
data
;
// 预计金额
// 预计金额
this
.
planPriceList
=
this
.
list
.
planPriceList
;
this
.
planPriceList
=
this
.
list
.
planPriceList
;
...
@@ -2348,7 +2347,6 @@
...
@@ -2348,7 +2347,6 @@
Hoteldest
[
i
].
row
=
row
Hoteldest
[
i
].
row
=
row
}
}
this
.
HotelDataList
=
this
.
unique
(
Hoteldest
,
'id'
);
this
.
HotelDataList
=
this
.
unique
(
Hoteldest
,
'id'
);
console
.
log
(
'dmcstatistics_post_GetNewLeaderPayStatics_V1 result'
,
this
.
list
)
}
else
{
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
);
this
.
$message
.
error
(
res
.
data
.
message
);
}
}
...
@@ -2391,7 +2389,6 @@
...
@@ -2391,7 +2389,6 @@
return
this
.
moneyFormat
(
totalPrice
)
return
this
.
moneyFormat
(
totalPrice
)
},
},
hotelTotalPrice
(
obj
,
data
)
{
hotelTotalPrice
(
obj
,
data
)
{
console
.
log
(
'hotelTotalPrice'
,
obj
,
data
)
let
totalPrice
=
0
let
totalPrice
=
0
obj
.
forEach
(
x
=>
{
obj
.
forEach
(
x
=>
{
if
(
x
.
PayStyle
===
1
)
{
if
(
x
.
PayStyle
===
1
)
{
...
...
src/components/orderCommon/order-form.vue
View file @
dc709103
...
@@ -1679,7 +1679,6 @@
...
@@ -1679,7 +1679,6 @@
this
.
customerTypeList
=
res
.
data
.
data
;
this
.
customerTypeList
=
res
.
data
.
data
;
}
else
{
}
else
{
this
.
customerTypeList
=
res
.
data
.
data
.
filter
(
item
=>
item
.
Id
<
3
);
this
.
customerTypeList
=
res
.
data
.
data
.
filter
(
item
=>
item
.
Id
<
3
);
console
.
log
(
'this.customerTypeList'
,
this
.
customerTypeList
)
}
}
}
}
},
},
...
...
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