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
2d48459d
Commit
2d48459d
authored
Jun 23, 2021
by
罗超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
4119b68b
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
163 additions
and
77 deletions
+163
-77
activeSignUpList.vue
src/pages/activity/activeSignUpList.vue
+13
-3
activityList.vue
src/pages/activity/activityList.vue
+7
-6
materialMan.vue
src/pages/activity/materialMan.vue
+5
-1
payment.vue
src/pages/activity/payment.vue
+131
-61
ChoiceAddFinancialDocuments.vue
...inancial/financalDocument/ChoiceAddFinancialDocuments.vue
+5
-2
addReceivablesDocuments.vue
...es/financial/financalDocument/addReceivablesDocuments.vue
+2
-4
No files found.
src/pages/activity/activeSignUpList.vue
View file @
2d48459d
...
@@ -164,6 +164,12 @@
...
@@ -164,6 +164,12 @@
<span
v-if=
"props.row.IsApplyForCancel===1"
>
是
</span>
<span
v-if=
"props.row.IsApplyForCancel===1"
>
是
</span>
<span
v-if=
"props.row.IsApplyForCancel===2"
>
否
</span>
<span
v-if=
"props.row.IsApplyForCancel===2"
>
否
</span>
</q-td>
</q-td>
</
template
>
<
template
v-slot:body-cell-ApplyForCancelStatus=
"props"
>
<q-td
:props=
"props"
>
<span
v-if=
"props.row.ApplyForCancelStatus===1"
>
同意
</span>
<span
v-if=
"props.row.ApplyForCancelStatus===2"
>
拒绝
</span>
</q-td>
</
template
>
</
template
>
<!-- <template v-slot:body-cell-optioned="props">
<!-- <template v-slot:body-cell-optioned="props">
<q-td :props="props">
<q-td :props="props">
...
@@ -256,6 +262,12 @@
...
@@ -256,6 +262,12 @@
label
:
"是否申请取消"
,
label
:
"是否申请取消"
,
field
:
" IsApplyForCancel"
,
field
:
" IsApplyForCancel"
,
align
:
"left"
align
:
"left"
},
{
name
:
" ApplyForCancelStatus"
,
label
:
"申请取消审核状态"
,
field
:
" ApplyForCancelStatus"
,
align
:
"left"
},
},
{
{
name
:
"Remark"
,
name
:
"Remark"
,
...
@@ -263,8 +275,6 @@
...
@@ -263,8 +275,6 @@
field
:
"Remark"
,
field
:
"Remark"
,
align
:
"left"
align
:
"left"
},
},
// {
// {
// name: 'optioned',
// name: 'optioned',
// label: '操作',
// label: '操作',
...
...
src/pages/activity/activityList.vue
View file @
2d48459d
...
@@ -204,21 +204,22 @@
...
@@ -204,21 +204,22 @@
<q-item-label>
报名列表
</q-item-label>
<q-item-label>
报名列表
</q-item-label>
</q-item-section>
</q-item-section>
</q-item>
</q-item>
<q-item
clickable
v-close-popup
@
click=
"goUrl('/activity/
activeSummary
',props.row)"
>
<q-item
clickable
v-close-popup
@
click=
"goUrl('/activity/
payment
',props.row)"
>
<q-item-section>
<q-item-section>
<q-item-label>
活动
总结
</q-item-label>
<q-item-label>
活动
收支
</q-item-label>
</q-item-section>
</q-item-section>
</q-item>
</q-item>
<q-item
clickable
v-close-popup
@
click=
"goUrl('/activity/
materialMan',props.row)
"
>
<q-item
clickable
v-close-popup
@
click=
"goUrl('/activity/
activeSummary',props.row)"
v-if=
"props.row.ActivityStatus!==2
"
>
<q-item-section>
<q-item-section>
<q-item-label>
活动
图片与视频
</q-item-label>
<q-item-label>
活动
总结
</q-item-label>
</q-item-section>
</q-item-section>
</q-item>
</q-item>
<q-item
clickable
v-close-popup
>
<q-item
clickable
v-close-popup
@
click=
"goUrl('/activity/materialMan',props.row)"
v-if=
"props.row.ActivityStatus!==2"
>
<q-item-section>
<q-item-section>
<q-item-label>
活动
收支
</q-item-label>
<q-item-label>
活动
图片与视频
</q-item-label>
</q-item-section>
</q-item-section>
</q-item>
</q-item>
</q-list>
</q-list>
</q-btn-dropdown>
</q-btn-dropdown>
</div>
</div>
...
...
src/pages/activity/materialMan.vue
View file @
2d48459d
<
template
>
<
template
>
<div
class=
"ChooseImg materialMan page-body"
>
<div
class=
"ChooseImg materialMan page-body"
>
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
label=
"返回"
@
click=
"goBack"
/>
<div
v-loading=
"loading"
style=
"margin-top:10px;background:#fff;padding:20px"
>
<div
v-loading=
"loading"
style=
"margin-top:10px;background:#fff;padding:20px"
>
<div
class=
"TabDiv"
>
<div
class=
"TabDiv"
>
<span
:class=
"commonType==1?'spanActive':''"
@
click=
"handleClick(1)"
>
图片
</span>
<span
:class=
"commonType==1?'spanActive':''"
@
click=
"handleClick(1)"
>
图片
</span>
...
@@ -9,7 +10,7 @@
...
@@ -9,7 +10,7 @@
<div>
<div>
<div
style=
"height: 718px;display:flex;"
flex=
"box:first"
>
<div
style=
"height: 718px;display:flex;"
flex=
"box:first"
>
<div
style=
"margin-right: 15px;width: auto;-webkit-box-flex: 0;flex-shrink: 0;flex-grow: 0;"
>
<div
style=
"margin-right: 15px;width: auto;-webkit-box-flex: 0;flex-shrink: 0;flex-grow: 0;"
>
<
el-button
@
click=
"addGroup"
style=
"margin-bottom: 12px;"
type=
"primary"
size=
"small"
>
添加分组
</el-butto
n>
<
q-btn
@
click=
"addGroup"
style=
"margin-bottom: 12px;"
color=
"accent"
size=
"sm"
>
添加分组
</q-bt
n>
<div
style=
"border: 1px solid rgb(227, 227, 227);width:250px"
>
<div
style=
"border: 1px solid rgb(227, 227, 227);width:250px"
>
<div
class=
"el-scrollbar"
style=
"width: 100%;height:670px;"
>
<div
class=
"el-scrollbar"
style=
"width: 100%;height:670px;"
>
<div
class=
"el-scrollbar__wrap"
style=
"margin-bottom: -8px; margin-right: -8px;"
>
<div
class=
"el-scrollbar__wrap"
style=
"margin-bottom: -8px; margin-right: -8px;"
>
...
@@ -296,6 +297,9 @@
...
@@ -296,6 +297,9 @@
},
},
methods
:
{
methods
:
{
goBack
(){
this
.
$router
.
go
(
-
1
)
},
//登录后获取上传配置
//登录后获取上传配置
getUpConfig
(){
getUpConfig
(){
...
...
src/pages/activity/payment.vue
View file @
2d48459d
<
style
>
<
style
>
.paymentDetail
.p_title
{
.paymentDetail
.p_title
{
font-weight
:
bold
;
color
:
#000000
;
color
:
#000000
;
font-size
:
14px
;
font-size
:
20px
;
margin-bottom
:
20px
;
height
:
30px
!important
;
display
:
flex
;
align-items
:
center
;
}
}
.paymentDetail
.paymentList
{
.paymentDetail
.paymentList
{
...
@@ -131,6 +132,7 @@
...
@@ -131,6 +132,7 @@
.p_titleList
{
.p_titleList
{
position
:
relative
;
position
:
relative
;
margin-bottom
:
20px
;
}
}
</
style
>
</
style
>
...
@@ -138,37 +140,38 @@
...
@@ -138,37 +140,38 @@
<div
class=
"page-body paymentDetail"
>
<div
class=
"page-body paymentDetail"
>
<div
class=
"page-search items-center"
>
<div
class=
"page-search items-center"
>
<div
class=
"p_titleList"
>
<div
class=
"p_titleList"
>
<div
class=
"p_title"
>
活动收支
</div>
<q-btn
label=
"导出"
color=
"accent q-px-md"
size=
"sm"
<div
class=
"p_title"
>
style=
"font-weight:400 !important;position:absolute;right:0;top:0"
@
click=
"exportOrder"
/>
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-sm"
label=
"返回"
@
click=
"goBack"
/>
活动收支
</div>
</div>
</div>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col paymentList"
v-if=
"dataList
&&dataList
.ClassInfo"
>
<div
class=
"col paymentList"
v-if=
"dataList.ClassInfo"
>
<div
class=
"pay_topList"
>
<div
class=
"pay_topList"
>
<img
src=
"../../assets/images/myimg/bjqk.png"
alt=
""
/>
<img
src=
"../../assets/images/myimg/bjqk.png"
alt=
""
/>
<span
class=
"pay_Title"
>
活动情况
</span>
<span
class=
"pay_Title"
>
活动情况
</span>
</div>
</div>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListOne"
>
班级
名称
</div>
<div
class=
"pay_ListOne"
>
活动
名称
</div>
<div
class=
"pay_Inner"
>
{{
dataList
.
ClassInfo
.
Class
Name
}}
</div>
<div
class=
"pay_Inner"
>
{{
dataList
.
ClassInfo
.
Activity
Name
}}
</div>
</div>
</div>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListOne"
>
课程名称
</div>
<div
class=
"pay_ListOne"
>
开始时间
</div>
<div
class=
"pay_Inner"
>
{{
dataList
.
ClassInfo
.
CourseName
}}
</div>
<div
class=
"pay_Inner"
>
{{
dataList
.
ClassInfo
.
StartTimeStr
}}
</div>
</div>
</div>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListOne"
>
开课
时间
</div>
<div
class=
"pay_ListOne"
>
结束
时间
</div>
<div
class=
"pay_Inner"
>
{{
dataList
.
ClassInfo
.
OpenTime
}}
</div>
<div
class=
"pay_Inner"
>
{{
dataList
.
ClassInfo
.
EndTimeStr
}}
</div>
</div>
</div>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListOne"
>
带课老师
</div>
<div
class=
"pay_ListOne"
>
地址
</div>
<div
class=
"pay_Inner"
>
{{
dataList
.
ClassInfo
.
Teacher
Name
}}
</div>
<div
class=
"pay_Inner"
>
{{
dataList
.
ClassInfo
.
Location
Name
}}
</div>
</div>
</div>
</div>
</div>
<div
class=
"col paymentList"
>
<div
class=
"col paymentList"
>
<div
class=
"pay_topList"
>
<div
class=
"pay_topList"
>
<img
src=
"../../assets/images/myimg/bjsr.png"
alt=
""
/>
<img
src=
"../../assets/images/myimg/bjsr.png"
alt=
""
/>
<span
class=
"pay_Title"
>
班级
收入
</span>
<span
class=
"pay_Title"
>
活动
收入
</span>
</div>
</div>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListTwo"
>
应收
</div>
<div
class=
"pay_ListTwo"
>
应收
</div>
...
@@ -186,12 +189,33 @@
...
@@ -186,12 +189,33 @@
<div
class=
"pay_ListTwo"
>
注
</div>
<div
class=
"pay_ListTwo"
>
注
</div>
<div
class=
"pay_Inner"
>
应收=订单应收总额,实收=订单 实收总额
</div>
<div
class=
"pay_Inner"
>
应收=订单应收总额,实收=订单 实收总额
</div>
</div>
</div>
</div>
<div
class=
"col paymentList"
>
<div
class=
"pay_topList"
>
<img
src=
"../../assets/images/myimg/bjsr.png"
alt=
""
/>
<span
class=
"pay_Title"
>
活动支出
</span>
</div>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListTwo"
>
应付
</div>
<div
class=
"pay_Inner"
>
¥
{{
dataList
.
PayReceive
}}
</div>
</div>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListTwo"
>
实付
</div>
<div
class=
"pay_Inner orangeStyle"
>
¥
{{
dataList
.
PayActual
}}
</div>
</div>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListTwo"
>
待付
</div>
<div
class=
"pay_Inner orangeStyle"
>
¥
{{
getShiShou
(
dataList
.
PayReceive
,
dataList
.
PayActual
)
}}
</div>
</div>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListTwo"
>
注
</div>
<div
class=
"pay_Inner"
>
应付=订单应付总额,实付=订单 实付总额
</div>
</div>
</div>
</div>
<div
class=
"col paymentList"
>
<div
class=
"col paymentList"
>
<div
class=
"pay_topList"
>
<div
class=
"pay_topList"
>
<img
src=
"../../assets/images/myimg/qt.png"
alt=
""
/>
<img
src=
"../../assets/images/myimg/qt.png"
alt=
""
/>
<span
class=
"pay_Title"
>
其他
</span>
<span
class=
"pay_Title"
>
其他
收入
</span>
</div>
</div>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListTwo"
>
应收
</div>
<div
class=
"pay_ListTwo"
>
应收
</div>
...
@@ -214,19 +238,19 @@
...
@@ -214,19 +238,19 @@
<div
class=
"col paymentList"
>
<div
class=
"col paymentList"
>
<div
class=
"pay_topList"
>
<div
class=
"pay_topList"
>
<img
src=
"../../assets/images/myimg/zc.png"
alt=
""
/>
<img
src=
"../../assets/images/myimg/zc.png"
alt=
""
/>
<span
class=
"pay_Title"
>
支出
</span>
<span
class=
"pay_Title"
>
其他
支出
</span>
</div>
</div>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListTwo"
>
应付
</div>
<div
class=
"pay_ListTwo"
>
应付
</div>
<div
class=
"pay_Inner"
>
¥
{{
dataList
.
PayReceive
}}
</div>
<div
class=
"pay_Inner"
>
¥
{{
dataList
.
Other
PayReceive
}}
</div>
</div>
</div>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListTwo"
>
实付
</div>
<div
class=
"pay_ListTwo"
>
实付
</div>
<div
class=
"pay_Inner orangeStyle"
>
¥
{{
dataList
.
PayActual
}}
</div>
<div
class=
"pay_Inner orangeStyle"
>
¥
{{
dataList
.
Other
PayActual
}}
</div>
</div>
</div>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListTwo"
>
待付
</div>
<div
class=
"pay_ListTwo"
>
待付
</div>
<div
class=
"pay_Inner orangeStyle "
>
¥
{{
getShiShou
(
dataList
.
PayReceive
,
dataList
.
PayActual
)
}}
</div>
<div
class=
"pay_Inner orangeStyle "
>
¥
{{
getShiShou
(
dataList
.
OtherPayReceive
,
dataList
.
Other
PayActual
)
}}
</div>
</div>
</div>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListMent"
>
<div
class=
"pay_ListTwo"
>
注
</div>
<div
class=
"pay_ListTwo"
>
注
</div>
...
@@ -251,7 +275,7 @@
...
@@ -251,7 +275,7 @@
<div
class=
"pay_Inner"
>
实收-(应付/实付)+其他收入-总支出
</div>
<div
class=
"pay_Inner"
>
实收-(应付/实付)+其他收入-总支出
</div>
</div>
</div>
</div>
</div>
<div
class=
"col paymentList"
>
<
!--
<
div
class=
"col paymentList"
>
<div
class=
"pay_topList"
>
<div
class=
"pay_topList"
>
<img
src=
"../../assets/images/myimg/tc.png"
alt=
""
/>
<img
src=
"../../assets/images/myimg/tc.png"
alt=
""
/>
<span
class=
"pay_Title"
>
提成
</span>
<span
class=
"pay_Title"
>
提成
</span>
...
@@ -268,7 +292,7 @@
...
@@ -268,7 +292,7 @@
<div
class=
"pay_ListOne"
>
绩效奖励
</div>
<div
class=
"pay_ListOne"
>
绩效奖励
</div>
<div
class=
"pay_Inner orangeStyle "
>
¥
{{
dataList
.
MeritsProfit
}}
</div>
<div
class=
"pay_Inner orangeStyle "
>
¥
{{
dataList
.
MeritsProfit
}}
</div>
</div>
</div>
</div>
</div>
-->
</div>
</div>
<div
class=
"pay_InorOut"
>
<div
class=
"pay_InorOut"
>
<div
class=
"pay_TopTitle"
style=
"display:flex;justify-content: space-between;align-items:center;"
>
<div
class=
"pay_TopTitle"
style=
"display:flex;justify-content: space-between;align-items:center;"
>
...
@@ -277,7 +301,7 @@
...
@@ -277,7 +301,7 @@
@
click=
"goShoukuan(1)"
/>
@
click=
"goShoukuan(1)"
/>
</div>
</div>
<div
class=
"pay_TopTitle"
style=
"margin:15px 0 15px 20px;font-size:12px;"
>
<div
class=
"pay_TopTitle"
style=
"margin:15px 0 15px 20px;font-size:12px;"
>
<span
class=
"Pay_Line"
style=
"background-color:#02C499;"
></span>
学费
收入
<span
class=
"Pay_Line"
style=
"background-color:#02C499;"
></span>
活动
收入
</div>
</div>
<table
class=
"payTable"
>
<table
class=
"payTable"
>
<tr>
<tr>
...
@@ -384,6 +408,57 @@
...
@@ -384,6 +408,57 @@
<q-btn
label=
"新增付款"
color=
"accent q-px-md"
size=
"sm"
style=
"font-weight:400 !important;"
<q-btn
label=
"新增付款"
color=
"accent q-px-md"
size=
"sm"
style=
"font-weight:400 !important;"
@
click=
"goShoukuan(2)"
/>
@
click=
"goShoukuan(2)"
/>
</div>
</div>
<div
class=
"pay_TopTitle"
style=
"margin:15px 0 15px 20px;font-size:12px;"
>
<span
class=
"Pay_Line"
style=
"background-color:#02C499;"
></span>
活动支出
</div>
<table
class=
"payTable"
>
<tr>
<th
width=
"180"
>
单号
</th>
<th
width=
"200"
>
费用类型
</th>
<th
width=
"500"
>
交易明细
</th>
<th
width=
"300"
>
金额
</th>
<th
width=
"200"
>
交易日期
</th>
<th
width=
"250"
>
制单人员
</th>
<th
width=
'180'
>
审核状态
</th>
<th
width=
"200"
>
当前审核人
</th>
</tr>
<tr
v-if=
"dataList && dataList.FinicePayList==0"
>
<td
:colspan=
"8"
align=
"center"
>
暂无数据
</td>
</tr>
<tr
v-for=
"(item,index) in dataList.FinicePayList"
:key=
"index"
>
<td>
<span
class=
"finince_Order"
@
click=
"goOrderDetail('FinancialDocumentsDetail',item)"
>
{{
item
.
FrID
}}
</span>
</td>
<td><span
v-for=
"subItem in item.CostTypeList"
:key=
"subItem.subCode"
>
{{
subItem
}}
</span></td>
<td
style=
"text-align:left;"
>
<div
v-for=
"childItem in item.TradeWayList"
>
支付方式:
{{
childItem
.
Alias
}}
<span
class=
"TB_Rate"
>
币种:
{{
childItem
.
CurrencyName
}}
</span>
<span
class=
"Team_Coins orangeStyle"
>
{{
childItem
.
OriginalMoney
}}
*
{{
childItem
.
Rate
}}
</span>
<span
class=
"TB_Rate"
style=
"margin-left:10px;"
>
汇率:
{{
childItem
.
Rate
}}
</span>
</div>
</td>
<td>
<div
class=
"financeYing"
>
应收:
{{
item
.
Money
}}
<br
/>
实收:
{{
item
.
PayMoney
}}
</div>
</td>
<td>
{{
item
.
TradeDate
}}
</td>
<td>
<div>
{{
item
.
RB_CreateByName
}}
</div>
<div>
{{
item
.
CreateDate
}}
</div>
</td>
<td>
<div
class=
"finice_pass"
>
{{
item
.
StatusStr
}}
</div>
</td>
<td>
<div
v-for=
"AuditItem in item.AuditList"
>
{{
AuditItem
.
AuditEmName
}}
<span
class=
"TB_Rate"
>
{{
AuditItem
.
AuditDate
}}
</span>
</div>
</td>
</tr>
</table>
<div
class=
"pay_TopTitle"
style=
"margin:15px 0 15px 20px;font-size:12px;"
>
<div
class=
"pay_TopTitle"
style=
"margin:15px 0 15px 20px;font-size:12px;"
>
<span
class=
"Pay_Line"
style=
"background-color:#F28C1D;"
></span>
其他支出
<span
class=
"Pay_Line"
style=
"background-color:#F28C1D;"
></span>
其他支出
</div>
</div>
...
@@ -441,37 +516,31 @@
...
@@ -441,37 +516,31 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
{
GetClassBalanceSheet
,
}
from
'../../api/finance/index'
;
import
{
EduDownLoad
,
}
from
'../../api/common/common'
;
export
default
{
export
default
{
props
:
{},
components
:
{},
data
()
{
data
()
{
return
{
return
{
dataList
:
[],
//数据
dataList
:
{
ClassInfo
:{}
},
//数据
msg
:
{
msg
:
{
ClassId
:
0
,
Id
:
0
,
School_Id
:
0
},
},
}
}
},
},
created
()
{},
mounted
()
{
mounted
()
{
if
(
this
.
$route
.
query
.
ClassId
&&
this
.
$route
.
query
.
School_Id
)
{
if
(
this
.
$route
.
query
.
Id
)
{
this
.
msg
.
ClassId
=
this
.
$route
.
query
.
ClassId
;
this
.
msg
.
Id
=
this
.
$route
.
query
.
Id
;
this
.
msg
.
School_Id
=
this
.
$route
.
query
.
School_Id
;
}
}
this
.
getData
();
this
.
getData
();
},
},
methods
:
{
methods
:
{
getData
()
{
getData
()
{
GetClassBalanceSheet
(
this
.
msg
).
then
(
res
=>
{
this
.
loading
=
true
;
if
(
res
.
Code
==
1
)
{
this
.
apipostDS
(
"/api/Education/GetActivityBalanceSheet"
,
this
.
msg
,(
res
)
=>
{
this
.
dataList
=
res
.
Data
;
this
.
loading
=
false
if
(
res
.
data
.
resultCode
===
1
){
this
.
dataList
=
res
.
data
.
data
;
console
.
log
(
500
,
this
.
dataList
)
}
}
})
})
},
},
...
@@ -494,35 +563,36 @@
...
@@ -494,35 +563,36 @@
}
}
})
})
},
},
//导出单据
exportOrder
()
{
var
msg
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
msg
));
EduDownLoad
(
"/Finance/GetClassBalanceSheetToExcel"
,
msg
,
"收支明细.xls"
)
},
//跳转到收款单
//跳转到收款单
goShoukuan
(
type
)
{
goShoukuan
(
type
)
{
let
TCIDARR
=
[]
//
let TCIDARR = []
TCIDARR
.
push
(
this
.
msg
.
ClassId
)
//
TCIDARR.push(this.msg.ClassId)
let
orderObj
=
{
let
orderObj
=
{
OrderID
:
0
,
//
OrderID: 0,
OrderSource
:
17
,
OrderSource
:
17
,
Obj
:
{},
// Obj: {},
SourceID
:
0
,
// SourceID: 0,
TCIDList
:
TCIDARR
// TCIDList: TCIDARR,
OtherType
:
41
,
ReFinanceId
:
this
.
msg
.
Id
}
}
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
'/financial/financalDocument/ChoiceAddFinancialDocuments'
,
path
:
'/financial/financalDocument/ChoiceAddFinancialDocuments'
,
query
:
{
query
:
{
"Type"
:
type
,
"Type"
:
type
,
"companyID"
:
this
.
msg
.
School_Id
,
// "ReFinanceId":this.msg.Id,
"path"
:
""
,
// "companyID": this.msg.Id,
'blank'
:
'y'
,
// "path": "",
// 'blank': 'y',
'orderObj'
:
JSON
.
stringify
(
orderObj
),
'orderObj'
:
JSON
.
stringify
(
orderObj
),
'tradeWay'
:
''
,
//
'tradeWay': '',
}
}
});
});
}
},
goBack
(){
this
.
$router
.
go
(
-
1
)
}
,
}
}
}
}
...
...
src/pages/financial/financalDocument/ChoiceAddFinancialDocuments.vue
View file @
2d48459d
...
@@ -104,6 +104,7 @@
...
@@ -104,6 +104,7 @@
platformAccount
:
''
,
platformAccount
:
''
,
Handmsg
:{},
Handmsg
:{},
czmsg
:{},
czmsg
:{},
ReFinanceId
:
0
,
//活动id
}
}
},
},
computed
:
{
computed
:
{
...
@@ -142,7 +143,7 @@
...
@@ -142,7 +143,7 @@
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
'/financial/financalDocument/addReceivablesDocuments'
,
path
:
'/financial/financalDocument/addReceivablesDocuments'
,
query
:{
"tradeWay"
:
this
.
tradeWay
,
"platformAccount"
:
this
.
platformAccount
,
"id"
:
id
,
"Name"
:
Name
,
"Type"
:
Type
,
"orderObj"
:
this
.
orderObj
,
'path'
:
this
.
$route
.
query
.
path
,
'IsUploadPic'
:
IsUploadPic
,
'Cmd'
:
this
.
$route
.
query
.
Cmd
,
query
:{
"tradeWay"
:
this
.
tradeWay
,
"platformAccount"
:
this
.
platformAccount
,
"id"
:
id
,
"Name"
:
Name
,
"Type"
:
Type
,
"orderObj"
:
this
.
orderObj
,
'path'
:
this
.
$route
.
query
.
path
,
'IsUploadPic'
:
IsUploadPic
,
'Cmd'
:
this
.
$route
.
query
.
Cmd
,
'companyID'
:
this
.
$route
.
query
.
companyID
,
blank
:
'y'
,
tab
:
'新增收款单'
,
GuestId
:
this
.
$route
.
query
.
GuestId
}
'companyID'
:
this
.
$route
.
query
.
companyID
,
blank
:
'y'
,
tab
:
'新增收款单'
,
GuestId
:
this
.
$route
.
query
.
GuestId
,
ReFinanceId
:
this
.
ReFinanceId
}
});
});
}
}
}
else
if
(
this
.
active
==
2
){
}
else
if
(
this
.
active
==
2
){
...
@@ -310,7 +311,9 @@
...
@@ -310,7 +311,9 @@
else
if
(
this
.
showTab
==
4
){
else
if
(
this
.
showTab
==
4
){
this
.
GetList
=
this
.
ZRList
;
this
.
GetList
=
this
.
ZRList
;
}
}
if
(
this
.
$route
.
query
.
ReFinanceId
){
this
.
ReFinanceId
=
this
.
$route
.
query
.
ReFinanceId
}
this
.
active
=
parseInt
(
this
.
$route
.
query
.
Type
)?
parseInt
(
this
.
$route
.
query
.
Type
):
1
;
this
.
active
=
parseInt
(
this
.
$route
.
query
.
Type
)?
parseInt
(
this
.
$route
.
query
.
Type
):
1
;
this
.
orderObj
=
this
.
$route
.
query
.
orderObj
;
this
.
orderObj
=
this
.
$route
.
query
.
orderObj
;
this
.
Handmsg
=
this
.
$route
.
query
.
Handmsg
?
this
.
$route
.
query
.
Handmsg
:
this
.
Handmsg
;
this
.
Handmsg
=
this
.
$route
.
query
.
Handmsg
?
this
.
$route
.
query
.
Handmsg
:
this
.
Handmsg
;
...
...
src/pages/financial/financalDocument/addReceivablesDocuments.vue
View file @
2d48459d
...
@@ -720,7 +720,7 @@
...
@@ -720,7 +720,7 @@
RB_BranchName
:
''
,
RB_BranchName
:
''
,
RB_DepartName
:
''
,
RB_DepartName
:
''
,
OrderSource
:
17
,
OrderSource
:
17
,
GuestId
:
""
GuestId
:
""
,
},
},
AccountNumber
:
''
,
AccountNumber
:
''
,
queryAccMsg
:
{
queryAccMsg
:
{
...
@@ -1305,7 +1305,7 @@
...
@@ -1305,7 +1305,7 @@
//从电商过来的参数处理
//从电商过来的参数处理
this
.
msg
.
OrderSource
=
this
.
orderObj
.
OrderSource
?
this
.
orderObj
.
OrderSource
:
0
;
this
.
msg
.
OrderSource
=
this
.
orderObj
.
OrderSource
?
this
.
orderObj
.
OrderSource
:
0
;
this
.
msg
.
OtherType
=
this
.
orderObj
.
OtherType
?
this
.
orderObj
.
OtherType
:
0
;
this
.
msg
.
OtherType
=
this
.
orderObj
.
OtherType
?
this
.
orderObj
.
OtherType
:
0
;
this
.
msg
.
ReFinanceId
=
this
.
orderObj
.
ReFinanceId
?
this
.
orderObj
.
ReFinanceId
:
0
;
this
.
msg
.
ReFinanceId
=
this
.
orderObj
.
ReFinanceId
?
parseInt
(
this
.
orderObj
.
ReFinanceId
)
:
0
;
this
.
msg
.
ReFinanceId2
=
this
.
orderObj
.
ReFinanceId2
?
this
.
orderObj
.
ReFinanceId2
:
0
;
this
.
msg
.
ReFinanceId2
=
this
.
orderObj
.
ReFinanceId2
?
this
.
orderObj
.
ReFinanceId2
:
0
;
this
.
msg
.
ECOrderList
=
this
.
orderObj
.
ECOrderList
?
this
.
orderObj
.
ECOrderList
:
[];
this
.
msg
.
ECOrderList
=
this
.
orderObj
.
ECOrderList
?
this
.
orderObj
.
ECOrderList
:
[];
}
}
...
@@ -1815,8 +1815,6 @@
...
@@ -1815,8 +1815,6 @@
this
.
platformAccount
=
this
.
$route
.
query
.
platformAccount
?
this
.
$route
.
query
.
platformAccount
:
0
;
this
.
platformAccount
=
this
.
$route
.
query
.
platformAccount
?
this
.
$route
.
query
.
platformAccount
:
0
;
this
.
orderObj
=
this
.
$route
.
query
.
orderObj
&&
this
.
$route
.
query
.
orderObj
!=
'undefined'
?
JSON
.
parse
(
this
.
$route
.
query
.
orderObj
)
:
null
;
this
.
orderObj
=
this
.
$route
.
query
.
orderObj
&&
this
.
$route
.
query
.
orderObj
!=
'undefined'
?
JSON
.
parse
(
this
.
$route
.
query
.
orderObj
)
:
null
;
this
.
Handmsg
=
this
.
$route
.
query
.
Handmsg
&&
this
.
$route
.
query
.
Handmsg
!=
'undefined'
?
JSON
.
parse
(
this
.
$route
.
query
.
Handmsg
)
:
null
;
this
.
Handmsg
=
this
.
$route
.
query
.
Handmsg
&&
this
.
$route
.
query
.
Handmsg
!=
'undefined'
?
JSON
.
parse
(
this
.
$route
.
query
.
Handmsg
)
:
null
;
if
(
this
.
orderObj
!=
null
&&
this
.
orderObj
.
OrderSource
===
8
&&
this
.
orderObj
.
tipObj
==
1
)
{
if
(
this
.
orderObj
!=
null
&&
this
.
orderObj
.
OrderSource
===
8
&&
this
.
orderObj
.
tipObj
==
1
)
{
that
.
Description
=
"旅客名单:"
;
that
.
Description
=
"旅客名单:"
;
that
.
describeList
=
JSON
.
parse
(
sessionStorage
.
getItem
(
"TipGuestList"
));
that
.
describeList
=
JSON
.
parse
(
sessionStorage
.
getItem
(
"TipGuestList"
));
...
...
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