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
Commit
40d436c6
authored
Jul 21, 2021
by
罗超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
88bb26a4
Expand all
Hide 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
request
from
'../../utils/request'
import
ds
from
'../../utils/erpindex'
import
{
import
{
Loading
Loading
}
from
'quasar'
}
from
'quasar'
...
@@ -388,4 +389,4 @@ export function EduDownLoad(cmd, msg, fileName, callBack) {
...
@@ -388,4 +389,4 @@ export function EduDownLoad(cmd, msg, fileName, callBack) {
callBack
(
result
);
callBack
(
result
);
}
}
})
})
}
}
\ No newline at end of file
src/pages/activity/activeSignUpList.vue
View file @
40d436c6
<
template
>
<
template
>
<div
class=
"page-body myActiveOrder"
>
<div
class=
"page-body myActiveOrder"
>
<div
class=
"row col"
style=
"
height: 4
0px"
>
<div
class=
"row col"
style=
"
margin-bottom: 1
0px"
>
<div
class=
"row col "
style=
"align-items: center;margin-bottom: 10px"
>
<div
class=
"row col "
>
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md "
label=
"返回"
@
click=
"goBack"
/>
<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
}}
活动名称:
{{
activeName
}}
</div>
</div>
</div>
</div>
<q-btn
color=
"accent"
style=
"float:right"
v-if=
"from==1"
size=
"sm"
label=
"参与者名单"
@
click=
"gourl"
/>
</div>
</div>
<div
class=
"page-content"
>
<div
class=
"page-content"
>
<OrderItem
:dataList=
"data.List"
ref=
"orderL"
:authObj=
"authObj"
:modityOrderType=
"2"
:cancelList=
"CancelList"
:formActiveMan=
"true"
@
agree=
"agreeApply"
@
refuse=
"jujueMsg"
<OrderItem
:dataList=
"data.List"
ref=
"orderL"
:authObj=
"authObj"
:modityOrderType=
"2"
:cancelList=
"CancelList"
@
success=
"refreshClassOrder"
></OrderItem>
:formActiveMan=
"true"
@
agree=
"agreeApply"
@
refuse=
"jujueMsg"
@
success=
"refreshClassOrder"
></OrderItem>
<div
class=
"row"
style=
"justify-content: flex-end;padding: 5px 20px"
>
<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"
<q-pagination
v-model=
"msg.pageIndex"
:max=
"pageCount"
@
input=
"changePage"
class=
"full-width justify-end"
color=
"primary"
:input=
"true"
>
color=
"primary"
:input=
"true"
>
</q-pagination>
</q-pagination>
</div>
</div>
</div>
</div>
<!-- 拒绝报名 -->
<!-- 拒绝报名 -->
<el-dialog
title=
"拒绝报名"
:visible
.
sync=
"showJujue"
width=
"600px"
>
<el-dialog
title=
"拒绝报名"
:visible
.
sync=
"showJujue"
width=
"600px"
>
<div
class=
"activityFlex"
>
<div
class=
"activityFlex"
>
<el-input
type=
"textarea"
rows=
"4"
v-model=
"bdMsg.RejectRemark"
></el-input>
<el-input
type=
"textarea"
rows=
"4"
v-model=
"bdMsg.RejectRemark"
></el-input>
</div>
</div>
<span
slot=
"footer"
class=
"dialog-footer"
>
<span
slot=
"footer"
class=
"dialog-footer"
>
<!--
<el-button
type=
"primary"
size=
"small"
@
click=
"sureJujue"
>
确定
</el-button>
-->
<!--
<el-button
type=
"primary"
size=
"small"
@
click=
"sureJujue"
>
确定
</el-button>
-->
<q-btn
text-color=
"accent"
size=
"sm"
class=
"q-mr-md"
label=
"取消"
@
click=
"showJujue=false"
/>
<q-btn
text-color=
"accent"
size=
"sm"
class=
"q-mr-md"
label=
"取消"
@
click=
"showJujue=false"
/>
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
label=
"确定"
@
click=
"sureJujue"
/>
<q-btn
color=
"accent"
size=
"sm"
class=
"q-mr-md"
label=
"确定"
@
click=
"sureJujue"
/>
</span>
</span>
</el-dialog>
</el-dialog>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
...
@@ -37,8 +39,8 @@
...
@@ -37,8 +39,8 @@
import
OrderItem
from
'../../components/sale/activeOrder-item.vue'
import
OrderItem
from
'../../components/sale/activeOrder-item.vue'
export
default
{
export
default
{
meta
:{
meta
:
{
title
:
"活动报名列表"
title
:
"活动报名列表"
},
},
components
:
{
components
:
{
OrderItem
OrderItem
...
@@ -46,13 +48,13 @@
...
@@ -46,13 +48,13 @@
data
()
{
data
()
{
return
{
return
{
data
:
{},
data
:
{},
activeName
:
""
,
activeName
:
""
,
msg
:
{
msg
:
{
pageIndex
:
1
,
pageIndex
:
1
,
pageSize
:
10
,
pageSize
:
10
,
ActivityId
:
0
ActivityId
:
0
},
},
pageCount
:
0
,
pageCount
:
0
,
//正常订单
//正常订单
dataList
:
[],
dataList
:
[],
//取消订单
//取消订单
...
@@ -72,7 +74,8 @@
...
@@ -72,7 +74,8 @@
ApplyForCancelStatus
:
1
,
//申请取消审核状态 1同意 2拒绝
ApplyForCancelStatus
:
1
,
//申请取消审核状态 1同意 2拒绝
RejectRemark
:
''
RejectRemark
:
''
},
},
showJujue
:
false
,
showJujue
:
false
,
from
:
0
,
//来源页面,1===活动=>活动管理=>活动列表
}
}
},
},
created
()
{
created
()
{
...
@@ -82,20 +85,20 @@
...
@@ -82,20 +85,20 @@
if
(
this
.
$route
.
query
.
name
)
{
if
(
this
.
$route
.
query
.
name
)
{
this
.
activeName
=
this
.
$route
.
query
.
name
this
.
activeName
=
this
.
$route
.
query
.
name
}
}
if
(
this
.
$route
.
query
.
from
)
{
this
.
from
=
this
.
$route
.
query
.
from
}
this
.
getList
();
this
.
getList
();
},
mounted
()
{
},
},
methods
:
{
methods
:
{
//获取订单列表
//获取订单列表
getList
()
{
getList
()
{
this
.
loading
=
true
;
this
.
loading
=
true
;
this
.
apipostDS
(
"/api/Education/GetConsultOrderStatisticsPage"
,
this
.
msg
,
(
res
)
=>
{
this
.
apipostDS
(
"/api/Education/GetConsultOrderStatisticsPage"
,
this
.
msg
,
(
res
)
=>
{
this
.
loading
=
false
this
.
loading
=
false
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
data
=
res
.
data
.
data
.
pageData
;
this
.
data
=
res
.
data
.
data
.
pageData
;
this
.
pageCount
=
res
.
data
.
data
.
pageCount
;
this
.
pageCount
=
res
.
data
.
data
.
pageCount
;
}
}
})
})
},
},
...
@@ -103,15 +106,15 @@
...
@@ -103,15 +106,15 @@
refreshClassOrder
()
{
refreshClassOrder
()
{
this
.
getList
();
this
.
getList
();
},
},
goBack
(){
goBack
()
{
this
.
$router
.
go
(
-
1
)
this
.
$router
.
go
(
-
1
)
},
},
//翻页
//翻页
changePage
(
val
)
{
changePage
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
msg
.
pageIndex
=
val
;
this
.
getList
()
this
.
getList
()
},
},
//同意
//同意
agreeApply
(
item
)
{
agreeApply
(
item
)
{
this
.
bdMsg
.
Id
=
item
.
Id
;
this
.
bdMsg
.
Id
=
item
.
Id
;
this
.
bdMsg
.
ApplyForCancelStatus
=
1
;
this
.
bdMsg
.
ApplyForCancelStatus
=
1
;
...
@@ -124,20 +127,20 @@
...
@@ -124,20 +127,20 @@
}
}
})
})
},
},
jujueMsg
(
item
){
jujueMsg
(
item
)
{
this
.
bdMsg
.
Id
=
item
.
Id
;
this
.
bdMsg
.
Id
=
item
.
Id
;
this
.
showJujue
=
true
;
this
.
showJujue
=
true
;
},
},
// 拒绝
// 拒绝
sureJujue
(){
sureJujue
()
{
if
(
!
this
.
bdMsg
.
RejectRemark
)
{
if
(
!
this
.
bdMsg
.
RejectRemark
)
{
this
.
Error
(
"请输入拒绝原因"
)
this
.
Error
(
"请输入拒绝原因"
)
return
return
}
}
this
.
bdMsg
.
ApplyForCancelStatus
=
2
;
this
.
bdMsg
.
ApplyForCancelStatus
=
2
;
this
.
apipostDS
(
"/api/Education/SetCommerceConsultApplyCancel"
,
this
.
bdMsg
,
res
=>
{
this
.
apipostDS
(
"/api/Education/SetCommerceConsultApplyCancel"
,
this
.
bdMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
showJujue
=
false
;
this
.
showJujue
=
false
;
this
.
Success
(
"操作成功"
)
this
.
Success
(
"操作成功"
)
this
.
getList
()
this
.
getList
()
}
else
{
}
else
{
...
@@ -145,35 +148,44 @@
...
@@ -145,35 +148,44 @@
}
}
})
})
},
},
gourl
()
{
this
.
$router
.
push
({
path
:
"/activity/activeSignUpList2"
,
query
:
{
Id
:
this
.
msg
.
ActivityId
,
name
:
this
.
activeName
,
from
:
this
.
from
}
})
},
}
}
}
}
</
script
>
</
script
>
<
style
>
<
style
>
.myActiveOrder
.table-body
{
.myActiveOrder
.table-body
{
height
:
calc
(
100vh
-
220px
);
height
:
calc
(
100vh
-
220px
);
}
}
/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
.myActiveOrder
.table-body
::-webkit-scrollbar
/*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
{
.myActiveOrder
.table-body
::-webkit-scrollbar
{
width
:
5px
;
width
:
5px
;
height
:
5px
;
height
:
5px
;
background-color
:
#F5F5F5
;
background-color
:
#F5F5F5
;
}
}
/*定义滚动条轨道 内阴影+圆角*/
/*定义滚动条轨道 内阴影+圆角*/
.myActiveOrder
.table-body
::-webkit-scrollbar-track
.myActiveOrder
.table-body
::-webkit-scrollbar-track
{
{
-webkit-box-shadow
:
inset
0
0
6px
rgba
(
0
,
0
,
0
,
0.3
);
-webkit-box-shadow
:
inset
0
0
6px
rgba
(
0
,
0
,
0
,
0.3
);
border-radius
:
10px
;
border-radius
:
10px
;
background-color
:
#F5F5F5
;
background-color
:
#F5F5F5
;
}
}
/*定义滑块 内阴影+圆角*/
/*定义滑块 内阴影+圆角*/
.myActiveOrder
.table-body
::-webkit-scrollbar-thumb
.myActiveOrder
.table-body
::-webkit-scrollbar-thumb
{
{
border-radius
:
5px
;
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
;
background-color
:
#555
;
}
}
</
style
>
</
style
>
src/pages/activity/activeSignUpList
1
.vue
→
src/pages/activity/activeSignUpList
2
.vue
View file @
40d436c6
This diff is collapsed.
Click to expand it.
src/pages/activity/activityList.vue
View file @
40d436c6
...
@@ -509,7 +509,8 @@
...
@@ -509,7 +509,8 @@
path
:
url
,
path
:
url
,
query
:
{
query
:
{
Id
:
item
.
Id
,
Id
:
item
.
Id
,
name
:
item
.
ActivityName
name
:
item
.
ActivityName
,
from
:
1
}
}
})
})
}
}
...
...
src/router/routes.js
View file @
40d436c6
...
@@ -746,6 +746,11 @@ const routes = [{
...
@@ -746,6 +746,11 @@ const routes = [{
component
:
()
=>
component
:
()
=>
import
(
"pages/activity/activeSignUpList.vue"
)
import
(
"pages/activity/activeSignUpList.vue"
)
},
},
{
path
:
"/activity/activeSignUpList2"
,
//活动 活动报名列表type2
component
:
()
=>
import
(
"pages/activity/activeSignUpList2.vue"
)
},
{
{
path
:
"/activity/activeSummary"
,
//活动 活动总结
path
:
"/activity/activeSummary"
,
//活动 活动总结
component
:
()
=>
component
:
()
=>
...
...
src/utils/erpindex.js
View file @
40d436c6
...
@@ -277,20 +277,38 @@ export default {
...
@@ -277,20 +277,38 @@ export default {
}
}
},
faildCall
)
},
faildCall
)
}
}
//电商文件下载
//价钱格式化,三位数逗号分隔,保留两位小数 duanjun
Vue
.
prototype
.
GetLocalFileDS
=
function
(
cmd
,
msg
,
fileName
,
newCmd
,
successCall
)
{
Vue
.
prototype
.
moneyFormat
=
function
(
value
)
{
var
apiurl
=
this
.
domainManager
().
mallUrl
+
cmd
;
let
nStr
=
Number
(
value
).
toFixed
(
2
)
var
postData
=
this
.
GetPostDataDS
(
cmd
,
msg
,
newCmd
);
nStr
+=
''
;
this
.
$http
.
post
(
apiurl
,
postData
,
{
let
x
=
nStr
.
split
(
'.'
);
responseType
:
'arraybuffer'
let
x1
=
x
[
0
];
}).
then
((
res
)
=>
{
let
x2
=
x
.
length
>
1
?
'.'
+
x
[
1
]
:
''
;
let
blob
=
new
Blob
([
res
.
data
],
{
var
rgx
=
/
(\d
+
)(\d{3})
/
;
type
:
"application/vnd.ms-excel"
while
(
rgx
.
test
(
x1
))
{
})
x1
=
x1
.
replace
(
rgx
,
'$1'
+
','
+
'$2'
);
let
url
=
URL
.
createObjectURL
(
blob
);
}
let
link
=
document
.
createElement
(
'a'
);
return
x1
+
x2
;
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
)
nStr
+=
''
;
let
x
=
nStr
.
split
(
'.'
);
let
x1
=
x
[
0
];
let
x2
=
x
.
length
>
1
?
'.'
+
x
[
1
]
:
''
;
var
rgx
=
/
(\d
+
)(\d{3})
/
;
while
(
rgx
.
test
(
x1
))
{
x1
=
x1
.
replace
(
rgx
,
'$1'
+
','
+
'$2'
);
}
return
x1
+
x2
;
},
//验证只能输入整数【负数:isMinus传true】
//验证只能输入整数【负数:isMinus传true】
Vue
.
prototype
.
checkInteger
=
function
(
item
,
filed
,
isMinus
)
{
Vue
.
prototype
.
checkInteger
=
function
(
item
,
filed
,
isMinus
)
{
var
value
=
""
+
item
[
filed
];
//转字符串
var
value
=
""
+
item
[
filed
];
//转字符串
...
...
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