Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
Support
提交反馈
为 GitLab 提交贡献
登录
切换导航
C
competitionWeb
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
刘英杰
competitionWeb
提交
8d81d686
提交
8d81d686
编写于
8月 29, 2024
作者:
刘英杰
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
V20240829
上级
272c5f42
变更
6
显示空白字符变更
内嵌
并排
正在显示
6 个修改的文件
包含
42 行增加
和
15 行删除
+42
-15
index.html
dist/index.html
+1
-1
activityData.vue
src/pages/details/eventCatalog/components/activityData.vue
+1
-1
eventCatalog.vue
src/pages/flowApproval/await/eventCatalog.vue
+1
-1
eventCatalog.vue
src/pages/flowApproval/haveDone/eventCatalog.vue
+9
-5
eventCatalog.vue
src/pages/flowApproval/myFlow/eventCatalog.vue
+27
-4
adminFlow.vue
src/pages/welcome/userOrAdmin/adminFlow.vue
+3
-3
未找到文件。
dist/index.html
浏览文件 @
8d81d686
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<link
rel=
"icon"
type=
"image/svg+xml"
href=
"./vite.svg"
/>
<link
rel=
"icon"
type=
"image/svg+xml"
href=
"./vite.svg"
/>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
/>
<meta
name=
"viewport"
content=
"width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
/>
<title>
竞赛管理
</title>
<title>
竞赛管理
</title>
<script
type=
"module"
crossorigin
src=
"./assets/index-
T1wLdwsq
.js"
></script>
<script
type=
"module"
crossorigin
src=
"./assets/index-
B4DRmj7l
.js"
></script>
<link
rel=
"stylesheet"
crossorigin
href=
"./assets/index-RofWzhxq.css"
>
<link
rel=
"stylesheet"
crossorigin
href=
"./assets/index-RofWzhxq.css"
>
</head>
</head>
<body>
<body>
...
...
src/pages/details/eventCatalog/components/activityData.vue
浏览文件 @
8d81d686
...
@@ -66,7 +66,7 @@ function getData() {
...
@@ -66,7 +66,7 @@ function getData() {
hooks
.
myEncapsulationFunction
(()
=>
{
hooks
.
myEncapsulationFunction
(()
=>
{
return
api
.
getApiFlowViewApiFlowViewGetFlowInfo
({
runid
:
props
.
runid
}).
then
(
res
=>
{
return
api
.
getApiFlowViewApiFlowViewGetFlowInfo
({
runid
:
props
.
runid
}).
then
(
res
=>
{
//获取流程信息
//获取流程信息
let
info
=
res
.
response
.
competition_report
let
info
=
res
.
response
.
competition_report
?
res
.
response
.
competition_report
:
res
.
response
.
report_temp_update
competitionFormInfo
.
setFormData
(
res
.
response
)
competitionFormInfo
.
setFormData
(
res
.
response
)
init
.
array
=
[
init
.
array
=
[
...
...
src/pages/flowApproval/await/eventCatalog.vue
浏览文件 @
8d81d686
...
@@ -295,7 +295,7 @@ function recordAction(key, item) {
...
@@ -295,7 +295,7 @@ function recordAction(key, item) {
}
}
function
details
(
item
)
{
function
details
(
item
)
{
//
详情
//
审批
router
.
push
({
router
.
push
({
path
:
'
/eventCatalogDetails
'
,
path
:
'
/eventCatalogDetails
'
,
query
:
{
query
:
{
...
...
src/pages/flowApproval/haveDone/eventCatalog.vue
浏览文件 @
8d81d686
...
@@ -89,7 +89,8 @@ const refreshing = ref(false);
...
@@ -89,7 +89,8 @@ const refreshing = ref(false);
const
onLoad
=
()
=>
{
const
onLoad
=
()
=>
{
//初始化数据
//初始化数据
api
.
postApiFlowViewApiFlowViewGetFlowTaskList
(
init
.
params
).
then
(
res
=>
{
api
.
postApiFlowViewApiFlowViewGetAlreadyFlowTaskList
(
init
.
params
).
then
(
res
=>
{
if
(
refreshing
.
value
)
{
if
(
refreshing
.
value
)
{
list
.
value
=
[]
list
.
value
=
[]
refreshing
.
value
=
false
;
refreshing
.
value
=
false
;
...
@@ -298,9 +299,12 @@ function recordAction(key, item) {
...
@@ -298,9 +299,12 @@ function recordAction(key, item) {
function
details
(
item
)
{
function
details
(
item
)
{
//详情
//详情
router
.
push
({
router
.
push
({
path
:
'
/
flow
Details
'
,
path
:
'
/
eventCatalog
Details
'
,
query
:
{
query
:
{
id
:
item
.
runid
,
runid
:
item
.
runid
,
//基础信息
flowid
:
item
.
flow_id
,
flowType
:
'
haveDone
'
,
//鉴别是否审批 await 才审批
form_id
:
item
.
form_id
,
//日志轨迹
}
}
})
})
}
}
...
@@ -629,14 +633,14 @@ onMounted(() => {
...
@@ -629,14 +633,14 @@ onMounted(() => {
</
template
>
</
template
>
<
template
v-slot:default
>
<
template
v-slot:default
>
<div
class=
"w-full h-full flex items-center justify-end"
>
<div
class=
"w-full h-full flex items-center justify-end"
>
<div
class=
"w-
[30%]
mx-2"
>
<div
class=
"w-
full
mx-2"
>
<van-button
<van-button
class=
"w-full "
class=
"w-full "
plain
plain
size=
"small"
size=
"small"
type=
"primary"
type=
"primary"
@
click=
"details(item)"
>
@
click=
"details(item)"
>
审批
详情
</van-button>
</van-button>
</div>
</div>
...
...
src/pages/flowApproval/myFlow/eventCatalog.vue
浏览文件 @
8d81d686
...
@@ -89,7 +89,7 @@ const refreshing = ref(false);
...
@@ -89,7 +89,7 @@ const refreshing = ref(false);
const
onLoad
=
()
=>
{
const
onLoad
=
()
=>
{
//初始化数据
//初始化数据
api
.
postApiFlowViewApiFlowViewGetFlowTaskList
(
init
.
params
).
then
(
res
=>
{
api
.
postApiFlowViewApiFlowViewGet
My
FlowTaskList
(
init
.
params
).
then
(
res
=>
{
if
(
refreshing
.
value
)
{
if
(
refreshing
.
value
)
{
list
.
value
=
[]
list
.
value
=
[]
refreshing
.
value
=
false
;
refreshing
.
value
=
false
;
...
@@ -298,9 +298,12 @@ function recordAction(key, item) {
...
@@ -298,9 +298,12 @@ function recordAction(key, item) {
function
details
(
item
)
{
function
details
(
item
)
{
//详情
//详情
router
.
push
({
router
.
push
({
path
:
'
/
flow
Details
'
,
path
:
'
/
eventCatalog
Details
'
,
query
:
{
query
:
{
id
:
item
.
runid
,
runid
:
item
.
runid
,
//基础信息
flowid
:
item
.
flow_id
,
flowType
:
'
myFlow
'
,
//鉴别是否审批
form_id
:
item
.
form_id
,
//日志轨迹
}
}
})
})
}
}
...
@@ -629,6 +632,26 @@ onMounted(() => {
...
@@ -629,6 +632,26 @@ onMounted(() => {
</
template
>
</
template
>
<
template
v-slot:default
>
<
template
v-slot:default
>
<div
class=
"w-full h-full flex items-center justify-end"
>
<div
class=
"w-full h-full flex items-center justify-end"
>
<div
class=
"w-[30%] mx-2"
>
<van-button
class=
"w-full "
plain
size=
"small"
type=
"warning"
@
click=
"details(item)"
>
重新发起
</van-button>
</div>
<div
class=
"w-[30%] mx-2"
>
<van-button
class=
"w-full "
plain
size=
"small"
type=
"primary"
@
click=
"details(item)"
>
取消
</van-button>
</div>
<div
class=
"w-[30%] mx-2"
>
<div
class=
"w-[30%] mx-2"
>
<van-button
<van-button
class=
"w-full "
class=
"w-full "
...
@@ -636,7 +659,7 @@ onMounted(() => {
...
@@ -636,7 +659,7 @@ onMounted(() => {
size=
"small"
size=
"small"
type=
"primary"
type=
"primary"
@
click=
"details(item)"
>
@
click=
"details(item)"
>
审批
详情
</van-button>
</van-button>
</div>
</div>
...
...
src/pages/welcome/userOrAdmin/adminFlow.vue
浏览文件 @
8d81d686
...
@@ -280,17 +280,17 @@ onMounted(() => {
...
@@ -280,17 +280,17 @@ onMounted(() => {
<div
class=
"mb-3 w-full flex flex-nowrap justify-between"
>
<div
class=
"mb-3 w-full flex flex-nowrap justify-between"
>
<van-cell-group
class=
"mb-3 w-full "
inset
style=
"padding: 0 !important;"
>
<van-cell-group
class=
"mb-3 w-full "
inset
style=
"padding: 0 !important;"
>
<van-cell
<van-cell
@
click=
"gotoPath('myFlow-
awardApplication
')"
@
click=
"gotoPath('myFlow-
eventCatalog
')"
:value=
"init.flow.count.report_me_count"
:value=
"init.flow.count.report_me_count"
class=
"van-haptics-feedback"
is-link
title=
"赛事申请"
class=
"van-haptics-feedback"
is-link
title=
"赛事申请"
/>
/>
<van-cell
<van-cell
@
click=
"gotoPath('myFlow-
awardApplic
ation')"
@
click=
"gotoPath('myFlow-
eventRegistr
ation')"
:value=
"init.flow.count.sign_me_count"
:value=
"init.flow.count.sign_me_count"
class=
"van-haptics-feedback"
is-link
title=
"赛事审批"
class=
"van-haptics-feedback"
is-link
title=
"赛事审批"
/>
/>
<van-cell
<van-cell
@
click=
"gotoPath('myFlow-a
wardApplic
ation')"
@
click=
"gotoPath('myFlow-a
chievementDeclar
ation')"
:value=
"init.flow.count.certificate_me_count"
:value=
"init.flow.count.certificate_me_count"
class=
"van-haptics-feedback"
is-link
title=
"成绩申报"
class=
"van-haptics-feedback"
is-link
title=
"成绩申报"
/>
/>
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录