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
1071fb19
Commit
1071fb19
authored
Apr 18, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
禁止修改汇率,增加投诉单号
parent
d7277f93
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
31 additions
and
13 deletions
+31
-13
ChoiceAddFinancialDocuments.vue
...omponents/FinancialModule/ChoiceAddFinancialDocuments.vue
+10
-4
ChoiceAddFinancialDocuments2.vue
...mponents/FinancialModule/ChoiceAddFinancialDocuments2.vue
+3
-0
addFinancialDocuments.vue
src/components/FinancialModule/addFinancialDocuments.vue
+6
-2
addFinancialGZDocuments.vue
src/components/FinancialModule/addFinancialGZDocuments.vue
+2
-2
addReceivablesDocuments.vue
src/components/FinancialModule/addReceivablesDocuments.vue
+5
-2
groupTourOrder.vue
src/components/SalesModule/groupTourOrder.vue
+3
-2
groupTourOrderByTuan.vue
src/components/SalesModule/groupTourOrderByTuan.vue
+2
-1
No files found.
src/components/FinancialModule/ChoiceAddFinancialDocuments.vue
View file @
1071fb19
...
...
@@ -172,7 +172,6 @@ export default {
if
(
valid
)
{
this
.
apipost
(
'Financial_post_GetTemplateDetail'
,
this
.
ruleForm
,
r
=>
{
if
(
r
.
data
.
resultCode
===
1
)
{
console
.
log
(
r
)
if
(
this
.
ruleForm
.
Type
===
1
){
this
.
R
=
r
.
data
.
data
}
else
{
...
...
@@ -183,7 +182,6 @@ export default {
}
},
null
)
}
else
{
console
.
log
(
'error submit!!'
);
return
false
;
}
});
...
...
@@ -212,9 +210,12 @@ export default {
}
},
Financial_post_GetList
(){
//获取
console
.
log
(
"111"
);
this
.
apipost
(
'Financial_post_GetList'
,{},
res
=>
{
console
.
log
(
"res"
,
res
);
if
(
res
.
data
.
resultCode
==
1
){
let
data
=
res
.
data
.
data
;
console
.
log
(
"data"
,
data
)
if
(
data
){
data
.
forEach
(
x
=>
{
if
(
x
.
Type
==
1
){
...
...
@@ -261,14 +262,19 @@ export default {
}
else
{}
},
err
=>
{})
},
},
mounted
(){
},
created
(){
this
.
Financial_post_GetList
();
},
mounted
(){
this
.
MsgBus
.
$on
(
'bankAddPage'
,()
=>
{
this
.
F
=
false
;
this
.
R
=
false
;
});
let
userInfo
=
this
.
getLocalStorage
();
this
.
getCompanyMsg
.
RB_Group_Id
=
userInfo
.
RB_Group_id
;
//集团ID
this
.
Financial_post_GetList
();
this
.
showTab
=
this
.
$route
.
query
.
Type
?
this
.
$route
.
query
.
Type
:
0
;
if
(
this
.
showTab
==
1
){
this
.
GetList
=
this
.
collectList
;
...
...
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @
1071fb19
...
...
@@ -133,11 +133,14 @@
})
this
.
GetList
=
newList
}
console
.
log
(
"this.GetList"
,
this
.
GetList
)
},
Financial_post_GetList
(){
//获取
this
.
apipost
(
'Financial_post_GetList'
,{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
let
data
=
res
.
data
.
data
;
console
.
log
(
"data"
,
data
);
if
(
data
){
data
.
forEach
(
x
=>
{
if
(
x
.
Type
==
1
){
...
...
src/components/FinancialModule/addFinancialDocuments.vue
View file @
1071fb19
...
...
@@ -317,7 +317,7 @@
</el-select>
</td>
<td
height=
"26px"
>
{{
da
.
yTotalPrice
}}
</td>
<td
height=
"26px"
><el-input
v-model=
"da.Rate"
type=
"text"
@
blur=
"addList(2,daIn+1)"
@
change=
"Calculation(2,daIn+1)"
class=
"w80 _border_b_1"
></el-input></td>
<td
height=
"26px"
><el-input
v-model=
"da.Rate"
:disabled=
"true"
type=
"text"
@
blur=
"addList(2,daIn+1)"
@
change=
"Calculation(2,daIn+1)"
class=
"w80 _border_b_1"
></el-input></td>
<td
height=
"26px"
>
{{
da
.
bTotalPrice
}}
</td>
<td
height=
"26px"
><el-input
v-model=
"da.Remark"
type=
"textarea"
class=
"w80 _border_b_1"
></el-input>
<i
@
click=
"deleteRow(daIn,da)"
class=
"_delete_row iconfont icon-img_delete_small"
></i></td>
</tr>
...
...
@@ -355,7 +355,7 @@
</el-select>
</td>
<td>
{{detailList.yTotalPrice}}
</td>
<td><el-input
v-model=
"detailList.Rate"
type=
"text"
@
blur=
"addList(1)"
@
change=
"Calculation(1)"
class=
"w80 _border_b_1"
></el-input></td>
<td><el-input
v-model=
"detailList.Rate"
:disabled=
"true"
type=
"text"
@
blur=
"addList(1)"
@
change=
"Calculation(1)"
class=
"w80 _border_b_1"
></el-input></td>
<td>
{{detailList.bTotalPrice}}
</td>
<td><el-input
v-model=
"detailList.Remark"
type=
"textarea"
@
blur=
"addList(1)"
class=
"w80 _border_b_1"
></el-input></td>
</tr>
...
...
@@ -1178,6 +1178,7 @@ export default {
this
.
apipost
(
'Financial_post_Get'
,{
ID
:
id
,
TempId
:
tempId
,
TCIDList
:(
this
.
orderObj
&&
this
.
orderObj
.
TCIDList
)?
this
.
orderObj
.
TCIDList
:[]},
res
=>
{
// console.log(this.orderObj.TCIDList)
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
"res.data"
,
res
.
data
)
let
data
=
res
.
data
.
data
;
data
.
IsLeader
=
1
;
this
.
msg
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
...
...
@@ -1226,6 +1227,7 @@ export default {
this
.
IsUploadPic
=
data
.
IsUploadPic
;
this
.
msg
.
IsPublic
=
data
.
IsPublic
;
this
.
GetDetail
=
data
;
this
.
Description
=
this
.
GetDetail
.
Description
;
if
(
this
.
orderObj
){
this
.
msg
.
OrderID
=
this
.
orderObj
.
OrderID
?
this
.
orderObj
.
OrderID
:
0
;
this
.
OrderSource
=
this
.
msg
.
OrderSource
=
this
.
orderObj
.
OrderSource
?
this
.
orderObj
.
OrderSource
:
0
;
...
...
@@ -1309,9 +1311,11 @@ export default {
if
(
this
.
orderObj
!=
null
&&
this
.
orderObj
.
OrderSource
===
10
){
that
.
Description
=
"旅客名单:"
;
that
.
describeList
=
JSON
.
parse
(
sessionStorage
.
getItem
(
"saveGuestInfo"
));
console
.
log
(
"that.describeList"
,
that
.
describeList
)
that
.
describeList
.
forEach
(
item
=>
{
that
.
Description
+=
item
.
GuestName
+
" "
;
})
console
.
log
(
"that.Description"
,
that
.
Description
)
}
},
mounted
(){
let
userInfo
=
this
.
getLocalStorage
();
...
...
src/components/FinancialModule/addFinancialGZDocuments.vue
View file @
1071fb19
...
...
@@ -279,7 +279,7 @@
</el-select>
</td>
<td
height=
"26px"
>
{{
da
.
yTotalPrice
}}
</td>
<td
height=
"26px"
><el-input
v-model=
"da.Rate"
type=
"text"
@
blur=
"addList(2,daIn+1)"
@
change=
"Calculation(2,daIn+1)"
class=
"w80 _border_b_1"
></el-input></td>
<td
height=
"26px"
><el-input
v-model=
"da.Rate"
:disabled=
"true"
type=
"text"
@
blur=
"addList(2,daIn+1)"
@
change=
"Calculation(2,daIn+1)"
class=
"w80 _border_b_1"
></el-input></td>
<td
height=
"26px"
>
{{
da
.
bTotalPrice
}}
</td>
<td
height=
"26px"
>
<el-select
...
...
@@ -343,7 +343,7 @@
</el-select>
</td>
<td>
{{detailList.yTotalPrice}}
</td>
<td><el-input
v-model=
"detailList.Rate"
type=
"text"
@
blur=
"addList(1)"
@
change=
"Calculation(1)"
class=
"w80 _border_b_1"
></el-input></td>
<td><el-input
v-model=
"detailList.Rate"
:disabled=
"true"
type=
"text"
@
blur=
"addList(1)"
@
change=
"Calculation(1)"
class=
"w80 _border_b_1"
></el-input></td>
<td>
{{detailList.bTotalPrice}}
</td>
<td
height=
"26px"
>
<el-select
...
...
src/components/FinancialModule/addReceivablesDocuments.vue
View file @
1071fb19
...
...
@@ -241,7 +241,8 @@
<span
class=
"w80"
>
{{
da
.
currenName
}}
</span>
</td>
<td
height=
"26px"
>
{{
da
.
yTotalPrice
}}
</td>
<td
height=
"26px"
><el-input
v-model=
"da.Rate"
type=
"text"
@
change=
"Calculation(2,daIn+1)"
@
blur=
"addList(2,daIn+1)"
class=
"w80 _border_b_1"
></el-input></td>
<!-- @change="Calculation(2,daIn+1)" @blur="addList(2,daIn+1)" -->
<td
height=
"26px"
><el-input
v-model=
"da.Rate"
:disabled=
"true"
type=
"text"
class=
"w80 _border_b_1"
></el-input></td>
<td
height=
"26px"
>
{{
da
.
bTotalPrice
}}
</td>
<td
height=
"26px"
><el-input
v-model=
"da.Remark"
type=
"textarea"
class=
"w80 _border_b_1"
></el-input>
<i
@
click=
"deleteRow(daIn,da)"
class=
"_delete_row iconfont icon-img_delete_small"
></i>
</td>
</tr>
...
...
@@ -272,7 +273,8 @@
<span
class=
"w110"
>
{{detailList.currenName}}
</span>
</td>
<td>
{{detailList.yTotalPrice}}
</td>
<td><el-input
v-model=
"detailList.Rate"
type=
"text"
@
change=
"Calculation(1)"
@
blur=
"addList(1)"
class=
"w80 _border_b_1"
></el-input></td>
<!-- @change="Calculation(1)" @blur="addList(1)" -->
<td><el-input
v-model=
"detailList.Rate"
:disabled=
"true"
type=
"text"
class=
"w80 _border_b_1"
></el-input></td>
<td>
{{detailList.bTotalPrice}}
</td>
<td><el-input
v-model=
"detailList.Remark"
@
blur=
"addList(1)"
type=
"textarea"
class=
"w80 _border_b_1"
></el-input></td>
</tr>
...
...
@@ -1307,6 +1309,7 @@ export default {
// })
// TCID.split(0,TCID.length-1)
this
.
apipost
(
'Financial_post_Get'
,{
ID
:
id
,
TempId
:
tempId
,
TCIDList
:(
this
.
orderObj
&&
this
.
orderObj
.
TCIDList
)?
this
.
orderObj
.
TCIDList
:[]},
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
res
.
data
.
data
;
this
.
msg
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
...
...
src/components/SalesModule/groupTourOrder.vue
View file @
1071fb19
...
...
@@ -1786,7 +1786,7 @@
<td
colspan=
"4"
class=
"groupTourOrder_remarks"
style=
"height: 40px;"
>
<div>
<div><span>
备注:
</span>
<p><span
v-
if=
"item.tsId>0"
>
投诉单号:
<a
href=
"javascript:void(0);"
@
click=
"goUrlTS('ComplaintsDetail',item.tsId,item.orderId,'投诉详情')"
>
{{
item
.
tsId
}}
</a>
;
</span><span
<p><span
v-
for=
"ts in item.tsIdList"
>
投诉单号:
<a
href=
"javascript:void(0);"
@
click=
"goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')"
>
{{
ts
}}
</a>
;
</span><span
v-if=
'item.clientSource==1&&item.brandName!=""'
>
{{
item
.
brandName
}}
订单
{{
item
.
platformOrder
}}
;
</span>
{{
item
.
remarks
}}
</p></div>
<div>
...
...
@@ -3486,7 +3486,8 @@
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
loading
=
false
this
.
total
=
res
.
data
.
data
.
count
this
.
list
=
res
.
data
.
data
.
pageData
this
.
list
=
res
.
data
.
data
.
pageData
;
console
.
log
(
"this.list"
,
this
.
list
)
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
)
}
...
...
src/components/SalesModule/groupTourOrderByTuan.vue
View file @
1071fb19
...
...
@@ -1773,7 +1773,7 @@
<td
colspan=
"4"
class=
"groupTourOrder_remarks"
style=
"height: 40px;"
>
<div>
<div><span>
备注:
</span><p>
<span
v-
if=
"item.tsId>0"
>
投诉单号:
<a
href=
"javascript:void(0);"
@
click=
"goUrlTS('ComplaintsDetail',item.tsId,item.orderId,'投诉详情')"
>
{{
item
.
tsId
}}
</a>
;
</span>
<span
v-
for=
"ts in item.tsIdList"
>
投诉单号:
<a
href=
"javascript:void(0);"
@
click=
"goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')"
>
{{
ts
}}
</a>
;
</span>
<span
v-if=
'item.clientSource==1&&item.brandName!=""'
>
{{
item
.
brandName
}}
订单
{{
item
.
platformOrder
}}
;
</span>
{{
item
.
remarks
}}
</p></div>
<div>
<!--
<span>
{{
item
.
remarksName
}}
 
{{
item
.
rematksTime
}}
</span>
-->
...
...
@@ -3998,6 +3998,7 @@ submitYSZEForm(){
this
.
tuanMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
console
.
log
(
"res"
,
res
);
this
.
loading
=
false
;
this
.
total
=
res
.
data
.
data
.
count
;
this
.
list
=
res
.
data
.
data
.
pageData
.
rtData
;
...
...
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