diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index 0439e3de1..5fe194ce3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -336,11 +336,6 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl e.getSerialNumber().equals(sameSerialNumber)).collect(Collectors.toList()).get(0); sameinfoCJList.add(sameInfoCJ); } - /* for (String sameSerialNumber : sameSerialNumberList) { - //查询数据库里包含共有编号的数据 - DummyInventoryInfoEO sameInfoCJ = infoCJList.stream().filter(e -> e.getSerialNumber().equals(sameSerialNumber)).collect(Collectors.toList()).get(0); - sameinfoCJList.add(sameInfoCJ); - }*/ } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 7323668e8..5aabcb80d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -1154,10 +1154,19 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl
- {{$t('add')}} + {{$t('newlyAdded')}}
diff --git a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue index df330eb61..a260dd7c8 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagContent.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagContent.vue @@ -20,7 +20,7 @@
- {{$t('add')}} + {{$t('newlyAdded')}}
diff --git a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue index b76aeb093..fcd00fd36 100644 --- a/jero-web/src/views/documentManage/tags/tabs/TagItem.vue +++ b/jero-web/src/views/documentManage/tags/tabs/TagItem.vue @@ -32,7 +32,7 @@
- {{$t('add')}} + {{$t('newlyAdded')}}
diff --git a/jero-web/src/views/documentTools/virtualList/index.vue b/jero-web/src/views/documentTools/virtualList/index.vue index d4200ae46..95e35e94f 100644 --- a/jero-web/src/views/documentTools/virtualList/index.vue +++ b/jero-web/src/views/documentTools/virtualList/index.vue @@ -33,7 +33,7 @@
- {{$t('add')}} + {{$t('newlyAdded')}}
diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue index 8726d8987..743c8f69e 100644 --- a/jero-web/src/views/projectManagement/projectLibrary/index.vue +++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue @@ -98,7 +98,7 @@
- {{$t('add')}} + {{$t('newlyAdded')}}
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index 472613501..c72ba24cc 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -4,22 +4,22 @@
-
- {{$t('standard')}} +
+ {{$t('entryName')}}
- +
-
- {{$t('areaOfResponsibility')}} +
+ {{$t('targetMarket')}}
- + :triggerChange="false" :dictCode="'region'"/>
@@ -33,7 +33,9 @@
{{$t('regulatoryCertificationTaskPlan')}}
+
+
@@ -84,6 +86,7 @@