Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
confucius
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
罗超
confucius
Commits
94a2a591
Commit
94a2a591
authored
Dec 23, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
f341cc82
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
275 additions
and
211 deletions
+275
-211
CostType.vue
src/pages/financial/CostType.vue
+1
-1
PlatformAccount.vue
src/pages/financial/PlatformAccount.vue
+1
-1
TeamRevenueReport.vue
src/pages/financial/TeamRevenueReport.vue
+1
-1
CashAccDetail.vue
src/pages/financial/accDetail/CashAccDetail.vue
+1
-1
CashReport.vue
src/pages/financial/accDetail/CashReport.vue
+1
-7
CompanyAccDetail.vue
src/pages/financial/accDetail/CompanyAccDetail.vue
+1
-1
PlatformAccDetail.vue
src/pages/financial/accDetail/PlatformAccDetail.vue
+1
-1
TransferReport.vue
src/pages/financial/accDetail/TransferReport.vue
+1
-1
CapitalAllocation.vue
src/pages/financial/financalDocument/CapitalAllocation.vue
+214
-148
FinancialDocuments.vue
src/pages/financial/financalDocument/FinancialDocuments.vue
+52
-48
RecPayQuery.vue
src/pages/financial/financalDocument/RecPayQuery.vue
+1
-1
No files found.
src/pages/financial/CostType.vue
View file @
94a2a591
...
@@ -765,7 +765,7 @@
...
@@ -765,7 +765,7 @@
},
},
//导出费用类型明细报表
//导出费用类型明细报表
method5
:
function
()
{
method5
:
function
()
{
this
.
GetLocalFile
(
"financeinfo_post_OutToCostTypeExcel"
,
this
.
msg
,
"费用类型明细报表.xls"
);
this
.
Get
Erp
LocalFile
(
"financeinfo_post_OutToCostTypeExcel"
,
this
.
msg
,
"费用类型明细报表.xls"
);
}
,
}
,
editCurency
(
id
){
// 修改信息
editCurency
(
id
){
// 修改信息
this
.
apipost
(
'financeinfo_post_GetCostType'
,{
ID
:
id
},
res
=>
{
this
.
apipost
(
'financeinfo_post_GetCostType'
,{
ID
:
id
},
res
=>
{
...
...
src/pages/financial/PlatformAccount.vue
View file @
94a2a591
...
@@ -1022,7 +1022,7 @@
...
@@ -1022,7 +1022,7 @@
let
msg
=
this
.
msg
;
let
msg
=
this
.
msg
;
let
userInfo
=
this
.
getLocalStorage
();
let
userInfo
=
this
.
getLocalStorage
();
msg
.
UId
=
userInfo
.
Id
;
msg
.
UId
=
userInfo
.
Id
;
this
.
GetLocalFile
(
this
.
Get
Erp
LocalFile
(
"BankAccount_post_OutToExcelPlatform"
,
"BankAccount_post_OutToExcelPlatform"
,
msg
,
msg
,
"平台账户.xls"
"平台账户.xls"
...
...
src/pages/financial/TeamRevenueReport.vue
View file @
94a2a591
...
@@ -2046,7 +2046,7 @@
...
@@ -2046,7 +2046,7 @@
delete
msg
.
pageIndex
;
delete
msg
.
pageIndex
;
delete
msg
.
pageSize
;
delete
msg
.
pageSize
;
msg
.
EmployeeId
=
this
.
userId
;
msg
.
EmployeeId
=
this
.
userId
;
this
.
GetLocalFile
(
this
.
Get
Erp
LocalFile
(
"financestatistics_post_OutToExcelRevenueReportList"
,
"financestatistics_post_OutToExcelRevenueReportList"
,
msg
,
msg
,
"营收报表.xls"
"营收报表.xls"
...
...
src/pages/financial/accDetail/CashAccDetail.vue
View file @
94a2a591
...
@@ -522,7 +522,7 @@
...
@@ -522,7 +522,7 @@
msg
.
EmployeeId
=
this
.
userInfo
.
EmployeeId
;
msg
.
EmployeeId
=
this
.
userInfo
.
EmployeeId
;
msg
.
AccountToExcelType
=
1
;
msg
.
AccountToExcelType
=
1
;
var
fileName
=
"现金账户明细.xls"
;
var
fileName
=
"现金账户明细.xls"
;
this
.
GetLocalFile
(
"Financial_post_OutToExcelAccountDetailList"
,
msg
,
fileName
);
this
.
Get
Erp
LocalFile
(
"Financial_post_OutToExcelAccountDetailList"
,
msg
,
fileName
);
},
},
addChuNaFun
(){
// 添加出纳按钮点击事件
addChuNaFun
(){
// 添加出纳按钮点击事件
let
count
=
0
;
let
count
=
0
;
...
...
src/pages/financial/accDetail/CashReport.vue
View file @
94a2a591
...
@@ -273,14 +273,8 @@
...
@@ -273,14 +273,8 @@
this
.
currentPage
=
1
;
this
.
currentPage
=
1
;
},
},
method5
:
function
()
{
method5
:
function
()
{
this
.
GetLocalFile
(
"Financial_post_CashOutToGetReportList"
,
this
.
msg
,
"现金日报表.xls"
);
this
.
Get
Erp
LocalFile
(
"Financial_post_CashOutToGetReportList"
,
this
.
msg
,
"现金日报表.xls"
);
},
},
// goUrl(path,id,type,typeid){
// this.$router.push({
// path: '/' + path,
// query: {'Is_Cashier':1,'typeid':type,'AccountId':id,'Type':type,'sTradeDate':this.msg.sTradeDate,'eTradeDate':this.msg.eTradeDate,blank:'y',tab:'现金账户明细'}
// })
// },
}
}
}
}
...
...
src/pages/financial/accDetail/CompanyAccDetail.vue
View file @
94a2a591
...
@@ -577,7 +577,7 @@
...
@@ -577,7 +577,7 @@
msg
.
EmployeeId
=
this
.
userInfo
.
EmployeeId
;
msg
.
EmployeeId
=
this
.
userInfo
.
EmployeeId
;
msg
.
AccountToExcelType
=
2
;
msg
.
AccountToExcelType
=
2
;
var
fileName
=
"银行账户明细.xls"
;
var
fileName
=
"银行账户明细.xls"
;
this
.
GetLocalFile
(
"Financial_post_OutToExcelAccountDetailList"
,
msg
,
fileName
);
this
.
Get
Erp
LocalFile
(
"Financial_post_OutToExcelAccountDetailList"
,
msg
,
fileName
);
},
},
goUrlNew
(
item
){
goUrlNew
(
item
){
let
status
=
false
;
let
status
=
false
;
...
...
src/pages/financial/accDetail/PlatformAccDetail.vue
View file @
94a2a591
...
@@ -483,7 +483,7 @@
...
@@ -483,7 +483,7 @@
msg
.
EmployeeId
=
this
.
userInfo
.
EmployeeId
;
msg
.
EmployeeId
=
this
.
userInfo
.
EmployeeId
;
msg
.
AccountToExcelType
=
3
;
msg
.
AccountToExcelType
=
3
;
var
fileName
=
"平台账户明细.xls"
;
var
fileName
=
"平台账户明细.xls"
;
this
.
GetLocalFile
(
"Financial_post_OutToExcelAccountDetailList"
,
msg
,
fileName
);
this
.
Get
Erp
LocalFile
(
"Financial_post_OutToExcelAccountDetailList"
,
msg
,
fileName
);
},
},
goUrlNew
(
item
){
goUrlNew
(
item
){
let
status
=
false
;
let
status
=
false
;
...
...
src/pages/financial/accDetail/TransferReport.vue
View file @
94a2a591
...
@@ -260,7 +260,7 @@
...
@@ -260,7 +260,7 @@
this
.
currentPage
=
1
;
this
.
currentPage
=
1
;
},
},
method5
:
function
()
{
method5
:
function
()
{
this
.
GetLocalFile
(
"Financial_post_OutToGetReportList"
,
this
.
msg
,
"银行日报表.xls"
);
this
.
Get
Erp
LocalFile
(
"Financial_post_OutToGetReportList"
,
this
.
msg
,
"银行日报表.xls"
);
},
},
}
}
}
}
...
...
src/pages/financial/financalDocument/CapitalAllocation.vue
View file @
94a2a591
<
style
>
<
style
>
@import
"../css/cssReset.css"
;
@import
"../css/cssReset.css"
;
.page_CapitalAllocation
.query-box
{
.page_CapitalAllocation
.query-box
{
padding
:
0
;
padding
:
0
;
border
:
0
border
:
0
}
}
.page_CapitalAllocation
.form
{
.page_CapitalAllocation
.form
{
padding-top
:
25px
;
padding-top
:
25px
;
}
}
.page_CapitalAllocation
.el-date-editor
.el-range-separator
{
.page_CapitalAllocation
.el-date-editor
.el-range-separator
{
padding
:
0
;
padding
:
0
;
line-height
:
29px
;
line-height
:
29px
;
}
}
.page_CapitalAllocation
.el-select
{
.page_CapitalAllocation
.el-select
{
width
:
100%
;
width
:
100%
;
}
}
.page_CapitalAllocation
.page_CapitalAllocation_list
{
.page_CapitalAllocation
.page_CapitalAllocation_list
{
width
:
100%
;
width
:
100%
;
}
}
.page_CapitalAllocation
i
.icon-sousuo
,
.page_CapitalAllocation
i
.el-icon-edit
{
.page_CapitalAllocation
i
.icon-sousuo
,
.page_CapitalAllocation
i
.el-icon-edit
{
width
:
30px
;
width
:
30px
;
height
:
30px
;
height
:
30px
;
display
:
inline-block
;
display
:
inline-block
;
...
@@ -30,24 +36,99 @@
...
@@ -30,24 +36,99 @@
cursor
:
pointer
;
cursor
:
pointer
;
outline
:
none
;
outline
:
none
;
}
}
.page_CapitalAllocation
i
.el-icon-edit
{
background-color
:
#00C6FF
;
font-size
:
16px
;}
.page_CapitalAllocation
i
.el-icon-edit
:hover
{
background-color
:
#59daff
}
.page_CapitalAllocation
i
.el-icon-edit
{
.page_CapitalAllocation
i
.el-icon-edit
:active
{
background-color
:
#00b8ec
}
background-color
:
#00C6FF
;
.page_CapitalAllocation
i
.icon-sousuo
{
background-color
:
#47BF8C
;}
font-size
:
16px
;
.page_CapitalAllocation
i
.icon-sousuo
:hover
{
background-color
:
#66bb97
}
}
.page_CapitalAllocation
i
.icon-sousuo
:active
{
background-color
:
#35ab79
}
.page_CapitalAllocation
._btn_group
{
font-size
:
14px
;}
.page_CapitalAllocation
i
.el-icon-edit
:hover
{
.page_CapitalAllocation
.icon-daiqueren
{
color
:
#4BCA81
}
background-color
:
#59daff
.page_CapitalAllocation
.icon-yiqueren
{
color
:
#4BCA81
}
}
.page_CapitalAllocation
.icon-yiquxiao
{
color
:
#959595
}
.page_CapitalAllocation
.icon-shenhebohui
{
color
:
#E95252
}
.page_CapitalAllocation
i
.el-icon-edit
:active
{
.page_CapitalAllocation
.icon-icon-zancun
{
color
:
#FF9C01
}
background-color
:
#00b8ec
.page_CapitalAllocation
.text_d
{
text-decoration
:
underline
;
cursor
:
pointer
;}
}
.InfoChangeLog
{
height
:
auto
;
max-height
:
220px
;
background-color
:
#FFFFFF
;}
.changLogList
{
padding-left
:
20px
;
max-height
:
180px
;
overflow
:
auto
;}
.page_CapitalAllocation
i
.icon-sousuo
{
.changLogList_l
{
border-left
:
1px
solid
#E9E9E9
;
position
:
relative
;
padding-bottom
:
10px
;
padding-left
:
20px
;
padding-top
:
10px
;}
background-color
:
#47BF8C
;
._radius_green
{
background-color
:
#47BF8C
;
width
:
7px
;
height
:
7px
;
border-radius
:
50%
;
display
:
inline-block
;
position
:
absolute
;
left
:
-4px
;
top
:
19px
;}
}
.changLog_time
{
color
:
#666666
;
font-size
:
12px
;
display
:
inline-block
;
padding-right
:
10px
}
.page_CapitalAllocation
i
.icon-sousuo
:hover
{
background-color
:
#66bb97
}
.page_CapitalAllocation
i
.icon-sousuo
:active
{
background-color
:
#35ab79
}
.page_CapitalAllocation
._btn_group
{
font-size
:
14px
;
}
.page_CapitalAllocation
.icon-daiqueren
{
color
:
#4BCA81
}
.page_CapitalAllocation
.icon-yiqueren
{
color
:
#4BCA81
}
.page_CapitalAllocation
.icon-yiquxiao
{
color
:
#959595
}
.page_CapitalAllocation
.icon-shenhebohui
{
color
:
#E95252
}
.page_CapitalAllocation
.icon-icon-zancun
{
color
:
#FF9C01
}
.page_CapitalAllocation
.text_d
{
text-decoration
:
underline
;
cursor
:
pointer
;
}
.InfoChangeLog
{
height
:
auto
;
max-height
:
220px
;
background-color
:
#FFFFFF
;
}
.changLogList
{
padding-left
:
20px
;
max-height
:
180px
;
overflow
:
auto
;
}
.changLogList_l
{
border-left
:
1px
solid
#E9E9E9
;
position
:
relative
;
padding-bottom
:
10px
;
padding-left
:
20px
;
padding-top
:
10px
;
}
._radius_green
{
background-color
:
#47BF8C
;
width
:
7px
;
height
:
7px
;
border-radius
:
50%
;
display
:
inline-block
;
position
:
absolute
;
left
:
-4px
;
top
:
19px
;
}
.changLog_time
{
color
:
#666666
;
font-size
:
12px
;
display
:
inline-block
;
padding-right
:
10px
}
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"page_CapitalAllocation"
>
<div
class=
"page_CapitalAllocation"
>
...
@@ -59,73 +140,56 @@
...
@@ -59,73 +140,56 @@
</li>
</li>
<li>
<li>
<em>
{{
$t
(
'system.table_company'
)
}}
</em>
<em>
{{
$t
(
'system.table_company'
)
}}
</em>
<el-select
v-model=
"msg.RB_Branch_Id"
:placeholder=
"$t('rule.company')"
class=
"w220"
@
change=
"getDepartment(msg.RB_Branch_Id),msg.RB_Depart_Id = -2"
>
<el-select
v-model=
"msg.RB_Branch_Id"
:placeholder=
"$t('rule.company')"
class=
"w220"
@
change=
"getDepartment(msg.RB_Branch_Id),msg.RB_Depart_Id = -2"
>
<el-option
:value=
"-1"
:label=
"$t('pub.unlimitedSel')"
></el-option>
<el-option
:value=
"-1"
:label=
"$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for=
'item in CompanyList'
<el-option
v-for=
'item in CompanyList'
:label=
'item.SName'
:value=
'item.SId'
:key=
'item.SId'
>
:label=
'item.SName'
:value=
'item.SId'
:key=
'item.SId'
>
</el-option>
</el-option>
</el-select>
</el-select>
</li>
</li>
<li>
<li>
<em>
{{
$t
(
'admin.admin_Department'
)
}}
</em>
<em>
{{
$t
(
'admin.admin_Department'
)
}}
</em>
<el-select
v-model=
"msg.RB_Depart_Id"
:placeholder=
"$t('rule.qxzbmen')"
class=
"w220"
@
change=
"getEmployee(msg.RB_Depart_Id), msg.UpdateBy='-1'"
>
<el-select
v-model=
"msg.RB_Depart_Id"
:placeholder=
"$t('rule.qxzbmen')"
class=
"w220"
<el-option
:value=
"-2"
:label=
"$t('pub.unlimitedSel')"
></el-option>
@
change=
"getEmployee(msg.RB_Depart_Id), msg.UpdateBy='-1'"
>
<el-option
v-for=
'item in DepartmentList'
<el-option
:value=
"-2"
:label=
"$t('pub.unlimitedSel')"
></el-option>
:label=
'item.DeptName'
<el-option
v-for=
'item in DepartmentList'
:label=
'item.DeptName'
:value=
'item.DeptId'
:key=
'item.DeptId'
>
:value=
'item.DeptId'
</el-option>
:key=
'item.DeptId'
>
</el-option>
</el-select>
</el-select>
</li>
</li>
<li>
<li>
<em>
{{
$t
(
'fnc.zhidanren'
)
}}
</em>
<em>
{{
$t
(
'fnc.zhidanren'
)
}}
</em>
<el-select
filterable
v-model=
'msg.UpdateBy'
class=
"w220"
>
<el-select
filterable
v-model=
'msg.UpdateBy'
class=
"w220"
>
<el-option
value=
"-1"
:label=
"$t('pub.unlimitedSel')"
></el-option>
<el-option
value=
"-1"
:label=
"$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for=
'item in EmployeeList'
<el-option
v-for=
'item in EmployeeList'
:label=
'item.EmployeeName'
:value=
'item.Id'
:key=
'item.Id'
>
:label=
'item.EmployeeName'
</el-option>
:value=
'item.Id'
</el-select>
:key=
'item.Id'
>
</el-option>
</el-select>
</li>
</li>
<li>
<li>
<em>
{{
$t
(
'fnc.zdriqi'
)
}}
</em>
<em>
{{
$t
(
'fnc.zdriqi'
)
}}
</em>
<el-date-picker
<el-date-picker
@
change=
"timeAdd(1)"
v-model=
"productionDate"
type=
"daterange"
value-format=
"yyyy-MM-dd"
@
change=
"timeAdd(1)"
range-separator=
"至"
>
v-model=
"productionDate"
</el-date-picker>
type=
"daterange"
value-format=
"yyyy-MM-dd"
range-separator=
"至"
>
</el-date-picker>
</li>
</li>
<li>
<li>
<em>
{{
$t
(
'fnc.jiaoyiriqi'
)
}}
</em>
<em>
{{
$t
(
'fnc.jiaoyiriqi'
)
}}
</em>
<el-date-picker
<el-date-picker
@
change=
"timeAdd(2)"
v-model=
"productionDate2"
type=
"daterange"
value-format=
"yyyy-MM-dd"
@
change=
"timeAdd(2)"
:range-separator=
"$t('restaurant.res_To')"
>
v-model=
"productionDate2"
</el-date-picker>
type=
"daterange"
value-format=
"yyyy-MM-dd"
:range-separator=
"$t('restaurant.res_To')"
>
</el-date-picker>
</li>
</li>
<li>
<li>
<em>
{{
$t
(
'admin.admin_status'
)
}}
</em>
<em>
{{
$t
(
'admin.admin_status'
)
}}
</em>
<el-select
v-model=
"msg.Status"
filterable
class=
"w220"
>
<el-select
v-model=
"msg.Status"
filterable
class=
"w220"
>
<el-option
value=
"-1"
:label=
"$t('pub.unlimitedSel')"
></el-option>
<el-option
value=
"-1"
:label=
"$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for=
'item in StatusList'
<el-option
v-for=
'item in StatusList'
:label=
'item.Name'
:value=
'item.ID'
:key=
'item.ID'
>
:label=
'item.Name'
</el-option>
:value=
'item.ID'
</el-select>
:key=
'item.ID'
>
</el-option>
</el-select>
</li>
</li>
<li>
<li>
<input
v-if=
"btnShow"
type=
"button"
class=
"normalBtn"
:value=
"$t('op.fgszjdb')"
@
click=
"goAddurl('addCapitalAllocation')"
/>
<input
v-if=
"btnShow"
type=
"button"
class=
"normalBtn"
:value=
"$t('op.fgszjdb')"
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('pub.addBtn')"
@
click=
"goURL('addCapitalAllocation')"
/>
@
click=
"goAddurl('addCapitalAllocation')"
/>
<input
type=
"button"
class=
"hollowFixedBtn"
:value=
"$t('pub.searchBtn')"
@
click=
"getList()"
/>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('pub.addBtn')"
@
click=
"goURL('addCapitalAllocation')"
/>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('visa.v_daochu')"
@
click=
"method5()"
/>
<input
type=
"button"
class=
"hollowFixedBtn"
:value=
"$t('pub.searchBtn')"
@
click=
"getList()"
/>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('visa.v_daochu')"
@
click=
"method5()"
/>
</li>
</li>
</ul>
</ul>
</div>
</div>
...
@@ -211,7 +275,8 @@
...
@@ -211,7 +275,8 @@
</el-row>
</el-row>
</el-form>
-->
</el-form>
-->
<div
class=
"page_CapitalAllocation_list"
>
<div
class=
"page_CapitalAllocation_list"
>
<table
class=
"singeRowTable"
style=
"border:1px solid #E6E6E6;"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
>
<table
class=
"singeRowTable"
style=
"border:1px solid #E6E6E6;"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
>
<tr>
<tr>
<th>
{{
$t
(
'fnc.danhao'
)
}}
</th>
<th>
{{
$t
(
'fnc.danhao'
)
}}
</th>
<th>
{{
$t
(
'fnc.jine'
)
}}
</th>
<th>
{{
$t
(
'fnc.jine'
)
}}
</th>
...
@@ -237,19 +302,17 @@
...
@@ -237,19 +302,17 @@
<i
v-if=
"item.Status==1"
class=
"iconfont icon-daiqueren"
></i>
<i
v-if=
"item.Status==1"
class=
"iconfont icon-daiqueren"
></i>
<i
v-if=
"item.Status==4"
class=
"iconfont icon-yiquxiao"
></i>
<i
v-if=
"item.Status==4"
class=
"iconfont icon-yiquxiao"
></i>
<i
v-if=
"item.Status==2"
class=
"iconfont icon-yiqueren"
></i>
<i
v-if=
"item.Status==2"
class=
"iconfont icon-yiqueren"
></i>
<i
v-if=
"item.Status==3"
class=
"iconfont icon-shenhebohui"
></i>
<i
v-if=
"item.Status==3"
class=
"iconfont icon-shenhebohui"
></i>
<i
v-if=
"item.Status==0 || item.Status==5"
class=
"iconfont icon-zancun"
></i>
<i
v-if=
"item.Status==0 || item.Status==5"
class=
"iconfont icon-zancun"
></i>
<el-popover
<el-popover
popper-class=
"detailsIT_Journal"
width=
"250"
trigger=
"click"
>
popper-class=
"detailsIT_Journal"
<div
class=
"InfoChangeLog"
>
width=
"250"
trigger=
"click"
>
<div
class=
"InfoChangeLog"
>
<div
class=
"changLog"
>
<div
class=
"changLog"
>
<p
class=
"_log_t"
>
{{
$t
(
'fnc.lcrizhi'
)
}}
</p>
<p
class=
"_log_t"
>
{{
$t
(
'fnc.lcrizhi'
)
}}
</p>
<ul
class=
"changLogList"
v-if=
"GetFinancLogList"
v-loading=
'LogLoading'
>
<ul
class=
"changLogList"
v-if=
"GetFinancLogList"
v-loading=
'LogLoading'
>
<li
class=
"changLogList_l"
v-for=
"(log,li) in GetFinancLogList"
>
<li
class=
"changLogList_l"
v-for=
"(log,li) in GetFinancLogList"
>
<span
style=
"background-color: #47BF8C"
class=
"_radius_green"
></span>
<span
style=
"background-color: #47BF8C"
class=
"_radius_green"
></span>
<p>
<span
class=
"_color_blue"
>
{{
log
.
EmName
}}
</span>
<span
class=
"fr changLog_time"
>
{{
log
.
UpdateDate
}}
</span>
</p>
<p>
<span
class=
"_color_blue"
>
{{
log
.
EmName
}}
</span>
<span
class=
"fr changLog_time"
>
{{
log
.
UpdateDate
}}
</span>
</p>
<p
class=
"_dtel"
>
{{
log
.
StartValue
}}
</p>
<p
class=
"_dtel"
>
{{
log
.
StartValue
}}
</p>
</li>
</li>
</ul>
</ul>
...
@@ -258,28 +321,27 @@
...
@@ -258,28 +321,27 @@
</ul>
</ul>
</div>
</div>
</div>
</div>
<span
slot=
"reference"
class=
"text_d _font_init"
@
click=
"Financial_post_GetFinancLogList(item.FrID)"
>
{{
item
.
StatusStr
}}
</span>
<span
slot=
"reference"
class=
"text_d _font_init"
@
click=
"Financial_post_GetFinancLogList(item.FrID)"
>
{{
item
.
StatusStr
}}
</span>
</el-popover>
</el-popover>
</td>
</td>
<td>
<td>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('pub.updateMsg')"
placement=
"top"
v-if=
"(item.Status===1 || item.Status===3) && item.CreateBy===EmId && item.InOrNotProcess===-1"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('pub.updateMsg')"
placement=
"top"
v-if=
"(item.Status===1 || item.Status===3) && item.CreateBy===EmId && item.InOrNotProcess===-1"
>
<i
class=
"edit el-icon-edit"
@
click=
"goURL('addCapitalAllocation', 1, item.FrID)"
></i>
<i
class=
"edit el-icon-edit"
@
click=
"goURL('addCapitalAllocation', 1, item.FrID)"
></i>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('fnc.xiangqing')"
placement=
"top"
>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('fnc.xiangqing')"
placement=
"top"
>
<i
class=
"iconfont icon-sousuo"
@
click=
"goDetail('CapitalAllocationDetail', item.FrID)"
></i>
<i
class=
"iconfont icon-sousuo"
@
click=
"goDetail('CapitalAllocationDetail', item.FrID)"
></i>
</el-tooltip>
</el-tooltip>
</td>
</td>
</tr>
</tr>
</table>
</table>
<div
class=
"noDataNotice"
v-if=
"dataList.length
<1
"
><i
class=
"iconfont icon-kong"
></i>
<p>
{{
$t
(
'active.ld_noData'
)
}}
</p></div>
<div
class=
"noDataNotice"
v-if=
"dataList.length
<1
"
><i
class=
"iconfont icon-kong"
></i>
<p>
{{
$t
(
'active.ld_noData'
)
}}
</p>
</div>
<div>
<div>
<el-pagination
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"currentPage"
background
layout=
"total,prev, pager, next, jumper"
:page-size=
'msg.pageSize'
:total=
'total'
>
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"currentPage"
layout=
"total,prev, pager, next, jumper"
:page-size=
'msg.pageSize'
:total=
'total'
>
</el-pagination>
</el-pagination>
</div>
</div>
</div>
</div>
...
@@ -297,7 +359,7 @@
...
@@ -297,7 +359,7 @@
}
from
'../../../api/system/dept'
}
from
'../../../api/system/dept'
export
default
{
export
default
{
data
(){
data
()
{
return
{
return
{
msg
:
{
msg
:
{
pageIndex
:
1
,
pageIndex
:
1
,
...
@@ -311,11 +373,11 @@
...
@@ -311,11 +373,11 @@
Status
:
'-1'
,
Status
:
'-1'
,
sTradeDate
:
''
,
sTradeDate
:
''
,
eTradeDate
:
''
,
eTradeDate
:
''
,
EmployeeId
:
0
EmployeeId
:
0
},
},
getCompanyMsg
:
{
// 公司
getCompanyMsg
:
{
// 公司
RB_Group_Id
:
'0'
,
RB_Group_Id
:
'0'
,
Status
:
'0'
,
Status
:
'0'
,
},
},
dataList
:
[],
dataList
:
[],
CompanyList
:
[],
CompanyList
:
[],
...
@@ -327,11 +389,11 @@
...
@@ -327,11 +389,11 @@
GetFinancLogList
:
[],
GetFinancLogList
:
[],
loading
:
true
,
loading
:
true
,
LogLoading
:
true
,
LogLoading
:
true
,
EmId
:
0
,
EmId
:
0
,
total
:
0
,
total
:
0
,
currentPage
:
0
,
currentPage
:
0
,
btnShow
:
false
,
btnShow
:
false
,
schoolMsg
:{
schoolMsg
:
{
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
12
,
pageSize
:
12
,
rowsPerPage
:
12
,
rowsPerPage
:
12
,
...
@@ -340,50 +402,51 @@
...
@@ -340,50 +402,51 @@
}
}
}
}
},
},
created
(){
created
()
{
this
.
getList
()
this
.
getList
()
let
userInfo
=
this
.
getLocalStorage
();
// 读取缓存数据
let
userInfo
=
this
.
getLocalStorage
();
// 读取缓存数据
this
.
getCompanyMsg
.
RB_Group_Id
=
userInfo
.
Group_Id
;
// 集团ID
this
.
getCompanyMsg
.
RB_Group_Id
=
userInfo
.
Group_Id
;
// 集团ID
this
.
EmId
=
userInfo
.
Id
;
this
.
EmId
=
userInfo
.
Id
;
let
ActionMenuCode
=
userInfo
.
ActionMenuCode
;
let
ActionMenuCode
=
userInfo
.
ActionMenuCode
;
},
},
methods
:{
methods
:
{
getList
:
function
()
{
// 获取列表数据
getList
:
function
()
{
// 获取列表数据
if
(
this
.
msg
.
FrID
===
''
)
{
if
(
this
.
msg
.
FrID
===
''
)
{
this
.
msg
.
FrID
=
0
this
.
msg
.
FrID
=
0
}
}
this
.
loading
=
true
this
.
loading
=
true
this
.
apipost
(
'Financial_get_GetFundTransferPageList'
,
this
.
msg
,
res
=>
{
this
.
apipost
(
'Financial_get_GetFundTransferPageList'
,
this
.
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
this
.
total
=
res
.
data
.
data
.
count
;
}
else
{
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
)
this
.
$message
.
error
(
res
.
data
.
message
)
}
}
if
(
this
.
msg
.
FrID
===
0
)
{
if
(
this
.
msg
.
FrID
===
0
)
{
this
.
msg
.
FrID
=
''
this
.
msg
.
FrID
=
''
}
}
this
.
loading
=
false
this
.
loading
=
false
},
null
)
},
null
)
},
},
handleCurrentChange
(
val
)
{
//翻页
handleCurrentChange
(
val
)
{
//翻页
this
.
msg
.
pageIndex
=
val
;
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
this
.
getList
();
},
},
resetPageIndex
()
{
// 重置页码
resetPageIndex
()
{
// 重置页码
this
.
msg
.
pageIndex
=
1
;
this
.
msg
.
pageIndex
=
1
;
this
.
currentPage
=
1
;
this
.
currentPage
=
1
;
},
},
//导出
//导出
method5
:
function
()
{
method5
:
function
()
{
if
(
!
this
.
msg
.
RB_Branch_Id
)
this
.
msg
.
RB_Branch_Id
=
-
1
;
if
(
!
this
.
msg
.
RB_Branch_Id
)
this
.
msg
.
RB_Branch_Id
=
-
1
;
if
(
!
this
.
msg
.
RB_Depart_Id
)
this
.
msg
.
RB_Depart_Id
=
0
;
if
(
!
this
.
msg
.
RB_Depart_Id
)
this
.
msg
.
RB_Depart_Id
=
0
;
if
(
!
this
.
msg
.
UpdateBy
)
this
.
msg
.
UpdateBy
=
0
;
if
(
!
this
.
msg
.
UpdateBy
)
this
.
msg
.
UpdateBy
=
0
;
if
(
!
this
.
msg
.
Status
)
this
.
msg
.
Status
=
0
;
if
(
!
this
.
msg
.
Status
)
this
.
msg
.
Status
=
0
;
if
(
!
this
.
msg
.
FrID
)
this
.
msg
.
FrID
=
0
;
if
(
!
this
.
msg
.
FrID
)
this
.
msg
.
FrID
=
0
;
this
.
msg
.
EmployeeId
=
this
.
EmId
;
this
.
msg
.
EmployeeId
=
this
.
EmId
;
this
.
GetLocalFile
(
"Financial_get_OutToFundTransfer"
,
this
.
msg
,
this
.
$t
(
'fnc.zjdbbiao'
)
+
".xls"
);}
,
this
.
GetErpLocalFile
(
"Financial_get_OutToFundTransfer"
,
this
.
msg
,
this
.
$t
(
'fnc.zjdbbiao'
)
+
".xls"
);
},
getCompanyList
:
function
()
{
//获取公司列表
getCompanyList
:
function
()
{
//获取公司列表
getSchoolPage
(
this
.
schoolMsg
).
then
(
res
=>
{
getSchoolPage
(
this
.
schoolMsg
).
then
(
res
=>
{
this
.
CompanyList
=
res
.
Data
.
PageData
;
this
.
CompanyList
=
res
.
Data
.
PageData
;
...
@@ -391,8 +454,8 @@
...
@@ -391,8 +454,8 @@
})
})
},
},
getDepartment
:
function
(
id
)
{
//获取部门列表
getDepartment
:
function
(
id
)
{
//获取部门列表
let
msg
=
{
let
msg
=
{
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
999
,
pageSize
:
999
,
rowsPerPage
:
12
,
rowsPerPage
:
12
,
...
@@ -405,21 +468,20 @@
...
@@ -405,21 +468,20 @@
}
}
msg
.
School_Id
=
id
;
msg
.
School_Id
=
id
;
getDeptPage
(
msg
).
then
(
res
=>
{
getDeptPage
(
msg
).
then
(
res
=>
{
this
.
DepartmentList
=
res
.
Data
.
PageData
;
this
.
DepartmentList
=
res
.
Data
.
PageData
;
}).
catch
(()
=>
{
}).
catch
(()
=>
{})
})
},
},
timeAdd
:
function
(
t
)
{
// 日期格式
timeAdd
:
function
(
t
)
{
// 日期格式
if
(
t
===
1
)
{
if
(
t
===
1
)
{
if
(
!
this
.
productionDate
)
{
if
(
!
this
.
productionDate
)
{
this
.
msg
.
sDate
=
''
;
this
.
msg
.
sDate
=
''
;
this
.
msg
.
eDate
=
''
;
this
.
msg
.
eDate
=
''
;
return
return
}
}
this
.
msg
.
sDate
=
this
.
productionDate
[
0
];
this
.
msg
.
sDate
=
this
.
productionDate
[
0
];
this
.
msg
.
eDate
=
this
.
productionDate
[
1
];
this
.
msg
.
eDate
=
this
.
productionDate
[
1
];
}
else
if
(
t
===
2
)
{
}
else
if
(
t
===
2
)
{
if
(
!
this
.
productionDate2
)
{
if
(
!
this
.
productionDate2
)
{
this
.
msg
.
sTradeDate
=
''
;
this
.
msg
.
sTradeDate
=
''
;
this
.
msg
.
eTradeDate
=
''
;
this
.
msg
.
eTradeDate
=
''
;
return
return
...
@@ -428,9 +490,9 @@
...
@@ -428,9 +490,9 @@
this
.
msg
.
eTradeDate
=
this
.
productionDate2
[
1
];
this
.
msg
.
eTradeDate
=
this
.
productionDate2
[
1
];
}
}
},
},
GetStatusList
:
function
()
{
// 获取审核状态枚举
GetStatusList
:
function
()
{
// 获取审核状态枚举
this
.
apipost
(
'FinancialFlowTemplate_post_GetStatusList'
,{},
res
=>
{
this
.
apipost
(
'FinancialFlowTemplate_post_GetStatusList'
,
{},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
StatusList
=
res
.
data
.
data
;
this
.
StatusList
=
res
.
data
.
data
;
}
}
},
err
=>
{})
},
err
=>
{})
...
@@ -439,43 +501,46 @@
...
@@ -439,43 +501,46 @@
var
qMsg
=
{
var
qMsg
=
{
Dept_Id
:
0
Dept_Id
:
0
}
}
qMsg
.
Dept_Id
=
id
;
qMsg
.
Dept_Id
=
id
;
queryEmployee
(
qMsg
).
then
(
res
=>
{
queryEmployee
(
qMsg
).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
if
(
res
.
Code
==
1
)
{
this
.
EmployeeList
=
res
.
Data
;
this
.
EmployeeList
=
res
.
Data
;
}
}
}).
catch
(()
=>
{
}).
catch
(()
=>
{
})
})
},
},
goAddurl
(
url
){
goAddurl
(
url
)
{
// this.$router.push({ name: url,query:{fengs: 1,blank: 'y', tab: '新增资金调拨'}})
// this.$router.push({ name: url,query:{fengs: 1,blank: 'y', tab: '新增资金调拨'}})
var
tempStr
=
'/financial/financalDocument/'
+
url
+
'?fengs=1'
;
var
tempStr
=
'/financial/financalDocument/'
+
url
+
'?fengs=1'
;
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
tempStr
path
:
tempStr
});
});
},
},
goURL
:
function
(
url
,
edit
,
id
)
{
goURL
:
function
(
url
,
edit
,
id
)
{
// this.$router.push({ name: url,query:{edit: edit, id: id, blank: 'y', tab: '新增资金调拨'}})
// this.$router.push({ name: url,query:{edit: edit, id: id, blank: 'y', tab: '新增资金调拨'}})
var
tempStr
=
'/financial/financalDocument/'
+
url
+
'?edit='
+
edit
+
'&id='
+
id
;
var
tempStr
=
'/financial/financalDocument/'
+
url
+
'?edit='
+
edit
+
'&id='
+
id
;
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
tempStr
path
:
tempStr
});
});
},
},
goDetail
:
function
(
url
,
id
)
{
goDetail
:
function
(
url
,
id
)
{
// this.$router.push({ name: url,query:{id: id, blank: 'y', tab: '资金调拨详情'}})
// this.$router.push({ name: url,query:{id: id, blank: 'y', tab: '资金调拨详情'}})
var
tempStr
=
'/financial/financalDocument/'
+
url
+
'?id='
+
id
;
var
tempStr
=
'/financial/financalDocument/'
+
url
+
'?id='
+
id
;
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
tempStr
path
:
tempStr
});
});
},
},
Financial_post_GetFinancLogList
:
function
(
id
){
// 获取单据日志
Financial_post_GetFinancLogList
:
function
(
id
)
{
// 获取单据日志
if
(
this
.
checkboxShow
)
return
if
(
this
.
checkboxShow
)
return
this
.
LogLoading
=
true
;
this
.
LogLoading
=
true
;
this
.
apipost
(
'Financial_post_GetFinancLogList'
,{
ID
:
id
,
Type
:
2
},
res
=>
{
this
.
apipost
(
'Financial_post_GetFinancLogList'
,
{
if
(
res
.
data
.
resultCode
==
1
)
{
ID
:
id
,
Type
:
2
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
res
.
data
.
data
;
let
data
=
res
.
data
.
data
;
data
.
forEach
(
x
=>
{
data
.
forEach
(
x
=>
{
x
.
UpdateDate
=
this
.
$commonUtils
.
formatMsgTime
(
x
.
UpdateDate
)
x
.
UpdateDate
=
this
.
$commonUtils
.
formatMsgTime
(
x
.
UpdateDate
)
})
})
this
.
LogLoading
=
false
;
this
.
LogLoading
=
false
;
...
@@ -484,11 +549,12 @@
...
@@ -484,11 +549,12 @@
},
err
=>
{})
},
err
=>
{})
},
},
},
},
mounted
(){
mounted
()
{
this
.
getCompanyList
()
this
.
getCompanyList
()
this
.
getDepartment
(
0
)
this
.
getDepartment
(
0
)
this
.
GetStatusList
()
this
.
GetStatusList
()
this
.
getEmployee
(
0
)
this
.
getEmployee
(
0
)
}
}
}
}
</
script
>
</
script
>
src/pages/financial/financalDocument/FinancialDocuments.vue
View file @
94a2a591
...
@@ -597,8 +597,8 @@
...
@@ -597,8 +597,8 @@
<!--
<button
v-if=
"active==3 && !hbState && hbShow"
class=
"hollowFixedBtn"
@
click=
"HebingSP"
>
合并审批
</button>
-->
<!--
<button
v-if=
"active==3 && !hbState && hbShow"
class=
"hollowFixedBtn"
@
click=
"HebingSP"
>
合并审批
</button>
-->
<!--
<button
v-if=
"active==3 && hbState"
class=
"hollowFixedBtn"
@
click=
"hbState=false,getPageList"
>
关闭合并审批
</button>
-->
<!--
<button
v-if=
"active==3 && hbState"
class=
"hollowFixedBtn"
@
click=
"hbState=false,getPageList"
>
关闭合并审批
</button>
-->
<button
v-loading=
"hbBtn"
v-if=
"active==3 && hbState"
class=
"hollowFixedBtn"
@
click=
"HebingSPLast"
>
审批
</button>
<button
v-loading=
"hbBtn"
v-if=
"active==3 && hbState"
class=
"hollowFixedBtn"
@
click=
"HebingSPLast"
>
审批
</button>
<!--
<button
v-if=
"HandShow"
class=
"hollowFixedBtn"
@
click=
"Handwithfee"
>
手配费收入
</button>
-->
<!--
<button
v-if=
"HandShow"
class=
"hollowFixedBtn"
@
click=
"Handwithfee"
>
手配费收入
</button>
-->
<!--
<button
class=
"hollowFixedBtn"
@
click=
"ZhiDanChongDi"
>
预付款冲抵
</button>
-->
<!--
<button
class=
"hollowFixedBtn"
@
click=
"ZhiDanChongDi"
>
预付款冲抵
</button>
-->
<!--
<button
class=
"hollowFixedBtn"
@
click=
"BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false"
<!--
<button
class=
"hollowFixedBtn"
@
click=
"BOSSBtn = !BOSSBtn, checkList = [], getPageList(1), BOSSBtn2 = false"
v-if=
"msg.Conditon === 3 "
>
{{
BOSSBtn
?
'关闭一键审批'
:
'一键审批'
}}
</button>
-->
v-if=
"msg.Conditon === 3 "
>
{{
BOSSBtn
?
'关闭一键审批'
:
'一键审批'
}}
</button>
-->
<button
class=
"hollowFixedBtn"
v-if=
"msg.Conditon === 3 && BOSSBtn"
<button
class=
"hollowFixedBtn"
v-if=
"msg.Conditon === 3 && BOSSBtn"
...
@@ -690,7 +690,8 @@
...
@@ -690,7 +690,8 @@
<span>
<span>
<em>
{{
$t
(
'fnc.fybumen'
)
}}
</em>
<em>
{{
$t
(
'fnc.fybumen'
)
}}
</em>
<el-select
filterable
v-model=
'msg.RB_Depart_Id'
<el-select
filterable
v-model=
'msg.RB_Depart_Id'
@
change=
"employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(msg.RB_Depart_Id),msg.UpdateBy=''"
class=
"w150"
>
@
change=
"employeeMsg.DepartmentId=msg.RB_Depart_Id,getEmployee(msg.RB_Depart_Id),msg.UpdateBy=''"
class=
"w150"
>
<el-option
:value=
"0"
:label=
"$t('pub.unlimitedSel')"
></el-option>
<el-option
:value=
"0"
:label=
"$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for=
'item in DepartmentList'
:label=
'item.DeptName'
:value=
'item.DeptId'
<el-option
v-for=
'item in DepartmentList'
:label=
'item.DeptName'
:value=
'item.DeptId'
:key=
'item.DeptId'
>
:key=
'item.DeptId'
>
...
@@ -703,8 +704,7 @@
...
@@ -703,8 +704,7 @@
<em>
{{
$t
(
'fnc.zdrenyuan'
)
}}
</em>
<em>
{{
$t
(
'fnc.zdrenyuan'
)
}}
</em>
<el-select
filterable
v-model=
'msg.UpdateBy'
class=
"w150"
>
<el-select
filterable
v-model=
'msg.UpdateBy'
class=
"w150"
>
<el-option
:value=
"0"
:label=
"$t('pub.unlimitedSel')"
></el-option>
<el-option
:value=
"0"
:label=
"$t('pub.unlimitedSel')"
></el-option>
<el-option
v-for=
'item in EmployeeList'
:label=
'item.EmployeeName'
:value=
'item.Id'
<el-option
v-for=
'item in EmployeeList'
:label=
'item.EmployeeName'
:value=
'item.Id'
:key=
'item.Id'
>
:key=
'item.Id'
>
</el-option>
</el-option>
</el-select>
</el-select>
</span>
</span>
...
@@ -966,7 +966,7 @@
...
@@ -966,7 +966,7 @@
</
template
>
</
template
>
</td>
</td>
<td
valign=
"middle"
>
<td
valign=
"middle"
>
<!-- <img class="_head_img" :src="item.EmPhoto" alt="">-->
<!-- <img class="_head_img" :src="item.EmPhoto" alt="">-->
<span>
{{item.EmName}}
</span>
<span>
{{item.EmName}}
</span>
</td>
</td>
<td
class=
"_btn_group"
>
<td
class=
"_btn_group"
>
...
@@ -1026,8 +1026,7 @@
...
@@ -1026,8 +1026,7 @@
<i
v-if=
"((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))"
<i
v-if=
"((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))"
class=
"iconfont icon-quxiao1"
@
click=
"financeRemove(item.FrID)"
></i>
class=
"iconfont icon-quxiao1"
@
click=
"financeRemove(item.FrID)"
></i>
</el-tooltip>
</el-tooltip>
<el-tooltip
class=
"item"
<el-tooltip
class=
"item"
:content=
"$t('fnc.tzjyriqi')"
placement=
"top"
>
:content=
"$t('fnc.tzjyriqi')"
placement=
"top"
>
<i
v-if=
"msg.Conditon==2 && item.TradeDate"
class=
"iconfont icon-tiaozheng"
<i
v-if=
"msg.Conditon==2 && item.TradeDate"
class=
"iconfont icon-tiaozheng"
@
click=
"dialogFormVisible=true,updateMsg.FrID=item.FrID,updateMsg.OTradeDate=item.TradeDate"
></i>
@
click=
"dialogFormVisible=true,updateMsg.FrID=item.FrID,updateMsg.OTradeDate=item.TradeDate"
></i>
</el-tooltip>
</el-tooltip>
...
@@ -1051,8 +1050,8 @@
...
@@ -1051,8 +1050,8 @@
<el-form
label-width=
"100px"
>
<el-form
label-width=
"100px"
>
<el-form-item
:label=
"$t('fnc.zhuanjiaoren')"
>
<el-form-item
:label=
"$t('fnc.zhuanjiaoren')"
>
<el-select
v-model=
"zhuanMsg.AuditEmId"
filterable
remote
reserve-keyword
<el-select
v-model=
"zhuanMsg.AuditEmId"
filterable
remote
reserve-keyword
:placeholder=
"$t('pub.pleaseImport')"
:remote-method=
"remoteMethod"
@
change=
"$forceUpdate(),choicereciveN(zhuanMsg.AuditEmId)"
:placeholder=
"$t('pub.pleaseImport')"
:remote-method=
"remoteMethod"
:loading=
"loading2"
>
@
change=
"$forceUpdate(),choicereciveN(zhuanMsg.AuditEmId)"
:loading=
"loading2"
>
<el-option
v-for=
"item in searchList"
:key=
"item.Id"
:label=
"item.EmployeeName"
:value=
"item.Id"
>
<el-option
v-for=
"item in searchList"
:key=
"item.Id"
:label=
"item.EmployeeName"
:value=
"item.Id"
>
<span
style=
"float: left"
>
{{
item
.
EmployeeName
}}
</span>
<span
style=
"float: left"
>
{{
item
.
EmployeeName
}}
</span>
<span
style=
"float: right; color: #8492a6; font-size: 13px"
>
{{
item
.
DeptName
}}
</span>
<span
style=
"float: right; color: #8492a6; font-size: 13px"
>
{{
item
.
DeptName
}}
</span>
...
@@ -1127,7 +1126,8 @@
...
@@ -1127,7 +1126,8 @@
<el-form
label-width=
"100px"
>
<el-form
label-width=
"100px"
>
<el-form-item
label=
"制单人转交:"
>
<el-form-item
label=
"制单人转交:"
>
<el-select
v-model=
"zhuanjiaoMsg.CreateBy"
filterable
remote
reserve-keyword
<el-select
v-model=
"zhuanjiaoMsg.CreateBy"
filterable
remote
reserve-keyword
:placeholder=
"$t('pub.pleaseImport')"
:remote-method=
"remoteMethodEx"
@
change=
"$forceUpdate(),choicereciveN2(zhuanjiaoMsg.CreateBy)"
>
:placeholder=
"$t('pub.pleaseImport')"
:remote-method=
"remoteMethodEx"
@
change=
"$forceUpdate(),choicereciveN2(zhuanjiaoMsg.CreateBy)"
>
<el-option
v-for=
"item in searchList"
:key=
"item.Id"
:label=
"item.EmployeeName"
:value=
"item.Id"
>
<el-option
v-for=
"item in searchList"
:key=
"item.Id"
:label=
"item.EmployeeName"
:value=
"item.Id"
>
<span
style=
"float: left"
>
{{
item
.
EmployeeName
}}
</span>
<span
style=
"float: left"
>
{{
item
.
EmployeeName
}}
</span>
<span
style=
"float: right; color: #8492a6; font-size: 13px"
>
{{
item
.
DeptName
}}
</span>
<span
style=
"float: right; color: #8492a6; font-size: 13px"
>
{{
item
.
DeptName
}}
</span>
...
@@ -1239,7 +1239,9 @@
...
@@ -1239,7 +1239,9 @@
import
{
import
{
getSchoolPage
getSchoolPage
}
from
'../../../api/school/index'
}
from
'../../../api/school/index'
import
{
getClassNameList
}
from
'../../../api/finance/index'
import
{
getClassNameList
}
from
'../../../api/finance/index'
export
default
{
export
default
{
data
()
{
data
()
{
...
@@ -1414,7 +1416,7 @@
...
@@ -1414,7 +1416,7 @@
IsAdvanceFinance
:
1
,
IsAdvanceFinance
:
1
,
},
},
costList
:
[],
costList
:
[],
schoolMsg
:{
schoolMsg
:
{
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
12
,
pageSize
:
12
,
rowsPerPage
:
12
,
rowsPerPage
:
12
,
...
@@ -1468,7 +1470,8 @@
...
@@ -1468,7 +1470,8 @@
this
.
yfOutBranchId
=
userInfo
.
School_Id
;
this
.
yfOutBranchId
=
userInfo
.
School_Id
;
// let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
// let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
// this.userMenuCode = userMenuCode.indexOf(',C_Batch_AuditFinance,') != -1 ? true : false;
// this.userMenuCode = userMenuCode.indexOf(',C_Batch_AuditFinance,') != -1 ? true : false;
this
.
getCompanyMsg
.
RB_Group_Id
=
this
.
employeeMsg
.
GroupId
=
this
.
getDepartmentMsg
.
RB_Group_Id
=
userInfo
.
GroupName
;
//集团ID
this
.
getCompanyMsg
.
RB_Group_Id
=
this
.
employeeMsg
.
GroupId
=
this
.
getDepartmentMsg
.
RB_Group_Id
=
userInfo
.
GroupName
;
//集团ID
this
.
ActionMenuCode
=
userInfo
.
ActionMenuCode
;
this
.
ActionMenuCode
=
userInfo
.
ActionMenuCode
;
this
.
DepartIDs
=
userInfo
.
DeptId
;
this
.
DepartIDs
=
userInfo
.
DeptId
;
this
.
userId
=
userInfo
.
Id
;
this
.
userId
=
userInfo
.
Id
;
...
@@ -1699,9 +1702,9 @@
...
@@ -1699,9 +1702,9 @@
var
qMsg
=
{
var
qMsg
=
{
EmployeeName
:
0
EmployeeName
:
0
}
}
qMsg
.
EmployeeName
=
query
;
qMsg
.
EmployeeName
=
query
;
queryEmployee
(
qMsg
).
then
(
res
=>
{
queryEmployee
(
qMsg
).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
if
(
res
.
Code
==
1
)
{
this
.
searchList
=
res
.
Data
;
this
.
searchList
=
res
.
Data
;
}
}
...
@@ -1825,9 +1828,9 @@
...
@@ -1825,9 +1828,9 @@
var
qMsg
=
{
var
qMsg
=
{
EmployeeName
:
0
EmployeeName
:
0
}
}
qMsg
.
EmployeeName
=
query
;
qMsg
.
EmployeeName
=
query
;
queryEmployee
(
qMsg
).
then
(
res
=>
{
queryEmployee
(
qMsg
).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
if
(
res
.
Code
==
1
)
{
this
.
searchList
=
res
.
Data
;
this
.
searchList
=
res
.
Data
;
this
.
loading2
=
false
;
this
.
loading2
=
false
;
...
@@ -1841,19 +1844,19 @@
...
@@ -1841,19 +1844,19 @@
this
.
loading2
=
false
;
this
.
loading2
=
false
;
}
}
},
},
choicereciveN
(
Id
){
choicereciveN
(
Id
)
{
if
(
this
.
searchList
.
length
>
0
)
{
if
(
this
.
searchList
.
length
>
0
)
{
this
.
searchList
.
forEach
(
x
=>
{
this
.
searchList
.
forEach
(
x
=>
{
if
(
x
.
Id
==
Id
)
{
if
(
x
.
Id
==
Id
)
{
this
.
zhuanMsg
.
AuditEmIdName
=
x
.
EmployeeName
this
.
zhuanMsg
.
AuditEmIdName
=
x
.
EmployeeName
}
}
})
})
}
}
},
},
choicereciveN2
(
Id
){
choicereciveN2
(
Id
)
{
if
(
this
.
searchList
.
length
>
0
)
{
if
(
this
.
searchList
.
length
>
0
)
{
this
.
searchList
.
forEach
(
x
=>
{
this
.
searchList
.
forEach
(
x
=>
{
if
(
x
.
Id
==
Id
)
{
if
(
x
.
Id
==
Id
)
{
this
.
zhuanjiaoMsg
.
AuditEmIdName
=
x
.
EmployeeName
this
.
zhuanjiaoMsg
.
AuditEmIdName
=
x
.
EmployeeName
}
}
})
})
...
@@ -1973,20 +1976,22 @@
...
@@ -1973,20 +1976,22 @@
data
.
forEach
(
x
=>
{
data
.
forEach
(
x
=>
{
x
.
modelShow
=
false
;
x
.
modelShow
=
false
;
this
.
checkAllList
.
push
(
x
.
FrID
)
this
.
checkAllList
.
push
(
x
.
FrID
)
if
(
x
.
TCIDList
.
length
>
0
)
{
if
(
x
.
TCIDList
.
length
>
0
)
{
da
=
da
.
concat
(
x
.
TCIDList
)
da
=
da
.
concat
(
x
.
TCIDList
)
}
}
})
})
this
.
DataList
=
data
;
this
.
DataList
=
data
;
if
(
da
.
length
>
0
){
if
(
da
.
length
>
0
)
{
let
str
=
da
.
join
(
','
)
let
str
=
da
.
join
(
','
)
getClassNameList
({
ClassIds
:
str
}).
then
(
res
=>
{
getClassNameList
({
this
.
DataList
.
forEach
(
x
=>
{
ClassIds
:
str
if
(
x
.
TCIDList
.
length
>
0
){
}).
then
(
res
=>
{
x
.
TCIDList
.
forEach
(
z
=>
{
this
.
DataList
.
forEach
(
x
=>
{
res
.
Data
.
forEach
(
j
=>
{
if
(
x
.
TCIDList
.
length
>
0
)
{
if
(
z
==
j
.
ClassId
){
x
.
TCIDList
.
forEach
(
z
=>
{
res
.
Data
.
forEach
(
j
=>
{
if
(
z
==
j
.
ClassId
)
{
x
.
TCIDAndTCNUMList
.
push
(
j
)
x
.
TCIDAndTCNUMList
.
push
(
j
)
}
}
})
})
...
@@ -2205,10 +2210,10 @@
...
@@ -2205,10 +2210,10 @@
if
(
!
this
.
msg
.
TradeWay
)
this
.
msg
.
TradeWay
=
0
;
if
(
!
this
.
msg
.
TradeWay
)
this
.
msg
.
TradeWay
=
0
;
if
(
!
this
.
msg
.
AccountType
)
this
.
msg
.
AccountType
=
0
;
if
(
!
this
.
msg
.
AccountType
)
this
.
msg
.
AccountType
=
0
;
this
.
msg
.
EmployeeId
=
this
.
userId
;
this
.
msg
.
EmployeeId
=
this
.
userId
;
this
.
GetLocalFile
(
"Financial_get_OutToFinanceList"
,
this
.
msg
,
this
.
$t
(
'fnc.cwbaobiao'
)
+
".xls"
);
this
.
Get
Erp
LocalFile
(
"Financial_get_OutToFinanceList"
,
this
.
msg
,
this
.
$t
(
'fnc.cwbaobiao'
)
+
".xls"
);
},
},
getDepartment
(
id
)
{
//部门
getDepartment
(
id
)
{
//部门
let
msg
=
{
let
msg
=
{
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
999
,
pageSize
:
999
,
rowsPerPage
:
12
,
rowsPerPage
:
12
,
...
@@ -2221,17 +2226,16 @@
...
@@ -2221,17 +2226,16 @@
}
}
msg
.
School_Id
=
id
;
msg
.
School_Id
=
id
;
getDeptPage
(
msg
).
then
(
res
=>
{
getDeptPage
(
msg
).
then
(
res
=>
{
this
.
DepartmentList
=
res
.
Data
.
PageData
;
this
.
DepartmentList
=
res
.
Data
.
PageData
;
}).
catch
(()
=>
{
}).
catch
(()
=>
{})
})
},
},
getEmployee
(
id
)
{
//员工
getEmployee
(
id
)
{
//员工
var
qMsg
=
{
var
qMsg
=
{
Dept_Id
:
0
Dept_Id
:
0
}
}
qMsg
.
Dept_Id
=
id
;
qMsg
.
Dept_Id
=
id
;
queryEmployee
(
qMsg
).
then
(
res
=>
{
queryEmployee
(
qMsg
).
then
(
res
=>
{
if
(
res
.
Code
==
1
)
{
if
(
res
.
Code
==
1
)
{
this
.
EmployeeList
=
res
.
Data
;
this
.
EmployeeList
=
res
.
Data
;
}
}
}).
catch
(()
=>
{
}).
catch
(()
=>
{
...
@@ -2369,7 +2373,7 @@
...
@@ -2369,7 +2373,7 @@
goUrl
(
path
,
id
,
Conditon
,
pageIndex
)
{
goUrl
(
path
,
id
,
Conditon
,
pageIndex
)
{
// return;
// return;
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
'/financial/financalDocument/'
+
path
,
path
:
'/financial/financalDocument/'
+
path
,
query
:
{
query
:
{
"id"
:
id
,
"id"
:
id
,
"Conditon"
:
Conditon
,
"Conditon"
:
Conditon
,
...
@@ -2390,7 +2394,7 @@
...
@@ -2390,7 +2394,7 @@
if
(
type
===
1
)
{
if
(
type
===
1
)
{
path
=
'addReceivablesDocuments'
path
=
'addReceivablesDocuments'
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
'/financial/financalDocument/'
+
path
,
path
:
'/financial/financalDocument/'
+
path
,
query
:
{
query
:
{
"type"
:
type
,
"type"
:
type
,
"FrID"
:
id
,
"FrID"
:
id
,
...
@@ -2407,7 +2411,7 @@
...
@@ -2407,7 +2411,7 @@
}
else
{
}
else
{
path
=
'addFinancialDocuments'
path
=
'addFinancialDocuments'
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
'/financial/financalDocument/'
+
path
,
path
:
'/financial/financalDocument/'
+
path
,
query
:
{
query
:
{
"type"
:
type
,
"type"
:
type
,
"FrID"
:
id
,
"FrID"
:
id
,
...
@@ -2422,7 +2426,7 @@
...
@@ -2422,7 +2426,7 @@
}
else
if
(
type
===
4
)
{
}
else
if
(
type
===
4
)
{
path
=
'addCapitalAllocation'
path
=
'addCapitalAllocation'
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
'/financial/financalDocument/'
+
path
,
path
:
'/financial/financalDocument/'
+
path
,
query
:
{
query
:
{
"id"
:
id
,
"id"
:
id
,
"edit"
:
1
,
"edit"
:
1
,
...
@@ -2433,7 +2437,7 @@
...
@@ -2433,7 +2437,7 @@
}
else
if
(
type
===
7
)
{
}
else
if
(
type
===
7
)
{
path
=
'addFinancialGZDocuments'
path
=
'addFinancialGZDocuments'
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
'/financial/financalDocument/'
+
path
,
path
:
'/financial/financalDocument/'
+
path
,
query
:
{
query
:
{
"FrID"
:
id
,
"FrID"
:
id
,
"edit"
:
1
,
"edit"
:
1
,
...
...
src/pages/financial/financalDocument/RecPayQuery.vue
View file @
94a2a591
...
@@ -1281,7 +1281,7 @@
...
@@ -1281,7 +1281,7 @@
if
(
!
this
.
msg
.
AccountType
)
this
.
msg
.
AccountType
=
0
;
if
(
!
this
.
msg
.
AccountType
)
this
.
msg
.
AccountType
=
0
;
if
(
!
this
.
msg
.
KJCostTypeId
)
this
.
msg
.
KJCostTypeId
=
0
;
if
(
!
this
.
msg
.
KJCostTypeId
)
this
.
msg
.
KJCostTypeId
=
0
;
if
(
!
this
.
msg
.
IsSelectKJSetCostType
)
this
.
msg
.
IsSelectKJSetCostType
=
0
;
if
(
!
this
.
msg
.
IsSelectKJSetCostType
)
this
.
msg
.
IsSelectKJSetCostType
=
0
;
this
.
GetLocalFile
(
"Financial_post_DownInOrOut"
,
this
.
msg
,
"收支款.xls"
);
this
.
Get
Erp
LocalFile
(
"Financial_post_DownInOrOut"
,
this
.
msg
,
"收支款.xls"
);
},
},
financeRemove
(
id
)
{
//作废
financeRemove
(
id
)
{
//作废
this
.
$confirm
(
'是否对申请单进行作废操作?作废后不可恢复!'
,
'提示'
,
{
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