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

2023-04-18 15:28:35 +08:00
parent e4d784f79a 609ae0ce18
commit 8b9d379694
2 changed files with 3 additions and 0 deletions
@@ -817,6 +817,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl<ProcessInfoEOMapper, P
 						taskDefinitionKey = CertificationFlowNodeEnum.TASK_REVIEW.getKey();
 					}

+					data.setTaskDefinitionKey(taskDefinitionKey);
 					data.setTaskDefinitionKeyName(CertificationFlowNodeEnum.getTextByValue(taskDefinitionKey,cut));
 				}
 			});
@@ -105,6 +105,7 @@
          </div>
          <div class="Virtual-detail-left-text"
               :title="$t('projectStatus')"
+               v-has="'projectLawsInventory:ProjectStatus'"
               @click="textClick(5,$t('projectStatus'))">
            <a-icon type="cluster"/>
            {{$t('projectStatus')}}
@@ -144,6 +145,7 @@
          </div>
          <div class="Virtual-detail-left-text"
               :title="$t('projectStatus')"
+               v-has="'projectLawsInventory:ProjectStatus'"
               @click="textClick(5,$t('projectStatus'))">
            <a-icon type="cluster"/>
          </div>