Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
Support
提交反馈
为 GitLab 提交贡献
登录
切换导航
C
competitionWeb
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
刘英杰
competitionWeb
提交
b2e51264
提交
b2e51264
编写于
12月 07, 2023
作者:
刘英杰
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
更新审批退回发起人
上级
67a1b237
流水线
#22875
已通过 ,包含阶段
in 49 second
变更
9
流水线
1
显示空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
70 行增加
和
30 行删除
+70
-30
index.html
dist/index.html
+1
-1
requestUtils.js
src/api/requestUtils.js
+1
-1
index.js
src/configState/index.js
+10
-1
main.js
src/main.js
+0
-1
index.vue
src/pages/Bursary/index.vue
+1
-1
index.vue
src/pages/Certificate/index.vue
+1
-1
index.vue
src/pages/CompetitionSign/index.vue
+3
-1
eventApplication.vue
src/pages/eventCatalogue/eventApplication.vue
+1
-1
index.vue
src/pages/flowAssemble/awaitDoneComponents/index.vue
+52
-22
未找到文件。
dist/index.html
浏览文件 @
b2e51264
<!DOCTYPE html>
<html><head><meta
charset=
utf-8
><meta
http-equiv=
X-UA-Compatible
content=
"IE=edge"
><meta
name=
viewport
content=
"width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"
><link
rel=
"shortcut icon"
href=
favicon.ico
><title>
竞赛管理
</title><link
href=
css/chunk-vendors.064c214c.css
rel=
stylesheet
><link
href=
css/app.1af866c1.css
rel=
stylesheet
></head><body><script
src=
/a/manager/identify/identify.js
></script><noscript><strong>
请开启 JavaScript 功能来使用 竞赛管理。
</strong></noscript><div
id=
app
></div><script
src=
js/chunk-vendors.dd103f50.js
></script><script
src=
js/app.d23d1cd3.js
></script></body></html>
<!DOCTYPE html>
<html><head><meta
charset=
utf-8
><meta
http-equiv=
X-UA-Compatible
content=
"IE=edge"
><meta
name=
viewport
content=
"width=device-width,initial-scale=1,maximum-scale=1,user-scalable=0"
><link
rel=
"shortcut icon"
href=
favicon.ico
><title>
竞赛管理
</title><link
href=
css/chunk-vendors.064c214c.css
rel=
stylesheet
><link
href=
css/app.1af866c1.css
rel=
stylesheet
></head><body><script
src=
/a/manager/identify/identify.js
></script><noscript><strong>
请开启 JavaScript 功能来使用 竞赛管理。
</strong></noscript><div
id=
app
></div><script
src=
js/chunk-vendors.b8ea6964.js
></script><script
src=
js/app.72cf4645.js
></script></body></html>
\ No newline at end of file
\ No newline at end of file
src/api/requestUtils.js
浏览文件 @
b2e51264
...
@@ -603,7 +603,7 @@ export function FlowApproval(data) {
...
@@ -603,7 +603,7 @@ export function FlowApproval(data) {
export
function
FlowRevocation
(
data
)
{
export
function
FlowRevocation
(
data
)
{
//流程撤回
//流程撤回
return
request
({
return
request
({
url
:
`/api/Flow/api/Flow/FlowRevocation?taskid=
${
data
.
taskid
}
&remark=
${
data
.
remark
}
`
,
url
:
`/api/Flow/api/Flow/FlowRevocation?taskid=
${
data
.
taskid
}
&remark=
${
data
.
remark
}
&action=
${
data
.
action
}
`
,
method
:
'
get
'
,
method
:
'
get
'
,
data
data
});
});
...
...
src/configState/index.js
浏览文件 @
b2e51264
...
@@ -11,5 +11,14 @@ export const publicState = {
...
@@ -11,5 +11,14 @@ export const publicState = {
label
:
'
退回到发起人
'
,
label
:
'
退回到发起人
'
,
value
:
2
,
value
:
2
,
}
}
]
],
// ['未审批', '审批中', '审批通过', '审批不通过', '驳回']
flowApprovalState
:
{
color
:
[
'
default
'
,
'
primary
'
,
'
success
'
,
'
warning
'
,
'
error
'
],
"
0
"
:
'
未审批
'
,
"
1
"
:
'
审批中
'
,
"
2
"
:
'
审批通过
'
,
"
3
"
:
'
审批不通过
'
,
"
4
"
:
'
驳回
'
,
}
}
}
src/main.js
浏览文件 @
b2e51264
...
@@ -57,7 +57,6 @@ Vue.prototype.getUserRole = () => {
...
@@ -57,7 +57,6 @@ Vue.prototype.getUserRole = () => {
}
}
Vue
.
prototype
.
publicState
=
publicState
Vue
.
prototype
.
publicState
=
publicState
Vue
.
use
(
plugins
);
Vue
.
use
(
plugins
);
Vue
.
use
(
ViewUI
,
{
Vue
.
use
(
ViewUI
,
{
i18n
:
(
key
,
value
)
=>
i18n
.
t
(
key
,
value
)
i18n
:
(
key
,
value
)
=>
i18n
.
t
(
key
,
value
)
});
});
...
...
src/pages/Bursary/index.vue
浏览文件 @
b2e51264
...
@@ -481,7 +481,7 @@ export default {
...
@@ -481,7 +481,7 @@ export default {
}
}
</
script
>
</
script
>
<
style
>
<
style
lang=
"less"
scoped
>
.tableList {
.tableList {
display: flex;
display: flex;
justify-content: center;
justify-content: center;
...
...
src/pages/Certificate/index.vue
浏览文件 @
b2e51264
...
@@ -626,7 +626,7 @@ export default {
...
@@ -626,7 +626,7 @@ export default {
}
}
</
script
>
</
script
>
<
style
>
<
style
lang=
"less"
scoped
>
.tableList {
.tableList {
display: flex;
display: flex;
justify-content: center;
justify-content: center;
...
...
src/pages/CompetitionSign/index.vue
浏览文件 @
b2e51264
...
@@ -60,7 +60,9 @@
...
@@ -60,7 +60,9 @@
</
template
>
</
template
>
>
>
<
template
#approval_state
="{
row
}"
>
<
template
#approval_state
="{
row
}"
>
{{
[
'
未审批
'
,
'
审批中
'
,
'
审批通过
'
,
'
审批不通过
'
][
row
.
approval_state
]
}}
<Tag
:color=
"publicState.flowApprovalState.color[row.approval_state] "
>
{{
publicState
.
flowApprovalState
[
row
.
approval_state
]
}}
</Tag>
</
template
>
</
template
>
<
template
v-slot:action=
"{row}"
>
<
template
v-slot:action=
"{row}"
>
...
...
src/pages/eventCatalogue/eventApplication.vue
浏览文件 @
b2e51264
<
template
>
<
template
>
<Card>
<Card>
<h1>
333
测试中...
</h1>
<h1>
测试中...
</h1>
</Card>
</Card>
</
template
>
</
template
>
...
...
src/pages/flowAssemble/awaitDoneComponents/index.vue
浏览文件 @
b2e51264
...
@@ -291,7 +291,7 @@
...
@@ -291,7 +291,7 @@
</div>
</div>
</Card>
</Card>
<div
<div
style=
"box-sizing: border-box; border-top: #1e93ff 0.3vw solid; width: 15%;height: 127vh;margin-top:20px;
style=
"
overflow-y: auto;
box-sizing: border-box; border-top: #1e93ff 0.3vw solid; width: 15%;height: 127vh;margin-top:20px;
padding:3vw 1vw 3vw 1vw;background-color: white;display: flex;justify-content: center"
>
padding:3vw 1vw 3vw 1vw;background-color: white;display: flex;justify-content: center"
>
<Timeline>
<Timeline>
<TimelineItem
:color=
"['blue','green'][Number(!item.action_name)]"
<TimelineItem
:color=
"['blue','green'][Number(!item.action_name)]"
...
@@ -345,16 +345,26 @@
...
@@ -345,16 +345,26 @@
<Modal
<Modal
v-model=
"publicModal"
v-model=
"publicModal"
title=
"审批意见"
title=
"审批意见"
@
on-ok=
"ok"
>
@
on-cancel=
"cancel"
>
<Form
v-if=
"publicIdentificatio === 'revocation'"
ref=
"formValidate"
:model=
"formValidate"
:rules=
"ruleValidate"
<Select
v-model=
"publicAction"
>
:label-width=
"80"
>
<FormItem
label=
"退回节点"
prop=
"publicAction"
>
<Select
v-model=
"formValidate.publicAction"
>
<Option
v-for=
"(item,index) in publicState.revocationApporval"
:value=
"item.value"
:key=
"index"
>
{{
<Option
v-for=
"(item,index) in publicState.revocationApporval"
:value=
"item.value"
:key=
"index"
>
{{
item.label
item.label
}}
}}
</Option>
</Option>
</Select>
</Select>
</FormItem>
</Form>
<Input
v-model=
"publicTextarea"
type=
"textarea"
:autosize=
"{minRows: 5,maxRows: 10}"
<Input
v-model=
"publicTextarea"
type=
"textarea"
:autosize=
"{minRows: 5,maxRows: 10}"
placeholder=
"请输入审批意见..."
></Input>
placeholder=
"请输入审批意见..."
></Input>
<
template
#footer
>
<div
style=
"display: flex;justify-content: flex-end"
>
<Button
type=
"text"
@
click=
"cancel"
>
取消
</Button>
<Button
:loading=
"btLoad"
type=
"primary"
@
click=
"ok"
style=
"margin-left: 10px"
>
确定
</Button>
</div>
</
template
>
</Modal>
</Modal>
<Drawer
title=
"团队详细"
:closable=
"false"
v-model=
"teamDrawer"
width=
"40%"
>
<Drawer
title=
"团队详细"
:closable=
"false"
v-model=
"teamDrawer"
width=
"40%"
>
...
@@ -436,6 +446,7 @@ export default {
...
@@ -436,6 +446,7 @@ export default {
data
()
{
data
()
{
//这里存放数据",
//这里存放数据",
return
{
return
{
btLoad
:
false
,
viewFileUpdataKeys
:
1
,
viewFileUpdataKeys
:
1
,
split
:
0.7
,
split
:
0.7
,
drawerPreview
:
false
,
drawerPreview
:
false
,
...
@@ -511,7 +522,15 @@ export default {
...
@@ -511,7 +522,15 @@ export default {
flowInfo
:
''
,
flowInfo
:
''
,
publicIdentificatio
:
''
,
publicIdentificatio
:
''
,
publicTextarea
:
''
,
publicTextarea
:
''
,
formValidate
:
{
publicAction
:
""
,
publicAction
:
""
,
},
ruleValidate
:
{
publicAction
:
[
{
required
:
true
,
type
:
'
number
'
,
message
:
'
该项不能为空
'
,
trigger
:
'
change
'
}
],
},
publicModal
:
false
,
publicModal
:
false
,
data
:
{
data
:
{
keyValueArray
:
[],
keyValueArray
:
[],
...
@@ -631,7 +650,7 @@ export default {
...
@@ -631,7 +650,7 @@ export default {
this
.
teamDrawer
=
true
this
.
teamDrawer
=
true
},
},
async
ok
()
{
async
ok
()
{
this
.
$Spin
.
show
()
this
.
btLoad
=
true
const
data
=
{
const
data
=
{
taskid
:
this
.
data
.
Object
.
taskid
,
taskid
:
this
.
data
.
Object
.
taskid
,
remark
:
this
.
publicTextarea
remark
:
this
.
publicTextarea
...
@@ -639,7 +658,9 @@ export default {
...
@@ -639,7 +658,9 @@ export default {
switch
(
this
.
publicIdentificatio
)
{
switch
(
this
.
publicIdentificatio
)
{
case
'
pass
'
:
case
'
pass
'
:
const
pass
=
await
api
.
FlowApproval
(
data
)
const
pass
=
await
api
.
FlowApproval
(
data
)
this
.
btLoad
=
false
hook
.
publicMessage
(
pass
)
hook
.
publicMessage
(
pass
)
this
.
publicModal
=
false
if
(
pass
.
code
===
1
)
{
if
(
pass
.
code
===
1
)
{
setTimeout
(()
=>
{
setTimeout
(()
=>
{
localStorage
.
setItem
(
'
updataEvent
'
,
'
getDataEvent
'
);
localStorage
.
setItem
(
'
updataEvent
'
,
'
getDataEvent
'
);
...
@@ -648,17 +669,25 @@ export default {
...
@@ -648,17 +669,25 @@ export default {
}
}
break
;
break
;
case
'
revocation
'
:
case
'
revocation
'
:
this
.
$refs
.
formValidate
.
validate
(
async
(
value
)
=>
{
if
(
value
)
{
data
.
action
=
this
.
formValidate
.
publicAction
const
Revocation
=
await
api
.
FlowRevocation
(
data
)
const
Revocation
=
await
api
.
FlowRevocation
(
data
)
if
(
Revocation
.
code
===
1
)
{
if
(
Revocation
.
code
===
1
)
{
hook
.
publicMessage
(
Revocation
)
hook
.
publicMessage
(
Revocation
)
this
.
publicModal
=
false
setTimeout
(()
=>
{
setTimeout
(()
=>
{
localStorage
.
setItem
(
'
updataEvent
'
,
'
getDataEvent
'
);
localStorage
.
setItem
(
'
updataEvent
'
,
'
getDataEvent
'
);
this
.
$router
.
back
()
this
.
$router
.
back
()
},
1500
)
},
1500
)
}
else
{
}
else
{
this
.
$Spin
.
hide
()
this
.
btLoad
=
false
this
.
$Message
.
error
(
Revocation
.
msg_detail
)
this
.
$Message
.
error
(
Revocation
.
msg_detail
)
}
}
this
.
btLoad
=
false
}
})
break
;
break
;
}
}
},
},
...
@@ -681,6 +710,7 @@ export default {
...
@@ -681,6 +710,7 @@ export default {
revocationFlow
()
{
revocationFlow
()
{
this
.
publicTextarea
=
''
this
.
publicTextarea
=
''
this
.
publicIdentificatio
=
'
revocation
'
this
.
publicIdentificatio
=
'
revocation
'
if
(
this
.
formValidate
.
publicAction
)
this
.
$refs
[
'
formValidate
'
].
resetFields
()
this
.
publicModal
=
true
this
.
publicModal
=
true
},
},
passFlow
()
{
passFlow
()
{
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录