Skip to content

csbr-daop / fe-data-trusted-space

Go to a project
Toggle navigation
Toggle navigation pinning
840f6a2d by xukangle
Options

Merge branch 'develop' into dev_20241202_xukangle

2 parents 0e184ae7 c5fbe9e8
Inline Side-by-side
Showing 3 changed files with 6 additions and 125 deletions
src/views/data_asset/registerCatalogDetail.vue
......@@ -19,7 +19,7 @@ import { changeNum } from '@/utils/common'
import { ElMessage, ElMessageBox } from "element-plus";
import { passFlowData, rejectFlowData, revokeFlowData } from "@/api/modules/workFlowService";
import { CircleCloseFilled } from '@element-plus/icons-vue'
import { onUploadFilePreview, onUploadFileDownload, setFileName } from '@/api/modules/common';
import { onUploadFilePreview, onUploadFileDownload } from '@/api/modules/common';
const router = useRouter();
const route = useRoute();
......@@ -719,35 +719,6 @@ const rejectDialogBtnClick = (btn, info) => {
<template>
<div class="main-content" v-loading="fullscreenLoading">
<div class="detail-content" :style="{ height: detailType == 'qualityEvaluate' ? 'calc(100% - 44px)' : '100%' }">
<div v-if="detailType == 'qualityEvaluate'"
:class="['panel_wrap', 'results_panel', evaDetailInfo.approveVO?.approveState == 'Y' ? 'success' : (evaDetailInfo.approveVO?.approveState == 'R' ? 'reject' : (evaDetailInfo.approveVO?.approveState == 'C' ? 'revoke' : 'audit'))]">
<div class="panel_header">
<div class="header_title" v-if="evaDetailInfo.approveVO?.approveState == 'Y'">
<el-icon class="title-icon">
<svg-icon name="icon-success" />
</el-icon>
<span class="title_text">审批通过</span>
</div>
<div class="header_title" v-else-if="evaDetailInfo.approveVO?.approveState == 'R'">
<el-icon class="title-icon">
<CircleCloseFilled />
</el-icon>
<span class="title_text">审批被驳回</span>
</div>
<div class="header_title" v-else-if="evaDetailInfo.approveVO?.approveState == 'A'">
<el-icon class="title-icon">
<svg-icon name="icon-audit" />
</el-icon>
<span class="title_text">待审批</span>
</div>
<div class="header_title" v-else-if="evaDetailInfo.approveVO?.approveState == 'C'">
<el-icon class="title-icon">
<svg-icon name="icon-revoke" />
</el-icon>
<span class="title_text">已撤销</span>
</div>
</div>
</div>
<div class="header">
<div class="left-img"></div>
<div class="right-main">
......
src/views/data_asset/registerDetail.vue
......@@ -1093,95 +1093,6 @@ const formattedDate = (dateVal) => {
<Tabs :tab-position="'right'" :tabsInfo="tabsInfo" @tabClick="tabsClick" />
</div>
<div class="main-wrap" ref="contentRef">
<div v-if="detailType != 'certificate' && detailType != 'asset'"
:class="['panel_wrap', 'results_panel', detailInfo.approveVO?.approveState == 'Y' ? 'success' : (detailInfo.approveVO?.approveState == 'R' ? 'reject' : (detailInfo.approveVO?.approveState == 'C' ? 'revoke' : 'audit'))]">
<div class="panel_header">
<div class="header_title" v-if="detailInfo.approveVO?.approveState == 'Y'">
<el-icon class="title-icon">
<svg-icon name="icon-success" />
</el-icon>
<span class="title_text">审批通过</span>
</div>
<div class="header_title" v-else-if="detailInfo.approveVO?.approveState == 'R'">
<el-icon class="title-icon">
<CircleCloseFilled />
</el-icon>
<span class="title_text">审批被驳回</span>
</div>
<div class="header_title" v-else-if="detailInfo.approveVO?.approveState == 'A'">
<el-icon class="title-icon">
<svg-icon name="icon-audit" />
</el-icon>
<span class="title_text">待审批</span>
</div>
<div class="header_title" v-else-if="detailInfo.approveVO?.approveState == 'C'">
<el-icon class="title-icon">
<svg-icon name="icon-revoke" />
</el-icon>
<span class="title_text">已撤销</span>
</div>
</div>
<div class="panel_body"
v-if="detailInfo.approveVO?.approveState != 'A' && detailInfo.approveVO?.approveState != 'C'">
<div class="results_list">
<div class="list_item">
<span class="item_label">审批人:</span>
<span class="item_value">{{ approveTableInfo.data.at(-1)?.approvedTenantName || '--' }}</span>
</div>
<div class="list_item">
<span class="item_label">审批时间:</span>
<span class="item_value">{{ approveTableInfo.data.at(-1)?.approveTime || '--' }}</span>
</div>
<div class="list_item" v-if="detailInfo.approveVO?.approveState == 'R'">
<span class="item_label">审批意见:</span>
<span class="item_value">{{ approveTableInfo.data.at(-1)?.approveSuggest || '--' }}</span>
</div>
</div>
</div>
</div>
<div v-else-if="detailType != 'asset'"
:class="['panel_wrap', 'results_panel', detailInfo.state == 4 ? 'success' : (detailInfo.state == 0 ? 'revoke' : 'audit')]">
<div class="panel_header">
<div class="header_title" v-if="detailInfo.state == 4">
<el-icon class="title-icon">
<svg-icon name="icon-success" />
</el-icon>
<span class="title_text">已发证</span>
</div>
<div class="header_title" v-else-if="detailInfo.state == 3">
<el-icon class="title-icon">
<svg-icon name="icon-audit" />
</el-icon>
<span class="title_text">发证中</span>
</div>
<div class="header_title" v-else-if="detailInfo.state == 2">
<el-icon class="title-icon">
<svg-icon name="icon-audit" />
</el-icon>
<span class="title_text">待发证</span>
</div>
<div class="header_title" v-else-if="detailInfo.state == 1">
<el-icon class="title-icon">
<svg-icon name="icon-audit" />
</el-icon>
<span class="title_text">待制证</span>
</div>
<div class="header_title" v-else-if="detailInfo.state == 0">
<el-icon class="title-icon">
<svg-icon name="icon-revoke" />
</el-icon>
<span class="title_text">已过期</span>
</div>
</div>
<div class="panel_body" v-if="detailInfo.state == 4">
<div class="results_list">
<div class="list_item">
<span class="item_label">发证主体:</span>
<span class="item_value">{{ detailInfo.issuingEntityName ?? '--' }}</span>
</div>
</div>
</div>
</div>
<div class="base-info-main" id="id-baseInfo">
<div class="header">
<div class="left-img"></div>
......@@ -1457,7 +1368,7 @@ const formattedDate = (dateVal) => {
v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'">
<img class="file-img" src="../../assets/images/jpg.png" />
</template>
<div class="file-name">{{ setFileName(item.name) }}</div>
<div class="file-name">{{ item.name }}</div>
<div :style="{ right: '36px' }"
v-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'pdf' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'png' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'"
class="file-preview" @click="onUploadFilePreview(item)">查看</div>
......
src/views/data_asset/registerStart.vue
......@@ -29,7 +29,6 @@ import {
getRegisterCatalogList
} from '@/api/modules/dataAsset';
import { getCamundaDeploymentId } from "@/api/modules/workFlowService"
import { setFileName } from '@/api/modules/common';
import useDataAssetStore from "@/store/modules/dataAsset";
import { useValidator } from '@/hooks/useValidator';
......@@ -312,28 +311,28 @@ const setUploadFormItemsValue = (info) => {
if (item.field == 'registerLetter') {
let registerLetter = attach.registerLetter ? attach.registerLetter : [];
if(registerLetter.length){
registerLetter[0].name = setFileName(registerLetter[0].name)
registerLetter[0].name = registerLetter[0].name
}
item.default = registerLetter;
item.templateUrl = attachDataInfo.value.register_letter;
} else if (item.field == 'evaluationFile') {
let evaluationFile = attach.evaluationFile ? attach.evaluationFile : [];
if(evaluationFile.length){
evaluationFile[0].name = setFileName(evaluationFile[0].name)
evaluationFile[0].name = evaluationFile[0].name
}
item.default = evaluationFile;
item.templateUrl = attachDataInfo.value.quality_evaluation_file;
} else if (item.field == 'assessmentFile') {
let assessmentFile = attach.assessmentFile ? attach.assessmentFile : [];
if(assessmentFile.length){
assessmentFile[0].name = setFileName(assessmentFile[0].name)
assessmentFile[0].name = assessmentFile[0].name
}
item.default = assessmentFile;
item.templateUrl = attachDataInfo.value.cost_assessment_file;
} else if (item.field === 'commitmentLetter') {
let commitmentLetter = attach.commitmentLetter ? attach.commitmentLetter : [];
if(commitmentLetter.length){
commitmentLetter[0].name = setFileName(commitmentLetter[0].name)
commitmentLetter[0].name = commitmentLetter[0].name
}
item.default = commitmentLetter;
item.templateUrl = attachDataInfo.value['commitment-letter'];
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!