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' ...@@ -19,7 +19,7 @@ import { changeNum } from '@/utils/common'
19 import { ElMessage, ElMessageBox } from "element-plus"; 19 import { ElMessage, ElMessageBox } from "element-plus";
20 import { passFlowData, rejectFlowData, revokeFlowData } from "@/api/modules/workFlowService"; 20 import { passFlowData, rejectFlowData, revokeFlowData } from "@/api/modules/workFlowService";
21 import { CircleCloseFilled } from '@element-plus/icons-vue' 21 import { CircleCloseFilled } from '@element-plus/icons-vue'
22 import { onUploadFilePreview, onUploadFileDownload, setFileName } from '@/api/modules/common'; 22 import { onUploadFilePreview, onUploadFileDownload } from '@/api/modules/common';
23 23
24 const router = useRouter(); 24 const router = useRouter();
25 const route = useRoute(); 25 const route = useRoute();
...@@ -719,35 +719,6 @@ const rejectDialogBtnClick = (btn, info) => { ...@@ -719,35 +719,6 @@ const rejectDialogBtnClick = (btn, info) => {
719 <template> 719 <template>
720 <div class="main-content" v-loading="fullscreenLoading"> 720 <div class="main-content" v-loading="fullscreenLoading">
721 <div class="detail-content" :style="{ height: detailType == 'qualityEvaluate' ? 'calc(100% - 44px)' : '100%' }"> 721 <div class="detail-content" :style="{ height: detailType == 'qualityEvaluate' ? 'calc(100% - 44px)' : '100%' }">
722 <div v-if="detailType == 'qualityEvaluate'"
723 :class="['panel_wrap', 'results_panel', evaDetailInfo.approveVO?.approveState == 'Y' ? 'success' : (evaDetailInfo.approveVO?.approveState == 'R' ? 'reject' : (evaDetailInfo.approveVO?.approveState == 'C' ? 'revoke' : 'audit'))]">
724 <div class="panel_header">
725 <div class="header_title" v-if="evaDetailInfo.approveVO?.approveState == 'Y'">
726 <el-icon class="title-icon">
727 <svg-icon name="icon-success" />
728 </el-icon>
729 <span class="title_text">审批通过</span>
730 </div>
731 <div class="header_title" v-else-if="evaDetailInfo.approveVO?.approveState == 'R'">
732 <el-icon class="title-icon">
733 <CircleCloseFilled />
734 </el-icon>
735 <span class="title_text">审批被驳回</span>
736 </div>
737 <div class="header_title" v-else-if="evaDetailInfo.approveVO?.approveState == 'A'">
738 <el-icon class="title-icon">
739 <svg-icon name="icon-audit" />
740 </el-icon>
741 <span class="title_text">待审批</span>
742 </div>
743 <div class="header_title" v-else-if="evaDetailInfo.approveVO?.approveState == 'C'">
744 <el-icon class="title-icon">
745 <svg-icon name="icon-revoke" />
746 </el-icon>
747 <span class="title_text">已撤销</span>
748 </div>
749 </div>
750 </div>
751 <div class="header"> 722 <div class="header">
752 <div class="left-img"></div> 723 <div class="left-img"></div>
753 <div class="right-main"> 724 <div class="right-main">
......
src/views/data_asset/registerDetail.vue
...@@ -1093,95 +1093,6 @@ const formattedDate = (dateVal) => { ...@@ -1093,95 +1093,6 @@ const formattedDate = (dateVal) => {
1093 <Tabs :tab-position="'right'" :tabsInfo="tabsInfo" @tabClick="tabsClick" /> 1093 <Tabs :tab-position="'right'" :tabsInfo="tabsInfo" @tabClick="tabsClick" />
1094 </div> 1094 </div>
1095 <div class="main-wrap" ref="contentRef"> 1095 <div class="main-wrap" ref="contentRef">
1096 <div v-if="detailType != 'certificate' && detailType != 'asset'"
1097 :class="['panel_wrap', 'results_panel', detailInfo.approveVO?.approveState == 'Y' ? 'success' : (detailInfo.approveVO?.approveState == 'R' ? 'reject' : (detailInfo.approveVO?.approveState == 'C' ? 'revoke' : 'audit'))]">
1098 <div class="panel_header">
1099 <div class="header_title" v-if="detailInfo.approveVO?.approveState == 'Y'">
1100 <el-icon class="title-icon">
1101 <svg-icon name="icon-success" />
1102 </el-icon>
1103 <span class="title_text">审批通过</span>
1104 </div>
1105 <div class="header_title" v-else-if="detailInfo.approveVO?.approveState == 'R'">
1106 <el-icon class="title-icon">
1107 <CircleCloseFilled />
1108 </el-icon>
1109 <span class="title_text">审批被驳回</span>
1110 </div>
1111 <div class="header_title" v-else-if="detailInfo.approveVO?.approveState == 'A'">
1112 <el-icon class="title-icon">
1113 <svg-icon name="icon-audit" />
1114 </el-icon>
1115 <span class="title_text">待审批</span>
1116 </div>
1117 <div class="header_title" v-else-if="detailInfo.approveVO?.approveState == 'C'">
1118 <el-icon class="title-icon">
1119 <svg-icon name="icon-revoke" />
1120 </el-icon>
1121 <span class="title_text">已撤销</span>
1122 </div>
1123 </div>
1124 <div class="panel_body"
1125 v-if="detailInfo.approveVO?.approveState != 'A' && detailInfo.approveVO?.approveState != 'C'">
1126 <div class="results_list">
1127 <div class="list_item">
1128 <span class="item_label">审批人:</span>
1129 <span class="item_value">{{ approveTableInfo.data.at(-1)?.approvedTenantName || '--' }}</span>
1130 </div>
1131 <div class="list_item">
1132 <span class="item_label">审批时间:</span>
1133 <span class="item_value">{{ approveTableInfo.data.at(-1)?.approveTime || '--' }}</span>
1134 </div>
1135 <div class="list_item" v-if="detailInfo.approveVO?.approveState == 'R'">
1136 <span class="item_label">审批意见:</span>
1137 <span class="item_value">{{ approveTableInfo.data.at(-1)?.approveSuggest || '--' }}</span>
1138 </div>
1139 </div>
1140 </div>
1141 </div>
1142 <div v-else-if="detailType != 'asset'"
1143 :class="['panel_wrap', 'results_panel', detailInfo.state == 4 ? 'success' : (detailInfo.state == 0 ? 'revoke' : 'audit')]">
1144 <div class="panel_header">
1145 <div class="header_title" v-if="detailInfo.state == 4">
1146 <el-icon class="title-icon">
1147 <svg-icon name="icon-success" />
1148 </el-icon>
1149 <span class="title_text">已发证</span>
1150 </div>
1151 <div class="header_title" v-else-if="detailInfo.state == 3">
1152 <el-icon class="title-icon">
1153 <svg-icon name="icon-audit" />
1154 </el-icon>
1155 <span class="title_text">发证中</span>
1156 </div>
1157 <div class="header_title" v-else-if="detailInfo.state == 2">
1158 <el-icon class="title-icon">
1159 <svg-icon name="icon-audit" />
1160 </el-icon>
1161 <span class="title_text">待发证</span>
1162 </div>
1163 <div class="header_title" v-else-if="detailInfo.state == 1">
1164 <el-icon class="title-icon">
1165 <svg-icon name="icon-audit" />
1166 </el-icon>
1167 <span class="title_text">待制证</span>
1168 </div>
1169 <div class="header_title" v-else-if="detailInfo.state == 0">
1170 <el-icon class="title-icon">
1171 <svg-icon name="icon-revoke" />
1172 </el-icon>
1173 <span class="title_text">已过期</span>
1174 </div>
1175 </div>
1176 <div class="panel_body" v-if="detailInfo.state == 4">
1177 <div class="results_list">
1178 <div class="list_item">
1179 <span class="item_label">发证主体:</span>
1180 <span class="item_value">{{ detailInfo.issuingEntityName ?? '--' }}</span>
1181 </div>
1182 </div>
1183 </div>
1184 </div>
1185 <div class="base-info-main" id="id-baseInfo"> 1096 <div class="base-info-main" id="id-baseInfo">
1186 <div class="header"> 1097 <div class="header">
1187 <div class="left-img"></div> 1098 <div class="left-img"></div>
...@@ -1457,7 +1368,7 @@ const formattedDate = (dateVal) => { ...@@ -1457,7 +1368,7 @@ const formattedDate = (dateVal) => {
1457 v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'"> 1368 v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'">
1458 <img class="file-img" src="../../assets/images/jpg.png" /> 1369 <img class="file-img" src="../../assets/images/jpg.png" />
1459 </template> 1370 </template>
1460 <div class="file-name">{{ setFileName(item.name) }}</div> 1371 <div class="file-name">{{ item.name }}</div>
1461 <div :style="{ right: '36px' }" 1372 <div :style="{ right: '36px' }"
1462 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'" 1373 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'"
1463 class="file-preview" @click="onUploadFilePreview(item)">查看</div> 1374 class="file-preview" @click="onUploadFilePreview(item)">查看</div>
......
src/views/data_asset/registerStart.vue
...@@ -29,7 +29,6 @@ import { ...@@ -29,7 +29,6 @@ import {
29 getRegisterCatalogList 29 getRegisterCatalogList
30 } from '@/api/modules/dataAsset'; 30 } from '@/api/modules/dataAsset';
31 import { getCamundaDeploymentId } from "@/api/modules/workFlowService" 31 import { getCamundaDeploymentId } from "@/api/modules/workFlowService"
32 import { setFileName } from '@/api/modules/common';
33 import useDataAssetStore from "@/store/modules/dataAsset"; 32 import useDataAssetStore from "@/store/modules/dataAsset";
34 import { useValidator } from '@/hooks/useValidator'; 33 import { useValidator } from '@/hooks/useValidator';
35 34
...@@ -312,28 +311,28 @@ const setUploadFormItemsValue = (info) => { ...@@ -312,28 +311,28 @@ const setUploadFormItemsValue = (info) => {
312 if (item.field == 'registerLetter') { 311 if (item.field == 'registerLetter') {
313 let registerLetter = attach.registerLetter ? attach.registerLetter : []; 312 let registerLetter = attach.registerLetter ? attach.registerLetter : [];
314 if(registerLetter.length){ 313 if(registerLetter.length){
315 registerLetter[0].name = setFileName(registerLetter[0].name) 314 registerLetter[0].name = registerLetter[0].name
316 } 315 }
317 item.default = registerLetter; 316 item.default = registerLetter;
318 item.templateUrl = attachDataInfo.value.register_letter; 317 item.templateUrl = attachDataInfo.value.register_letter;
319 } else if (item.field == 'evaluationFile') { 318 } else if (item.field == 'evaluationFile') {
320 let evaluationFile = attach.evaluationFile ? attach.evaluationFile : []; 319 let evaluationFile = attach.evaluationFile ? attach.evaluationFile : [];
321 if(evaluationFile.length){ 320 if(evaluationFile.length){
322 evaluationFile[0].name = setFileName(evaluationFile[0].name) 321 evaluationFile[0].name = evaluationFile[0].name
323 } 322 }
324 item.default = evaluationFile; 323 item.default = evaluationFile;
325 item.templateUrl = attachDataInfo.value.quality_evaluation_file; 324 item.templateUrl = attachDataInfo.value.quality_evaluation_file;
326 } else if (item.field == 'assessmentFile') { 325 } else if (item.field == 'assessmentFile') {
327 let assessmentFile = attach.assessmentFile ? attach.assessmentFile : []; 326 let assessmentFile = attach.assessmentFile ? attach.assessmentFile : [];
328 if(assessmentFile.length){ 327 if(assessmentFile.length){
329 assessmentFile[0].name = setFileName(assessmentFile[0].name) 328 assessmentFile[0].name = assessmentFile[0].name
330 } 329 }
331 item.default = assessmentFile; 330 item.default = assessmentFile;
332 item.templateUrl = attachDataInfo.value.cost_assessment_file; 331 item.templateUrl = attachDataInfo.value.cost_assessment_file;
333 } else if (item.field === 'commitmentLetter') { 332 } else if (item.field === 'commitmentLetter') {
334 let commitmentLetter = attach.commitmentLetter ? attach.commitmentLetter : []; 333 let commitmentLetter = attach.commitmentLetter ? attach.commitmentLetter : [];
335 if(commitmentLetter.length){ 334 if(commitmentLetter.length){
336 commitmentLetter[0].name = setFileName(commitmentLetter[0].name) 335 commitmentLetter[0].name = commitmentLetter[0].name
337 } 336 }
338 item.default = commitmentLetter; 337 item.default = commitmentLetter;
339 item.templateUrl = attachDataInfo.value['commitment-letter']; 338 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!