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
d557305a
Commit
d557305a
authored
Nov 13, 2024
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
报价单和当地游查询调整
parent
9ecdf986
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
40 additions
and
451 deletions
+40
-451
Ground.js
src/assets/common/lang/EN/Ground.js
+1
-1
Ground.js
src/assets/common/lang/Japan/Ground.js
+1
-1
zh-tw.js
src/assets/common/lang/zh-tw.js
+1
-1
Ground.js
src/assets/common/lang/zhTW/Ground.js
+1
-1
productQueryOne2.vue
src/components/SalesModule/productQueryOne2.vue
+19
-12
AuditDan.vue
src/components/TravelManager/TravelGroupControl/AuditDan.vue
+12
-10
AuditDan1.vue
...components/TravelManager/TravelGroupControl/AuditDan1.vue
+0
-420
newQuotation.vue
...ponents/TravelManager/TravelNewQuotation/newQuotation.vue
+3
-3
index.vue
src/components/index.vue
+2
-2
No files found.
src/assets/common/lang/EN/Ground.js
View file @
d557305a
...
...
@@ -540,7 +540,7 @@ export const obj = {
cxlindui
:
' Re-elect the leader '
,
szlindui
:
' Set the leader '
,
glxiaoshou
:
' Related sales '
,
lduikongwei
:
'
Lead position
'
,
lduikongwei
:
'
Leader position
'
,
xgtcheng
:
' Modify commission '
,
szewaijine
:
' Set extra amount '
,
...
...
src/assets/common/lang/Japan/Ground.js
View file @
d557305a
...
...
@@ -557,7 +557,7 @@ export const obj = {
cxlindui
:
'監督を再選する'
,
szlindui
:
'リーダーを置く'
,
glxiaoshou
:
'関連販売'
,
lduikongwei
:
'
監督コントロール
'
,
lduikongwei
:
'
リーダー制御
'
,
xgtcheng
:
'修正して抽出する'
,
szewaijine
:
'追加金額を設定'
,
...
...
src/assets/common/lang/zh-tw.js
View file @
d557305a
...
...
@@ -2106,7 +2106,7 @@ export const salesModule={
backUnion
:
"回程聯運"
,
LYtime
:
'去程聯運時間'
,
backUnionTime
:
"回程聯運時間"
,
BackCity
:
'返回
都
市'
,
BackCity
:
'返回
城
市'
,
TeamPrice
:
'本團單價'
,
StartLY
:
'出發聯運價'
,
BackLY
:
'返回聯運價'
,
...
...
src/assets/common/lang/zhTW/Ground.js
View file @
d557305a
...
...
@@ -542,7 +542,7 @@ tuanbao:'團報',
cxlindui
:
'重選領隊'
,
szlindui
:
'設定領隊'
,
glxiaoshou
:
'關聯銷售'
,
lduikongwei
:
'領隊控
比特
'
,
lduikongwei
:
'領隊控
位
'
,
xgtcheng
:
'修改提成'
,
szewaijine
:
'設定額外金額'
,
...
...
src/components/SalesModule/productQueryOne2.vue
View file @
d557305a
...
...
@@ -230,7 +230,6 @@
.productQuerybottomLayer
.el-upload-list
{
width
:
200px
;
}
</
style
>
<
template
>
<div
class=
"flexOne"
>
...
...
@@ -273,13 +272,20 @@
<el-input
v-model=
'msg.TCID'
class=
'w150'
></el-input>
</span>
</li>
<li>
<span>
<em>
{{
$t
(
'Operation.Op_TeamName'
)
}}
</em>
<el-input
v-model=
"msg.Title"
class=
"w150"
clearable
></el-input>
</span>
</li>
<li><span><em>
{{
$t
(
'hotel.hotel_StarDate'
)
}}
</em>
<!--
<el-date-picker
v-model=
'msg.StartTime'
@
change=
"dataDui()"
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
></el-date-picker>
-->
<DateLimit
:clearable=
"false"
:StartGroupDate=
"msg.StartTime"
:EndGroupDate=
"msg.EndTime"
@
change=
"(date)=>
{msg.StartTime = date,dataDui()}">
</DateLimit>
<DateLimit
:clearable=
"false"
:StartGroupDate=
"msg.StartTime"
:EndGroupDate=
"msg.EndTime"
@
change=
"(date)=>
{msg.StartTime = date,dataDui()}">
</DateLimit>
-
<el-date-picker
v-model=
'msg.EndTime'
@
change=
"dataDui()"
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
:picker-options=
"pickerBeginDateAfter"
></el-date-picker>
<el-date-picker
v-model=
'msg.EndTime'
@
change=
"dataDui()"
class=
'w135'
value-format=
"yyyy-MM-dd"
type=
"date"
:picker-options=
"pickerBeginDateAfter"
></el-date-picker>
</span>
</li>
<li
style=
"height:34px;line-height:34px;padding: 0 0 0 20px;vertical-align: middle;"
>
...
...
@@ -384,7 +390,8 @@
<commonTeamInfo
ref=
"comTeam"
></commonTeamInfo>
</el-dialog>
<el-dialog
custom-class=
'w450'
:title=
"$t('Operation.Op_tripDownLoad')"
:visible
.
sync=
"travelControlTripLayerShow"
center
>
<el-dialog
custom-class=
'w450'
:title=
"$t('Operation.Op_tripDownLoad')"
:visible
.
sync=
"travelControlTripLayerShow"
center
>
<tripDownLoadCommon
ref=
"tripDownLoadCommon"
:tripObj=
"tripObj"
@
headCallBack=
"hideTripDown"
:downType=
"1"
>
</tripDownLoadCommon>
</el-dialog>
...
...
@@ -499,7 +506,7 @@
GatherAddress
:
''
,
LureEmpId
:
0
,
//引流id
CRMGuestId
:
0
,
//客人ID
LuggageNum
:
''
//行李数量
LuggageNum
:
''
,
//行李数量
},
GuestList
:
[{
SurName
:
''
,
...
...
@@ -649,7 +656,8 @@
TCIDList
:
''
,
WarningQuery
:
'-1'
,
RateOnDay
:
'-1'
,
RateOn
:
'-1'
RateOn
:
'-1'
,
Title
:
""
,
//团名
},
defaultImg
:
'this.src="'
+
require
(
"../../assets/img/bg_z1@2x.png"
)
+
'"'
,
list
:
[],
...
...
@@ -738,7 +746,7 @@
}
return
x1
+
x2
;
},
},
methods
:
{
goB2Bdetail
(
ConfigId
,
tcid
)
{
...
...
@@ -1453,7 +1461,7 @@
this
.
addMsg
.
TripleRoomNum
=
'0'
this
.
addMsg
.
TradeDate
=
''
this
.
addMsg
.
CostType
=
''
this
.
addMsg
.
LuggageNum
=
''
this
.
addMsg
.
LuggageNum
=
''
this
.
addMsg
.
PlatformOrder
=
''
this
.
ddlyList
=
[]
this
.
addMsg
.
Remarks
=
''
...
...
@@ -1784,7 +1792,7 @@
let
text
=
this
.
$t
(
'pub.unlimitedSel'
)
this
.
companyList
=
[{
Id
:
'-1'
,
BName
:
text
BName
:
text
}];;
res
.
data
.
data
.
forEach
(
x
=>
{
var
obj
=
{
...
...
@@ -1882,5 +1890,4 @@
}
}
</
script
>
</
script
>
\ No newline at end of file
src/components/TravelManager/TravelGroupControl/AuditDan.vue
View file @
d557305a
...
...
@@ -167,7 +167,8 @@
<div>
{{$t('salesModule.Adult')}}
</div>
<div
class=
"priceList"
>
<div>
<span
class=
"pLeftPrice"
>
{{$t('Airticket.Air_salesPrice')}}:¥{{item.QuotationPrice.B2BMemberPrice}}
</span>
<span
class=
"pLeftPrice"
>
{{$t('Airticket.Air_salesPrice')}}:¥{{item.QuotationPrice.B2BMemberPrice}}
</span>
</div>
</div>
<div>
{{$t('op.Child')}}
</div>
...
...
@@ -229,9 +230,8 @@
</div>
</div>
<div
class=
"AuditStatus"
>
<div
v-if=
"item.TravelState==2"
>
<div>
<div
style=
"color:red;"
>
<
template
v-if=
"item.ManagerAduitDate==''&&item.ManagerId>0"
>
{{
item
.
ManagerAduitName
}}
</
template
>
...
...
@@ -242,7 +242,7 @@
</div>
</div>
<div
v-if=
"item.TravelState==6"
>
<div>
<div
style=
"color:red;"
>
<
template
v-if=
"item.ChangeManagerAduitDate==''&&item.ChangeManagerId>0"
>
{{
item
.
ChangeManagerAduitName
}}
</
template
>
...
...
@@ -332,20 +332,21 @@
<span
@
click=
"offerAudit(item,1)"
>
{{$t('objFill.v101.cha')}}
</span>
</el-tooltip>
</span>
<span
class=
"openGroup opbdList"
v-if=
"item.TravelState==2"
>
<span
class=
"openGroup opbdList"
v-if=
"
activeName==2&&
item.TravelState==2"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('fnc.shenhe')"
placement=
"top-start"
popper-class=
"max-w250"
>
<span
@
click=
"offerAudit(item,2)"
>
{{$t('objFill.v101.FinancialModule.shen')}}
</span>
</el-tooltip>
</span>
<span
class=
"openGroup opbdList"
v-if=
"item.TravelState==6"
>
<span
class=
"openGroup opbdList"
v-if=
"
activeName==2&&
item.TravelState==6"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('fnc.shenhe')"
placement=
"top-start"
popper-class=
"max-w250"
>
<span
@
click=
"offerAudit(item,4)"
>
{{$t('objFill.v101.FinancialModule.shen')}}
</span>
</el-tooltip>
</span>
<span
class=
"openGroup opbdList"
v-if=
"item.TravelState==3"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('objFill.v101.bohuicxtz')"
placement=
"top-start"
popper-class=
"max-w250"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('objFill.v101.bohuicxtz')"
placement=
"top-start"
popper-class=
"max-w250"
>
<span
@
click=
"refuseOffer(item)"
>
{{$t('objFill.v101.bo')}}
</span>
</el-tooltip>
</span>
...
...
@@ -368,7 +369,8 @@
</div>
</div>
</div>
<span
slot=
"reference"
class=
"AuditLogSpan"
@
click=
"getAudiDanLog(item.ID)"
>
{{$t('objFill.v101.zhi')}}
</span>
<span
slot=
"reference"
class=
"AuditLogSpan"
@
click=
"getAudiDanLog(item.ID)"
>
{{$t('objFill.v101.zhi')}}
</span>
</el-popover>
</el-tooltip>
</span>
...
...
@@ -481,7 +483,7 @@
expectInfo
(
logIndex
)
{
var
flag
=
this
.
AuditLogList
[
logIndex
].
isShow
;
this
.
AuditLogList
[
logIndex
].
isShow
=
!
flag
;
let
arrText
=
[
this
.
$t
(
'pub.closeSel'
),
this
.
$t
(
'fnc.zhankai'
)]
let
arrText
=
[
this
.
$t
(
'pub.closeSel'
),
this
.
$t
(
'fnc.zhankai'
)]
if
(
this
.
AuditLogList
[
logIndex
].
isShow
)
{
this
.
AuditLogList
[
logIndex
].
expectName
=
arrText
[
0
];
}
else
{
...
...
@@ -569,7 +571,7 @@
OfferPayType
:
0
,
TeamType
:
item
.
TeamType
,
};
var
str
=
this
.
$t
(
'objFill.v101.shifouboh'
)
+
"【"
+
item
.
TCNUMS
+
"】"
+
this
.
$t
(
'objFill.v101.debaojiad'
);
var
str
=
this
.
$t
(
'objFill.v101.shifouboh'
)
+
"【"
+
item
.
TCNUMS
+
"】"
+
this
.
$t
(
'objFill.v101.debaojiad'
);
this
.
Confirm
(
str
,
function
()
{
that
.
apipost
(
"travel_get_AuditTravelOffer"
,
nObj
,
...
...
src/components/TravelManager/TravelGroupControl/AuditDan1.vue
deleted
100644 → 0
View file @
9ecdf986
<
style
>
@import
"../../../assets/css/newTravelManager.css"
;
.opbdList
{
font-weight
:
bold
;
display
:
inline-block
;
width
:
25px
;
height
:
25px
;
color
:
#fff
;
border-radius
:
50%
;
line-height
:
25px
;
font-size
:
12px
;
cursor
:
pointer
;
text-align
:
center
;
}
.Audian_cent
{
-webkit-box-flex
:
1
;
-ms-flex
:
1
;
display
:
-webkit-box
;
display
:
-ms-flexbox
;
display
:
flex
;
-webkit-box-align
:
center
;
-ms-flex-align
:
center
;
align-items
:
center
;
}
.quoTation
.Audit_left
{
align-items
:
center
;
border-right
:
1px
dashed
#dddddd
;
padding-right
:
20px
;
}
</
style
>
<
template
>
<div
class=
"flexOne quoTation"
>
<div
class=
"query-box"
>
<ul>
<li>
<span>
<em>
{{
$t
(
'system.table_ssLine'
)
}}
</em>
<el-select
v-model=
"queryData.LineId"
class=
'w200'
filterable
:placeholder=
"$t('pub.pleaseSel')"
@
change=
"getLineTeamList()"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'noLimit'
></el-option>
<el-option
v-for=
"item in LineList"
:label=
'item.LineName'
:value=
'item.LineID'
:key=
'item.LineID'
>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>
{{
$t
(
'active.ad_ssxl'
)
}}
</em>
<el-select
v-model=
"queryData.LineteamId"
class=
'w200'
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'noLimit'
></el-option>
<el-option
v-for=
"item in LineTeamList"
:label=
'item.LtName'
:value=
'item.LtID'
:key=
'item.LtID'
>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>
{{
$t
(
'objFill.v101.tijiaoren'
)
}}
</em>
<el-select
v-model=
"queryData.CreateBy"
filterable
:placeholder=
"$t('pub.pleaseSel')"
>
<el-option
:label=
"$t('pub.unlimitedSel')"
:value=
'noLimit'
></el-option>
<el-option
v-for=
"item in EmployeeList"
:label=
'item.EmName'
:value=
'item.EmployeeId'
:key=
'item.EmployeeId'
>
</el-option>
</el-select>
</span>
</li>
<li>
<button
class=
"hollowFixedBtn"
@
click=
"getList(),resetPageIndex()"
>
{{
$t
(
'pub.searchBtn'
)
}}
</button>
</li>
</ul>
</div>
<el-tabs
v-model=
"activeName"
@
tab-click=
"handleClick(activeName)"
>
<el-tab-pane
v-for=
"item in $tripUtils.TravelStateList"
:label=
"item.label"
:name=
"item.Id"
:key=
"item.subCode"
>
</el-tab-pane>
</el-tabs>
<div
class=
"commonContent"
v-loading=
"loading"
>
<ul
class=
"_content"
>
<li
v-for=
"item in dataList"
:key=
"item.ID"
style=
"padding:0 15px;"
>
<div
class=
"Audit_left"
style=
"width:160px"
>
<div>
<span>
{{
$t
(
'hotel.hotel_SerialNumber'
)
}}
:
{{
item
.
ID
}}
</span>
</div>
<div
style=
"margin-top:1px"
>
{{
$t
(
'system.query_type'
)
}}
:
<template
v-if=
"item.TeamType==1"
>
<i
style=
"color:red;font-weight:bold;"
>
{{
item
.
TeamTypeName
}}
</i>
</
template
>
<
template
v-else
>
{{
item
.
TeamTypeName
}}
</
template
>
</div>
<div
style=
"margin-top:3px"
>
{{$t('hotel.hotel_StarDate')}}:{{item.OutDateTime}}
</div>
</div>
<div
class=
"Audit_left"
style=
"width:20%;"
>
<div>
<p
class=
"quoListName"
style=
"padding-right:20px;width:100%;"
>
<span>
{{item.LineName}}
</span>
</p>
<p
class=
"Quo_Content"
style=
"padding-right:20px;width:100%;"
><i
v-if=
"item.LtName"
class=
"iconfont icon-richeng"
></i>
<span>
{{item.LtName}}
</span>
</p>
</div>
</div>
<div
class=
"Audit_left"
style=
"width:20%;"
>
<div>
<p
class=
"quoListName"
style=
"padding-right:20px;width:100%;"
>
<el-tooltip
popper-class=
"max-w250"
effect=
"dark"
:content=
"item.Title"
placement=
"top-start"
>
<span>
{{item.Title}}
</span>
</el-tooltip>
</p>
<p
class=
"Quo_Content"
style=
"padding-right:20px;width:100%;"
><i
v-if=
"item.CustomerName"
class=
"iconfont icon-richeng"
></i>
<span>
{{item.CustomerName}}
</span>
</p>
</div>
</div>
<div
class=
"Audian_cent"
style=
"width:260px;"
>
<div
class=
"stayDays"
>
{{item.DayNum}}{{$t('hotel.hotel_day')}}
</div>
<div
class=
""
>
{{$t('op.SalesPrice')}}
<el-popover
popper-class=
"salsSetPrice"
trigger=
"click"
>
<div
class=
"priceContentDiv"
v-if=
"item.QuotationPrice!=null"
>
<div>
<div>
{{$t('salesModule.Adult')}}
</div>
<div
class=
"priceList"
>
<div>
<span
class=
"pLeftPrice"
>
{{$t('Airticket.Air_salesPrice')}}:¥{{item.QuotationPrice.B2BMemberPrice}}
</span>
</div>
</div>
<div>
{{$t('op.Child')}}
</div>
<div
class=
"priceList"
>
<div>
<span
class=
"pLeftPrice"
>
{{$t('op.TakeBed')}}:¥{{item.QuotationPrice.ChildNeedPrice}}
</span>
<span
class=
"pRightPrice"
>
{{$t('op.NoneedBed')}}:¥{{item.QuotationPrice.ChildNoNeedPrice}}
</span>
</div>
<div
class=
"priceDivCon"
>
<span
class=
"pLeftPrice"
>
{{$t('Operation.Op_baby')}}:¥{{item.QuotationPrice.BabyPrice}}
</span>
<span
class=
"pRightPrice"
>
{{$t('op.Surcharge')}}:¥{{item.QuotationPrice.BabyChargePrice}}
</span>
</div>
</div>
<div>
{{$t('sm.laoren')}}
</div>
<div
class=
"priceList"
>
<div>
<span
class=
"pLeftPrice"
>
{{$t('op.Surcharge')}}:¥{{item.QuotationPrice.OldManChargePrice}}
</span>
</div>
</div>
<div>
{{$t('Operation.Op_zafei')}}
</div>
<div
class=
"priceList"
>
<div>
<span
class=
"pLeftPrice"
>
{{$t('active.cl_qianzheng')}}:¥{{item.QuotationPrice.VisaPrice}}
</span>
<span
class=
"pRightPrice"
>
{{$t('Operation.Op_singleRoomcha')}}:¥{{item.QuotationPrice.SingleRoomPrice}}
</span>
</div>
</div>
<div>
{{$t('op.SingleQuotes')}}
</div>
<div
class=
"priceList"
>
<div>
<span
class=
"pLeftPrice"
>
{{$t('salesModule.SingleJ')}}:¥{{item.QuotationPrice.SingleDMCPrice}}
</span>
</div>
</div>
</div>
</div>
<span
slot=
"reference"
class=
"diPrice"
>
{{item.JPYSalePrice}}
<span
class=
"qi"
>
{{$t('op.Qi')}}
</span></span>
</el-popover>
</div>
</div>
<div
class=
"_rightAudit"
>
<div
class=
"AuditUserInfo clearfix aa"
style=
"width:165px;"
>
<div
class=
"AuditDanHeader"
>
<img
v-if=
"item.CreateUserPhoto"
:src=
"item.CreateUserPhoto"
alt=
""
>
<img
v-else
src=
"../../../assets/img/default_head_img.jpg"
alt=
""
>
</div>
<div
class=
"AuditUserInfoDetail"
>
<div
style=
"width:85px;"
>
{{item.CreateUserName}}
</div>
<div
class=
"AuditChangeDate"
>
{{item.CreateDate}}
</div>
</div>
</div>
<div
class=
"AuditStatus"
>
<div
v-if=
"item.TravelState==2"
>
<div>
{{$t('objFill.dsh')}}
</div>
</div>
<div
v-if=
"item.TravelState==3"
>
<div
class=
"Auditapproved"
>
{{$t('fnc.ytongguo')}}
</div>
<el-popover
popper-class=
"salsSetPrice"
trigger=
"click"
>
<div
class=
"priceContentDiv"
>
<div>
<span>
{{$t('objFill.v101.FinancialModule.shenpjg')}}
</span>
<span
class=
"AuditDate"
>
{{item.AuditDate}}
</span>
</div>
<div>
{{item.AuditByName}}: {{item.AuditContent}}
</div>
</div>
<div
slot=
"reference"
class=
"AuditLookDetail"
>
{{$t('objFill.v101.chakansmin')}}
</div>
</el-popover>
</div>
<div
v-if=
"item.TravelState==4"
>
<div
class=
"Auditrejected"
>
{{$t('objFill.yibohui')}}
</div>
<el-popover
popper-class=
"salsSetPrice"
trigger=
"click"
>
<div
class=
"priceContentDiv"
>
<div>
<span>
{{$t('objFill.v101.FinancialModule.shenpjg')}}
</span>
<span
class=
"AuditDate"
>
{{item.AuditDate}}
</span>
</div>
<div>
{{item.AuditByName}}: {{item.AuditContent}}
</div>
</div>
<div
slot=
"reference"
class=
"AuditLookDetail"
>
{{$t('objFill.v101.chakansmin')}}
</div>
</el-popover>
</div>
</div>
<div
class=
"AD_Operation"
>
<span
class=
"openGroup opbdList"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('fnc.chakan')"
placement=
"top-start"
popper-class=
"max-w250"
>
<span
@
click=
"goUrl('QuotationAduit',item.ID,1)"
>
{{$t('objFill.v101.cha')}}
</span>
</el-tooltip>
</span>
<span
class=
"openGroup opbdList"
v-if=
"item.TravelState==2"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('fnc.shenhe')"
placement=
"top-start"
popper-class=
"max-w250"
>
<span
@
click=
"goUrl('QuotationAduit',item.ID,2)"
>
{{$t('objFill.v101.FinancialModule.shen')}}
</span>
</el-tooltip>
</span>
<span
class=
"openGroup opbdList"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('fnc.rizhi')"
placement=
"top-start"
popper-class=
"max-w250"
>
<el-popover
popper-class=
"salsSetPrice"
trigger=
"click"
>
<div
class=
"priceContentDiv"
>
<div
class=
"AuditLog"
>
{{$t('objFill.v101.baojdriz')}}
</div>
<div
class=
"logContact"
>
<div
v-for=
"(childItem,logIndex) in AuditLogList"
:key=
"childItem.subCode"
>
<div
class=
"clearfix"
>
<div
class=
"Auditcircle"
></div>
<div
class=
"operateName"
>
{{childItem.UserName}}
</div>
<div
class=
"operateDate"
>
{{childItem.hour}}
</div>
</div>
<div>
{{childItem.LogContent}}
<span
class=
"spread"
v-if=
"childItem.LogType==2"
@
click=
"expectInfo(logIndex)"
>
{{childItem.expectName}}
</span></div>
<div
v-if=
"childItem.isShow"
>
{{childItem.LogRemark}}
</div>
</div>
</div>
</div>
<span
slot=
"reference"
class=
"AuditLogSpan"
@
click=
"getAudiDanLog(item.ID)"
>
{{$t('objFill.v101.zhi')}}
</span>
</el-popover>
</el-tooltip>
</span>
</div>
</div>
</li>
</ul>
<div
class=
"noData"
v-show=
"noData"
>
{{$t('system.content_noData')}}
</div>
</div>
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"currentPage"
layout=
"total,prev, pager, next, jumper"
:page-size=
"queryData.pageSize"
:total=
"total"
>
</el-pagination>
</div>
</template>
<
script
>
export
default
{
data
()
{
return
{
queryData
:
{
LineId
:
0
,
LineteamId
:
0
,
CreateBy
:
0
,
PageSize
:
"5"
,
TravelState
:
2
},
loading
:
true
,
//默认选中
activeName
:
"2"
,
//员工列表
EmployeeList
:
[],
//日志
AuditLogList
:
""
,
//线路列表
LineList
:
""
,
noLimit
:
0
,
//系列列表
//是否有数据
noData
:
false
,
LineTeamList
:
""
,
dataList
:
""
,
total
:
0
,
currentPage
:
1
,
};
},
components
:
{
},
methods
:
{
handleCurrentChange
(
val
)
{
this
.
queryData
.
pageIndex
=
val
;
this
.
getList
();
},
resetPageIndex
()
{
this
.
queryData
.
pageIndex
=
1
;
this
.
currentPage
=
1
;
},
//选项卡切换
handleClick
(
activeName
)
{
this
.
resetPageIndex
()
this
.
queryData
.
TravelState
=
activeName
;
this
.
getList
();
},
//获取操作日志
getAudiDanLog
(
ID
)
{
let
msg
=
{
configId
:
ID
};
this
.
apipost
(
"travel_get_GetTravelConfigLog"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
var
endDate
=
new
Date
();
endDate
.
setMonth
(
endDate
.
getMonth
()
+
1
);
var
tempData
=
res
.
data
.
data
;
let
textName
=
this
.
$t
(
'fnc.zhankai'
)
tempData
.
forEach
(
x
=>
{
if
(
x
.
LogType
==
2
)
{
x
.
isShow
=
false
;
x
.
expectName
=
textName
;
}
x
.
hour
=
this
.
$commonUtils
.
formatMsgTime
(
x
.
LogTimeStr
);
});
this
.
AuditLogList
=
tempData
;
}
});
},
expectInfo
(
logIndex
)
{
var
flag
=
this
.
AuditLogList
[
logIndex
].
isShow
;
this
.
AuditLogList
[
logIndex
].
isShow
=
!
flag
;
let
arrText
=
[
this
.
$t
(
'pub.closeSel'
),
this
.
$t
(
'fnc.zhankai'
)]
if
(
this
.
AuditLogList
[
logIndex
].
isShow
)
{
this
.
AuditLogList
[
logIndex
].
expectName
=
arrText
[
0
];
}
else
{
this
.
AuditLogList
[
logIndex
].
expectName
=
arrText
[
1
];
}
},
//获取线路列表
getLineList
()
{
this
.
apipost
(
"line_post_GetList"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
LineList
=
res
.
data
.
data
;
}
});
},
//获取系列列表
getLineTeamList
(
lineId
)
{
this
.
queryData
.
LineteamId
=
0
;
let
msg
=
{
lineID
:
this
.
queryData
.
LineId
,
isTOOP
:
1
};
this
.
apipost
(
"team_post_GetList"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
LineTeamList
=
res
.
data
.
data
;
}
});
},
//初始化表格数据
getList
()
{
this
.
loading
=
true
;
this
.
apipost
(
"travel_get_GetTravelOfferAuditPageList"
,
this
.
queryData
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
total
=
res
.
data
.
data
.
count
;
this
.
noData
=
!
this
.
total
>
0
;
var
tempData
=
res
.
data
.
data
.
pageData
;
tempData
.
forEach
(
x
=>
{
if
(
x
.
AuditDate
&&
x
.
AuditDate
!=
''
)
{
x
.
hours
=
this
.
$commonUtils
.
formatMsgTime
(
x
.
AuditDate
);
}
});
this
.
dataList
=
tempData
;
}
}
);
},
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList
()
{
this
.
apipost
(
"admin_get_GetEmployeeByUserDepartmentId"
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
EmployeeList
=
res
.
data
.
data
;
}
}
);
},
goUrl
(
path
,
configId
,
qType
)
{
if
(
configId
>
0
)
{
this
.
$router
.
push
({
name
:
path
,
query
:
{
configId
:
configId
,
Qtype
:
qType
,
blank
:
'y'
,
tab
:
'报价单审核'
}
});
}
else
{
this
.
$router
.
push
({
name
:
path
});
}
},
},
mounted
()
{
this
.
getLineList
();
this
.
getEmployeeList
();
this
.
getList
();
}
};
</
script
>
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @
d557305a
...
...
@@ -230,7 +230,7 @@
</div>
<div
class=
"AuditStatus"
style=
"width:80px;"
>
<div
v-if=
"item.TravelState==2"
>
<div>
<
template
v-if=
"item.ManagerAduitDate==''&&item.ManagerId>0"
>
<div
style=
"color:red;"
>
<
template
v-if=
"item.ManagerAduitDate==''&&item.ManagerId>0"
>
{{
item
.
ManagerAduitName
}}
</
template
>
<
template
v-else
>
...
...
@@ -240,7 +240,7 @@
</div>
</div>
<div
v-if=
"item.TravelState==6"
>
<div>
<div
style=
"color:red;"
>
<
template
v-if=
"item.ChangeManagerAduitDate==''&&item.ChangeManagerId>0"
>
{{
item
.
ChangeManagerAduitName
}}
</
template
>
...
...
@@ -352,7 +352,7 @@
<i
@
click=
"goUrl('QuotationAduit',item,1)"
class=
"iconfont icon-view"
></i>
</el-tooltip>
</span>
<span
class=
"bianji newAopbdd"
v-if=
"item.TravelState==3||item.TravelState==7||item.TravelState==8"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('objFill.v101.baojdbgen')"
placement=
"top-start"
popper-class=
"max-w250"
>
...
...
src/components/index.vue
View file @
d557305a
...
...
@@ -112,12 +112,12 @@
<span
v-if=
"!useRed"
class=
"el-dropdown-link"
style=
"cursor: pointer;display: block;height: 100%;width: 100%;"
>
<span
style=
"color: #a6adb4;"
><i
class=
"iconfont icon-biaoge"
style=
"margin-right: 5px;font-size:13px"
></i>
{{$t('pub.more')}}
:
</span>
style=
"margin-right: 5px;font-size:13px"
></i>
{{$t('pub.more')}}
</span>
</span>
<span
v-if=
"useRed"
class=
"el-dropdown-link"
style=
"cursor: pointer;display: block;height: 100%;width: 100%;"
>
<span
style=
"color: #FFF;font-size:15px"
><i
class=
"iconfont icon-biaoge"
style=
"margin-right: 5px;font-size:12px"
></i>
{{$t('pub.more')}}
:
</span>
style=
"margin-right: 5px;font-size:12px"
></i>
{{$t('pub.more')}}
</span>
</span>
<el-dropdown-menu
slot=
"dropdown"
class=
"_dropdown _more_dropdown"
>
<el-dropdown-item
class=
"clearfix _dropdown_other"
v-for=
"(item,index) in menuList"
:key=
"index"
...
...
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