fc2bbc69 by lihua

修复资产相关详情页面

1 parent ea9a6f07
...@@ -94,12 +94,13 @@ const getDetailInfo = () => { ...@@ -94,12 +94,13 @@ const getDetailInfo = () => {
94 processInstanceId.value = data.approveVO?.camundaInstanceId; 94 processInstanceId.value = data.approveVO?.camundaInstanceId;
95 //需要显示质量评价信息 95 //需要显示质量评价信息
96 if (data.qualityScore != null) { 96 if (data.qualityScore != null) {
97 if (tabsInfo.value.tabs.length == 4) { 97 if (tabsInfo.value.tabs.length == 5) {
98 tabsInfo.value.tabs.splice(3, 0, { label: "质量评价", name: "qualityEvaluate" }) 98 tabsInfo.value.tabs.splice(4, 0, { label: "质量评价", name: "qualityEvaluate" })
99 } 99 }
100 } else { 100 } else {
101 if (tabsInfo.value.tabs.length == 5) { 101 const qualityTabIndex = tabsInfo.value.tabs.findIndex(tab => tab.name === "qualityEvaluate");
102 tabsInfo.value.tabs.splice(3, 1); 102 if (qualityTabIndex > -1) {
103 tabsInfo.value.tabs.splice(qualityTabIndex, 1);
103 } 104 }
104 } 105 }
105 if (evaDetailInfo.value.isApprove == 'N') { 106 if (evaDetailInfo.value.isApprove == 'N') {
...@@ -148,7 +149,7 @@ const getDetailInfo = () => { ...@@ -148,7 +149,7 @@ const getDetailInfo = () => {
148 }); 149 });
149 } 150 }
150 }); 151 });
151 if (!(uploadFileDetailInfo.value?.length || detailType.value != 'asset')) { 152 if (!uploadFileDetailInfo.value?.lengt) {
152 let index = tabsInfo.value.tabs.findIndex(t => t.label == '附件信息'); 153 let index = tabsInfo.value.tabs.findIndex(t => t.label == '附件信息');
153 index > -1 && tabsInfo.value.tabs.splice(index, 1); 154 index > -1 && tabsInfo.value.tabs.splice(index, 1);
154 } 155 }
...@@ -172,12 +173,14 @@ const getDetailInfo = () => { ...@@ -172,12 +173,14 @@ const getDetailInfo = () => {
172 processInstanceId.value = data.approveVO?.camundaInstanceId; 173 processInstanceId.value = data.approveVO?.camundaInstanceId;
173 // 需要显示价值评估信息 174 // 需要显示价值评估信息
174 if (data.assessmentMoney != null) { 175 if (data.assessmentMoney != null) {
175 if (tabsInfo.value.tabs.length == 4) {
176 tabsInfo.value.tabs.splice(3, 0, { label: "价值评估", name: "costAssess" })
177 }
178 } else {
179 if (tabsInfo.value.tabs.length == 5) { 176 if (tabsInfo.value.tabs.length == 5) {
180 tabsInfo.value.tabs.splice(3, 1); 177 tabsInfo.value.tabs.splice(4, 0, { label: "价值评估", name: "costAssess" })
178 }
179 }
180 else {
181 const costAssessTabIndex = tabsInfo.value.tabs.findIndex(tab => tab.name === "costAssess");
182 if (costAssessTabIndex > -1) {
183 tabsInfo.value.tabs.splice(costAssessTabIndex, 1);
181 } 184 }
182 } 185 }
183 if (costAssessDetailInfo.value.isApprove == 'N') { 186 if (costAssessDetailInfo.value.isApprove == 'N') {
...@@ -246,7 +249,7 @@ const getDetailInfo = () => { ...@@ -246,7 +249,7 @@ const getDetailInfo = () => {
246 }); 249 });
247 } 250 }
248 }); 251 });
249 if (!(uploadFileDetailInfo.value?.length || detailType.value != 'asset')) { 252 if (!uploadFileDetailInfo.value?.lengt) {
250 let index = tabsInfo.value.tabs.findIndex(t => t.label == '附件信息'); 253 let index = tabsInfo.value.tabs.findIndex(t => t.label == '附件信息');
251 index > -1 && tabsInfo.value.tabs.splice(index, 1); 254 index > -1 && tabsInfo.value.tabs.splice(index, 1);
252 } 255 }
...@@ -286,7 +289,7 @@ const getDetailInfo = () => { ...@@ -286,7 +289,7 @@ const getDetailInfo = () => {
286 if (data.qualityScore != null) { 289 if (data.qualityScore != null) {
287 let index = tabsInfo.value.tabs.findIndex(t => t.name == 'qualityEvaluate'); 290 let index = tabsInfo.value.tabs.findIndex(t => t.name == 'qualityEvaluate');
288 if (index == -1) { 291 if (index == -1) {
289 tabsInfo.value.tabs.splice(tabsInfo.value.tabs[3].name == 'costAssess' ? 4 : 3, 0, { label: "质量评价", name: "qualityEvaluate" }) 292 tabsInfo.value.tabs.splice(tabsInfo.value.tabs[4].name == 'costAssess' ? 5 : 4, 0, { label: "质量评价", name: "qualityEvaluate" })
290 } 293 }
291 } else { 294 } else {
292 let index = tabsInfo.value.tabs.findIndex(t => t.name == 'qualityEvaluate'); 295 let index = tabsInfo.value.tabs.findIndex(t => t.name == 'qualityEvaluate');
...@@ -310,7 +313,7 @@ const getDetailInfo = () => { ...@@ -310,7 +313,7 @@ const getDetailInfo = () => {
310 if (data.assessmentMoney != null) { 313 if (data.assessmentMoney != null) {
311 let index = tabsInfo.value.tabs.findIndex(t => t.name == 'costAssess'); 314 let index = tabsInfo.value.tabs.findIndex(t => t.name == 'costAssess');
312 if (index == -1) { 315 if (index == -1) {
313 tabsInfo.value.tabs.splice(tabsInfo.value.tabs[3].name == 'qualityEvaluate' ? 4 : 3, 0, { label: "价值评估", name: "costAssess" }) 316 tabsInfo.value.tabs.splice(tabsInfo.value.tabs[4].name == 'qualityEvaluate' ? 5 : 4, 0, { label: "价值评估", name: "costAssess" })
314 } 317 }
315 } else { 318 } else {
316 let index = tabsInfo.value.tabs.findIndex(t => t.name == 'costAssess'); 319 let index = tabsInfo.value.tabs.findIndex(t => t.name == 'costAssess');
...@@ -360,10 +363,6 @@ const getDetailInfo = () => { ...@@ -360,10 +363,6 @@ const getDetailInfo = () => {
360 }); 363 });
361 } 364 }
362 }); 365 });
363 if (!(uploadFileDetailInfo.value?.length || detailType.value != 'asset')) {
364 let index = tabsInfo.value.tabs.findIndex(t => t.label == '附件信息');
365 index > -1 && tabsInfo.value.tabs.splice(index, 1);
366 }
367 } else { 366 } else {
368 ElMessage.error(res.msg); 367 ElMessage.error(res.msg);
369 } 368 }
...@@ -1373,20 +1372,13 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1373,20 +1372,13 @@ const passCommonDialogBtnClick = (btn, info) => {
1373 <div class="left-img"></div> 1372 <div class="left-img"></div>
1374 <div class="right-main"> 1373 <div class="right-main">
1375 <div class="asset-title"> 1374 <div class="asset-title">
1376 <div style="display: flex;align-items: center;width: 100%;"> 1375 <div style="display: flex;align-items: center;width: 100%;flex-grow: 1;flex-shrink: 1;min-width: 0px;">
1377 <div class="title1"><ellipsis-tooltip :content="assetDetailInfo.productName || '--'" 1376 <div class="title1"><ellipsis-tooltip :content="assetDetailInfo.productName || '--'"
1378 class-name="w100f" :refName="'tooltipOver' + 'productName'"></ellipsis-tooltip></div> 1377 class-name="w100f" :refName="'tooltipOver' + 'productName'"></ellipsis-tooltip></div>
1379 <!-- <div v-if="assetDetailInfo.dataSensitivityLevelName?.length" class="dataLabel">{{
1380 (assetDetailInfo.dataSensitivityLevelName?.filter(u => u != '其他')?.join('、') +
1381 `${assetDetailInfo.dataSensitivityLevelOther || ''}`)
1382 }}
1383 </div> -->
1384 <div v-if="assetDetailInfo.registerRSVO?.dataTypeName" class="dataLabel">{{ 1378 <div v-if="assetDetailInfo.registerRSVO?.dataTypeName" class="dataLabel">{{
1385 assetDetailInfo.registerRSVO?.dataTypeName }}</div> 1379 assetDetailInfo.registerRSVO?.dataTypeName }}</div>
1386 <!-- <div :class="['dataLabel', assetDetailInfo.isPersonalInfo != 'Y' ? 'dataLabel1' : '']">{{
1387 assetDetailInfo.isPersonalInfo == 'Y' ? '涉及个人信息' : '不涉及个人信息' }}</div> -->
1388 </div> 1380 </div>
1389 <div style="display: flex"> 1381 <div style="display: flex;flex-shrink: 0;">
1390 <div v-if="tabsInfo.tabs.find(t => t.name == 'qualityEvaluate')" class="right-label" 1382 <div v-if="tabsInfo.tabs.find(t => t.name == 'qualityEvaluate')" class="right-label"
1391 :style="{ 'margin-right': tabsInfo.tabs.find(t => t.name == 'costAssess') ? '8px' : '0px' }"> 1383 :style="{ 'margin-right': tabsInfo.tabs.find(t => t.name == 'costAssess') ? '8px' : '0px' }">
1392 评分:<span style="color: var(--el-color-primary);font-weight: 600;font-size: 16px;">{{ 1384 评分:<span style="color: var(--el-color-primary);font-weight: 600;font-size: 16px;">{{
...@@ -1676,7 +1668,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -1676,7 +1668,7 @@ const passCommonDialogBtnClick = (btn, info) => {
1676 </el-tab-pane> 1668 </el-tab-pane>
1677 </el-tabs> 1669 </el-tabs>
1678 </ContentWrap> 1670 </ContentWrap>
1679 <ContentWrap v-show="uploadFileDetailInfo?.length || detailType != 'asset'" id="id-assetContent" title="附件信息" description="" style="margin-top: 15px" 1671 <ContentWrap v-show="uploadFileDetailInfo?.length" id="id-assetContent" title="附件信息" description="" style="margin-top: 15px"
1680 :isExpand="assetContentExpand" expandSwicth @expand="(v) => assetContentExpand = v"> 1672 :isExpand="assetContentExpand" expandSwicth @expand="(v) => assetContentExpand = v">
1681 <div class="list_panel mt4"> 1673 <div class="list_panel mt4">
1682 <div class="list_item isFile" v-for="(fileItem, index) in uploadFileDetailInfo"> 1674 <div class="list_item isFile" v-for="(fileItem, index) in uploadFileDetailInfo">
...@@ -2374,6 +2366,7 @@ const passCommonDialogBtnClick = (btn, info) => { ...@@ -2374,6 +2366,7 @@ const passCommonDialogBtnClick = (btn, info) => {
2374 display: flex; 2366 display: flex;
2375 align-items: center; 2367 align-items: center;
2376 justify-content: space-between; 2368 justify-content: space-between;
2369 width: 100%;
2377 2370
2378 .title1 { 2371 .title1 {
2379 max-width: calc(100% - 100px); 2372 max-width: calc(100% - 100px);
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!