35f2657e by lxs

数据资产登记bug修改

1 parent b02df939
......@@ -254,8 +254,8 @@ const getDetailInfo = () => {
isTextTruncated();
})
} else {
getRegiaterDetail({ guid: assetGuid }).then((res: any) => {
fullscreenLoading.value = false;
let ps: any = [], tentData = {};
ps.push(getRegiaterDetail({ guid: assetGuid }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || {};
let { approveVO } = data;
......@@ -267,6 +267,30 @@ const getDetailInfo = () => {
} else {
ElMessage.error(res.msg);
}
}));
ps.push(getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data ?? {};
tentData = {...tentData, ...data};
} else {
ElMessage.error(res.msg);
}
}));
ps.push(getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data ?? {};
tentData = {...tentData, ...data};
} else {
ElMessage.error(res.msg);
}
}))
Promise.all(ps).then(() => {
fullscreenLoading.value = false;
tenantDetail.value = tentData;
console.log(tentData);
}).catch(() => {
fullscreenLoading.value = false;
});
}
// approveTableInfo.value.loading = true;
......@@ -287,7 +311,7 @@ const handleExpand = () => {
onBeforeMount(() => {
getDetailInfo();
getTenantDetail();
// getTenantDetail();
});
onActivated(() => {
......@@ -403,14 +427,22 @@ const tenantDetail: any = ref({});
/** 获取当前登录会员,服务商,企业等详情。 */
const getTenantDetail = () => {
getTenantInfo({tenantName: userData.tenantName}).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data ?? {};
tenantDetail.value = data;
} else {
ElMessage.error(res.msg);
}
});
// getTenantDetailInfo(userData.tenantGuid).then((res: any) => {
// if (res.code == proxy.$passCode) {
// const data = res.data ?? {};
// userData.value = data;
// } else {
// ElMessage.error(res.msg);
// }
// })
// getTenantInfo({tenantName: userData.tenantName}).then((res: any) => {
// if (res.code == proxy.$passCode) {
// const data = res.data ?? {};
// tenantDetail.value = data;
// } else {
// ElMessage.error(res.msg);
// }
// });
}
const onUploadFilePreview = (file) => {
......@@ -1403,8 +1435,8 @@ const handleClickDamCatalogDetail = () => {
<div class="list_item is_block isFile" :style="{ width: '40%' }"
v-if="(detailType == 'asset' && assetDetailInfo.isQualityAssessment == 'Y') && assetDetailInfo.registerAttachment?.evaluationFile?.length">
<span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">质量评估报告</span>
<span v-for="(item) in (assetDetailInfo.registerAttachment?.evaluationFile || [])"
class="item_value" :style="{ 'padding-left': '0px' }">
<span v-for="(item) in (assetDetailInfo.registerAttachment?.evaluationFile || [])" class="item_value"
:style="{ 'padding-left': '0px' }">
<div class="file-operate">
<template
v-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'xls' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'xlsx' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'csv'">
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!