WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

Browse Source
This commit is contained in:
zyx.net
2023-04-18 15:28:35 +08:00
parent e4d784f79a 609ae0ce18
commit 8b9d379694
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java
+1
View File
@@ -817,6 +817,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
taskDefinitionKey = CertificationFlowNodeEnum.TASK_REVIEW.getKey(); taskDefinitionKey = CertificationFlowNodeEnum.TASK_REVIEW.getKey();
} }
data.setTaskDefinitionKey(taskDefinitionKey);
data.setTaskDefinitionKeyName(CertificationFlowNodeEnum.getTextByValue(taskDefinitionKey,cut)); data.setTaskDefinitionKeyName(CertificationFlowNodeEnum.getTextByValue(taskDefinitionKey,cut));
} }
}); });
jero-web/src/views/projectManagement/ProjectDetails/index.vue
+2
View File
@@ -105,6 +105,7 @@
</div> </div>
<div class="Virtual-detail-left-text" <div class="Virtual-detail-left-text"
:title="$t('projectStatus')" :title="$t('projectStatus')"
v-has="'projectLawsInventory:ProjectStatus'"
@click="textClick(5,$t('projectStatus'))"> @click="textClick(5,$t('projectStatus'))">
<a-icon type="cluster"/> <a-icon type="cluster"/>
{{$t('projectStatus')}} {{$t('projectStatus')}}
@@ -144,6 +145,7 @@
</div> </div>
<div class="Virtual-detail-left-text" <div class="Virtual-detail-left-text"
:title="$t('projectStatus')" :title="$t('projectStatus')"
v-has="'projectLawsInventory:ProjectStatus'"
@click="textClick(5,$t('projectStatus'))"> @click="textClick(5,$t('projectStatus'))">
<a-icon type="cluster"/> <a-icon type="cluster"/>
</div> </div>