diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 0fc2f46ea..c5ab2107c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -725,17 +725,31 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl treeOnlCgformFieldList = fieldList.stream().filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); List treeList = treeOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); List onlCgformFieldDateMoreList = fieldList.stream().filter(e -> FieldTypeEnum.DATE_MORE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); + List onlCgformFieldPersonList = fieldList.stream().filter(e -> FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); + List personList = onlCgformFieldPersonList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); List dateMoreList = onlCgformFieldDateMoreList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); //通过id查询数据 List> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id); //多选日期 + List userNameList = new ArrayList<>(); for (Map.Entry entry : dataList.get(0).entrySet()) { String key = entry.getKey(); + if(personList.contains(key)){ + String value = (String) entry.getValue(); + userNameList.addAll(Arrays.asList(value.split(","))); + } if(dateMoreList.contains(key) && ObjectUtils.isNotEmpty(entry.getValue())){ String value = (String) entry.getValue(); entry.setValue(Arrays.asList(value.split(","))); } } + List userList = new ArrayList<>(); + if(userNameList.size() != 0){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SysUser::getUsername,userNameList); + userList = sysUserService.list(wrapper); + } + //查询所有 List> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null); @@ -750,6 +764,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl personKeyList = new ArrayList<>(); for (Map.Entry entry : dataList.get(0).entrySet()) { if(treeList.contains(entry.getKey())){ String value = (String) entry.getValue(); @@ -759,6 +774,28 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl users = new ArrayList<>(); + if(userList.size() != 0 && StringUtils.isNotBlank(value)){ + for (String s : value.split(",")) { + List sysUserList = userList.stream().filter(e -> e.getUsername().equals(s)).collect(Collectors.toList()); + users.addAll(sysUserList); + } + if(users.size() != 0){ + List userIdList = users.stream().map(SysUser::getId).collect(Collectors.toList()); + dataList.get(0).put(personKey + "_id",StringUtils.join(userIdList,",")); + } + } + } } return dataList; } 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 97d9bf538..cd25c8aac 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 @@ -685,7 +685,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl 1) { this.$message.warning(this.$t('onlyOnePersonCanBeSelected')) + return } } let userIds = JSON.parse(JSON.stringify(this.userIds)) diff --git a/jero-web/src/components/jero/JLoading.vue b/jero-web/src/components/jero/JLoading.vue index eba0c4edd..29a67aea8 100644 --- a/jero-web/src/components/jero/JLoading.vue +++ b/jero-web/src/components/jero/JLoading.vue @@ -54,7 +54,7 @@ position: absolute; top: 0; left: 0; - z-index: 9999900; + z-index: 999; width: 100%; height: 100%; background-color: rgba(255, 255, 255, 0.9); diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue index 2aae52750..cf7ee5be3 100644 --- a/jero-web/src/views/dashboard/components/myList.vue +++ b/jero-web/src/views/dashboard/components/myList.vue @@ -14,7 +14,7 @@ {{prcTypeName[item.prcType]}}
- {{moment(item.createTime).format('YYYY-MM-DD HH:mm:ss')}} + {{item.creatTime}}
{{$t('Pending')}} diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index ab895aae0..e3a3f0752 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -4,7 +4,7 @@
{{$t('engineeringConfirmation')}} + type="question-circle"/>
@@ -395,7 +395,7 @@ { title: 'ID', dataIndex: 'serialNumber', - align: 'left', + align: 'left' }, { title: this.$t('completedBy'), @@ -604,7 +604,7 @@ this.dataSourceTable.forEach(val => { this.distributionEngineerList.push({ name: val.userName, - id:val.id, + id: val.id, userId: val.userId, deliveryInstructions: val.deliveryInstructions }) @@ -614,7 +614,7 @@ } this.formInline.userId = userId.join(',') this.formInline.userName = userName.join(',') - this.formInline = {...this.formInline} + this.formInline = { ...this.formInline } } this.loadingTable = false } else { @@ -670,6 +670,7 @@ }, PersonnelSelectionChange(value, id) { this.formInline[value] = id + this.distributionEngineerList = [] if (id) { this.formInline.userName.split(',').forEach((res, index) => { this.distributionEngineerList.push({ diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index 103403f61..57464c805 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -190,7 +190,6 @@ postAction('/workFlow/completeTask', query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) - this.loading = false if (this.$route.query.taskDefinitionKey == 'zrrjsrw' || this.$route.query.taskDefinitionKey == 'zrrqr') { if (value.flag == 0) { if (this.queryProject.verifyDeliverableType) { @@ -204,21 +203,32 @@ } if (!this.queryProject.verifyDeliverableType && !this.queryProject.prehomoDeliverableType && !this.queryProject.designDeliverableType) { - window.close() + setTimeout(() => { + this.loading = false + window.close() + }, 1000) // this.$router.push({ // path: '/ProcessCenter' // }) } } else { - window.close() + setTimeout(() => { + this.loading = false + window.close() + }, 1000) // this.$router.push({ // path: '/ProcessCenter' // }) } } else { - this.$router.push({ - path: '/ProcessCenter' - }) + setTimeout(() => { + this.loading = false + window.close() + }, 1000) + + // this.$router.push({ + // path: '/ProcessCenter' + // }) } } else { this.loading = false @@ -252,13 +262,12 @@ if (res.success) { this.visible = false setTimeout(() => { + this.loading = false window.close() - }, 2000) + }, 3000) // this.$router.push({ // path: '/ProcessCenter' // }) - } else { - this.$message.warning(this.$t('operationFailed')) } }) }, diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index afa3f81cf..a64d2367e 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -302,13 +302,16 @@ } putAction(this.url.dreSubmit, query).then((res) => { if (res.success) { - this.loading = false this.$message.success(this.$t('OperationSuccessful')) // this.$router.push({ // path: '/ProjectDetails', // query: this.$route.query // }) - window.close() + setTimeout(() => { + this.loading = false + window.close() + }, 1000) + } else { this.loading = false this.$message.warning(this.$t('operationFailed')) @@ -326,7 +329,6 @@ postAction('/workFlow/completeTask', query).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) - this.loading = false this.edit() // this.$router.push({ // path: '/ProjectDetails', @@ -345,7 +347,10 @@ } putAction(this.url.edit, query).then((res) => { if (res.success) { - window.close() + setTimeout(() => { + this.loading = false + window.close() + }, 1000) } }) },