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
54bfa520
Commit
54bfa520
authored
Jul 17, 2025
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合并 流水科目
parent
db9ed457
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
54 additions
and
18 deletions
+54
-18
fill.js
src/assets/common/lang/zhCN/fill.js
+5
-0
index.vue
...nts/FinancialModule/BankStatementReconciliation/index.vue
+20
-14
CompanyAccDetail.vue
...components/FinancialModule/accDetail/CompanyAccDetail.vue
+29
-4
No files found.
src/assets/common/lang/zhCN/fill.js
View file @
54bfa520
...
@@ -8175,6 +8175,11 @@ export const obj = {
...
@@ -8175,6 +8175,11 @@ export const obj = {
yinhangshouru
:
'银行收入'
,
yinhangshouru
:
'银行收入'
,
yinhangzhichu
:
'银行支出'
,
yinhangzhichu
:
'银行支出'
,
liushui
:
'流水'
,
liushui
:
'流水'
,
liushukemu
:
'流水科目'
,
qingxuanzlskm
:
'请选择流水科目'
,
yongtu
:
'用途'
,
danjusr
:
'单据收入'
,
danjuzc
:
'单据支出'
,
}
}
//#endregion
//#endregion
}
}
...
...
src/components/FinancialModule/BankStatementReconciliation/index.vue
View file @
54bfa520
...
@@ -131,20 +131,21 @@
...
@@ -131,20 +131,21 @@
<input
v-if=
"SubjectTypeList&&SubjectTypeList.length>0"
type=
"button"
class=
"normalBtn"
:value=
"$t('objFill.v103.xinzenliushuiu')"
@
click=
"addBankStatement"
/>
<input
v-if=
"SubjectTypeList&&SubjectTypeList.length>0"
type=
"button"
class=
"normalBtn"
:value=
"$t('objFill.v103.xinzenliushuiu')"
@
click=
"addBankStatement"
/>
<input
type=
"button"
class=
"hollowFixedBtn"
:value=
"$t('objFill.v101.FinancialModule.xinzengkem')"
@
click=
"isShowAdd=true"
/>
<input
type=
"button"
class=
"hollowFixedBtn"
:value=
"$t('objFill.v101.FinancialModule.xinzengkem')"
@
click=
"isShowAdd=true"
/>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('objFill.duizhnagkm')+$t('ground.liebiao')"
@
click=
"isShow=true"
/>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('objFill.duizhnagkm')+$t('ground.liebiao')"
@
click=
"isShow=true"
/>
<input
type=
"button"
class=
"hollowFixedBtn"
:value=
"$t('visa.v_daochu')"
@
click=
"Export()"
/>
</li>
</li>
</ul>
</ul>
</div>
</div>
<div
class=
"cm_content"
>
<div
class=
"cm_content"
>
<el-table
:data=
"SubjectList"
<el-table
:data=
"SubjectList"
style=
"width: 100%;
max-height: 600px;
"
style=
"width: 100%;
"
height=
"600
"
v-loading=
"loadingTable"
v-loading=
"loadingTable"
:span-method=
"objectSpanMethod"
>
:span-method=
"objectSpanMethod"
>
<el-table-column
prop=
"Name"
label=
""
width=
"150"
fixed=
"left"
align=
"center"
>
<el-table-column
prop=
"Name"
label=
""
width=
"150"
fixed=
"left"
align=
"center"
>
<template
#
header
>
<template
#
header
>
<div
class=
"headeBox"
>
<div
class=
"headeBox"
>
<div>
{{
titleStart
}}{{
titleStart
!=
titleEnd
?
'-'
+
titleEnd
:
''
}}
月
</div>
<div>
{{
titleStart
}}{{
titleStart
!=
titleEnd
?
'-'
+
titleEnd
:
''
}}
{{
$t
(
'ground.yuefen'
)
}}
</div>
<div>
期初余额
</div>
<div>
{{
$t
(
'objFill.v103.qichuyue'
)
}}
</div>
<div>
用途
</div>
<div>
{{
$t
(
'objFill.v103.yongtu'
)
}}
</div>
</div>
</div>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
@@ -156,14 +157,14 @@
...
@@ -156,14 +157,14 @@
<div
style=
"cursor: pointer;"
@
click=
"getTimeObj(item)"
>
{{
String
(
item
.
StartDate
)
}}
<i
style=
"color: #33B3FF"
class=
"el-icon-edit"
></i>
</div>
<div
style=
"cursor: pointer;"
@
click=
"getTimeObj(item)"
>
{{
String
(
item
.
StartDate
)
}}
<i
style=
"color: #33B3FF"
class=
"el-icon-edit"
></i>
</div>
</
template
>
</
template
>
<el-table-column
:label=
"String(item.StartBalance)"
align=
"center"
>
<el-table-column
:label=
"String(item.StartBalance)"
align=
"center"
>
<el-table-column
prop=
"Income"
label=
"银行收入
"
width=
"120"
align=
"center"
>
<el-table-column
prop=
"Income"
:label=
"$t('objFill.v103.yinhangshouru')
"
width=
"120"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<template
v-if=
"scope.row.SubjectId!=-6"
>
<template
v-if=
"scope.row.SubjectId!=-6"
>
{{
scope
.
row
.
BalanceList
[
index
].
Income
}}
{{
scope
.
row
.
BalanceList
[
index
].
Income
}}
</
template
>
</
template
>
<
template
v-else
>
<
template
v-else
>
<el-image
v-if=
"scope.row.BalanceList[index].Image"
<el-image
v-if=
"scope.row.BalanceList[index].Image"
style=
"width: 20px; height: 20px;
margin-top: 10px;
"
style=
"width: 20px; height: 20px;"
:src=
"scope.row.BalanceList[index].Image"
:src=
"scope.row.BalanceList[index].Image"
:preview-src-list=
"[scope.row.BalanceList[index].Image]"
:preview-src-list=
"[scope.row.BalanceList[index].Image]"
show-progress
show-progress
...
@@ -172,21 +173,21 @@
...
@@ -172,21 +173,21 @@
</
template
>
</
template
>
</template>
</template>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"FinanceIncome"
label=
"单据收入
"
width=
"120"
align=
"center"
>
<el-table-column
prop=
"FinanceIncome"
:label=
"$t('objFill.v103.danjusr')
"
width=
"120"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<template
v-if=
"scope.row.SubjectId!=-6"
>
<template
v-if=
"scope.row.SubjectId!=-6"
>
{{
scope
.
row
.
BalanceList
[
index
].
FinanceIncome
}}
{{
scope
.
row
.
BalanceList
[
index
].
FinanceIncome
}}
</
template
>
</
template
>
</template>
</template>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"Expenses"
label=
"银行支出
"
width=
"120"
align=
"center"
>
<el-table-column
prop=
"Expenses"
:label=
"$t('objFill.v103.yinhangzhichu')
"
width=
"120"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<template
v-if=
"scope.row.SubjectId!=-6"
>
<template
v-if=
"scope.row.SubjectId!=-6"
>
{{
scope
.
row
.
BalanceList
[
index
].
Expenses
}}
{{
scope
.
row
.
BalanceList
[
index
].
Expenses
}}
</
template
>
</
template
>
</template>
</template>
</el-table-column>
</el-table-column>
<el-table-column
prop=
"FinanceExpenses"
label=
"单据支出
"
width=
"120"
align=
"center"
>
<el-table-column
prop=
"FinanceExpenses"
:label=
"$t('objFill.v103.danjuzc')
"
width=
"120"
align=
"center"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<template
v-if=
"scope.row.SubjectId!=-6"
>
<template
v-if=
"scope.row.SubjectId!=-6"
>
{{
scope
.
row
.
BalanceList
[
index
].
FinanceExpenses
}}
{{
scope
.
row
.
BalanceList
[
index
].
FinanceExpenses
}}
...
@@ -250,14 +251,14 @@ export default {
...
@@ -250,14 +251,14 @@ export default {
Income
:
0
,
// 银行收入
Income
:
0
,
// 银行收入
Expenses
:
0
,
//银行支出
Expenses
:
0
,
//银行支出
},
},
SubjectTypeList
:[]
SubjectTypeList
:[]
,
}
}
},
},
created
(){
created
(){
//
let mon1= this.getBeforeDate(1, new Date().Format("yyyy-MM-dd"));
let
mon1
=
this
.
getBeforeDate
(
1
,
new
Date
().
Format
(
"yyyy-MM-dd"
));
//
let mon2= this.getBeforeDate(7, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
let
mon2
=
this
.
getBeforeDate
(
7
,
this
.
getBeforeDate
(
0
,
new
Date
().
Format
(
"yyyy-MM-dd"
)))
let
mon1
=
this
.
getBeforeDate
(
12
,
new
Date
().
Format
(
"yyyy-MM-dd"
));
//
let mon1= this.getBeforeDate(12, new Date().Format("yyyy-MM-dd"));
let
mon2
=
this
.
getBeforeDate
(
16
,
this
.
getBeforeDate
(
0
,
new
Date
().
Format
(
"yyyy-MM-dd"
)))
//
let mon2= this.getBeforeDate(16, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
this
.
titleStart
=
mon2
.
slice
(
5
,
7
)
>
9
?
mon2
.
slice
(
5
,
7
):
mon2
.
slice
(
6
,
7
)
this
.
titleStart
=
mon2
.
slice
(
5
,
7
)
>
9
?
mon2
.
slice
(
5
,
7
):
mon2
.
slice
(
6
,
7
)
this
.
titleEnd
=
mon1
.
slice
(
5
,
7
)
>
9
?
mon1
.
slice
(
5
,
7
):
mon1
.
slice
(
6
,
7
)
this
.
titleEnd
=
mon1
.
slice
(
5
,
7
)
>
9
?
mon1
.
slice
(
5
,
7
):
mon1
.
slice
(
6
,
7
)
this
.
productionDate
=
[
mon2
,
mon1
];
this
.
productionDate
=
[
mon2
,
mon1
];
...
@@ -267,6 +268,11 @@ export default {
...
@@ -267,6 +268,11 @@ export default {
this
.
getList
();
this
.
getList
();
},
},
methods
:{
methods
:{
Export
(){
let
msg
=
this
.
msg
;
var
fileName
=
this
.
$t
(
'objFill.duizhnagkm'
)
+
".xls"
;
this
.
GetLocalFile
(
"Financial_post_DownLoadBankBalance"
,
msg
,
fileName
);
},
changeDataBan
(){
changeDataBan
(){
this
.
isShowBankSta
=
false
this
.
isShowBankSta
=
false
this
.
getList
();
this
.
getList
();
...
...
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @
54bfa520
...
@@ -385,7 +385,7 @@
...
@@ -385,7 +385,7 @@
<
/tr
>
<
/tr
>
<
tr
v
-
if
=
"BillType===2"
>
<
tr
v
-
if
=
"BillType===2"
>
<
td
>
{{
$t
(
'fnc.jiaoyiriqi'
)
}}
<
/td
>
<
td
>
{{
$t
(
'fnc.jiaoyiriqi'
)
}}
<
/td
>
<
td
colspan
=
"
4
"
>
<
td
colspan
=
"
1
"
>
<
el
-
date
-
picker
<
el
-
date
-
picker
class
=
"width100b"
class
=
"width100b"
v
-
model
=
"addMsg.TradeDate"
v
-
model
=
"addMsg.TradeDate"
...
@@ -395,7 +395,20 @@
...
@@ -395,7 +395,20 @@
:
placeholder
=
"$t('admin.admin_choDate')"
>
:
placeholder
=
"$t('admin.admin_choDate')"
>
<
/el-date-picker
>
<
/el-date-picker
>
<
/td
>
<
/td
>
<
td
colspan
=
"3"
>
<
td
>
{{
$t
(
'objFill.v103.liushukemu'
)
}}
<
/td
>
<
td
colspan
=
"2"
>
<
el
-
select
class
=
"width100b"
v
-
model
=
"addMsg.BankSubjectId"
filterable
:
placeholder
=
"$t('objFill.v103.qingxuanzlskm')"
>
<
el
-
option
v
-
for
=
"item in SubjectTypeList"
:
key
=
"item.Id"
:
label
=
"item.Name"
:
value
=
"item.Id"
/>
<
/el-select
>
<
/td
>
<
td
colspan
=
"2"
>
<
el
-
checkbox
v
-
model
=
"addMsg.IsAdvanceFinance"
true
-
label
=
"1"
false
-
label
=
"0"
>
包含预付
<
/el-checkbox
>
<
el
-
checkbox
v
-
model
=
"addMsg.IsAdvanceFinance"
true
-
label
=
"1"
false
-
label
=
"0"
>
包含预付
<
/el-checkbox
>
<
/td
>
<
/td
>
<
/tr
>
<
/tr
>
...
@@ -552,7 +565,8 @@ export default {
...
@@ -552,7 +565,8 @@ export default {
TradeDate
:
''
,
TradeDate
:
''
,
BankList
:[],
BankList
:[],
vorcherInos
:[],
vorcherInos
:[],
IsAdvanceFinance
:
'0'
IsAdvanceFinance
:
'0'
,
BankSubjectId
:
''
,
}
,
}
,
AccListT
:[],
AccListT
:[],
accountListT
:[],
accountListT
:[],
...
@@ -573,6 +587,7 @@ export default {
...
@@ -573,6 +587,7 @@ export default {
saveMsg
:[],
saveMsg
:[],
TradeDate
:
''
,
TradeDate
:
''
,
initialIndex
:
0
,
initialIndex
:
0
,
SubjectTypeList
:
[],
}
}
}
,
}
,
created
(){
created
(){
...
@@ -581,6 +596,7 @@ export default {
...
@@ -581,6 +596,7 @@ export default {
// this.productionDateByTC = [StartDate, EndDate]
// this.productionDateByTC = [StartDate, EndDate]
// this.msg.QStartDate = this.productionDateByTC[0];
// this.msg.QStartDate = this.productionDateByTC[0];
// this.msg.QEndDate = this.productionDateByTC[1];
// this.msg.QEndDate = this.productionDateByTC[1];
this
.
getSubjectList
()
this
.
userInfo
=
this
.
getLocalStorage
();
this
.
userInfo
=
this
.
getLocalStorage
();
if
(
this
.
$route
.
query
.
DayReport
&&
this
.
$route
.
query
.
DayReport
==
'1'
){
if
(
this
.
$route
.
query
.
DayReport
&&
this
.
$route
.
query
.
DayReport
==
'1'
){
...
@@ -611,10 +627,18 @@ export default {
...
@@ -611,10 +627,18 @@ export default {
}
)
}
)
this
.
bankaccount_post_GetList
();
this
.
bankaccount_post_GetList
();
this
.
getList
();
this
.
getList
();
}
}
}
,
}
,
methods
:{
methods
:{
getSubjectList
(){
this
.
apipost
(
"Financial_post_GetBankSubjectList"
,
{
}
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
SubjectTypeList
=
res
.
data
.
data
;
}
}
,
null
)
}
,
//选择付款对象出现全选框
//选择付款对象出现全选框
getClientId
(
id
){
getClientId
(
id
){
if
(
id
>
0
||
this
.
AccountId
>
0
){
if
(
id
>
0
||
this
.
AccountId
>
0
){
...
@@ -827,7 +851,8 @@ export default {
...
@@ -827,7 +851,8 @@ export default {
TradeDate
:
''
,
TradeDate
:
''
,
BankList
:[],
BankList
:[],
vorcherInos
:[],
vorcherInos
:[],
IsAdvanceFinance
:
'0'
IsAdvanceFinance
:
'0'
,
BankSubjectId
:
''
,
}
}
}
,
}
,
Calculation
(
i
,
index
){
// 计算价格
Calculation
(
i
,
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