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
2ad9720d
Commit
2ad9720d
authored
Apr 22, 2019
by
liudong1993
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
营收报表修复,老挝地接资金池增加
parent
8bcd5610
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
MonthReport.vue
src/components/FinancialModule/ReportForm/MonthReport.vue
+1
-1
TeamRevenueReport.vue
...mponents/FinancialModule/ReportForm/TeamRevenueReport.vue
+3
-1
addReceivablesDocuments.vue
src/components/FinancialModule/addReceivablesDocuments.vue
+1
-1
No files found.
src/components/FinancialModule/ReportForm/MonthReport.vue
View file @
2ad9720d
...
@@ -629,7 +629,7 @@ export default {
...
@@ -629,7 +629,7 @@ export default {
let
userInfo
=
this
.
getLocalStorage
();
let
userInfo
=
this
.
getLocalStorage
();
this
.
getCompanyMsg
.
RB_Group_Id
=
userInfo
.
RB_Group_id
;
//集团ID
this
.
getCompanyMsg
.
RB_Group_Id
=
userInfo
.
RB_Group_id
;
//集团ID
this
.
userId
=
userInfo
.
EmployeeId
;
this
.
userId
=
userInfo
.
EmployeeId
;
this
.
msg
.
OutBranchId
=
-
1
;
this
.
msg
.
OutBranchId
=
0
;
this
.
msg
.
LineId
=
14
;
this
.
msg
.
LineId
=
14
;
this
.
getCompanyList
();
this
.
getCompanyList
();
...
...
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @
2ad9720d
...
@@ -508,7 +508,8 @@ tr._item_list td:last-child {
...
@@ -508,7 +508,8 @@ tr._item_list td:last-child {
<el-option
value=
"2"
label=
"国际机票"
></el-option>
<el-option
value=
"2"
label=
"国际机票"
></el-option>
<el-option
value=
"4"
label=
"国内票务"
></el-option>
<el-option
value=
"4"
label=
"国内票务"
></el-option>
<el-option
value=
"5"
label=
"散卖机票"
></el-option>
<el-option
value=
"5"
label=
"散卖机票"
></el-option>
<el-option
value=
"6"
label=
"地接部专户"
></el-option>
<el-option
value=
"6"
label=
"日本地接部专户"
></el-option>
<el-option
value=
"7"
label=
"老挝地接部专户"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
...
@@ -645,6 +646,7 @@ Vue.component("TCNUMJump", {
...
@@ -645,6 +646,7 @@ Vue.component("TCNUMJump", {
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',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">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===7">{{rowData.TCNUM}}</span>
</div>`
,
</div>`
,
props
:
{
props
:
{
rowData
:
{
rowData
:
{
...
...
src/components/FinancialModule/addReceivablesDocuments.vue
View file @
2ad9720d
...
@@ -1023,7 +1023,7 @@ export default {
...
@@ -1023,7 +1023,7 @@ export default {
}
}
if
(
x
.
Type
===
4
){
if
(
x
.
Type
===
4
){
AccList
.
forEach
(
y
=>
{
AccList
.
forEach
(
y
=>
{
if
(
y
.
Name
===
'公社资金池'
||
y
.
Name
===
'水口资金池'
||
y
.
Name
===
'橡胶资金池'
||
y
.
Name
==
'地接部专户'
){
if
(
y
.
Name
===
'公社资金池'
||
y
.
Name
===
'水口资金池'
||
y
.
Name
===
'橡胶资金池'
||
y
.
Name
==
'地接部专户'
||
y
.
Name
==
'老挝购物店资金池'
){
newAccList
.
push
(
y
)
newAccList
.
push
(
y
)
}
}
})
})
...
...
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