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
ad0ec7ba
Commit
ad0ec7ba
authored
May 05, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
投诉单号,资金池
parent
d474efd3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
9 deletions
+29
-9
BasicDocuments.vue
src/components/FinancialModule/BasicDocuments.vue
+2
-5
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+2
-2
TravelInfoList.vue
src/components/activity/TravelInfoList.vue
+25
-2
No files found.
src/components/FinancialModule/BasicDocuments.vue
View file @
ad0ec7ba
...
...
@@ -1623,7 +1623,7 @@ export default {
},
BankAccount_post_GetCashPoolList
(){
// 获取资金池账
let
id
=
0
;
this
.
AccList
this
.
AccList
.
forEach
(
x
=>
{
this
.
AccList
.
forEach
(
x
=>
{
if
(
x
.
Name
===
this
.
payMsg
.
AccName
)
{
id
=
x
.
ID
;
}
...
...
@@ -1696,7 +1696,7 @@ export default {
},
AuditOrRefund
(){
// 保存
// console.log("保存")
let
that
=
this
;
let
that
=
this
;
if
(
that
.
Ststus
==
1
){
if
(
this
.
AuditOrRefundMsg
.
Status
==
'5'
){
if
(
that
.
GetDetail
.
AccountNumber
.
indexOf
(
"东航平台"
)
!=-
1
){
...
...
@@ -1709,9 +1709,6 @@ export default {
return
;
}
}
// console.log("benMoney",this.benMoney)
// console.log(parseFloat(that.benMoney) - 5)
// console.log(parseFloat(that.benMoney) + 5)
}
else
{
if
(
this
.
allMoney
!=
parseFloat
(
that
.
benMoney
)){
this
.
Error
(
"请检查实付金额!"
)
...
...
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
ad0ec7ba
...
...
@@ -1982,9 +1982,9 @@
<div
class=
"clearfix RL-MARK"
>
<span
class=
"RL-remarkTitle"
>
备注:
</span>
<p
class=
"RL-redType RL-remarkCon"
>
<span
v-if=
"childItem.
tsIdList&&childItem.t
sIdList.length>0"
>
投诉单号:
<span
v-if=
"childItem.
TsIdList&&childItem.T
sIdList.length>0"
>
投诉单号:
<a
clas=
"underline"
v-for=
"ts in childItem.TsIdList"
href=
"javascript:void(0);"
@
click=
"goUrlTS('ComplaintsDetail',ts,childItem.OrderId,'投诉详情')"
>
{{
ts
}}
</a>
@
click=
"goUrlTS('ComplaintsDetail',ts,childItem.OrderId,'投诉详情')"
>
{{
ts
}}
</a>
;
</span>
<span
v-if=
'childItem.ClientSource==1&&childItem.BrandName!=""'
>
{{
childItem
.
BrandName
}}
订单
{{
childItem
.
PlatformOrder
}}
;
</span>
...
...
src/components/activity/TravelInfoList.vue
View file @
ad0ec7ba
...
...
@@ -9,7 +9,9 @@
.user_time_picker
.el-date-editor--date
>
span
.el-input__suffix
{
top
:
-4px
;
right
:
2px
;
}
.zidingyiFz
i
{
font-size
:
14px
!important
;}
.zidingyiFz
i
{
color
:
#fff
;
font-size
:
14px
!important
;}
.TravelInfoList
.choose_form
.el-form-item
{
display
:
inline-block
;
}
...
...
@@ -117,11 +119,14 @@
<el-button
type=
"primary"
icon=
"iconfont icon-nav-xiaoshou"
circle
@
click=
"Gourl('TravelCoupomPlanList',item)"
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"分配销售"
placement=
"top"
>
<el-button
type=
"primary"
icon=
"el-icon-edit
"
circle
@
click=
"Gourl('TravelInfoSalesList',item)"
></el-button>
<el-button
style=
"background:#5F95E8"
icon=
"iconfont icon-icon-test6
"
circle
@
click=
"Gourl('TravelInfoSalesList',item)"
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"删除"
placement=
"top"
>
<el-button
@
click=
"Delete(item)"
type=
"danger"
class=
'zidingyiFz'
icon=
"el-icon-delete"
circle
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"取消"
placement=
"top"
>
<el-button
@
click=
"Exit(item)"
style=
"background:#62DC9E"
class=
'zidingyiFz'
icon=
"el-icon-document-remove"
circle
></el-button>
</el-tooltip>
</td>
</tr>
...
...
@@ -302,6 +307,24 @@ import moment from "moment"
this
.
Error
(
res
.
data
.
message
)
}
},
null
);
},
Exit
(
item
){
this
.
$confirm
(
'是否取消该条行程定制信息?'
,
'提示'
,
{
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
type
:
'warning'
}).
then
(()
=>
{
this
.
apiJavaPost
(
"/api/b2b/free/cancelTravelCoupom"
,{
customId
:
item
.
customId
},
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
Success
(
res
.
data
.
message
)
this
.
getList
();
}
else
{
this
.
Error
(
res
.
data
.
message
)
}
},
null
);
}).
catch
(()
=>
{
});
},
Delete
(
item
){
this
.
$confirm
(
'是否删除该条行程定制信息?'
,
'提示'
,
{
...
...
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