23c39a83 by lxs

数据资产登记详情更新

1 parent 76a078a8
...@@ -261,22 +261,23 @@ const getDetailInfo = () => { ...@@ -261,22 +261,23 @@ const getDetailInfo = () => {
261 detailInfo.value = data; 261 detailInfo.value = data;
262 assetDetailInfo.value = data; 262 assetDetailInfo.value = data;
263 deploymentId.value = approveVO.camundaDeploymentId; 263 deploymentId.value = approveVO.camundaDeploymentId;
264 processInstanceId.value = approveVO.camundaInstanceId;
264 isTextTruncated(); 265 isTextTruncated();
265 } else { 266 } else {
266 ElMessage.error(res.msg); 267 ElMessage.error(res.msg);
267 } 268 }
268 }); 269 });
269 } 270 }
270 approveTableInfo.value.loading = true; 271 // approveTableInfo.value.loading = true;
271 getApproveList(detailType.value == 'qualityEvaluate' ? evaGuid.value : (detailType.value == 'costAssess' ? costAssessGuid.value : assetGuid)).then((res: any) => { 272 // getApproveList(detailType.value == 'qualityEvaluate' ? evaGuid.value : (detailType.value == 'costAssess' ? costAssessGuid.value : assetGuid)).then((res: any) => {
272 approveTableInfo.value.loading = false; 273 // approveTableInfo.value.loading = false;
273 if (res.code == proxy.$passCode) { 274 // if (res.code == proxy.$passCode) {
274 console.log(res.data); 275 // console.log(res.data);
275 approveTableInfo.value.data = res.data || []; 276 // approveTableInfo.value.data = res.data || [];
276 } else { 277 // } else {
277 ElMessage.error(res.msg); 278 // ElMessage.error(res.msg);
278 } 279 // }
279 }); 280 // });
280 } 281 }
281 282
282 const handleExpand = () => { 283 const handleExpand = () => {
...@@ -396,6 +397,7 @@ const approveTableInfo: any = ref({ ...@@ -396,6 +397,7 @@ const approveTableInfo: any = ref({
396 } 397 }
397 }); 398 });
398 const deploymentId = ref(''); 399 const deploymentId = ref('');
400 const processInstanceId = ref('');
399 const tenantDetail: any = ref({}); 401 const tenantDetail: any = ref({});
400 402
401 /** 获取当前登录会员,服务商,企业等详情。 */ 403 /** 获取当前登录会员,服务商,企业等详情。 */
...@@ -1026,7 +1028,7 @@ const handleClickDamCatalogDetail = () => { ...@@ -1026,7 +1028,7 @@ const handleClickDamCatalogDetail = () => {
1026 <Tabs :tab-position="'right'" :tabsInfo="tabsInfo" @tabClick="tabsClick" /> 1028 <Tabs :tab-position="'right'" :tabsInfo="tabsInfo" @tabClick="tabsClick" />
1027 </div> 1029 </div>
1028 <div class="main-wrap" ref="contentRef"> 1030 <div class="main-wrap" ref="contentRef">
1029 <div v-if="detailType != 'certificate'" 1031 <div v-if="detailType != 'certificate' && detailType != 'asset'"
1030 :class="['panel_wrap', 'results_panel', detailInfo.approveState == 'Y' ? 'success' : (detailInfo.approveState == 'R' ? 'reject' : (detailInfo.approveState == 'C' ? 'revoke' : 'audit'))]"> 1032 :class="['panel_wrap', 'results_panel', detailInfo.approveState == 'Y' ? 'success' : (detailInfo.approveState == 'R' ? 'reject' : (detailInfo.approveState == 'C' ? 'revoke' : 'audit'))]">
1031 <div class="panel_header"> 1033 <div class="panel_header">
1032 <div class="header_title" v-if="detailInfo.approveState == 'Y'"> 1034 <div class="header_title" v-if="detailInfo.approveState == 'Y'">
...@@ -1071,7 +1073,7 @@ const handleClickDamCatalogDetail = () => { ...@@ -1071,7 +1073,7 @@ const handleClickDamCatalogDetail = () => {
1071 </div> 1073 </div>
1072 </div> 1074 </div>
1073 </div> 1075 </div>
1074 <div v-else 1076 <div v-else-if="detailType != 'asset'"
1075 :class="['panel_wrap', 'results_panel', detailInfo.state == 4 ? 'success' : (detailInfo.state == 0 ? 'revoke' : 'audit')]"> 1077 :class="['panel_wrap', 'results_panel', detailInfo.state == 4 ? 'success' : (detailInfo.state == 0 ? 'revoke' : 'audit')]">
1076 <div class="panel_header"> 1078 <div class="panel_header">
1077 <div class="header_title" v-if="detailInfo.state == 4"> 1079 <div class="header_title" v-if="detailInfo.state == 4">
...@@ -1696,7 +1698,7 @@ const handleClickDamCatalogDetail = () => { ...@@ -1696,7 +1698,7 @@ const handleClickDamCatalogDetail = () => {
1696 <ContentWrap id="id-approveInfo" title="审批信息" expandSwicth style="margin-top: 15px" 1698 <ContentWrap id="id-approveInfo" title="审批信息" expandSwicth style="margin-top: 15px"
1697 :isExpand="approveInfoExpand" @expand="(v) => approveInfoExpand = v"> 1699 :isExpand="approveInfoExpand" @expand="(v) => approveInfoExpand = v">
1698 <!-- <Table :tableInfo="approveTableInfo" /> --> 1700 <!-- <Table :tableInfo="approveTableInfo" /> -->
1699 <ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :definitionId="''"> 1701 <ApprovalProcess v-if="deploymentId" :deploymentId="deploymentId" :processInstanceId="processInstanceId">
1700 </ApprovalProcess> 1702 </ApprovalProcess>
1701 </ContentWrap> 1703 </ContentWrap>
1702 <ContentWrap id="id-certificate" v-if="tabsInfo.tabs.find(t => t.name == 'certificate')" title="证件信息" 1704 <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!