Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
csbr-daop
/
fe-data-trusted-space
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
c8fc6251
authored
2025-04-21 11:24:40 +0800
by
lihua
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
质量评估,价值评估支持不走流程配置
1 parent
20136652
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
29 additions
and
12 deletions
src/api/modules/workFlowService.ts
src/components/Form/index.vue
src/views/data_asset/qualityEvaluate.vue
src/views/data_asset/registerCatalogDetail.vue
src/views/data_asset/registerDetail.vue
src/views/data_asset/valueEvaluate.vue
src/api/modules/workFlowService.ts
View file @
c8fc625
...
...
@@ -63,4 +63,10 @@ export const isMyFirstNode = (params) => request({
url
:
`
${
import
.
meta
.
env
.
VITE_APP_WORK_FLOW_URL
}
/work-flow/data/is-my-first-node`
,
method
:
'post'
,
data
:
params
})
/** 功能流程配置-获取是否需要审批 */
export
const
isNeedApprove
=
(
params
)
=>
request
({
url
:
`
${
import
.
meta
.
env
.
VITE_APP_WORK_FLOW_URL
}
/func-flow-config/is-need-approve?funcCode=
${
params
.
funcCode
}
`
,
method
:
'get'
,
})
\ No newline at end of file
...
...
src/components/Form/index.vue
View file @
c8fc625
...
...
@@ -1452,8 +1452,8 @@ const panelChange = (scope, row) => {
:disabled=
"item.disabled || readonly"
@
change=
"(val) => cascaderChange(val, item)"
/>
<
template
v-else-if=
"item.type && item.type.indexOf('date') > -1"
>
<el-date-picker
:class=
"[item.col,
{ is_block: item.block }]" v-if="item.type == 'date-picker'"
v-model="formInline[item.field]" type="daterange" range-separator="至" start-placeholder="开始日期" :format="item.format ??
''
"
:value-format="item.valueFormat ??
''
"
v-model="formInline[item.field]" type="daterange" range-separator="至" start-placeholder="开始日期" :format="item.format ??
null
"
:value-format="item.valueFormat ??
null
"
end-placeholder="结束日期" :unlink-panels="item.unlink ?? false" :shortcuts="item.shortcuts ?? []"
:default-value="item.defaultDate" :disabled="item.disabled ?? false" />
<el-date-picker
:class=
"[item.col,
{ is_block: item.block }]" v-else-if="item.type == 'date-year'"
...
...
src/views/data_asset/qualityEvaluate.vue
View file @
c8fc625
This diff is collapsed.
Click to expand it.
src/views/data_asset/registerCatalogDetail.vue
View file @
c8fc625
...
...
@@ -112,8 +112,8 @@ const getDetailInfo = () => {
getEvaDetail
({
guid
:
evaGuid
,
serviceTenantGuid
:
route
.
query
.
tenantGuid
}).
then
((
res
:
any
)
=>
{
if
(
res
.
code
==
proxy
.
$passCode
)
{
const
data
=
res
.
data
||
{};
evaDetailInfo
.
value
=
data
;
deploymentId
.
value
=
data
.
approveVO
.
camundaDeploymentId
;
evaDetailInfo
.
value
=
data
;
deploymentId
.
value
=
data
.
approveVO
?
.
camundaDeploymentId
;
processInstanceId
.
value
=
data
.
approveVO
?.
camundaInstanceId
;
}
else
{
proxy
.
$ElMessage
.
error
(
res
.
msg
);
...
...
@@ -126,7 +126,7 @@ const getDetailInfo = () => {
const
data
=
res
.
data
||
{};
costAssessDetail
.
value
=
data
;
evaDetailInfo
.
value
=
data
;
deploymentId
.
value
=
data
.
approveVO
.
camundaDeploymentId
;
deploymentId
.
value
=
data
.
approveVO
?
.
camundaDeploymentId
;
processInstanceId
.
value
=
data
.
approveVO
?.
camundaInstanceId
;
}
else
{
proxy
.
$ElMessage
.
error
(
res
.
msg
);
...
...
@@ -208,6 +208,9 @@ const toolBtns: any = computed(() => {
label: "关闭", value: "cancel", plain: true
}];
let approveVO = evaDetailInfo.value.approveVO || costAssessDetail.value.approveVO;
if (!approveVO) {
return btnsArr;
}
let staffGuid = userData.staffGuid;
if (approveVO && approveVO.approveState == 'A' && approveVO.approveStaffGuids && approveVO.approveStaffGuids.indexOf(staffGuid) > -1) {
btnsArr.push(...[{ label: "通过", value: "pass", type: 'primary' }, { label: "驳回", value: "reject", type: 'danger', plain: true }]);
...
...
@@ -1157,7 +1160,7 @@ const handleClick = () => {
</div>
</ContentWrap>
<ContentWrap
v-if=
"
route.query.type == 'qualityEvaluate' || route.query.type == 'costAssess'
"
id=
"id-approveInfo"
<ContentWrap
v-if=
"
(route.query.type == 'qualityEvaluate' && evaDetailInfo.approveVO && evaDetailInfo.isApprove !='N') || (route.query.type == 'costAssess' && costAssessDetail.approveVO && costAssessDetail.isApprove !='N')
"
id=
"id-approveInfo"
title=
"审批信息"
description=
""
style=
"margin: 16px 16px 16px"
>
<ApprovalProcess
ref=
"approvalProcessRef"
v-if=
"deploymentId"
:deploymentId=
"deploymentId"
:processInstanceId=
"processInstanceId"
>
</ApprovalProcess>
...
...
src/views/data_asset/registerDetail.vue
View file @
c8fc625
...
...
@@ -78,7 +78,7 @@ const getDetailInfo = () => {
const
data
=
res
.
data
||
{};
evaDetailInfo
.
value
=
data
;
detailInfo
.
value
=
data
;
deploymentId
.
value
=
data
.
approveVO
.
camundaDeploymentId
;
deploymentId
.
value
=
data
.
approveVO
?
.
camundaDeploymentId
;
processInstanceId
.
value
=
data
.
approveVO
?.
camundaInstanceId
;
//需要显示质量评价信息
if
(
data
.
qualityScore
!=
null
)
{
...
...
@@ -90,6 +90,9 @@ const getDetailInfo = () => {
tabsInfo
.
value
.
tabs
.
splice
(
3
,
1
);
}
}
if
(
evaDetailInfo
.
value
.
isApprove
==
'N'
)
{
tabsInfo
.
value
.
tabs
.
pop
();
}
if
(
fullPath
===
route
.
fullPath
)
{
document
.
title
=
`详情-
${
data
.
daName
}
`
;
}
...
...
@@ -124,7 +127,7 @@ const getDetailInfo = () => {
const
data
=
res
.
data
||
{};
costAssessDetailInfo
.
value
=
data
;
detailInfo
.
value
=
data
;
deploymentId
.
value
=
data
.
approveVO
.
camundaDeploymentId
;
deploymentId
.
value
=
data
.
approveVO
?
.
camundaDeploymentId
;
processInstanceId
.
value
=
data
.
approveVO
?.
camundaInstanceId
;
// 需要显示价值评估信息
if
(
data
.
assessmentMoney
!=
null
)
{
...
...
@@ -136,7 +139,9 @@ const getDetailInfo = () => {
tabsInfo
.
value
.
tabs
.
splice
(
3
,
1
);
}
}
if
(
costAssessDetailInfo
.
value
.
isApprove
==
'N'
)
{
tabsInfo
.
value
.
tabs
.
pop
();
}
if
(
data
.
qualityScore
)
{
// 确保"质量评价"标签存在于tabs中,并插入到"价值评估"前面
const
qualityTabIndex
=
tabsInfo
.
value
.
tabs
.
findIndex
(
tab
=>
tab
.
name
===
"qualityEvaluate"
);
...
...
@@ -285,8 +290,8 @@ const getDetailInfo = () => {
let
{
approveVO
}
=
data
;
detailInfo
.
value
=
data
;
assetDetailInfo
.
value
=
data
;
deploymentId
.
value
=
approveVO
.
camundaDeploymentId
;
processInstanceId
.
value
=
approveVO
.
camundaInstanceId
;
deploymentId
.
value
=
approveVO
?
.
camundaDeploymentId
;
processInstanceId
.
value
=
approveVO
?
.
camundaInstanceId
;
isTextTruncated
();
}
else
{
ElMessage
.
error
(
res
.
msg
);
...
...
@@ -446,6 +451,9 @@ const toolBtns: any = computed(() => {
return
btnsArr
;
}
let
approveVO
=
detailInfo
.
value
.
approveVO
;
if
(
!
approveVO
)
{
return
btnsArr
;
}
let
staffGuid
=
userData
.
staffGuid
;
if
(
approveVO
&&
approveVO
.
approveState
==
'A'
&&
approveVO
.
approveStaffGuids
&&
approveVO
.
approveStaffGuids
.
indexOf
(
staffGuid
)
>
-
1
)
{
btnsArr
.
push
(...[{
label
:
"通过"
,
value
:
"pass"
,
type
:
'primary'
},
{
label
:
"驳回"
,
value
:
"reject"
,
type
:
'danger'
,
plain
:
true
}]);
...
...
@@ -1725,7 +1733,7 @@ const passCommonDialogBtnClick = (btn, info) => {
</div>
</ContentWrap>
<ContentWrap id="
id
-
approveInfo
" title="
审批信息
" expandSwicth style="
margin
-
top
:
15
px
"
:isExpand="
approveInfoExpand
" @expand="
(
v
)
=>
approveInfoExpand
=
v
" v-if="
route
.
query
.
type
!=
'certificate'
">
:isExpand="
approveInfoExpand
" @expand="
(
v
)
=>
approveInfoExpand
=
v
" v-if="
tabsInfo
.
tabs
.
find
(
t
=>
t
.
name
==
'approveInfo'
)
&&
route
.
query
.
type
!=
'certificate'
">
<!-- <Table :tableInfo="
approveTableInfo
" /> -->
<ApprovalProcess ref="
approvalProcessRef
" v-if="
deploymentId
" :deploymentId="
deploymentId
"
:processInstanceId="
processInstanceId
">
...
...
src/views/data_asset/valueEvaluate.vue
View file @
c8fc625
This diff is collapsed.
Click to expand it.
Write
Preview
Styling with
Markdown
is supported
Attach a file
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 post a comment