From 0aa5b72dc5df5d4515aeb65a9a120c3d63003b7b Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 16 Aug 2022 14:37:02 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../projectManagement/components/listOfRegulations.vue | 6 ++++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 72d278ab7..1175d57c9 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1261,4 +1261,5 @@ module.exports = { currentlyTheFirstOneThatCannotMovedUp:'Currently the first one that cannot be moved up', currentlyTheLastOneCannotmovedDown:'Currently the last one cannot be moved down', weilaiRegulationMonthlyReport:'Weilai Regulation Monthly Report', + onlyTheDataWhoseStatusNotInitiatedAcceptedChanged:'Only the data whose list confirmation status is accepted and the task list status is not initiated or the task list status is accepted can be changed', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index bdd85ecab..4267b58cd 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1363,4 +1363,5 @@ module.exports = { currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移', currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移', weilaiRegulationMonthlyReport:'蔚来法规月报', + onlyTheDataWhoseStatusNotInitiatedAcceptedChanged:'只能变更清单确认状态为接受并且任务清单状态为未发起或任务清单状态为接受的数据', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 194e2cda8..4f4e1b73a 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1190,11 +1190,13 @@ for (let i = 0; i < this.dataSource.length; i++) { for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { - if (this.dataSource[i].taskAffirmStatus == 'Accepted') { + if (this.dataSource[i].taskAffirmStatus == 'Accepted' || + (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Accepted')|| + (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Not started')) { isTrue = true } else { isTrue = false - this.$message.warning(this.$t('onlyDataChanged')) + this.$message.warning(this.$t('onlyTheDataWhoseStatusNotInitiatedAcceptedChanged')) return } } From 6ff05bf3930b9b7d2cc089b25f637c9b43741420 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Tue, 16 Aug 2022 15:32:56 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/projectManagement/components/TaskList.vue | 3 +++ .../views/projectManagement/components/listOfRegulations.vue | 3 +++ 2 files changed, 6 insertions(+) diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index ea99ae712..cb48ff483 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -457,6 +457,9 @@ queryParam[val] = queryParam[val].join(',') } }) + if (queryParam.dutyTerritory) { + queryParam.dutyTerritory = '*'+queryParam.dutyTerritory+'*' + } let query = { projectLibraryId: this.$route.query.id, ...queryParam diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 4f4e1b73a..e2aaec1ba 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1397,6 +1397,9 @@ queryParam[val] = queryParam[val].join(',') } }) + if (queryParam.dutyTerritory) { + queryParam.dutyTerritory = '*'+queryParam.dutyTerritory+'*' + } let query = { ...this.queryParamQuery, ...queryParam, From aa204cf48c64c579eecbebbe17c4bda9d231efc2 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 16 Aug 2022 17:29:26 +0800 Subject: [PATCH 03/10] =?UTF-8?q?57363=20=E6=B3=95=E8=A7=84=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E3=80=81=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95=EF=BC=8C?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E5=A4=9A=E9=80=89=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectLawsInventoryEOServiceImpl.java | 25 ++++++++++++++++++- .../ProjectTaskInventoryEOServiceImpl.java | 24 +++++++++++++++++- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 525b4f7e4..fb186335b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -629,17 +629,40 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryList(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletRequest req) { + + String dutyTerritoryStr = ""; + if (StringUtils.isNotEmpty(projectLawsInventoryEO.getDutyTerritory())) { + dutyTerritoryStr = projectLawsInventoryEO.getDutyTerritory(); + projectLawsInventoryEO.setDutyTerritory(null); + } + QueryWrapper projectLawsInventoryEOQueryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO,req.getParameterMap()); projectLawsInventoryEOQueryWrapper.orderByDesc("create_time","serial_number"); String projectLibraryId = projectLawsInventoryEO.getProjectLibraryId(); + if (StringUtils.isNotEmpty(dutyTerritoryStr)) { + String finalDutyTerritoryStr = dutyTerritoryStr.replaceAll("\\*",""); + projectLawsInventoryEOQueryWrapper.and(query -> { + query.lambda().like(ProjectLawsInventoryEO::getDutyTerritory, finalDutyTerritoryStr); + if(StringUtils.contains(finalDutyTerritoryStr,",")){ + String[] dutyTerritoryArr = finalDutyTerritoryStr.split(","); + for (String duty : dutyTerritoryArr) { + query.or(q -> { + q.like("duty_territory",duty); + }); + } + } + }); + } + + if(StringUtils.isEmpty(projectLibraryId)){ throw new JeroBootException("项目库id不能为空！"); } LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - projectLawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); + //projectLawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); //验证当前用户在该项目中是什么角色 //int isProjectRole = checkUserRole(projectLibraryId, currentUser.getId(), ""); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java index 4e5f4babf..17c1d4e9c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryEOServiceImpl.java @@ -169,12 +169,34 @@ public class ProjectTaskInventoryEOServiceImpl extends ServiceImpl lawsInventoryEOQueryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO,req.getParameterMap()); //QueryWrapper lawsInventoryEOQueryWrapper = new QueryWrapper<>(); lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId); lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue()); lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue()); + + String dutyTerritoryStr = ""; + if (StringUtils.isNotEmpty(projectTaskInventoryEO.getDutyTerritory())) { + dutyTerritoryStr = projectTaskInventoryEO.getDutyTerritory(); + projectTaskInventoryEO.setDutyTerritory(null); + } + + if (StringUtils.isNotEmpty(dutyTerritoryStr)) { + String finalDutyTerritoryStr = dutyTerritoryStr.replaceAll("\\*",""); + lawsInventoryEOQueryWrapper.and(query -> { + query.lambda().like(ProjectLawsInventoryEO::getDutyTerritory, finalDutyTerritoryStr); + if(StringUtils.contains(finalDutyTerritoryStr,",")){ + String[] dutyTerritoryArr = finalDutyTerritoryStr.split(","); + for (String duty : dutyTerritoryArr) { + query.or(q -> { + q.like("duty_territory",duty); + }); + } + } + }); + } + List projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper); if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ From aecb7df88ec5854c4e558fdf63358d106c3420d0 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 17 Aug 2022 11:11:18 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/projectManagement/components/TaskList.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index cb48ff483..4e2991b71 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -76,10 +76,10 @@
- - - - +
+ + {{ $t('batSetting') }} +
{{$t('CertificationDirectory')}} @@ -95,10 +95,12 @@ @@ -458,7 +460,7 @@ } }) if (queryParam.dutyTerritory) { - queryParam.dutyTerritory = '*'+queryParam.dutyTerritory+'*' + queryParam.dutyTerritory = '*' + queryParam.dutyTerritory + '*' } let query = { projectLibraryId: this.$route.query.id, From 92f959ccd8c05f953166ec140d2de0a7e9cfa6a5 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 17 Aug 2022 13:38:44 +0800 Subject: [PATCH 05/10] update --- .../service/impl/ConditionAssessmentEOServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java index b274dea1a..8f87663db 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ConditionAssessmentEOServiceImpl.java @@ -98,6 +98,12 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId); List conditionAssessmentEOS = super.baseMapper.selectList(queryWrapper); + if(CollectionUtils.isNotEmpty(conditionAssessmentEOS)){ + //根据角色编码去重。 + conditionAssessmentEOS = conditionAssessmentEOS.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> + new TreeSet<>(Comparator.comparing(o -> o.getRoleCode()))), + ArrayList::new)); + } return conditionAssessmentEOS; } @@ -150,9 +156,9 @@ public class ConditionAssessmentEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(ConditionAssessmentEO::getProjectLawsInventoryId,projectLawsInventoryId); - if(StringUtils.isNotEmpty(projectTaskInventory.getProjectStatusAssess())){ + /*if(StringUtils.isNotEmpty(projectTaskInventory.getProjectStatusAssess())){ queryWrapper.lambda().eq(ConditionAssessmentEO::getConditionAssessment,projectTaskInventory.getProjectStatusAssess()); - } + }*/ if(StringUtils.equals(roleCode,ProjectRoleEnum.REGULATI_ENGINEER.getValue()) || StringUtils.equals(roleCode,ProjectRoleEnum.HOMOLOGATION_ENGINEER.getValue())){ queryWrapper.lambda().eq(ConditionAssessmentEO::getCreateBy,currentUser.getUsername()); From 0e5f9e30162d441da28141a9d30cc7fba0369849 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 17 Aug 2022 20:39:02 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=9B=B4=E6=96=B0log--=E5=8F=AA=E8=AE=B0=E5=BD=95=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=96=B0=E5=A2=9E=E5=92=8C=E5=88=A0=E9=99=A4=E7=9A=84?= =?UTF-8?q?=E5=8F=98=E5=8C=96=EF=BC=8C=E4=B8=8D=E5=AF=B9=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=93=8D=E4=BD=9C=E5=81=9A=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DummyInventoryInfoEOServiceImpl.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) 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 7d5fa5e92..198274289 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 @@ -236,11 +236,11 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl> infoDiffListEn = new ArrayList<>(); infoDiffListEn.add(infoDiffEn); if(infoDiff.size()>1) { - contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null, infoDiffList, contentLog); - enContentLog = dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog, infoDiffListEn, null); +// contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null, infoDiffList, contentLog); +// enContentLog = dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog, infoDiffListEn, null); - dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue()); - dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue()); +// dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue()); +// dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue()); } }else{ if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ @@ -362,14 +362,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"复制了“"+serialNumber+"”"; - String enContentLog = username+" copied “"+serialNumber+"”."; - dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue()); - dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue()); +// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); +// String username = sysUser.getUsername(); +// String projectId = dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(); +// String serialNumber = dummyInventoryInfoEOList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(",")); +// String contentLog = username+"复制了“"+serialNumber+"”"; +// String enContentLog = username+" copied “"+serialNumber+"”."; +// dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue()); +// dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue()); } }else{ if(CutEnum.CN.getValue().equals(cut)){ @@ -600,12 +600,12 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl Date: Thu, 18 Aug 2022 11:51:46 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/TaskList.vue | 10 +- .../components/listOfRegulations.vue | 37 +- .../components/listOfRegulationsView.vue | 555 ++++++++++++++++++ 3 files changed, 589 insertions(+), 13 deletions(-) create mode 100644 jero-web/src/views/projectManagement/components/listOfRegulationsView.vue diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 4e2991b71..9de65fa66 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -76,10 +76,10 @@
-
- - {{ $t('batSetting') }} -
+ + + +
{{$t('CertificationDirectory')}} @@ -95,12 +95,10 @@ diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index e2aaec1ba..c8c4f0d60 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -225,6 +225,10 @@ @click="resultReportedClick(record)"> {{$t('resultReported')}} + + {{$t('view')}} + @@ -238,7 +242,8 @@ - {{ record.designDeliverableTypeName }}
+ {{ record.designDeliverableTypeName }}
@@ -250,7 +255,8 @@ - {{ record.prehomoDeliverableTypeName }}
+ {{ record.prehomoDeliverableTypeName }}
 @@ -262,7 +268,8 @@ - {{ record.verifyDeliverableTypeName }}
+ {{ record.verifyDeliverableTypeName }}
 @@ -424,6 +431,7 @@ {{$t('dataLoading')}} + @@ -435,6 +443,7 @@ import transferList from './transferList' import fixedPlate from './fixedPlateForm' import resultReportedUpload from './resultReportedUpload' + import listOfRegulationsView from './listOfRegulationsView' import globalAdvancedQuery from '@/components/globalAdvancedQuery/index' import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage' import moment from 'moment' @@ -452,7 +461,8 @@ transferList, globalAdvancedQuery, fixedPlate, - resultReportedUpload + resultReportedUpload, + listOfRegulationsView }, data() { return { @@ -726,7 +736,7 @@ title: this.$t('operation'), align: 'center', fixed: 'right', - width: 210, + width: 240, scopedSlots: { customRender: 'operation' } } ], @@ -1008,6 +1018,19 @@ }, methods: { ...mapGetters(['userInfo']), + viewClick(row) { + let roleCodeIndex + if (this.isDisplay) { + roleCodeIndex = 0 + } else { + roleCodeIndex = 4 + } + if (this.formInlineRoleSwitching.roleSwitchingCode == '11' || this.formInlineRoleSwitching.roleSwitchingCode == '12') { + roleCodeIndex = 0 + } + row.roleCodeIndex = roleCodeIndex + this.$refs.listOfRegulationsViewRef.editModel(JSON.parse(JSON.stringify(row))) + }, handleModule() { downloadFile(this.url.exportTemplate, this.$t('listOfRegulations') + this.$t('importTemplate') + '.xls', {}) }, @@ -1191,7 +1214,7 @@ for (let j = 0; j < selectedRowKeys.length; j++) { if (this.dataSource[i].id == selectedRowKeys[j]) { if (this.dataSource[i].taskAffirmStatus == 'Accepted' || - (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Accepted')|| + (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Accepted') || (this.dataSource[i].inventoryAffirmStatus == 'Accepted' && this.dataSource[i].taskAffirmStatus == 'Not started')) { isTrue = true } else { @@ -1398,7 +1421,7 @@ } }) if (queryParam.dutyTerritory) { - queryParam.dutyTerritory = '*'+queryParam.dutyTerritory+'*' + queryParam.dutyTerritory = '*' + queryParam.dutyTerritory + '*' } let query = { ...this.queryParamQuery, diff --git a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue new file mode 100644 index 000000000..8601a76be --- /dev/null +++ b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue @@ -0,0 +1,555 @@ + + + + \ No newline at end of file From b0310f21a451f6ad39e1d7dba265e8eb19cff084 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 18 Aug 2022 11:56:01 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../virtualList/components/virtualListDetails.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 15deaa0a6..e30c173ee 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -169,7 +169,7 @@ - {{record.designDeliverableTypeName}}
+ {{record.designDeliverableTypeName}}
@@ -180,7 +180,7 @@ -- - {{record.prehomoDeliverableTypeName}}
+ {{record.prehomoDeliverableTypeName}}
 @@ -191,7 +191,7 @@ -- - {{record.verifyDeliverableTypeName}}
+ {{record.verifyDeliverableTypeName}}
 From 66a88fe2879e5cfab8309b7a5461fea2c95e0a57 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 18 Aug 2022 13:50:13 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/virtualListDetails.vue | 19 +++++++++++-------- .../components/listOfRegulations.vue | 6 +++++- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index e30c173ee..05445eab3 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -143,7 +143,7 @@ class="ant-table tableList" :loading="loading" :pagination="false" - :scroll="{x: '100%',y:'calc(100vh - 186px)'}" + :scroll="{x: '100%',y:'calc(100vh - 356px)'}" rowKey="id" :data-source="dataSource" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" @@ -169,7 +169,8 @@ - {{record.designDeliverableTypeName}}
+ {{record.designDeliverableTypeName}}
@@ -180,7 +181,8 @@ -- - {{record.prehomoDeliverableTypeName}}
+ {{record.prehomoDeliverableTypeName}}
 @@ -191,7 +193,8 @@ -- - {{record.verifyDeliverableTypeName}}
+ {{record.verifyDeliverableTypeName}}
 @@ -1015,6 +1018,10 @@ font-weight: 500; color: #000F16; } + + ::v-deep .ant-card-body { + padding: 14px 32px 0 32px; + }