Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apaas-ui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gzga-jzapi
apaas-ui
Commits
4ca48942
Commit
4ca48942
authored
Jun 19, 2020
by
张俊
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复服务申请
parent
440d807f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
31 deletions
+41
-31
src/components/menu.vue
src/components/menu.vue
+2
-1
src/pages/workbench/fwgl/apply_service_detail.vue
src/pages/workbench/fwgl/apply_service_detail.vue
+38
-29
src/pages/workbench/fwgl/approval_service_detail.vue
src/pages/workbench/fwgl/approval_service_detail.vue
+1
-1
No files found.
src/components/menu.vue
View file @
4ca48942
...
@@ -26,8 +26,9 @@
...
@@ -26,8 +26,9 @@
<div
<div
style=
"float:right;cursor: pointer;position:relative;"
style=
"float:right;cursor: pointer;position:relative;"
class=
"shop_hover"
class=
"shop_hover"
@
click=
"gotopage('/shop/shopping_cart')"
>
>
<div
class=
"number"
>
99+
</div>
<div
class=
"number"
>
{{
shopping_list
.
length
>=
100
?
'
99+
'
:
shopping_list
.
length
}}
</div>
<img
src=
"../assets/imgs/home_ic_shop.png"
alt
class=
"car"
/>
<img
src=
"../assets/imgs/home_ic_shop.png"
alt
class=
"car"
/>
<div
class=
"shop_menu"
>
<div
class=
"shop_menu"
>
<div
class=
"shop_list_title"
>
最近加入的服务:
</div>
<div
class=
"shop_list_title"
>
最近加入的服务:
</div>
...
...
src/pages/workbench/fwgl/apply_service_detail.vue
View file @
4ca48942
...
@@ -378,36 +378,45 @@ export default {
...
@@ -378,36 +378,45 @@ export default {
}
}
]
]
console
.
log
(
this
.
zd_table_arr
);
console
.
log
(
this
.
zd_table_arr
);
data
.
service_apply_info
.
approval_process
.
forEach
(
e
=>
{
if
(
data
.
service_apply_info
.
approval_process
){
this
.
use_approval_arr
.
push
(
data
.
service_apply_info
.
approval_process
.
forEach
(
e
=>
{
{
this
.
use_approval_arr
.
push
(
title
:
e
.
level
==
1
?
'
一级审批
'
:
'
二级审批
'
,
{
result
:
e
.
status
==-
1
?
'
审批未通过
'
:
e
.
status
==
0
?
'
审批中
'
:
'
审批通过
'
,
title
:
e
.
level
==
1
?
'
一级审批
'
:
'
二级审批
'
,
}
result
:
e
.
status
==-
1
?
'
审批未通过
'
:
e
.
status
==
0
?
'
审批中
'
:
'
审批通过
'
,
)
}
)
if
(
e
.
status
!==
0
){
this
.
use_approval_arr
[
this
.
use_approval_arr
.
length
-
1
][
'
arr
'
]
=
[
{
title
:
'
审批时间:
'
,
info
:
e
.
approval_time
.
split
(
'
+
'
)[
0
].
replace
(
"
T
"
,
'
'
)
},
{
title
:
'
审批单位:
'
,
info
:
e
.
user_info
.
department_name
},
{
title
:
'
审批人:
'
,
info
:
e
.
user_info
.
user_name
},
{
title
:
'
审批意见:
'
,
info
:
e
.
comments
},
]
}
if
(
e
.
status
!==
0
){
});
this
.
use_approval_arr
[
this
.
use_approval_arr
.
length
-
1
][
'
arr
'
]
=
[
{
title
:
'
审批时间:
'
,
info
:
e
.
approval_time
.
split
(
'
+
'
)[
0
].
replace
(
"
T
"
,
'
'
)
},
{
title
:
'
审批单位:
'
,
info
:
e
.
user_info
.
department_name
},
{
title
:
'
审批人:
'
,
info
:
e
.
user_info
.
user_name
},
{
title
:
'
审批意见:
'
,
info
:
e
.
comments
},
]
}
});
}
else
{
this
.
use_approval_arr
.
push
(
{
title
:
'
一级审批
'
,
result
:
'
待审批
'
,
}
)
}
this
.
res_data
=
JSON
.
parse
(
data
.
res_fields
)
this
.
res_data
=
JSON
.
parse
(
data
.
res_fields
)
})
})
.
catch
(
function
(
response
)
{
.
catch
(
function
(
response
)
{
...
...
src/pages/workbench/fwgl/approval_service_detail.vue
View file @
4ca48942
...
@@ -81,7 +81,7 @@ export default {
...
@@ -81,7 +81,7 @@ export default {
option
:[
option
:[
{
required
:
true
,
message
:
'
请输入意见
'
,
trigger
:
'
blur
'
},
{
required
:
true
,
message
:
'
请输入意见
'
,
trigger
:
'
blur
'
},
{
{
min
:
10
,
message
:
'
长度大于10个字符
'
,
trigger
:
'
blur
'
min
:
10
,
message
:
'
长度
应
大于10个字符
'
,
trigger
:
'
blur
'
}
}
]
]
},
},
...
...
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