23c39a83 by lxs

数据资产登记详情更新

1 parent 76a078a8
......@@ -261,22 +261,23 @@ const getDetailInfo = () => {
detailInfo.value = data;
assetDetailInfo.value = data;
deploymentId.value = approveVO.camundaDeploymentId;
processInstanceId.value = approveVO.camundaInstanceId;
isTextTruncated();
} else {
ElMessage.error(res.msg);
}
});
}
approveTableInfo.value.loading = true;
getApproveList(detailType.value == 'qualityEvaluate' ? evaGuid.value : (detailType.value == 'costAssess' ? costAssessGuid.value : assetGuid)).then((res: any) => {
approveTableInfo.value.loading = false;
if (res.code == proxy.$passCode) {
console.log(res.data);
approveTableInfo.value.data = res.data || [];
} else {
ElMessage.error(res.msg);
}
});
// approveTableInfo.value.loading = true;
// getApproveList(detailType.value == 'qualityEvaluate' ? evaGuid.value : (detailType.value == 'costAssess' ? costAssessGuid.value : assetGuid)).then((res: any) => {
// approveTableInfo.value.loading = false;
// if (res.code == proxy.$passCode) {
// console.log(res.data);
// approveTableInfo.value.data = res.data || [];
// } else {
// ElMessage.error(res.msg);
// }
// });
}
const handleExpand = () => {
......@@ -396,6 +397,7 @@ const approveTableInfo: any = ref({
}
});
const deploymentId = ref('');
const processInstanceId = ref('');
const tenantDetail: any = ref({});
/** 获取当前登录会员,服务商,企业等详情。 */
......@@ -1026,7 +1028,7 @@ const handleClickDamCatalogDetail = () => {
<Tabs :tab-position="'right'" :tabsInfo="tabsInfo" @tabClick="tabsClick" />
</div>
<div class="main-wrap" ref="contentRef">
<div v-if="detailType != 'certificate'"
<div v-if="detailType != 'certificate' && detailType != 'asset'"
:class="['panel_wrap', 'results_panel', detailInfo.approveState == 'Y' ? 'success' : (detailInfo.approveState == 'R' ? 'reject' : (detailInfo.approveState == 'C' ? 'revoke' : 'audit'))]">
<div class="panel_header">
<div class="header_title" v-if="detailInfo.approveState == 'Y'">
......@@ -1071,7 +1073,7 @@ const handleClickDamCatalogDetail = () => {
</div>
</div>
</div>
<div v-else
<div v-else-if="detailType != 'asset'"
:class="['panel_wrap', 'results_panel', detailInfo.state == 4 ? 'success' : (detailInfo.state == 0 ? 'revoke' : 'audit')]">
<div class="panel_header">
<div class="header_title" v-if="detailInfo.state == 4">
......@@ -1696,7 +1698,7 @@ const handleClickDamCatalogDetail = () => {
<ContentWrap id="id-approveInfo" title="审批信息" expandSwicth style="margin-top: 15px"
:isExpand="approveInfoExpand" @expand="(v) => approveInfoExpand = v">
<!-- <Table :tableInfo="approveTableInfo" /> -->
<ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :definitionId="''">
<ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :processInstanceId="processInstanceId">
</ApprovalProcess>
</ContentWrap>
<ContentWrap id="id-certificate" v-if="tabsInfo.tabs.find(t => t.name == 'certificate')" title="证件信息"
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!