Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-operate-sys-cscec
Project
Project
Details
Activity
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
fulixin
dsk-operate-sys-cscec
Commits
83650423
Commit
83650423
authored
Jan 09, 2024
by
tianhongyang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🐞
fix(咨询机构跳转参数变为query传参):
parent
d569e9cd
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
161 additions
and
29 deletions
+161
-29
index.js
dsk-operate-ui/src/utils/index.js
+7
-1
consultingAgency.vue
...ent/components/EnterpriseList/detail/consultingAgency.vue
+146
-20
detailsOfCooperation.vue
...components/EnterpriseList/detail/detailsOfCooperation.vue
+1
-1
projectDetail.vue
...gement/components/EnterpriseList/detail/projectDetail.vue
+5
-5
index.vue
.../consultingOrgManagement/components/ProjectList/index.vue
+2
-2
No files found.
dsk-operate-ui/src/utils/index.js
View file @
83650423
import
{
Message
}
from
"element-ui"
;
import
{
parseTime
}
from
'./ruoyi'
;
import
{
router
}
from
"@/router"
;
/**
* 表格时间格式化
...
...
@@ -924,5 +925,10 @@ export const detailSideBar = new Map([
[
"cooperationList"
,
"cooperationRecord"
],
// 内部合作 准入情况
[
"approveInfo"
,
"accessCondition"
],
])
]);
export
const
tableContainerFixed
=
(
scrollBarContainer
=
""
,)
=>
{
}
dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/consultingAgency.vue
View file @
83650423
This diff is collapsed.
Click to expand it.
dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/detailsOfCooperation.vue
View file @
83650423
...
...
@@ -56,7 +56,7 @@
v-else-if=
"!tableLoading"
:maxHeight=
"true"
@
handle-current-change=
"handleCurrentChange"
>
<!-- 项目列表 -->
<template
slot=
"projectName"
slot-scope=
"
{data,row}">
<div
v-if=
"row.projectName"
class=
"no-line-feed"
>
{{
row
.
projectName
}}
</div>
<div
v-if=
"row.projectName"
class=
"no-line-feed"
v-html=
"row.projectName"
>
</div>
<span
v-else
>
-
</span>
</
template
>
<
template
slot=
"projectLeader"
slot-scope=
"{data,row}"
>
...
...
dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/detail/projectDetail.vue
View file @
83650423
...
...
@@ -25,7 +25,7 @@
<el-button
type=
"primary"
@
click=
"editProjectDetail"
>
编辑信息
</el-button>
</div>
<div
class=
"save-project-detail-container"
v-if=
"currentList === 'consultingAgency' && isModify"
:key=
"'save-project'"
>
<el-button
type=
"primary"
@
click=
"
edit
ProjectDetail"
>
保存
</el-button>
<el-button
type=
"primary"
@
click=
"
save
ProjectDetail"
>
保存
</el-button>
<el-button
@
click=
"cancelSave"
>
取消
</el-button>
</div>
</transition>
...
...
@@ -92,19 +92,19 @@ export default {
methods
:
{
async
init
()
{
try
{
const
advisoryBodyCid
=
this
.
$route
.
params
?.
advisoryBodyCid
;
const
advisoryBodyCid
=
this
.
$route
.
query
?.
advisoryBodyCid
;
const
projectKey
=
this
.
$route
.
query
?.
projectKey
;
if
(
!
advisoryBodyCid
)
return
this
.
$message
.
error
(
"缺少咨询机构ID"
);
//
if (!advisoryBodyCid) return this.$message.error("缺少咨询机构ID");
if
(
!
projectKey
)
return
this
.
$message
.
error
(
"缺少项目主键"
);
const
detail
=
await
getgetConsultingOrgProjectDetailApi
({
advisoryBodyCid
,
projectKey
});
if
(
detail
.
code
==
200
&&
detail
.
data
)
{
this
.
projectDetailInfo
=
{
...
this
.
p
p
rojectDetailInfo
,
...
detail
.
data
};
this
.
projectDetailInfo
=
{
...
this
.
projectDetailInfo
,
...
detail
.
data
};
}
}
catch
(
error
)
{
console
.
log
(
error
);
}
},
editProjectDetail
()
{
...
...
dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue
View file @
83650423
...
...
@@ -337,8 +337,8 @@ export default {
},
// 查看项目详情
viewProjectDetail
(
row
)
{
if
(
!
row
?.
advisoryBody
?.
advisoryBodyCid
)
return
this
.
$message
.
warning
(
"缺少咨询机构id"
);
this
.
$tab
.
openPage
(
row
.
projectName
,
`/consultingOrgManagement/projectDetail
/
${
row
.
advisoryBody
?.
advisoryBodyCid
}?
projectKey
=
$
{
row
.
projectKey
}
`);
//
if (!row?.advisoryBody?.advisoryBodyCid) return this.$message.warning("缺少咨询机构id");
this
.
$tab
.
openPage
(
row
.
projectName
,
`/consultingOrgManagement/projectDetail
?advisoryBodyCid=
${
row
.
advisoryBody
?.
advisoryBodyCid
?
row
.
advisoryBody
?.
advisoryBodyCid
:
""
}
&
projectKey
=
$
{
row
.
projectKey
}
`);
},
// 跳转到企业详情
viewEnterprise(row) {
...
...
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