Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
6a49606c by lihua
Options

fix产品上架

1 parent ad2c98ba
Expand all
Inline Side-by-side
Showing 6 changed files with 33 additions and 41 deletions
src/components/ApprovalProcess/src/ApprovalProcess.vue
<script setup lang="tsx">
<script lang="ts" setup name="ApprovalProcess">
import LookBpmn from "./components/LookBpmn.vue";
import useProcessStore from '@/store/modules/process'
import { cloneDeep } from 'lodash-es';
......@@ -14,6 +14,9 @@ const props = defineProps({
default: ''
},
});
const fullscreenLoading = ref(false);
const tableData = ref<any>([])
const lookBpmnRef = ref()
// const contentRef = ref();
......@@ -23,7 +26,9 @@ const renderProcessNodes = () => {
deploymentId: props.deploymentId || null,
processInstanceId: props.processInstanceId || null,
};
fullscreenLoading.value = true;
getProcessNodesPromise(param).then((res:any) => {
fullscreenLoading.value = false;
if (res.code === "00000") {
let data = res.data;
if (data) {
......@@ -151,19 +156,26 @@ const getSpecialEventUserTaskList = () => {
lookBpmnRef.value.getDetailData(props.deploymentId)
};
watch(() => props.processInstanceId, () => {
if (!props.processInstanceId) {
return;
}
renderProcessNodes();
}, {
immediate: true
})
onBeforeRouteLeave((to, from) =>{
processStore.clearStore()
})
onMounted(() => {
renderProcessNodes()
});
defineExpose({
renderProcessNodes
})
</script>
<template>
<div>
<div v-loading="fullscreenLoading">
<!-- <Table :columns="columns" :data="tableData" :border="false"></Table> -->
<el-table tooltip-effect="light" :data="tableData" :border="false" >
<el-table-column type="index" label="节点" :width="140" align="left" >
......
src/components/Form/index.vue
......@@ -1401,40 +1401,6 @@ const panelChange = (scope, row) => {
</template>
<template #file="{ file }">
<div class="file-operate">
<!-- <template
v-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'xls' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'xlsx'">
<img class="file-img" src="../../assets/images/excel.png" />
</template>
<template
v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'doc' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'docx'">
<img class="file-img" src="../../assets/images/word.png" />
</template>
<template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'zip'">
<img class="file-img" src="../../assets/images/zip.png" />
</template>
<template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'rar'">
<img class="file-img" src="../../assets/images/RAR.png" />
</template>
<template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf'">
<img class="file-img" src="../../assets/images/PDF.png" />
</template>
<template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'png'">
<img class="file-img" src="../../assets/images/png.png" />
</template>
<template
v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'">
<img class="file-img" src="../../assets/images/jpg.png" />
</template>
<div class="file-name">
<ellipsis-tooltip :content="file.name" class-name="w100f" :refName="'tooltipOver' + file.name"></ellipsis-tooltip>
</div>
<div :style="{ right: '72px' }" class="file-preview"
v-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'png' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'"
@click="onUploadFilePreview(file, item)">查看</div>
<div :style="{ right: '36px' }" class="file-preview" @click="onUploadFileDownload(file, item)">下载
</div>
<div v-if="!item.disabled" :style="{ right: 0 }" class="file-preview" @click="handleUploadFileRemove(file, item)">删除
</div> -->
<template
v-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'xls' || file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'xlsx'">
<img class="file-img" src="../../assets/images/excel.png" />
......
src/views/data_asset/registerCatalogDetail.vue
......@@ -282,6 +282,7 @@ const btnClick = (btn) => {
if (res.data) {
ElMessage.success('该审批流程撤销成功！');
getDetailInfo();
approvalProcessRef.value?.renderProcessNodes();
} else {
ElMessage.error('该审批流程撤销失败！');
}
......@@ -617,6 +618,7 @@ const passDialogInputChange = (val, item, inlineValue) => {
}
}
const approvalProcessRef = ref();
const submitPromise: any = ref(null);
......@@ -641,6 +643,7 @@ const passDialogBtnClick = (btn, info) => {
ElMessage.success('审批成功');
passDialogInfo.value.visible = false;
getDetailInfo();
approvalProcessRef.value?.renderProcessNodes();
} else {
ElMessage.error('审批失败');
}
......@@ -676,6 +679,7 @@ const passDialogBtnClick = (btn, info) => {
ElMessage.success('审批成功');
passDialogInfo.value.visible = false;
getDetailInfo();
approvalProcessRef.value?.renderProcessNodes();
} else {
ElMessage.error('审批失败');
}
......@@ -708,6 +712,7 @@ const passDialogBtnClick = (btn, info) => {
ElMessage.success('审批成功');
passDialogInfo.value.visible = false;
getDetailInfo();
approvalProcessRef.value?.renderProcessNodes();
} else {
ElMessage.error('审批失败');
}
......@@ -778,6 +783,7 @@ const rejectDialogBtnClick = (btn, info) => {
ElMessage.success('驳回成功');
rejectDialogInfo.value.visible = false;
getDetailInfo();
approvalProcessRef.value?.renderProcessNodes();
} else {
ElMessage.error('驳回失败');
}
......@@ -843,6 +849,7 @@ const passCommonDialogBtnClick = (btn, info) => {
ElMessage.success('驳回成功');
passCommonDialogInfo.value.visible = false;
getDetailInfo();
approvalProcessRef.value?.renderProcessNodes();
} else {
ElMessage.error('驳回失败');
}
......@@ -1148,7 +1155,7 @@ const handleClick = () => {
<ContentWrap v-if="route.query.type == 'qualityEvaluate' || route.query.type == 'costAssess'" id="id-approveInfo"
title="审批信息" description="" style="margin: 16px 16px 16px">
<ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :processInstanceId="processInstanceId">
<ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId" :processInstanceId="processInstanceId">
</ApprovalProcess>
</ContentWrap>
</div>
......
src/views/data_asset/registerDetail.vue
......@@ -496,6 +496,7 @@ const approveTableInfo: any = ref({
show: false
}
});
const approvalProcessRef = ref();
const deploymentId = ref('');
const processInstanceId = ref('');
const tenantDetail: any = ref({});
......@@ -987,6 +988,7 @@ const passDialogBtnClick = (btn, info) => {
ElMessage.success('审批成功');
passDialogInfo.value.visible = false;
getDetailInfo();
approvalProcessRef.value?.renderProcessNodes();
} else {
ElMessage.error('审批失败');
}
......@@ -1020,6 +1022,7 @@ const passDialogBtnClick = (btn, info) => {
ElMessage.success('审批成功');
passDialogInfo.value.visible = false;
getDetailInfo();
approvalProcessRef.value?.renderProcessNodes();
} else {
ElMessage.error('审批失败');
}
......@@ -1052,6 +1055,7 @@ const passDialogBtnClick = (btn, info) => {
ElMessage.success('审批成功');
passDialogInfo.value.visible = false;
getDetailInfo();
approvalProcessRef.value?.renderProcessNodes();
} else {
ElMessage.error('审批失败');
}
......@@ -1075,6 +1079,7 @@ const passDialogBtnClick = (btn, info) => {
ElMessage.success('该资产发证确认成功');
passDialogInfo.value.visible = false;
getDetailInfo();
approvalProcessRef.value?.renderProcessNodes();
} else {
ElMessage.error(res.msg);
}
......@@ -1142,6 +1147,7 @@ const rejectDialogBtnClick = (btn, info) => {
ElMessage.success('驳回成功');
rejectDialogInfo.value.visible = false;
getDetailInfo();
approvalProcessRef.value?.renderProcessNodes();
} else {
ElMessage.error('驳回失败');
}
......@@ -1225,6 +1231,7 @@ const passCommonDialogBtnClick = (btn, info) => {
ElMessage.success('驳回成功');
passCommonDialogInfo.value.visible = false;
getDetailInfo();
approvalProcessRef.value?.renderProcessNodes();
} else {
ElMessage.error('驳回失败');
}
......@@ -1909,7 +1916,7 @@ const passCommonDialogBtnClick = (btn, info) => {
<ContentWrap id="id-approveInfo" title="审批信息" expandSwicth style="margin-top: 15px"
:isExpand="approveInfoExpand" @expand="(v) => approveInfoExpand = v" v-if="route.query.type != 'certificate'">
<!-- <Table :tableInfo="approveTableInfo" /> -->
<ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :processInstanceId="processInstanceId">
<ApprovalProcess ref="approvalProcessRef" 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!