Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
06460e78 by lihua
Options

fix产品上架

1 parent 22056987
Expand all
Inline Side-by-side
Showing 6 changed files with 33 additions and 41 deletions
src/components/ApprovalProcess/src/ApprovalProcess.vue
1 <script setup lang="tsx"> 1 <script lang="ts" setup name="ApprovalProcess">
2 import LookBpmn from "./components/LookBpmn.vue"; 2 import LookBpmn from "./components/LookBpmn.vue";
3 import useProcessStore from '@/store/modules/process' 3 import useProcessStore from '@/store/modules/process'
4 import { cloneDeep } from 'lodash-es'; 4 import { cloneDeep } from 'lodash-es';
...@@ -14,6 +14,9 @@ const props = defineProps({ ...@@ -14,6 +14,9 @@ const props = defineProps({
14 default: '' 14 default: ''
15 }, 15 },
16 }); 16 });
17
18 const fullscreenLoading = ref(false);
19
17 const tableData = ref<any>([]) 20 const tableData = ref<any>([])
18 const lookBpmnRef = ref() 21 const lookBpmnRef = ref()
19 // const contentRef = ref(); 22 // const contentRef = ref();
...@@ -23,7 +26,9 @@ const renderProcessNodes = () => { ...@@ -23,7 +26,9 @@ const renderProcessNodes = () => {
23 deploymentId: props.deploymentId || null, 26 deploymentId: props.deploymentId || null,
24 processInstanceId: props.processInstanceId || null, 27 processInstanceId: props.processInstanceId || null,
25 }; 28 };
29 fullscreenLoading.value = true;
26 getProcessNodesPromise(param).then((res:any) => { 30 getProcessNodesPromise(param).then((res:any) => {
31 fullscreenLoading.value = false;
27 if (res.code === "00000") { 32 if (res.code === "00000") {
28 let data = res.data; 33 let data = res.data;
29 if (data) { 34 if (data) {
...@@ -151,19 +156,26 @@ const getSpecialEventUserTaskList = () => { ...@@ -151,19 +156,26 @@ const getSpecialEventUserTaskList = () => {
151 lookBpmnRef.value.getDetailData(props.deploymentId) 156 lookBpmnRef.value.getDetailData(props.deploymentId)
152 }; 157 };
153 158
159 watch(() => props.processInstanceId, () => {
160 if (!props.processInstanceId) {
161 return;
162 }
163 renderProcessNodes();
164 }, {
165 immediate: true
166 })
167
154 onBeforeRouteLeave((to, from) =>{ 168 onBeforeRouteLeave((to, from) =>{
155 processStore.clearStore() 169 processStore.clearStore()
156 }) 170 })
157 onMounted(() => { 171
158 renderProcessNodes()
159 });
160 defineExpose({ 172 defineExpose({
161 renderProcessNodes 173 renderProcessNodes
162 }) 174 })
163 </script> 175 </script>
164 176
165 <template> 177 <template>
166 <div> 178 <div v-loading="fullscreenLoading">
167 <!-- <Table :columns="columns" :data="tableData" :border="false"></Table> --> 179 <!-- <Table :columns="columns" :data="tableData" :border="false"></Table> -->
168 <el-table tooltip-effect="light" :data="tableData" :border="false" > 180 <el-table tooltip-effect="light" :data="tableData" :border="false" >
169 <el-table-column type="index" label="节点" :width="140" align="left" > 181 <el-table-column type="index" label="节点" :width="140" align="left" >
......
src/components/Form/index.vue
...@@ -1401,40 +1401,6 @@ const panelChange = (scope, row) => { ...@@ -1401,40 +1401,6 @@ const panelChange = (scope, row) => {
1401 </template> 1401 </template>
1402 <template #file="{ file }"> 1402 <template #file="{ file }">
1403 <div class="file-operate"> 1403 <div class="file-operate">
1404 <!-- <template
1405 v-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'xls' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'xlsx'">
1406 <img class="file-img" src="../../assets/images/excel.png" />
1407 </template>
1408 <template
1409 v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'doc' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'docx'">
1410 <img class="file-img" src="../../assets/images/word.png" />
1411 </template>
1412 <template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'zip'">
1413 <img class="file-img" src="../../assets/images/zip.png" />
1414 </template>
1415 <template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'rar'">
1416 <img class="file-img" src="../../assets/images/RAR.png" />
1417 </template>
1418 <template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'pdf'">
1419 <img class="file-img" src="../../assets/images/PDF.png" />
1420 </template>
1421 <template v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'png'">
1422 <img class="file-img" src="../../assets/images/png.png" />
1423 </template>
1424 <template
1425 v-else-if="file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpg' || file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase() == 'jpeg'">
1426 <img class="file-img" src="../../assets/images/jpg.png" />
1427 </template>
1428 <div class="file-name">
1429 <ellipsis-tooltip :content="file.name" class-name="w100f" :refName="'tooltipOver' + file.name"></ellipsis-tooltip>
1430 </div>
1431 <div :style="{ right: '72px' }" class="file-preview"
1432 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'"
1433 @click="onUploadFilePreview(file, item)">查看</div>
1434 <div :style="{ right: '36px' }" class="file-preview" @click="onUploadFileDownload(file, item)">下载
1435 </div>
1436 <div v-if="!item.disabled" :style="{ right: 0 }" class="file-preview" @click="handleUploadFileRemove(file, item)">删除
1437 </div> -->
1438 <template 1404 <template
1439 v-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'xls' || file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'xlsx'"> 1405 v-if="file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'xls' || file?.name?.substring(file.name.lastIndexOf('.') + 1).toLowerCase() === 'xlsx'">
1440 <img class="file-img" src="../../assets/images/excel.png" /> 1406 <img class="file-img" src="../../assets/images/excel.png" />
......
src/views/data_asset/registerCatalogDetail.vue
...@@ -282,6 +282,7 @@ const btnClick = (btn) => { ...@@ -282,6 +282,7 @@ const btnClick = (btn) => {
282 if (res.data) { 282 if (res.data) {
283 ElMessage.success('该审批流程撤销成功！'); 283 ElMessage.success('该审批流程撤销成功！');
284 getDetailInfo(); 284 getDetailInfo();
285 approvalProcessRef.value?.renderProcessNodes();
285 } else { 286 } else {
286 ElMessage.error('该审批流程撤销失败！'); 287 ElMessage.error('该审批流程撤销失败！');
287 } 288 }
...@@ -617,6 +618,7 @@ const passDialogInputChange = (val, item, inlineValue) => { ...@@ -617,6 +618,7 @@ const passDialogInputChange = (val, item, inlineValue) => {
617 } 618 }
618 } 619 }
619 620
621 const approvalProcessRef = ref();
620 622
621 const submitPromise: any = ref(null); 623 const submitPromise: any = ref(null);
622 624
...@@ -641,6 +643,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -641,6 +643,7 @@ const passDialogBtnClick = (btn, info) => {
641 ElMessage.success('审批成功'); 643 ElMessage.success('审批成功');
642 passDialogInfo.value.visible = false; 644 passDialogInfo.value.visible = false;
643 getDetailInfo(); 645 getDetailInfo();
646 approvalProcessRef.value?.renderProcessNodes();
644 } else { 647 } else {
645 ElMessage.error('审批失败'); 648 ElMessage.error('审批失败');
646 } 649 }
...@@ -676,6 +679,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -676,6 +679,7 @@ const passDialogBtnClick = (btn, info) => {
676 ElMessage.success('审批成功'); 679 ElMessage.success('审批成功');
677 passDialogInfo.value.visible = false; 680 passDialogInfo.value.visible = false;
678 getDetailInfo(); 681 getDetailInfo();
682 approvalProcessRef.value?.renderProcessNodes();
679 } else { 683 } else {
680 ElMessage.error('审批失败'); 684 ElMessage.error('审批失败');
681 } 685 }
...@@ -708,6 +712,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -708,6 +712,7 @@ const passDialogBtnClick = (btn, info) => {
708 ElMessage.success('审批成功'); 712 ElMessage.success('审批成功');
709 passDialogInfo.value.visible = false; 713 passDialogInfo.value.visible = false;
710 getDetailInfo(); 714 getDetailInfo();
715 approvalProcessRef.value?.renderProcessNodes();
711 } else { 716 } else {
712 ElMessage.error('审批失败'); 717 ElMessage.error('审批失败');
713 } 718 }
...@@ -778,6 +783,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -778,6 +783,7 @@ const rejectDialogBtnClick = (btn, info) => {
778 ElMessage.success('驳回成功'); 783 ElMessage.success('驳回成功');
779 rejectDialogInfo.value.visible = false; 784 rejectDialogInfo.value.visible = false;
780 getDetailInfo(); 785 getDetailInfo();
786 approvalProcessRef.value?.renderProcessNodes();
781 } else { 787 } else {
782 ElMessage.error('驳回失败'); 788 ElMessage.error('驳回失败');
783 } 789 }
...@@ -843,6 +849,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -843,6 +849,7 @@ const passCommonDialogBtnClick = (btn, info) => {
843 ElMessage.success('驳回成功'); 849 ElMessage.success('驳回成功');
844 passCommonDialogInfo.value.visible = false; 850 passCommonDialogInfo.value.visible = false;
845 getDetailInfo(); 851 getDetailInfo();
852 approvalProcessRef.value?.renderProcessNodes();
846 } else { 853 } else {
847 ElMessage.error('驳回失败'); 854 ElMessage.error('驳回失败');
848 } 855 }
...@@ -1148,7 +1155,7 @@ const handleClick = () => { ...@@ -1148,7 +1155,7 @@ const handleClick = () => {
1148 1155
1149 <ContentWrap v-if="route.query.type == 'qualityEvaluate' || route.query.type == 'costAssess'" id="id-approveInfo" 1156 <ContentWrap v-if="route.query.type == 'qualityEvaluate' || route.query.type == 'costAssess'" id="id-approveInfo"
1150 title="审批信息" description="" style="margin: 16px 16px 16px"> 1157 title="审批信息" description="" style="margin: 16px 16px 16px">
1151 <ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :processInstanceId="processInstanceId"> 1158 <ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId" :processInstanceId="processInstanceId">
1152 </ApprovalProcess> 1159 </ApprovalProcess>
1153 </ContentWrap> 1160 </ContentWrap>
1154 </div> 1161 </div>
......
src/views/data_asset/registerDetail.vue
...@@ -496,6 +496,7 @@ const approveTableInfo: any = ref({ ...@@ -496,6 +496,7 @@ const approveTableInfo: any = ref({
496 show: false 496 show: false
497 } 497 }
498 }); 498 });
499 const approvalProcessRef = ref();
499 const deploymentId = ref(''); 500 const deploymentId = ref('');
500 const processInstanceId = ref(''); 501 const processInstanceId = ref('');
501 const tenantDetail: any = ref({}); 502 const tenantDetail: any = ref({});
...@@ -987,6 +988,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -987,6 +988,7 @@ const passDialogBtnClick = (btn, info) => {
987 ElMessage.success('审批成功'); 988 ElMessage.success('审批成功');
988 passDialogInfo.value.visible = false; 989 passDialogInfo.value.visible = false;
989 getDetailInfo(); 990 getDetailInfo();
991 approvalProcessRef.value?.renderProcessNodes();
990 } else { 992 } else {
991 ElMessage.error('审批失败'); 993 ElMessage.error('审批失败');
992 } 994 }
...@@ -1020,6 +1022,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -1020,6 +1022,7 @@ const passDialogBtnClick = (btn, info) => {
1020 ElMessage.success('审批成功'); 1022 ElMessage.success('审批成功');
1021 passDialogInfo.value.visible = false; 1023 passDialogInfo.value.visible = false;
1022 getDetailInfo(); 1024 getDetailInfo();
1025 approvalProcessRef.value?.renderProcessNodes();
1023 } else { 1026 } else {
1024 ElMessage.error('审批失败'); 1027 ElMessage.error('审批失败');
1025 } 1028 }
...@@ -1052,6 +1055,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -1052,6 +1055,7 @@ const passDialogBtnClick = (btn, info) => {
1052 ElMessage.success('审批成功'); 1055 ElMessage.success('审批成功');
1053 passDialogInfo.value.visible = false; 1056 passDialogInfo.value.visible = false;
1054 getDetailInfo(); 1057 getDetailInfo();
1058 approvalProcessRef.value?.renderProcessNodes();
1055 } else { 1059 } else {
1056 ElMessage.error('审批失败'); 1060 ElMessage.error('审批失败');
1057 } 1061 }
...@@ -1075,6 +1079,7 @@ const passDialogBtnClick = (btn, info) => { ...@@ -1075,6 +1079,7 @@ const passDialogBtnClick = (btn, info) => {
1075 ElMessage.success('该资产发证确认成功'); 1079 ElMessage.success('该资产发证确认成功');
1076 passDialogInfo.value.visible = false; 1080 passDialogInfo.value.visible = false;
1077 getDetailInfo(); 1081 getDetailInfo();
1082 approvalProcessRef.value?.renderProcessNodes();
1078 } else { 1083 } else {
1079 ElMessage.error(res.msg); 1084 ElMessage.error(res.msg);
1080 } 1085 }
...@@ -1142,6 +1147,7 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -1142,6 +1147,7 @@ const rejectDialogBtnClick = (btn, info) => {
1142 ElMessage.success('驳回成功'); 1147 ElMessage.success('驳回成功');
1143 rejectDialogInfo.value.visible = false; 1148 rejectDialogInfo.value.visible = false;
1144 getDetailInfo(); 1149 getDetailInfo();
1150 approvalProcessRef.value?.renderProcessNodes();
1145 } else { 1151 } else {
1146 ElMessage.error('驳回失败'); 1152 ElMessage.error('驳回失败');
1147 } 1153 }
...@@ -1225,6 +1231,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1225,6 +1231,7 @@ const passCommonDialogBtnClick = (btn, info) => {
1225 ElMessage.success('驳回成功'); 1231 ElMessage.success('驳回成功');
1226 passCommonDialogInfo.value.visible = false; 1232 passCommonDialogInfo.value.visible = false;
1227 getDetailInfo(); 1233 getDetailInfo();
1234 approvalProcessRef.value?.renderProcessNodes();
1228 } else { 1235 } else {
1229 ElMessage.error('驳回失败'); 1236 ElMessage.error('驳回失败');
1230 } 1237 }
...@@ -1909,7 +1916,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1909,7 +1916,7 @@ const passCommonDialogBtnClick = (btn, info) => {
1909 <ContentWrap id="id-approveInfo" title="审批信息" expandSwicth style="margin-top: 15px" 1916 <ContentWrap id="id-approveInfo" title="审批信息" expandSwicth style="margin-top: 15px"
1910 :isExpand="approveInfoExpand" @expand="(v) => approveInfoExpand = v" v-if="route.query.type != 'certificate'"> 1917 :isExpand="approveInfoExpand" @expand="(v) => approveInfoExpand = v" v-if="route.query.type != 'certificate'">
1911 <!-- <Table :tableInfo="approveTableInfo" /> --> 1918 <!-- <Table :tableInfo="approveTableInfo" /> -->
1912 <ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :processInstanceId="processInstanceId"> 1919 <ApprovalProcess ref="approvalProcessRef" v-if="deploymentId" :deploymentId="deploymentId" :processInstanceId="processInstanceId">
1913 </ApprovalProcess> 1920 </ApprovalProcess>
1914 </ContentWrap> 1921 </ContentWrap>
1915 <ContentWrap id="id-certificate" v-if="tabsInfo.tabs.find(t => t.name == 'certificate')" title="证件信息" 1922 <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!