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
129d57a7
Commit
129d57a7
authored
Feb 11, 2025
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
cb1381f6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
237 additions
and
2512 deletions
+237
-2512
leaderManagement.vue
src/components/LeaderManagement/leaderManagement.vue
+11
-5
AuditDan.vue
src/components/TravelManager/TravelGroupControl/AuditDan.vue
+30
-2
CostNewPriceAudit.vue
...ts/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
+21
-17
EditOffer.vue
...components/TravelManager/TravelNewQuotation/EditOffer.vue
+0
-709
NewQuotationAduit.vue
...ts/TravelManager/TravelNewQuotation/NewQuotationAduit.vue
+0
-289
OfferChange.vue
...mponents/TravelManager/TravelNewQuotation/OfferChange.vue
+20
-12
OfferCostNewPriceAudit.vue
...avelManager/TravelNewQuotation/OfferCostNewPriceAudit.vue
+0
-1374
QuotationAduit.vue
...nents/TravelManager/TravelNewQuotation/QuotationAduit.vue
+8
-5
QuotationNewPrice.vue
...ts/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
+73
-22
newQuotation.vue
...ponents/TravelManager/TravelNewQuotation/newQuotation.vue
+73
-61
config.js
src/router/config.js
+1
-16
No files found.
src/components/LeaderManagement/leaderManagement.vue
View file @
129d57a7
...
...
@@ -585,7 +585,8 @@
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"submitForm('addMsg')"
>
{{
$t
(
'pub.saveBtn'
)
}}
</button>
<el-button
type=
"primary"
class=
"normalBtn"
@
click=
"submitForm('addMsg')"
:loading=
"saveLoading"
>
{{
$t
(
'pub.saveBtn'
)
}}
</el-button>
<button
class=
"hollowFixedBtn"
@
click=
"outerVisible = false,resetForm('addMsg')"
>
{{
$t
(
'pub.cancelBtn'
)
}}
</button>
</div>
...
...
@@ -849,7 +850,8 @@
message
:
this
.
$t
(
'admin.admin_lnLoginPwd'
),
trigger
:
"blur"
}],
}
},
saveLoading
:
false
,
};
},
methods
:
{
...
...
@@ -1013,10 +1015,12 @@
//添加
addGroupGuide
()
{
var
that
=
this
;
this
.
saveLoading
=
true
;
this
.
apipost
(
"leader_post_Set"
,
that
.
addMsg
,
res
=>
{
that
.
saveLoading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
that
.
Success
(
that
.
$t
(
'tips.saveYes'
));
that
.
getList
();
...
...
@@ -1030,7 +1034,9 @@
that
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{}
err
=>
{
that
.
saveLoading
=
false
;
}
);
},
submitForm
(
addMsg
)
{
...
...
@@ -1145,8 +1151,8 @@
},
//弹出框取消 初始化谈框内表单
resetForm
(
formName
)
{
// this.$refs[formName].resetFields();
this
.
initAddMsg
();
// this.$refs[formName].resetFields();
this
.
initAddMsg
();
this
.
LanguageIdS
=
[];
}
},
...
...
src/components/TravelManager/TravelGroupControl/AuditDan.vue
View file @
129d57a7
...
...
@@ -139,6 +139,32 @@
</p>
<p
class=
"Quo_Content"
style=
"padding-right:20px;width:100%;"
>
<span>
{{$t('hotel.hotel_StarDate')}}:{{item.OutDateTime}}
</span>
<
template
v-if=
"item.OfferList && item.OfferList.length > 1"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('hotel.hotel_StarDate')"
>
<el-popover
width=
"350"
trigger=
"click"
popper-class=
"TC_HotelPop"
>
<table
width=
"100%"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<td
style=
"width: 100px"
>
{{
$t
(
'objFill.v101.baojiadanh'
)
}}
</td>
<td
style=
"width: 250px"
>
{{
$t
(
"hotel.hotel_StarDate"
)
}}
</td>
</tr>
<tr
v-for=
"(rItem, rIndex) in item.OfferList"
:key=
"`d_`+index+`_r_`+rIndex"
>
<td>
{{
rItem
.
OfferId
}}
</td>
<td>
{{
rItem
.
OutDateTime
}}
</td>
</tr>
</table>
<el-button
slot=
"reference"
circle
size=
"mini"
type=
"primary"
style=
"width: 20px; height: 20px; padding: 4px"
>
{{
item
.
OfferList
.
length
}}
</el-button>
</el-popover>
</el-tooltip>
</
template
>
</p>
</div>
</div>
...
...
@@ -519,7 +545,7 @@
getList
()
{
this
.
loading
=
true
;
this
.
apipost
(
"travel_get_Get
TravelOfferAuditPageList_V2
"
,
"travel_get_Get
NewTravelOfferAuditPage
"
,
this
.
queryData
,
res
=>
{
this
.
loading
=
false
;
...
...
@@ -555,10 +581,12 @@
newQType
=
3
;
}
}
//NewQuotationAduit
//QuotationAduit
this
.
$router
.
push
({
name
:
'QuotationAduit'
,
query
:
{
offerid
:
item
.
OfferId
,
BatchNum
:
item
.
BatchNum
,
Qtype
:
newQType
,
blank
:
'y'
,
tab
:
'报价单审核'
...
...
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @
129d57a7
...
...
@@ -65,10 +65,9 @@
<
template
v-else
>
{{
postConfig
.
TeamTypeName
}}
</
template
>
</td>
<td
width=
"80"
class=
"txtRightCost"
>
{{$t('objFill.tuanduilx')}}
</td>
<td>
{{postConfig.PriceTeamTypeName}}
<
template
v-if=
"postConfig.PriceTeamTypeName&&postConfig.PriceTeamTypeName!=''"
>
(
{{
postConfig
.
PriceTeamTypeName
}}
)
</
template
>
</td>
<td
width=
"80"
class=
"txtRightCost"
>
{{$t('advmanager.v_line')}}
</td>
<td
width=
"300"
>
...
...
@@ -80,7 +79,7 @@
</td>
</tr>
<tr>
<td
colspan=
"
8
"
style=
"height:20px;"
>
<td
colspan=
"
6
"
style=
"height:20px;"
>
</td>
</tr>
<tr>
...
...
@@ -88,13 +87,9 @@
<td>
{{postConfig.OutBranchName}}
</td>
<td
width=
"80"
class=
"txtRightCost"
>
{{$t('hotel.hotel_StarDate')}}
</td>
<td>
{{postConfig.OutDateTime}}
</td>
<td
width=
"80"
class=
"txtRightCost"
>
{{$t('visa.v_xcdays')}}
</td>
<td>
{{postConfig.DayNum}}
{{postConfig.DayNum}}
{{$t('hotel.hotel_day')}}{{postConfig.NightNum}}{{$t('Operation.Op_night')}}
</td>
<td
width=
"80"
class=
"txtRightCost"
>
{{$t('fnc.khmingcheng')}}
</td>
<td>
...
...
@@ -102,23 +97,32 @@
</td>
</tr>
<tr>
<td
colspan=
"
8
"
style=
"height:20px;"
>
<td
colspan=
"
6
"
style=
"height:20px;"
>
</td>
</tr>
<tr>
<td
width=
"80"
class=
"txtRightCost"
>
{{$t('sm.tuanduibiaoti')}}
</td>
<td
width=
"300"
colspan=
"
7
"
>
<td
width=
"300"
colspan=
"
5
"
>
{{postConfig.Title}}
</td>
</tr>
<tr>
<td
colspan=
"6"
style=
"height:20px;"
>
</td>
</tr>
<tr>
<td
width=
"80"
class=
"txtRightCost"
>
{{$t('hotel.hotel_StarDate')}}
</td>
<td
colspan=
"5"
>
<
template
v-if=
"postConfig.OutDateTimeList&&postConfig.OutDateTimeList.length>0"
>
<el-tag
v-for=
"(item,oIndex) in postConfig.OutDateTimeList"
:key=
"oIndex"
style=
"margin-right:5px;"
>
{{
item
}}
</el-tag>
</
template
>
</td>
</tr>
</table>
</div>
<br
/>
<!-- <el-tag v-for="(item, index) in orderList" :key="index"
style="margin-right: 10px;margin-bottom: 10px; cursor: pointer;" :type="index ===tabsActive ? '':'info'"
@click="selectTag(index)" :disable-transitions="false">
{{`报价单${index + 1}${item.IsDefault ? '(默认)' : ''}`}}
</el-tag> -->
<table
class=
"CostPriceTable CostNewTable"
>
<thead>
<tr>
...
...
src/components/TravelManager/TravelNewQuotation/EditOffer.vue
deleted
100644 → 0
View file @
cb1381f6
This diff is collapsed.
Click to expand it.
src/components/TravelManager/TravelNewQuotation/NewQuotationAduit.vue
deleted
100644 → 0
View file @
cb1381f6
This diff is collapsed.
Click to expand it.
src/components/TravelManager/TravelNewQuotation/OfferChange.vue
View file @
129d57a7
...
...
@@ -7,6 +7,7 @@
padding
:
0
20px
20px
20px
;
border-radius
:
4px
;
}
</
style
>
<
template
>
<div
class=
"DirectQuotation clearfix"
v-loading=
"loading"
>
...
...
@@ -64,6 +65,7 @@
OutBranchId
:
-
1
,
//出团公司
OutBranchName
:
""
,
//出团公司名称
OutDateTime
:
""
,
//出发时间
OutDateTimeList
:
[],
//出发时间
OfferPayType
:
0
,
//报价单付款方式()
SaleOfferPayType
:
0
,
//售价付款方式
AuditContent
:
""
,
//审核备注
...
...
@@ -79,6 +81,10 @@
PriceTeamType
:
0
,
//团队类型,
PriceTeamTypeName
:
""
,
//团队类型,
},
pMsg
:
{
offerId
:
0
,
// BatchNum: "",
},
isSubmit
:
true
,
loading
:
false
,
IsEdit
:
0
,
...
...
@@ -88,7 +94,7 @@
//保存数据
SaveData
(
Type
)
{
var
nObj
=
{
offerid
:
this
.
$route
.
query
.
offeri
d
,
offerid
:
this
.
pMsg
.
offerI
d
,
};
this
.
loading
=
true
;
this
.
apipost
(
...
...
@@ -117,22 +123,14 @@
this
.
getPostData
();
},
getPostData
()
{
let
offerId
=
0
;
if
(
this
.
$route
.
query
.
offerid
)
{
offerId
=
this
.
$route
.
query
.
offerid
;
}
let
msg
=
{
offerId
:
offerId
};
this
.
OfferArray
=
[];
this
.
haveData
=
false
;
this
.
loading
=
true
;
this
.
apipost
(
"travel_get_GetMyTravelInfo_V
4
"
,
m
sg
,
"travel_get_GetMyTravelInfo_V
5
"
,
this
.
pM
sg
,
res
=>
{
this
.
loading
=
false
;
console
.
log
(
"travel_get_GetMyTravelInfo_V4_OfferChange"
,
res
.
data
);
if
(
res
.
data
.
resultCode
==
1
)
{
var
tempData
=
res
.
data
.
data
;
if
(
tempData
.
ID
&&
tempData
.
ID
>
0
)
{
...
...
@@ -213,6 +211,9 @@
this
.
postData
.
CustomerName
=
tempData
.
CustomerName
;
this
.
postData
.
OutBranchId
=
tempData
.
OutBranchId
;
this
.
postData
.
OutDateTime
=
tempData
.
OutDateTime
;
if
(
tempData
.
OutDateTimeList
)
{
this
.
postData
.
OutDateTimeList
=
tempData
.
OutDateTimeList
;
}
this
.
postData
.
LineName
=
tempData
.
LineName
;
this
.
postData
.
LtName
=
tempData
.
LtName
;
this
.
postData
.
OutBranchName
=
tempData
.
OutBranchName
;
...
...
@@ -238,10 +239,17 @@
if
(
this
.
$route
.
query
.
Qtype
)
{
this
.
IsEdit
=
this
.
$route
.
query
.
Qtype
;
}
if
(
this
.
$route
.
query
.
offerid
)
{
this
.
pMsg
.
offerId
=
this
.
$route
.
query
.
offerid
;
}
// if (this.$route.query.BatchNum) {
// this.pMsg.BatchNum = this.$route.query.BatchNum;
// }
this
.
getPostData
();
},
components
:
{
CostNewPriceAudit
:
CostNewPriceAudit
}
};
</
script
>
\ No newline at end of file
</
script
>
src/components/TravelManager/TravelNewQuotation/OfferCostNewPriceAudit.vue
deleted
100644 → 0
View file @
cb1381f6
This diff is collapsed.
Click to expand it.
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @
129d57a7
...
...
@@ -61,6 +61,7 @@
OutBranchId
:
-
1
,
//出团公司
OutBranchName
:
""
,
//出团公司名称
OutDateTime
:
""
,
//出发时间
OutDateTimeList
:
[],
OfferPayType
:
0
,
//报价单付款方式()
SaleOfferPayType
:
0
,
//售价付款方式
AuditContent
:
""
,
//审核备注
...
...
@@ -97,6 +98,7 @@
SaveData
(
Type
)
{
var
nObj
=
{
ID
:
this
.
$route
.
query
.
offerid
,
BatchNum
:
this
.
$route
.
query
.
BatchNum
,
AuditContent
:
this
.
postData
.
CRemarks
,
TravelState
:
Type
,
OfferPayType
:
this
.
postData
.
OfferPayType
,
...
...
@@ -129,16 +131,16 @@
});
},
getPostData
()
{
let
offerId
=
0
;
if
(
this
.
$route
.
query
.
offerid
)
{
offerId
=
this
.
$route
.
query
.
offerid
;
let
BatchNum
=
""
;
if
(
this
.
$route
.
query
.
BatchNum
)
{
BatchNum
=
this
.
$route
.
query
.
BatchNum
;
}
let
msg
=
{
offerId
:
offerId
BatchNum
:
BatchNum
};
this
.
loading
=
true
;
this
.
apipost
(
"travel_get_GetMyTravelInfo_V
4
"
,
"travel_get_GetMyTravelInfo_V
5
"
,
msg
,
res
=>
{
this
.
loading
=
false
;
...
...
@@ -251,6 +253,7 @@
this
.
postData
.
CustomerName
=
tempData
.
CustomerName
;
this
.
postData
.
OutBranchId
=
tempData
.
OutBranchId
;
this
.
postData
.
OutDateTime
=
tempData
.
OutDateTime
;
this
.
postData
.
OutDateTimeList
=
tempData
.
OutDateTimeList
;
this
.
postData
.
LineName
=
tempData
.
LineName
;
this
.
postData
.
LtName
=
tempData
.
LtName
;
this
.
postData
.
OutBranchName
=
tempData
.
OutBranchName
;
...
...
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @
129d57a7
...
...
@@ -79,7 +79,7 @@
<th>
{{
$t
(
'objFill.v101.kaituants'
)
}}
</th>
<th
colspan=
"
7
"
style=
"text-align:left;line-height:40px;"
>
<th
colspan=
"
5
"
style=
"text-align:left;line-height:40px;"
>
<p
style=
"color:red;font-weight:bold;"
>
1.
{{
$t
(
'objFill.v101.changuitdyshnp'
)
}}
2.
{{
$t
(
'objFill.v101.xiaobtcgbjd'
)
}}
...
...
@@ -90,18 +90,14 @@
<tr>
<td
width=
"80"
class=
"txtRightCost"
>
{{
$t
(
'objFill.v101.chutuanleix'
)
}}
</td>
<td>
<el-select
class=
"multiple_input"
v-model=
"postData.TeamType"
@
change=
"changeTeamType()"
>
<el-select
class=
"multiple_input"
v-model=
"postData.TeamType"
@
change=
"changeTeamType()"
style=
"width:100px;"
>
<el-option
v-for=
'item in teamList'
:key=
"item.ID"
:label=
"item.Name"
:value=
"item.ID"
>
</el-option>
</el-select>
</td>
<td
width=
"80"
class=
"txtRightCost"
>
<template
v-if=
"postData.TeamType==0||postData.TeamType==1"
>
{{
$t
(
'objFill.tuanduilx'
)
}}
</
template
>
</td>
<td>
<template
v-if=
"postData.TeamType==0||postData.TeamType==1"
>
<el-select
class=
"multiple_input"
v-model=
"postData.PriceTeamType"
>
{{
$t
(
'objFill.tuanduilx'
)
}}
<el-select
class=
"multiple_input"
v-model=
"postData.PriceTeamType"
style=
"width:100px;"
>
<template
v-for=
"item in TeamListArr"
>
<template
v-if=
"postData.TeamType==0"
>
<el-option
v-if=
"item.Id==1||item.Id==2||item.Id==3||item.Id==9"
:key=
"item.Id"
...
...
@@ -142,23 +138,18 @@
<tr>
<td
width=
"80"
class=
"txtRightCost"
>
{{$t('scen.sc_cp')}}
</td>
<td>
<el-select
class=
"multiple_input"
v-model=
"postData.OutBranchId"
filterable
>
<el-select
class=
"multiple_input"
v-model=
"postData.OutBranchId"
filterable
style=
"width:265px;"
>
<el-option
v-for=
'item in companyList'
:key=
"item.id"
:label=
"item.bName"
:value=
"item.id"
>
</el-option>
</el-select>
</td>
<td
width=
"80"
class=
"txtRightCost"
>
{{$t('Airticket.Air_StartTime')}}
</td>
<td>
<el-date-picker
type=
"date"
v-model=
"postData.OutDateTime"
value-format=
"yyyy-MM-dd"
placeholder
>
</el-date-picker>
</td>
<td
width=
"80"
class=
"txtRightCost"
>
{{$t('visa.v_xcdays')}}
</td>
<td>
<el-input
class=
"w240 LowNum"
v-model=
"postData.DayNum"
@
keyup
.
native=
"checkInteger(postData,'DayNum');createDayTripPrice()"
maxlength=
"2"
>
<
template
slot=
"append"
>
{{
$t
(
'hotel.hotel_day'
)
}}
</
template
>
</el-input>
<el-input
class=
"w120 LowNum"
v-model=
"postData.NightNum"
style=
"display:none;"
<el-input
class=
"w120 LowNum"
v-model=
"postData.NightNum"
@
keyup
.
native=
"checkInteger(postData,'NightNum')"
maxlength=
"2"
>
<
template
slot=
"append"
>
{{
$t
(
'Operation.Op_night'
)
}}
</
template
>
</el-input>
...
...
@@ -171,15 +162,35 @@
</td>
</tr>
<tr>
<td
colspan=
"
8
"
style=
"height:20px;"
>
<td
colspan=
"
6
"
style=
"height:20px;"
>
</td>
</tr>
<tr>
<td
width=
"80"
class=
"txtRightCost"
>
{{$t('sm.tuanduibiaoti')}}
</td>
<td
colspan=
"
7
"
>
<td
colspan=
"
3
"
>
<el-input
v-model=
"postData.Title"
type=
"textarea"
:autosize=
"{minRows: 1, maxRows: 2 }"
resize=
"none"
:placeholder=
"$t('objFill.v101.qingtxtdbti')"
maxlength=
"200"
></el-input>
</td>
<td
width=
"80"
class=
"txtRightCost"
>
{{$t('Airticket.Air_StartTime')}}
</td>
<td>
<el-date-picker
type=
"dates"
v-model=
"postData.OutDateTimeList"
value-format=
"yyyy-MM-dd"
placeholder
>
</el-date-picker>
</td>
</tr>
<tr>
<td
colspan=
"8"
style=
"height:20px;"
>
</td>
</tr>
<tr>
<td
width=
"80"
class=
"txtRightCost"
>
已选日期
</td>
<td
colspan=
"5"
>
<
template
v-if=
"postData.OutDateTimeList&&postData.OutDateTimeList.length>0"
>
<el-tag
v-for=
"(item,oIndex) in postData.OutDateTimeList"
:key=
"item"
closable
style=
"margin-right:5px;"
@
close=
"handleClose(item,oIndex)"
>
{{
item
}}
</el-tag>
</
template
>
</td>
</tr>
</table>
</div>
...
...
@@ -232,6 +243,7 @@
haveData
:
false
,
//基本配置
postData
:
{
BatchNum
:
""
,
ID
:
0
,
TCID
:
0
,
OfferId
:
0
,
...
...
@@ -266,6 +278,7 @@
TravelState
:
1
,
//团控状态(1-草稿,2-待审核,3-审核通过,4-审核拒绝,5已撤销)
OutBranchId
:
""
,
//出团公司
OutDateTime
:
""
,
//出发时间
OutDateTimeList
:
[],
//出发时间
OfferPayType
:
0
,
//报价单付款方式
SaleOfferPayType
:
0
,
//售价付款方式
OPId
:
""
,
//主OP
...
...
@@ -357,10 +370,33 @@
TeamListArr
:
[],
//团队子类型
companyList
:
[],
//出团公司列表
AllCurrencyList
:
[],
//币种列表
loading
:
false
loading
:
false
,
rParams
:
{
OfferId
:
0
,
TCID
:
0
,
BatchNum
:
""
},
};
},
methods
:
{
//删除日期
handleClose
(
item
,
index
)
{
if
(
this
.
postData
.
BatchNum
&&
this
.
postData
.
BatchNum
!=
''
)
{
var
postMsg
=
{
BatchNum
:
this
.
postData
.
BatchNum
,
Date
:
item
}
this
.
apipost
(
"travel_post_RemoveTravelOffer"
,
postMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
postData
.
OutDateTimeList
.
splice
(
index
,
1
);
}
});
}
else
{
this
.
postData
.
OutDateTimeList
.
splice
(
index
,
1
);
}
},
changeTeamType
()
{
this
.
postData
.
LineId
=
0
;
this
.
postData
.
LineteamId
=
0
;
...
...
@@ -515,7 +551,7 @@
};
this
.
loading
=
true
;
this
.
apipost
(
"travel_post_SetConfigOffer_V
4
"
,
postMsg
,
"travel_post_SetConfigOffer_V
3
"
,
postMsg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
...
...
@@ -543,17 +579,23 @@
if
(
this
.
$route
.
query
.
offerid
)
{
offerId
=
this
.
$route
.
query
.
offerid
;
}
let
BatchNum
=
""
;
if
(
this
.
$route
.
query
.
BatchNum
)
{
BatchNum
=
this
.
$route
.
query
.
BatchNum
;
}
let
msg
=
{
offerId
:
offerId
,
TCID
:
0
,
BatchNum
:
BatchNum
};
if
(
this
.
$route
.
query
.
TCID
&&
this
.
$route
.
query
.
TCID
>
0
)
{
msg
.
TCID
=
this
.
$route
.
query
.
TCID
}
this
.
loading
=
true
;
this
.
apipost
(
"travel_get_GetMyTravelInfo_V
4
"
,
msg
,
"travel_get_GetMyTravelInfo_V
5
"
,
msg
,
res
=>
{
console
.
log
(
"travel_get_GetMyTravelInfo_V5"
,
res
);
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
var
tempData
=
res
.
data
.
data
;
...
...
@@ -593,6 +635,9 @@
if
(
tempData
.
OutDateTime
)
{
this
.
postData
.
OutDateTime
=
tempData
.
OutDateTime
;
}
if
(
tempData
.
OutDateTimeList
)
{
this
.
postData
.
OutDateTimeList
=
tempData
.
OutDateTimeList
;
}
if
(
tempData
.
OutBranchName
&&
tempData
.
OutBranchName
!=
''
)
{
this
.
postData
.
OutBranchId
=
Number
(
tempData
.
OutBranchId
);
}
...
...
@@ -638,10 +683,16 @@
created
()
{
if
(
this
.
$route
.
query
.
offerid
&&
this
.
$route
.
query
.
offerid
>
0
)
{
this
.
postData
.
OfferId
=
this
.
$route
.
query
.
offerid
;
this
.
rParams
.
OfferId
=
this
.
$route
.
query
.
offerid
}
if
(
this
.
$route
.
query
.
BatchNum
)
{
this
.
postData
.
BatchNum
=
this
.
$route
.
query
.
BatchNum
;
this
.
rParams
.
BatchNum
=
this
.
$route
.
query
.
BatchNum
;
}
//从团控列表跳转信息
if
(
this
.
$route
.
query
.
TCID
&&
this
.
$route
.
query
.
TCID
>
0
)
{
this
.
postData
.
TCID
=
this
.
$route
.
query
.
TCID
this
.
postData
.
TCID
=
this
.
$route
.
query
.
TCID
;
this
.
rParams
.
TCID
=
this
.
$route
.
query
.
TCID
;
}
//团控列表跳转参数结束
this
.
getCompanyList
();
...
...
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @
129d57a7
...
...
@@ -105,15 +105,6 @@
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"queryData.EndGroupDate"
:picker-options=
"pickerBeginDateAfter"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
</span>
<li>
<span>
<em>
{{
$t
(
'objFill.v101.dmc.kaituanzt'
)
}}
</em>
<el-select
v-model=
"queryData.OpenState"
filterable
:placeholder=
"$t('pub.pleaseSel')"
class=
'w200'
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'noLimit'
></el-option>
<el-option
v-for=
'item in OpenStateList'
:key=
"item.Id"
:label=
"item.label"
:value=
"item.Id"
>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
...
...
@@ -128,8 +119,9 @@
</li>
<li>
<button
class=
"hollowFixedBtn"
@
click=
"getList(),resetPageIndex()"
>
{{
$t
(
'pub.searchBtn'
)
}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"goMakeQuo('QuotationNewPrice',0)"
>
{{
$t
(
'pub.addBtn'
)
}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"ShowImportOffer()"
style=
""
>
{{
$t
(
'objFill.v101.daorubjiad'
)
}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"goMakeQuo('QuotationNewPrice',null,0)"
>
{{
$t
(
'pub.addBtn'
)
}}
</button>
<button
class=
"hollowFixedBtn"
@
click=
"ShowImportOffer()"
style=
"display:none;"
>
{{
$t
(
'objFill.v101.daorubjiad'
)
}}
</button>
</li>
</ul>
</div>
...
...
@@ -162,7 +154,35 @@
<span>
{{$t('system.query_lineName')}}:{{item.LineName}}
</span>
</p>
<span>
{{$t('active.ad_xlmc')}}:{{item.LtName}}
</span>
<div>
{{$t('hotel.hotel_StarDate')}}:{{item.OutDateTime}}
</div>
<div>
{{$t('hotel.hotel_StarDate')}}:
{{item.OutDateTime}}
<
template
v-if=
"item.OfferList && item.OfferList.length > 1"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('hotel.hotel_StarDate')"
>
<el-popover
width=
"350"
trigger=
"click"
popper-class=
"TC_HotelPop"
>
<table
width=
"100%"
border=
"0"
cellspacing=
"0"
cellpadding=
"0"
>
<tr>
<td
style=
"width: 100px"
>
{{
$t
(
'objFill.v101.baojiadanh'
)
}}
</td>
<td
style=
"width: 250px"
>
{{
$t
(
"hotel.hotel_StarDate"
)
}}
</td>
</tr>
<tr
v-for=
"(rItem, rIndex) in item.OfferList"
:key=
"`d_`+item.OfferId+`_r_`+rIndex"
>
<td>
{{
rItem
.
OfferId
}}
</td>
<td>
{{
rItem
.
OutDateTime
}}
</td>
</tr>
</table>
<el-button
slot=
"reference"
circle
size=
"mini"
type=
"primary"
style=
"width: 20px; height: 20px; padding: 4px"
>
{{
item
.
OfferList
.
length
}}
</el-button>
</el-popover>
</el-tooltip>
</
template
>
</div>
</div>
</div>
<div
class=
"_left"
style=
"padding-left:10px"
>
...
...
@@ -367,20 +387,22 @@
</template>
</div>
<div
style=
"width:134px;"
>
<span
class=
"openGroup opbd"
@
click=
"goToOpenTravel(item)"
v-if=
"item.TravelState==3&& item.OpenState==2"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('sm.kaituan')"
placement=
"top-start"
popper-class=
"max-w250"
>
</el-tooltip>
{{$t('op.Kai')}}
</span>
<span
class=
"bianji newAopbdd"
v-if=
"item.TravelState==1||item.TravelState==2||item.TravelState==4||item.TravelState==5"
@
click=
"goMakeQuo('QuotationNewPrice',item.OfferId)"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('pub.updateMsg')"
placement=
"top-start"
popper-class=
"max-w250"
>
<i
class=
"iconfont icon-bianji-smal"
></i>
</el-tooltip>
</span>
<
template
v-if=
"item.TravelState==1||item.TravelState==2||item.TravelState==4||item.TravelState==5"
>
<template
v-if=
"item.OfferList&&item.OfferList.length>1"
>
<span
class=
"bianji newAopbdd"
@
click=
"goMakeQuo('QuotationNewPrice',item,0)"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"系列修改"
placement=
"top-start"
popper-class=
"max-w250"
>
<i
class=
"iconfont icon-bianji"
></i>
</el-tooltip>
</span>
</
template
>
<span
class=
"bianji newAopbdd"
@
click=
"goMakeQuo('QuotationNewPrice',item,item.OfferId)"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('pub.updateMsg')"
placement=
"top-start"
popper-class=
"max-w250"
>
<i
class=
"iconfont icon-bianji-smal"
></i>
</el-tooltip>
</span>
</template>
<span
class=
"QT-delete newAopbdd"
@
click=
"delQuotation(item)"
v-if=
"item.TravelState==1||item.TravelState==4||item.TravelState==5"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('system.table_delete')"
placement=
"top-start"
...
...
@@ -795,14 +817,25 @@
);
},
goUrl
(
path
,
item
,
qType
)
{
this
.
$router
.
push
({
name
:
path
,
query
:
{
var
queryMsg
=
{};
if
(
path
==
'QuotationAduit'
)
{
queryMsg
=
{
BatchNum
:
item
.
BatchNum
,
Qtype
:
qType
,
blank
:
'y'
,
tab
:
'报价单查看'
}
}
else
{
queryMsg
=
{
offerid
:
item
.
OfferId
,
Qtype
:
qType
,
blank
:
'y'
,
tab
:
'报价单查看'
}
}
this
.
$router
.
push
({
name
:
path
,
query
:
queryMsg
});
},
handleCurrentChange
(
val
)
{
...
...
@@ -854,7 +887,7 @@
//初始化表格数据
getList
()
{
this
.
loading
=
true
;
this
.
apipost
(
"travel_get_GetTravelOfferPageList
_V3
"
,
this
.
queryData
,
res
=>
{
this
.
apipost
(
"travel_get_GetTravelOfferPageList"
,
this
.
queryData
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
queryData
.
total
=
res
.
data
.
data
.
count
;
...
...
@@ -886,45 +919,24 @@
});
},
//报价单跳转
goMakeQuo
(
path
,
OfferId
)
{
goMakeQuo
(
path
,
item
,
offerId
)
{
var
BatchNum
=
''
;
if
(
item
)
{
BatchNum
=
item
.
BatchNum
;
}
this
.
$router
.
push
({
path
:
path
,
query
:
{
offerid
:
OfferId
,
BatchNum
:
BatchNum
,
offerid
:
offerId
,
blank
:
'y'
,
tab
:
'报价单'
}
});
},
//开团或修改
goToOpenTravel
(
item
)
{
// TeamType 0常规,1-小包团,2-当地游,3-地接团
var
routeName
=
this
.
$route
.
name
;
var
path
=
'TravelManager'
;
if
(
item
.
TeamType
===
0
)
{
path
=
'TravelManager'
}
else
if
(
item
.
TeamType
===
1
)
{
path
=
'TravelManager3'
}
else
if
(
item
.
TeamType
===
2
)
{
path
=
'TravelManager5'
}
if
(
item
.
ID
>
0
)
{
this
.
$router
.
push
({
name
:
path
,
query
:
{
configId
:
item
.
ID
,
openState
:
1
,
isOffer
:
1
,
offerId
:
item
.
OfferId
,
blank
:
'y'
}
});
}
else
{
this
.
$router
.
push
({
name
:
path
});
}
},
//显示下载弹窗
showDownLoad
(
item
)
{
this
.
downLoadMsg
.
ID
=
item
.
ID
;
...
...
src/router/config.js
View file @
129d57a7
...
...
@@ -3796,14 +3796,7 @@ export default {
title
:
'制作报价单'
},
},
{
//新版制作报价单
path
:
'/EditOffer'
,
name
:
'EditOffer'
,
component
:
resolve
=>
require
([
'@/components/TravelManager/TravelNewQuotation/EditOffer'
],
resolve
),
meta
:
{
title
:
'制作报价单'
},
},
{
//报价单变更
path
:
'/OfferChange'
,
name
:
'OfferChange'
,
...
...
@@ -3836,14 +3829,6 @@ export default {
title
:
'报价单审核'
},
},
{
//新版报价单审核
path
:
'/NewQuotationAduit'
,
name
:
'NewQuotationAduit'
,
component
:
resolve
=>
require
([
'@/components/TravelManager/TravelNewQuotation/NewQuotationAduit'
],
resolve
),
meta
:
{
title
:
'报价单审核'
},
},
{
//团控-我的机票
path
:
'/TravelMyTicket'
,
name
:
'TravelMyTicket'
,
...
...
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