e515422a by xukangle

fix

1 parent 840f6a2d
......@@ -133,6 +133,13 @@ export const getEvaDetail = (params) => request({
params
})
// 获取价值评价详情
export const getCostDetail = (params) => request({
url: `${import.meta.env.VITE_API_NEW_PORTAL}/cost-assessment/detail`,
method: 'get',
params
})
/** 资产价值评估相关接口 */
/** 获取资产价值评估分页列表。 */
......
......@@ -13,7 +13,8 @@ import {
qualityAllow,
costAssessAllow,
getRegisterCatalogTableDetail,
getEvaDetail
getEvaDetail,
getCostDetail
} from "@/api/modules/dataAsset";
import { changeNum } from '@/utils/common'
import { ElMessage, ElMessageBox } from "element-plus";
......@@ -28,6 +29,7 @@ const userData = JSON.parse(userStore.userData)
const fullPath = route.fullPath;
const catalogGuid = route.query.guid;
const evaGuid = route.query.evaGuid;
const costAssessGuid = route.query.costAssessGuid;
const detailType = ref(route.query.type);
const { proxy } = getCurrentInstance() as any;
......@@ -76,6 +78,8 @@ const baseInfoFormItems = ref([
const evaDetailInfo: any = ref({});
const costAssessDetail: any = ref({});
const deploymentId = ref('');
const processInstanceId = ref('');
......@@ -117,6 +121,19 @@ const getDetailInfo = () => {
}
});
}
if (costAssessGuid) {
getCostDetail({ guid: costAssessGuid }).then((res: any) => {
if (res.code == proxy.$passCode) {
const data = res.data || {};
costAssessDetail.value = data;
evaDetailInfo.value = data;
deploymentId.value = data.approveVO.camundaDeploymentId;
processInstanceId.value = data.approveVO?.camundaInstanceId;
} else {
proxy.$ElMessage.error(res.msg);
}
})
}
}
onBeforeMount(() => {
......@@ -191,9 +208,9 @@ const toolBtns: any = computed(() => {
let btnsArr: any = [{
label: "关闭", value: "cancel", plain: true
}];
let approveVO = evaDetailInfo.value.approveVO;
let approveVO = evaDetailInfo.value.approveVO || costAssessDetail.value.approveVO;
let staffGuid = userData.staffGuid;
if (approveVO && approveVO.approveState == 'A' && approveVO.approveStaffGuids&&approveVO.approveStaffGuids.indexOf(staffGuid) > -1) {
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 }]);
}
if (approveVO && approveVO.approveState == 'A' && approveVO.staffGuid == staffGuid) {
......@@ -837,12 +854,14 @@ const rejectDialogBtnClick = (btn, info) => {
</el-table-column>
</el-table>
</ContentWrap>
<ContentWrap v-if="route.query.type == 'qualityEvaluate'" id="id-assetContent" title="附件信息" description="" style="margin: 16px 16px 16px">
<ContentWrap v-if="route.query.type == 'qualityEvaluate'" id="id-assetContent" title="附件信息" description=""
style="margin: 16px 16px 16px">
<div class="list_panel mt4">
<div class="list_item is_block isFile" v-if="evaDetailInfo?.qualityEvaluationFile?.length" :style="{ width: '40%' }">
<div class="list_item is_block isFile" v-if="evaDetailInfo?.qualityEvaluationFile?.length"
:style="{ width: '40%' }">
<span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">数据质量评价收集</span>
<span v-for="(item) in (evaDetailInfo?.qualityEvaluationFile || [])"
class="item_value" :style="{ 'padding-left': '0px' }">
<span v-for="(item) in (evaDetailInfo?.qualityEvaluationFile || [])" 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'">
......@@ -878,7 +897,8 @@ const rejectDialogBtnClick = (btn, info) => {
</div>
</div>
</ContentWrap>
<ContentWrap id="id-qualityEvaluate" v-if="route.query.type == 'qualityEvaluate' && evaDetailInfo.qualityScore != null" title="质量评价"
<ContentWrap id="id-qualityEvaluate"
v-if="route.query.type == 'qualityEvaluate' && evaDetailInfo.qualityScore != null" title="质量评价"
description="资产质量评价信息" style="margin: 16px 16px 16px">
<div class="list_panel">
<div class="list_item">
......@@ -909,12 +929,14 @@ const rejectDialogBtnClick = (btn, info) => {
</div>
</div>
</ContentWrap>
<ContentWrap v-if="route.query.type == 'qualityEvaluate'" id="id-approveInfo" title="审批信息" description="" style="margin: 16px 16px 16px">
<ContentWrap v-if="route.query.type == 'qualityEvaluate' || 'costAssess'" id="id-approveInfo" title="审批信息"
description="" style="margin: 16px 16px 16px">
<ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :processInstanceId="processInstanceId">
</ApprovalProcess>
</ContentWrap>
</div>
<div class="tool_btns" v-if="toolBtns.length && route.query.type == 'qualityEvaluate'">
<div class="tool_btns"
v-if="toolBtns.length && (route.query.type == 'qualityEvaluate' || route.query.type == 'costAssess')">
<div class="btns">
<el-button v-for="btn in toolBtns" :type="btn.type" :plain="btn.plain" @click="btnClick(btn)">{{ btn.label
}}</el-button>
......@@ -952,6 +974,7 @@ const rejectDialogBtnClick = (btn, info) => {
font-weight: 600;
}
}
&.results_panel {
box-shadow: 0 0 0 1px #d9d9d9;
margin: 16px 16px 0px;
......@@ -1173,9 +1196,9 @@ const rejectDialogBtnClick = (btn, info) => {
color: var(--el-color-primary);
margin-right: 8px;
}
}
}
.list_panel {
.list_panel {
display: flex;
flex-wrap: wrap;
display: flex;
......
......@@ -369,11 +369,6 @@ const tableBtnClick = (scope, btn) => {
});
});
} else if (type === 'detail') { // 详情
router.push({
name: 'registerValueDetail',
query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess', daTenantGuid: row.tenantGuid }
});
} else if (type === 'detail') { // 详情
if (row.registerApproveState == 'Y') {
router.push({
name: 'registerDetail',
......@@ -382,7 +377,7 @@ const tableBtnClick = (scope, btn) => {
} else {
router.push({
name: 'evaCatalogDetail',
query: { guid: row.registerGuid, costAssessGuid: row.guid, type: 'costAssess' }
query: { guid: row.damGuid, costAssessGuid: row.guid, type: 'costAssess' }
});
}
} else if (type == 'productDetail') {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!