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
40d436c6
You need to sign in or sign up before continuing.
Commit
40d436c6
authored
Jul 21, 2021
by
罗超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
88bb26a4
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
276 additions
and
146 deletions
+276
-146
common.js
src/api/common/common.js
+2
-1
activeSignUpList.vue
src/pages/activity/activeSignUpList.vue
+69
-57
activeSignUpList2.vue
src/pages/activity/activeSignUpList2.vue
+167
-74
activityList.vue
src/pages/activity/activityList.vue
+2
-1
routes.js
src/router/routes.js
+5
-0
erpindex.js
src/utils/erpindex.js
+31
-13
No files found.
src/api/common/common.js
View file @
40d436c6
import
request
from
'../../utils/request'
import
ds
from
'../../utils/erpindex'
import
{
Loading
}
from
'quasar'
...
...
src/pages/activity/activeSignUpList.vue
View file @
40d436c6
<
template
>
<div
class=
"page-body myActiveOrder"
>
<div
class=
"row col"
style=
"
height: 4
0px"
>
<div
class=
"row col "
style=
"align-items: center;margin-bottom: 10px"
>
<div
class=
"row col"
style=
"
margin-bottom: 1
0px"
>
<div
class=
"row col "
>
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md "
label=
"返回"
@
click=
"goBack"
/>
<div
v-if=
"activeName
"
>
<div
v-if=
"activeName"
style=
"line-height:25px
"
>
活动名称:
{{
activeName
}}
</div>
</div>
<q-btn
color=
"accent"
style=
"float:right"
v-if=
"from==1"
size=
"sm"
label=
"参与者名单"
@
click=
"gourl"
/>
</div>
<div
class=
"page-content"
>
<OrderItem
:dataList=
"data.List"
ref=
"orderL"
:authObj=
"authObj"
:modityOrderType=
"2"
:cancelList=
"CancelList"
:formActiveMan=
"true"
@
agree=
"agreeApply"
@
refuse=
"jujueMsg"
@
success=
"refreshClassOrder"
></OrderItem>
<OrderItem
:dataList=
"data.List"
ref=
"orderL"
:authObj=
"authObj"
:modityOrderType=
"2"
:cancelList=
"CancelList"
:formActiveMan=
"true"
@
agree=
"agreeApply"
@
refuse=
"jujueMsg"
@
success=
"refreshClassOrder"
></OrderItem>
<div
class=
"row"
style=
"justify-content: flex-end;padding: 5px 20px"
>
<q-pagination
v-model=
"msg.pageIndex"
:max=
"pageCount"
@
input=
"changePage"
class=
"full-width justify-end"
color=
"primary"
:input=
"true"
>
...
...
@@ -28,6 +29,7 @@
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
label=
"确定"
@
click=
"sureJujue"
/>
</span>
</el-dialog>
</div>
</
template
>
<
script
>
...
...
@@ -37,8 +39,8 @@
import
OrderItem
from
'../../components/sale/activeOrder-item.vue'
export
default
{
meta
:{
title
:
"活动报名列表"
meta
:
{
title
:
"活动报名列表"
},
components
:
{
OrderItem
...
...
@@ -46,13 +48,13 @@
data
()
{
return
{
data
:
{},
activeName
:
""
,
activeName
:
""
,
msg
:
{
pageIndex
:
1
,
pageSize
:
10
,
pageIndex
:
1
,
pageSize
:
10
,
ActivityId
:
0
},
pageCount
:
0
,
pageCount
:
0
,
//正常订单
dataList
:
[],
//取消订单
...
...
@@ -72,7 +74,8 @@
ApplyForCancelStatus
:
1
,
//申请取消审核状态 1同意 2拒绝
RejectRemark
:
''
},
showJujue
:
false
,
showJujue
:
false
,
from
:
0
,
//来源页面,1===活动=>活动管理=>活动列表
}
},
created
()
{
...
...
@@ -82,16 +85,16 @@
if
(
this
.
$route
.
query
.
name
)
{
this
.
activeName
=
this
.
$route
.
query
.
name
}
if
(
this
.
$route
.
query
.
from
)
{
this
.
from
=
this
.
$route
.
query
.
from
}
this
.
getList
();
},
mounted
()
{
},
methods
:
{
//获取订单列表
getList
()
{
this
.
loading
=
true
;
this
.
apipostDS
(
"/api/Education/GetConsultOrderStatisticsPage"
,
this
.
msg
,
(
res
)
=>
{
this
.
apipostDS
(
"/api/Education/GetConsultOrderStatisticsPage"
,
this
.
msg
,
(
res
)
=>
{
this
.
loading
=
false
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
data
=
res
.
data
.
data
.
pageData
;
...
...
@@ -103,7 +106,7 @@
refreshClassOrder
()
{
this
.
getList
();
},
goBack
(){
goBack
()
{
this
.
$router
.
go
(
-
1
)
},
//翻页
...
...
@@ -124,20 +127,20 @@
}
})
},
jujueMsg
(
item
){
jujueMsg
(
item
)
{
this
.
bdMsg
.
Id
=
item
.
Id
;
this
.
showJujue
=
true
;
this
.
showJujue
=
true
;
},
// 拒绝
sureJujue
(){
if
(
!
this
.
bdMsg
.
RejectRemark
)
{
sureJujue
()
{
if
(
!
this
.
bdMsg
.
RejectRemark
)
{
this
.
Error
(
"请输入拒绝原因"
)
return
}
this
.
bdMsg
.
ApplyForCancelStatus
=
2
;
this
.
apipostDS
(
"/api/Education/SetCommerceConsultApplyCancel"
,
this
.
bdMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
showJujue
=
false
;
this
.
showJujue
=
false
;
this
.
Success
(
"操作成功"
)
this
.
getList
()
}
else
{
...
...
@@ -145,35 +148,44 @@
}
})
},
gourl
()
{
this
.
$router
.
push
({
path
:
"/activity/activeSignUpList2"
,
query
:
{
Id
:
this
.
msg
.
ActivityId
,
name
:
this
.
activeName
,
from
:
this
.
from
}
})
},
}
}
</
script
>
<
style
>
.myActiveOrder
.table-body
{
<
style
>
.myActiveOrder
.table-body
{
height
:
calc
(
100vh
-
220px
);
}
/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
.myActiveOrder
.table-body
::-webkit-scrollbar
{
}
/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
.myActiveOrder
.table-body
::-webkit-scrollbar
{
width
:
5px
;
height
:
5px
;
background-color
:
#F5F5F5
;
}
}
/*定义滚动条轨道 内阴影+圆角*/
.myActiveOrder
.table-body
::-webkit-scrollbar-track
{
-webkit-box-shadow
:
inset
0
0
6px
rgba
(
0
,
0
,
0
,
0.3
);
/*定义滚动条轨道 内阴影+圆角*/
.myActiveOrder
.table-body
::-webkit-scrollbar-track
{
-webkit-box-shadow
:
inset
0
0
6px
rgba
(
0
,
0
,
0
,
0.3
);
border-radius
:
10px
;
background-color
:
#F5F5F5
;
}
}
/*定义滑块 内阴影+圆角*/
.myActiveOrder
.table-body
::-webkit-scrollbar-thumb
{
/*定义滑块 内阴影+圆角*/
.myActiveOrder
.table-body
::-webkit-scrollbar-thumb
{
border-radius
:
5px
;
-webkit-box-shadow
:
inset
0
0
6px
rgba
(
0
,
0
,
0
,
.3
);
-webkit-box-shadow
:
inset
0
0
6px
rgba
(
0
,
0
,
0
,
.3
);
background-color
:
#555
;
}
}
</
style
>
src/pages/activity/activeSignUpList
1
.vue
→
src/pages/activity/activeSignUpList
2
.vue
View file @
40d436c6
...
...
@@ -109,6 +109,7 @@
line-height
:
25px
;
background-color
:
#004d40
;
}
.activeType
.app-image
{
background-position
:
center
center
;
width
:
50px
;
...
...
@@ -127,7 +128,9 @@
separator=
"none"
:data=
"data"
:columns=
"columns"
row-key=
"name"
>
<template
v-slot:top=
"props"
>
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
label=
"返回"
@
click=
"goBack"
/>
<div
class=
"col-2 q-table__title"
>
活动报名列表
</div>
<div
class=
"col-2 q-table__title"
>
参与者名单
</div>
<q-space></q-space>
<q-btn
color=
"accent"
style=
"float:right"
v-if=
"from==1"
size=
"sm"
label=
"导出"
@
click=
"showExportDialog"
/>
</
template
>
<
template
v-slot:body-cell-Status=
"props"
>
<q-td
:props=
"props"
>
...
...
@@ -142,7 +145,7 @@
</q-td>
</
template
>
<
template
v-slot:body-cell-quxiaomoney=
"props"
>
<q-td
:props=
"props"
>
<q-td
:props=
"props"
>
<span
v-if=
"props.row.Status===1"
>
{{
props
.
row
.
Money
}}
</span>
</q-td>
...
...
@@ -151,10 +154,10 @@
<
template
v-slot:body-cell-optioned=
"props"
>
<q-td
:props=
"props"
v-if=
"props.row.IsApplyForCancel==1&&props.row.Status===0"
>
<div>
<q-btn
flat
size=
"xs"
icon=
"edit
"
color=
"accent"
style=
"font-weight:400"
label=
"同意"
@
click=
"agreeApply(props.row)"
/>
<q-btn
flat
size=
"xs"
icon=
"edit
"
color=
"accent"
style=
"font-weight:400"
label=
"拒绝"
@
click=
"jujueMsg(props.row)"
/>
<q-btn
flat
size=
"xs"
icon=
"edit"
color=
"accent"
style=
"font-weight:400"
label=
"同意
"
@
click=
"agreeApply(props.row)"
/>
<q-btn
flat
size=
"xs"
icon=
"edit"
color=
"accent"
style=
"font-weight:400"
label=
"拒绝
"
@
click=
"jujueMsg(props.row)"
/>
</div>
</q-td>
</
template
>
...
...
@@ -174,6 +177,28 @@
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
label=
"确定"
@
click=
"sureJujue"
/>
</span>
</el-dialog>
<!-- 导出弹窗 -->
<q-dialog
v-model=
"showExport"
transition-show=
"scale"
>
<q-card>
<q-card-section>
<div>
选择导出信息
</div>
<div
class=
"col-12 q-mt-sm q-mb-sm"
style=
"background-color:#F3F5F6"
>
<q-checkbox
v-model=
"allCheck"
label=
"全选"
val=
'2'
@
input=
"allCheckType"
/>
</div>
<div
class=
"flex row col"
>
<div
class=
"col-3"
v-for=
"item in exportTypeList"
:key=
"item.Id"
text-color=
"primary"
>
<q-checkbox
v-model=
"checkType"
:label=
"item.Name"
:val=
"item.Id"
/>
</div>
</div>
</q-card-section>
<q-card-actions
align=
"right"
>
<q-btn
flat
label=
"关闭"
size=
"sm"
color=
"primary"
v-close-popup
/>
<q-btn
color=
"accent"
size=
"sm"
label=
"导出"
@
click=
"exportInfo"
/>
</q-card-actions>
</q-card>
</q-dialog>
</div>
</template>
<
script
>
...
...
@@ -189,13 +214,17 @@
msg
:
{
pageIndex
:
1
,
pageSize
:
10
,
ActivityId
:
0
,
EnrollState
:
3
,
rowsPerPage
:
0
ActivityId
:
0
,
EnrollState
:
3
,
rowsPerPage
:
0
},
pageCount
:
0
,
columns
:
[
columns
:
[{
name
:
"Id"
,
label
:
"订单号"
,
field
:
"Id"
,
align
:
"left"
},
{
name
:
"LinkMan"
,
label
:
"联系人"
,
...
...
@@ -211,84 +240,124 @@
{
name
:
"UnitPrice"
,
label
:
"单价"
,
field
:
"UnitPrice"
,
field
:
"UnitPrice"
,
align
:
"left"
,
},
{
name
:
"Money"
,
label
:
"应收"
,
field
:
"Money"
,
field
:
"Money"
,
align
:
"left"
,
},
{
name
:
"
Status
"
,
label
:
"
状态
"
,
field
:
"Status
"
,
align
:
"left"
name
:
"
Income
"
,
label
:
"
实收
"
,
field
:
"Income
"
,
align
:
"left"
,
},
{
name
:
"OrderNo"
,
required
:
true
,
label
:
"订单号"
,
field
:
"OrderNo"
,
name
:
"RefundPrice"
,
label
:
"退款"
,
field
:
"RefundPrice"
,
align
:
"left"
,
},
{
name
:
"OrderStatus"
,
required
:
true
,
label
:
"订单状态"
,
field
:
"OrderStatus"
,
name
:
"PlatformTax"
,
label
:
"平台税金"
,
field
:
"PlatformTax"
,
align
:
"left"
,
},
{
name
:
"
PaymentTime
"
,
label
:
"
支付时间
"
,
field
:
"PaymentTime
"
,
align
:
"left"
name
:
"
DueInMoney
"
,
label
:
"
待收金额
"
,
field
:
"DueInMoney
"
,
align
:
"left"
,
},
{
name
:
" quxiaomoney"
,
label
:
"取消金额"
,
name
:
"Status"
,
label
:
"状态"
,
field
:
"Status"
,
align
:
"left"
},
// {
// name: "OrderNo",
// required: true,
// label: "订单号",
// field: "OrderNo",
// align: "left",
// },
// {
// name: "OrderStatus",
// required: true,
// label: "订单状态",
// field: "OrderStatus",
// align: "left",
// },
// {
// name: "PaymentTime",
// label: "支付时间",
// field: "PaymentTime",
// align: "left"
// },
// {
// name: " quxiaomoney",
// label: "取消金额",
// align: "left"
// },
{
name
:
"Remark"
,
label
:
"备注"
,
field
:
"Remark"
,
field
:
"Remark"
,
align
:
"left"
},
{
name
:
'optioned'
,
label
:
'申请取消审核状态'
,
name
:
"CreateTime"
,
label
:
"报名时间"
,
field
:
"CreateTime"
,
align
:
"left"
}
},
// {
// name: 'optioned',
// label: '申请取消审核状态',
// align: "left"
// }
],
showForm
:
false
,
typeObj
:{},
showForm
:
false
,
typeObj
:
{},
bdMsg
:
{
Id
:
0
,
//报名id
ApplyForCancelStatus
:
1
,
//申请取消审核状态 1同意 2拒绝
RejectRemark
:
''
},
showJujue
:
false
,
showJujue
:
false
,
from
:
0
,
//来源页面,1===活动=>活动管理=>活动列表
showExport
:
false
,
//是否显示导出弹窗
exportTypeList
:
[],
//导出类型
allCheck
:
false
,
checkType
:
[]
}
},
mounted
()
{
if
(
this
.
$route
.
query
.
name
)
{
if
(
this
.
$route
.
query
.
name
)
{
this
.
msg
.
ActivityName
=
this
.
$route
.
query
.
name
;
}
this
.
msg
.
ActivityId
=
this
.
$route
.
query
.
Id
;
if
(
this
.
$route
.
query
.
Id
)
{
this
.
msg
.
ActivityId
=
this
.
$route
.
query
.
Id
}
if
(
this
.
$route
.
query
.
from
)
{
this
.
from
=
this
.
$route
.
query
.
from
}
this
.
getList
();
this
.
getEnumList
();
},
methods
:
{
getList
()
{
getList
()
{
this
.
loading
=
true
;
this
.
apipostDS
(
"/api/Education/GetCommerceConsultAndFinancePage"
,
this
.
msg
,(
res
)
=>
{
this
.
apipostDS
(
"/api/Education/GetCommerceConsultAndFinancePage"
,
this
.
msg
,
(
res
)
=>
{
this
.
loading
=
false
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
data
=
res
.
data
.
data
;
}
})
...
...
@@ -306,20 +375,20 @@
}
})
},
jujueMsg
(
item
){
jujueMsg
(
item
)
{
this
.
bdMsg
.
Id
=
item
.
Id
;
this
.
showJujue
=
true
;
this
.
showJujue
=
true
;
},
// 拒绝
sureJujue
(){
if
(
!
this
.
bdMsg
.
RejectRemark
)
{
sureJujue
()
{
if
(
!
this
.
bdMsg
.
RejectRemark
)
{
this
.
Error
(
"请输入拒绝原因"
)
return
}
this
.
bdMsg
.
ApplyForCancelStatus
=
2
;
this
.
apipostDS
(
"/api/Education/SetCommerceConsultApplyCancel"
,
this
.
bdMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
showJujue
=
false
;
this
.
showJujue
=
false
;
this
.
Success
(
"操作成功"
)
this
.
getList
()
}
else
{
...
...
@@ -327,10 +396,34 @@
}
})
},
goBack
(){
goBack
()
{
this
.
$router
.
go
(
-
1
)
}
},
showExportDialog
()
{
this
.
showExport
=
true
},
//获取导出类型枚举
getEnumList
()
{
this
.
apipostDS
(
"/api/Education/GetConsultOrderExportExcelEnumList"
,
{},
(
res
)
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
exportTypeList
=
res
.
data
.
data
}
})
},
allCheckType
(
val
)
{
if
(
val
)
{
this
.
checkType
=
[]
this
.
exportTypeList
.
map
(
e
=>
{
this
.
checkType
.
push
(
e
.
Id
)
})
}
else
{
this
.
checkType
=
[]
}
},
exportInfo
()
{
this
.
GetLocalFileDS
(
"/api/Education/GetExportCommerceConsultList"
,
{...
this
.
msg
,
ExcelEnumIds
:
this
.
checkType
},
"参与者名单.xls"
)
}
}
}
...
...
src/pages/activity/activityList.vue
View file @
40d436c6
...
...
@@ -509,7 +509,8 @@
path
:
url
,
query
:
{
Id
:
item
.
Id
,
name
:
item
.
ActivityName
name
:
item
.
ActivityName
,
from
:
1
}
})
}
...
...
src/router/routes.js
View file @
40d436c6
...
...
@@ -746,6 +746,11 @@ const routes = [{
component
:
()
=>
import
(
"pages/activity/activeSignUpList.vue"
)
},
{
path
:
"/activity/activeSignUpList2"
,
//活动 活动报名列表type2
component
:
()
=>
import
(
"pages/activity/activeSignUpList2.vue"
)
},
{
path
:
"/activity/activeSummary"
,
//活动 活动总结
component
:
()
=>
...
...
src/utils/erpindex.js
View file @
40d436c6
...
...
@@ -277,7 +277,25 @@ export default {
}
},
faildCall
)
}
//电商文件下载
Vue
.
prototype
.
GetLocalFileDS
=
function
(
cmd
,
msg
,
fileName
,
newCmd
,
successCall
)
{
var
apiurl
=
this
.
domainManager
().
mallUrl
+
cmd
;
var
postData
=
this
.
GetPostDataDS
(
cmd
,
msg
,
newCmd
);
this
.
$http
.
post
(
apiurl
,
postData
,
{
responseType
:
'arraybuffer'
}).
then
((
res
)
=>
{
let
blob
=
new
Blob
([
res
.
data
],
{
type
:
"application/vnd.ms-excel"
})
let
url
=
URL
.
createObjectURL
(
blob
);
let
link
=
document
.
createElement
(
'a'
);
link
.
href
=
url
;
link
.
setAttribute
(
"download"
,
fileName
);
document
.
body
.
appendChild
(
link
);
link
.
click
();
successCall
(
res
);
}).
catch
(
function
(
res
)
{
});
},
//价钱格式化,三位数逗号分隔,保留两位小数 duanjun
Vue
.
prototype
.
moneyFormat
=
function
(
value
)
{
let
nStr
=
Number
(
value
).
toFixed
(
2
)
...
...
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