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
ce2909d4
Commit
ce2909d4
authored
5 years ago
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
af5a9f97
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
6 deletions
+29
-6
RecPayQuery.vue
src/components/FinancialModule/RecPayQuery.vue
+9
-4
TeamRevenueReport.vue
...mponents/FinancialModule/ReportForm/TeamRevenueReport.vue
+20
-2
No files found.
src/components/FinancialModule/RecPayQuery.vue
View file @
ce2909d4
...
@@ -842,6 +842,12 @@ export default {
...
@@ -842,6 +842,12 @@ export default {
if
(
this
.
$route
.
query
.
Type
){
if
(
this
.
$route
.
query
.
Type
){
this
.
msg
.
Type
=
this
.
$route
.
query
.
Type
+
''
;
this
.
msg
.
Type
=
this
.
$route
.
query
.
Type
+
''
;
}
}
if
(
this
.
$route
.
query
.
rec
){
this
.
msg
.
AccountType
=
15
;
this
.
msg
.
TradeWay
=
4
;
this
.
getAccountList
(
this
.
msg
.
AccountType
,
this
.
msg
.
TradeWay
)
this
.
msg
.
BankID
=
14
;
}
},
components
:
{
},
components
:
{
"my-Bill"
:
myBill
,
"my-Bill"
:
myBill
,
"my-RVB-Bill"
:
myrbvBill
,
"my-RVB-Bill"
:
myrbvBill
,
...
@@ -949,7 +955,7 @@ export default {
...
@@ -949,7 +955,7 @@ export default {
this
.
$message
.
error
(
res
.
data
.
message
);
this
.
$message
.
error
(
res
.
data
.
message
);
}
}
// this.msg.TCID= this.msg.TCID==0?this.msg.TCID:'';
// this.msg.TCID= this.msg.TCID==0?this.msg.TCID:'';
this
.
queryInfoInit
();
//
this.queryInfoInit();
this
.
currentPage
=
parseInt
(
this
.
msg
.
pageIndex
);
this
.
currentPage
=
parseInt
(
this
.
msg
.
pageIndex
);
},
err
=>
{})
},
err
=>
{})
},
},
...
@@ -1049,7 +1055,6 @@ export default {
...
@@ -1049,7 +1055,6 @@ export default {
},
},
getAccountList
(
i
,
t
){
//收款账户
getAccountList
(
i
,
t
){
//收款账户
let
accountList
=
[];
let
accountList
=
[];
this
.
msg
.
BankID
=
""
;
if
(
t
==
1
){
// 银行
if
(
t
==
1
){
// 银行
this
.
apipost
(
'bankaccount_post_GetList'
,{
TypeId
:
i
},
res
=>
{
this
.
apipost
(
'bankaccount_post_GetList'
,{
TypeId
:
i
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
...
...
This diff is collapsed.
Click to expand it.
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @
ce2909d4
...
@@ -614,6 +614,7 @@ tr._item_list td:last-child {
...
@@ -614,6 +614,7 @@ tr._item_list td:last-child {
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
moment
from
'moment'
import
Vue
from
"vue"
;
import
Vue
from
"vue"
;
import
XLSX
from
"xlsx"
;
import
XLSX
from
"xlsx"
;
import
downloadExcelEasy
from
"../../../assets/utils/downloadExcelEasy"
;
import
downloadExcelEasy
from
"../../../assets/utils/downloadExcelEasy"
;
...
@@ -663,8 +664,8 @@ Vue.component("TCNUMJump", {
...
@@ -663,8 +664,8 @@ Vue.component("TCNUMJump", {
<span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrlExtend('individualTicket',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrlExtend('individualTicket',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===6"
@click="goRec('RecPayQuery',rowData)"
>{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===7">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===7"
@click="goRec('RecPayQuery',rowData)"
>{{rowData.TCNUM}}</span>
</div>`
,
</div>`
,
props
:
{
props
:
{
rowData
:
{
rowData
:
{
...
@@ -678,6 +679,23 @@ Vue.component("TCNUMJump", {
...
@@ -678,6 +679,23 @@ Vue.component("TCNUMJump", {
}
}
},
},
methods
:
{
methods
:
{
goRec
(
path
,
rowData
){
let
BankID
=
""
;
let
StartDate
=
""
;
if
(
rowData
.
DataType
===
6
){
BankID
=
14
;
}
if
(
rowData
.
DataType
===
7
){
BankID
=
15
;
}
if
(
rowData
.
TCNUM
.
indexOf
(
'JAP'
)
!=-
1
||
rowData
.
TCNUM
.
indexOf
(
'LAO'
)
!=-
1
){
StartDate
=
moment
(
rowData
.
StartDate
).
format
(
"YYYY-MM-DD"
);
}
this
.
$router
.
push
({
path
:
"/"
+
path
,
query
:
{
'rec'
:
'rec'
,
'StartDate'
:
StartDate
,
"BankID"
:
BankID
,
blank
:
"y"
}
});
},
goUrl
(
path
,
id
)
{
goUrl
(
path
,
id
)
{
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
"/"
+
path
,
path
:
"/"
+
path
,
...
...
This diff is collapsed.
Click to expand it.
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