数据资产登记bug修改
Showing
1 changed file
with
45 additions
and
13 deletions
| ... | @@ -254,8 +254,8 @@ const getDetailInfo = () => { | ... | @@ -254,8 +254,8 @@ const getDetailInfo = () => { |
| 254 | isTextTruncated(); | 254 | isTextTruncated(); |
| 255 | }) | 255 | }) |
| 256 | } else { | 256 | } else { |
| 257 | getRegiaterDetail({ guid: assetGuid }).then((res: any) => { | 257 | let ps: any = [], tentData = {}; |
| 258 | fullscreenLoading.value = false; | 258 | ps.push(getRegiaterDetail({ guid: assetGuid }).then((res: any) => { |
| 259 | if (res.code == proxy.$passCode) { | 259 | if (res.code == proxy.$passCode) { |
| 260 | const data = res.data || {}; | 260 | const data = res.data || {}; |
| 261 | let { approveVO } = data; | 261 | let { approveVO } = data; |
| ... | @@ -267,6 +267,30 @@ const getDetailInfo = () => { | ... | @@ -267,6 +267,30 @@ const getDetailInfo = () => { |
| 267 | } else { | 267 | } else { |
| 268 | ElMessage.error(res.msg); | 268 | ElMessage.error(res.msg); |
| 269 | } | 269 | } |
| 270 | })); | ||
| 271 | ps.push(getTenantDetailInfo(userData.tenantGuid).then((res: any) => { | ||
| 272 | if (res.code == proxy.$passCode) { | ||
| 273 | const data = res.data ?? {}; | ||
| 274 | tentData = {...tentData, ...data}; | ||
| 275 | } else { | ||
| 276 | ElMessage.error(res.msg); | ||
| 277 | } | ||
| 278 | })); | ||
| 279 | ps.push(getTenantInfo({ tenantName: userData.tenantName }).then((res: any) => { | ||
| 280 | if (res.code == proxy.$passCode) { | ||
| 281 | const data = res.data ?? {}; | ||
| 282 | tentData = {...tentData, ...data}; | ||
| 283 | } else { | ||
| 284 | ElMessage.error(res.msg); | ||
| 285 | } | ||
| 286 | })) | ||
| 287 | |||
| 288 | Promise.all(ps).then(() => { | ||
| 289 | fullscreenLoading.value = false; | ||
| 290 | tenantDetail.value = tentData; | ||
| 291 | console.log(tentData); | ||
| 292 | }).catch(() => { | ||
| 293 | fullscreenLoading.value = false; | ||
| 270 | }); | 294 | }); |
| 271 | } | 295 | } |
| 272 | // approveTableInfo.value.loading = true; | 296 | // approveTableInfo.value.loading = true; |
| ... | @@ -287,7 +311,7 @@ const handleExpand = () => { | ... | @@ -287,7 +311,7 @@ const handleExpand = () => { |
| 287 | 311 | ||
| 288 | onBeforeMount(() => { | 312 | onBeforeMount(() => { |
| 289 | getDetailInfo(); | 313 | getDetailInfo(); |
| 290 | getTenantDetail(); | 314 | // getTenantDetail(); |
| 291 | }); | 315 | }); |
| 292 | 316 | ||
| 293 | onActivated(() => { | 317 | onActivated(() => { |
| ... | @@ -403,14 +427,22 @@ const tenantDetail: any = ref({}); | ... | @@ -403,14 +427,22 @@ const tenantDetail: any = ref({}); |
| 403 | 427 | ||
| 404 | /** 获取当前登录会员,服务商,企业等详情。 */ | 428 | /** 获取当前登录会员,服务商,企业等详情。 */ |
| 405 | const getTenantDetail = () => { | 429 | const getTenantDetail = () => { |
| 406 | getTenantInfo({tenantName: userData.tenantName}).then((res: any) => { | 430 | // getTenantDetailInfo(userData.tenantGuid).then((res: any) => { |
| 407 | if (res.code == proxy.$passCode) { | 431 | // if (res.code == proxy.$passCode) { |
| 408 | const data = res.data ?? {}; | 432 | // const data = res.data ?? {}; |
| 409 | tenantDetail.value = data; | 433 | // userData.value = data; |
| 410 | } else { | 434 | // } else { |
| 411 | ElMessage.error(res.msg); | 435 | // ElMessage.error(res.msg); |
| 412 | } | 436 | // } |
| 413 | }); | 437 | // }) |
| 438 | // getTenantInfo({tenantName: userData.tenantName}).then((res: any) => { | ||
| 439 | // if (res.code == proxy.$passCode) { | ||
| 440 | // const data = res.data ?? {}; | ||
| 441 | // tenantDetail.value = data; | ||
| 442 | // } else { | ||
| 443 | // ElMessage.error(res.msg); | ||
| 444 | // } | ||
| 445 | // }); | ||
| 414 | } | 446 | } |
| 415 | 447 | ||
| 416 | const onUploadFilePreview = (file) => { | 448 | const onUploadFilePreview = (file) => { |
| ... | @@ -1403,8 +1435,8 @@ const handleClickDamCatalogDetail = () => { | ... | @@ -1403,8 +1435,8 @@ const handleClickDamCatalogDetail = () => { |
| 1403 | <div class="list_item is_block isFile" :style="{ width: '40%' }" | 1435 | <div class="list_item is_block isFile" :style="{ width: '40%' }" |
| 1404 | v-if="(detailType == 'asset' && assetDetailInfo.isQualityAssessment == 'Y') && assetDetailInfo.registerAttachment?.evaluationFile?.length"> | 1436 | v-if="(detailType == 'asset' && assetDetailInfo.isQualityAssessment == 'Y') && assetDetailInfo.registerAttachment?.evaluationFile?.length"> |
| 1405 | <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">质量评估报告</span> | 1437 | <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">质量评估报告</span> |
| 1406 | <span v-for="(item) in (assetDetailInfo.registerAttachment?.evaluationFile || [])" | 1438 | <span v-for="(item) in (assetDetailInfo.registerAttachment?.evaluationFile || [])" class="item_value" |
| 1407 | class="item_value" :style="{ 'padding-left': '0px' }"> | 1439 | :style="{ 'padding-left': '0px' }"> |
| 1408 | <div class="file-operate"> | 1440 | <div class="file-operate"> |
| 1409 | <template | 1441 | <template |
| 1410 | 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'"> | 1442 | 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'"> | ... | ... |
-
Please register or sign in to post a comment