From 70ef6e1e9b0ff4f03fc43e1ae9dce1e3bc7668f1 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 12 May 2022 09:26:36 +0800 Subject: [PATCH 01/17] =?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/zh-cn.js | 6 +++--- .../views/projectManagement/projectNonConformance/index.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 46cfc6eae..121b22236 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -805,9 +805,9 @@ module.exports = { TheDoesNotContainData: '该虚拟清单的维护清单中没有数据,是否需要添加', number: '序号', Deadline: '截止时间', - designComplianceReview: '设计符合性审查', - preHomeConfirmation: 'Pre-Home确认', - verificationComplianceReview: '验证符合性审查', + designComplianceReview: '设计符合性确认', + preHomeConfirmation: 'PreHomo确认', + verificationComplianceReview: '验证符合性确认', pleaseDesignConformityConfirmation: '请补全设计符合性确认的数据', pleaseConfirmedByPrehomo: '请补全 PreHomo确认的数据', pleaseConformityVerification: '请补全验证符合性确认的数据', diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index 74d6b0423..7038c89cd 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -59,7 +59,7 @@ :placeholder="$t('PleaseSelect')+$t('RelatedItems')"> + :value="item.projectName"> {{ item.projectName}} From ad8507f0fafd2c28aa9fd5cb5cc29ddeea940e4b Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 12 May 2022 09:33:00 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/projectManagement/components/nonConformance.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index 210024e08..9e2435171 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -116,7 +116,7 @@ pageSize: 10, pageNo: 1, url: { - page: '/project/ncrTrackController/queryPage' + page: '/project/ncrTrackController/queryPageInfo' } } }, From 047fe6983deab1eeba58395edb648bd0337d280e Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Thu, 12 May 2022 09:51:40 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E8=B7=9F=E8=B8=AA--=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/NcrTrackController.java | 23 +++++++++- .../project/mapper/NcrTrackMapper.java | 3 +- .../project/mapper/xml/NcrTrackMapper.xml | 42 ++++++++++++++++--- .../service/impl/NcrTrackServiceImpl.java | 15 ++++--- .../jero/modules/project/vo/NcrTrackVO.java | 13 +++--- 5 files changed, 75 insertions(+), 21 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/NcrTrackController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/NcrTrackController.java index b4d3c618b..9cad884c2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/NcrTrackController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/NcrTrackController.java @@ -30,7 +30,7 @@ public class NcrTrackController { @Autowired private INcrTrackService iNcrTrackService; /** - * 分页列表查询 + * 项目库分页列表查询 * * @param ncrTrackVO * @param pageNo @@ -45,7 +45,26 @@ public class NcrTrackController { @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - Page page = new Page(pageNo, pageSize); + IPage pageList = iNcrTrackService.getPageInfo(ncrTrackVO,pageNo, pageSize); + return Result.OK(pageList); + } + + /** + * 项目详情中项目未符合项跟踪 + * + * @param ncrTrackVO + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @AutoLog(value = "项目未符合项跟踪-分页列表查询") + @ApiOperation(value="项目未符合项跟踪-分页列表查询", notes="项目未符合项跟踪-分页列表查询") + @GetMapping(value = "/queryPageInfo") + public Result queryPageInfo(NcrTrackVO ncrTrackVO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { IPage pageList = iNcrTrackService.getPageInfo(ncrTrackVO,pageNo, pageSize); return Result.OK(pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/NcrTrackMapper.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/NcrTrackMapper.java index 8e445b470..1f0ab0aee 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/NcrTrackMapper.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/NcrTrackMapper.java @@ -13,6 +13,5 @@ import java.util.List; */ public interface NcrTrackMapper extends BaseMapper { - List getInfoList(@Param("inconformity") String inconformity, - @Param("track") String track); + List getInfoList(@Param("ncrTrackVO") NcrTrackVO ncrTrackVO); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml index fdb5b4495..bc87910af 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/NcrTrackMapper.xml @@ -35,11 +35,43 @@ left join project_name_info pni on pni.id = plb.project_name_id where - - - design_flow_task_status =#{inconformity} or design_flow_task_status =#{track} - or prehomo_flow_task_status =#{inconformity} or prehomo_flow_task_status =#{track} - or verify_flow_task_status =#{inconformity} or verify_flow_task_status =#{track} + + plb.id =#{ncrTrackVO.projectLibraryId} + and + + + pli.serial_number =#{ncrTrackVO.serialNumber} + and + + + pli.title =#{ncrTrackVO.title} + and + + + pli.duty_territory =#{ncrTrackVO.dutyTerritory} + and + + + pni.project_name =#{ncrTrackVO.projectName} + and + + + (pti.design_flow_task_status =#{ncrTrackVO.problemType} or pti.prehomo_flow_task_status =#{ncrTrackVO.problemType} or pti.verify_flow_task_status =#{ncrTrackVO.problemType}) + and + + + (pli.design_initiator_id =#{ncrTrackVO.initiator} or pli.prehomo_initiator_id =#{ncrTrackVO.initiator} or pli.verify_initiator_id =#{ncrTrackVO.initiator}) + and + + + (pli.design_duty_id =#{ncrTrackVO.duty} or pli.prehomo_duty_id =#{ncrTrackVO.duty} or pli.verify_duty_id =#{ncrTrackVO.duty}) + and + + ( + design_flow_task_status =#{ncrTrackVO.inconformity} or design_flow_task_status =#{ncrTrackVO.track} + or prehomo_flow_task_status =#{ncrTrackVO.inconformity} or prehomo_flow_task_status =#{ncrTrackVO.track} + or verify_flow_task_status =#{ncrTrackVO.inconformity} or verify_flow_task_status =#{ncrTrackVO.track} + ) order by pli.create_time desc diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index 6dcc4dc68..9560e42c8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -39,8 +39,16 @@ public class NcrTrackServiceImpl extends ServiceImpl @Override public IPage getPageInfo(NcrTrackVO ncrTrackVO, Integer pageNo, Integer pageSize) { + if(StringUtils.isNotBlank(ncrTrackVO.getSerialNumber())){ + ncrTrackVO.setSerialNumber(ncrTrackVO.getSerialNumber().replace("*","")); + } + if(StringUtils.isNotBlank(ncrTrackVO.getTitle())){ + ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("*","")); + } List sysUserList = sysUserService.list(); - List infoList = ncrTrackMapper.getInfoList(ReviewResultEnum.INCONFORMITY.getValue(), ReviewResultEnum.TO_TRACK.getValue()); + ncrTrackVO.setInconformity(ReviewResultEnum.INCONFORMITY.getValue()); + ncrTrackVO.setTrack(ReviewResultEnum.TO_TRACK.getValue()); + List infoList = ncrTrackMapper.getInfoList(ncrTrackVO); List trackVOList = new ArrayList<>(); String designName = ""; String prehomoName = ""; @@ -49,12 +57,10 @@ public class NcrTrackServiceImpl extends ServiceImpl designName = "设计符合性确认"; prehomoName = "PreHomo确认"; verifyName = "验证符合性确认"; - }else{ designName = "Confirm design conformance"; prehomoName = "PreHomo confirmation"; verifyName = "Verify conformance validation"; - } for (NcrTrackVO trackVO : infoList) { @@ -86,8 +92,6 @@ public class NcrTrackServiceImpl extends ServiceImpl verifyFlowTaskStatusName = cut(ncrTrackVO, verifyFlowTaskStatus, verifyFlowTaskStatusName); } - - //设计符合性确认 if(StringUtils.isNotBlank(designPId)){ NcrTrackVO ncrTrackVOTemp = entityInfo(trackVO.getSerialNumber(), @@ -208,7 +212,6 @@ public class NcrTrackServiceImpl extends ServiceImpl dutyTemp = collect.get(0).getUsername(); } } - NcrTrackVO ncrTrackVO = new NcrTrackVO(); ncrTrackVO.setSerialNumber(serialNumber);//编号 ncrTrackVO.setTitle(title);//标题 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java index bcd72ce1e..a89998a7f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java @@ -1,17 +1,11 @@ package com.jero.modules.project.vo; -import com.fasterxml.jackson.annotation.JsonFormat; import com.jero.common.aspect.annotation.Dict; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; -import java.util.List; /** @@ -56,6 +50,13 @@ public class NcrTrackVO implements Serializable { //责任人 private String duty; + //项目id + private String projectLibraryId; + //项目id + private String inconformity; + //项目id + private String track; + //设计符合性确认 design_p_id private String designPId; //PreHomo确认 prehomo_p_id From 09b6dff601939119fdae2cad278d093ad72da678 Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Thu, 12 May 2022 10:01:56 +0800 Subject: [PATCH 04/17] =?UTF-8?q?[add]=20=E6=8E=A5=E5=8F=A3=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/ParameterLibrary/index.vue | 20 +++++++++++++++---- .../ParameterItemCollectionList.vue | 10 +++++++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/jero-web/src/components/ParameterLibrary/index.vue b/jero-web/src/components/ParameterLibrary/index.vue index 2a06c20a4..8de962466 100644 --- a/jero-web/src/components/ParameterLibrary/index.vue +++ b/jero-web/src/components/ParameterLibrary/index.vue @@ -124,10 +124,16 @@ export default { spinLoading: false, confirmLoading: false, templatetitle: '', - selectedRowKeys: [] + selectedRowKeys: [], + ParameterCollectionRow: {} } }, props: { + authenticationParameterCollection: { + type: Object, + default: {}, + require: true + } }, mounted() { this.loadData() @@ -135,8 +141,14 @@ export default { methods: { loadData() { this.loading = true + let _tt = { + paramsManifestId: this.ParameterCollectionRow.id, + paramsTemplateId: this.ParameterCollectionRow.paramsTemplateId, + paramsTemplatePublishVersion: this.ParameterCollectionRow.paramsTemplatePublishVersion + } let params = { - ...this.form + ...this.form, + ..._tt } getAction(`params/collectManifest/paramsInfoList`, params).then(res => { if (res.success) { @@ -283,8 +295,8 @@ export default { } }, watch: { - templateTitle(val) { - this.templatetitle = val + authenticationParameterCollection(val) { + this.ParameterCollectionRow = val }, selectedRowKeyS(val) { this.selectedRowKeys = val diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 767ef7fca..8f88318b7 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -124,7 +124,7 @@ - + @@ -212,7 +212,8 @@ export default { rowId: '', version: 0, itemId: '', - selectedRowKeysValue: [] + selectedRowKeysValue: [], + authenticationParameterCollection: {}, } }, props: { @@ -223,6 +224,8 @@ export default { } }, mounted() { + this.authenticationParameterCollection = JSON.parse(localStorage.getItem('paramsManifest')) + // console.log(JSON.parse(localStorage.getItem('paramsManifest'))) }, methods:{ addselectedRowKeys() { @@ -254,10 +257,11 @@ export default { postDateobj.id = item.id postDate.push(postDateobj) }) + let configDataList = { configDataList: postDate } if(this.selectedRowKeys.length == 0) { this.$message.warning(this.$t('selectLeastOne')) }else { - postAction(this.url.add, postDate).then((res) => { + postAction(this.url.add, configDataList).then((res) => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) // _this.getlist() From fff7d43cc4ebf0898f4e18d906bcae168b50fa70 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 12 May 2022 10:07:04 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E4=B8=BA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectNonConformance/index.vue | 83 ++++++++++++------- 1 file changed, 54 insertions(+), 29 deletions(-) diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index 7038c89cd..2c6e8bce4 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -22,32 +22,43 @@
-
- {{$t('ProcessType')}} +
+ {{$t('areaOfResponsibility')}}
- - - - {{ $t('designComplianceReview') }} - - - - - {{ $t('preHomeConfirmation') }} - - - - - {{ $t('verificationComplianceReview') }} - - - +
@@ -555,9 +584,21 @@ } ], visibleFile: false, + formInlineComment: {}, + rulesComment: { + commentContent: [ + { + required: true, + message: this.$t('reasonsForRejection') + this.$t('cannotEmpty'), + trigger: 'blur' + } + ] + }, timeName: '', + visibleComment: false, dataSourceFile: [], confirmLoading: false, + confirmLoadingComment: false, queryParamQuery: {}, isDisplay: true, selectedRowKeys: [], @@ -1063,17 +1104,48 @@ this.$confirm({ content: num == 0 ? _this.$t('confirmSubmit') : _this.$t('confirmOverrule'), onOk() { - let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) - _this.getRowKeys(selectedRowKeys, function() { - _this.updateStatusBatch(num, selectedRowKeys) - }) + if (num == 0) { + let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) + _this.getRowKeys(selectedRowKeys, function() { + _this.updateStatusBatch(num, selectedRowKeys) + }) + } else { + let selectedRowKeys = JSON.parse(JSON.stringify(_this.selectedRowKeys)) + _this.getRowKeys(selectedRowKeys, function() { + _this.visibleComment = true + }) + } } }) } else { this.$message.warning(this.$t('selectLeastOne')) } }, - + handleOkComment() { + this.$refs.ruleFormComment.validate(valid => { + if (valid) { + let url = '/project/projectCommentEO/add' + let query = { + commentContent: this.formInlineComment.commentContent, + projectLibraryId: this.$route.query.id + } + this.confirmLoadingComment = true + let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) + this.updateStatusBatch(1, selectedRowKeys) + postAction(url, query).then((res) => { + if (res.success) { + this.visibleComment = false + this.confirmLoadingComment = false + } else { + this.confirmLoadingComment = false + } + }) + } + }) + }, + handleCancelComment() { + this.visibleComment = false + }, handleCancel() { this.formInline = {} this.visible = false @@ -1385,6 +1457,24 @@ color: #040B29; margin-bottom: 22px; } + .itemModelComment{ + width: calc(100% - 64px); + display: inline-block; + margin-top: 2px; + } + .title-text-Comment{ + width: 74px; + text-align: right; + display: inline-block; + font-weight: 500; + font-size: 14px; + margin-right: 16px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + height: 42px; + line-height: 48px; + } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index fb2985fb8..3e6aef24a 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -150,10 +150,8 @@ this.getList() }, handleExport() { - let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys)) let query = { ...this.queryParam, - ids: selectedRowKeys.join(','), projectLibraryId: this.$route.query.id } downloadFile(this.url.exportData, this.$t('NonConformance') + '.xls', query, this.Deselect) From 702a8a6a0d830dc3701f1440c7f50aeff4deb456 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 12 May 2022 13:41:27 +0800 Subject: [PATCH 17/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AA=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E9=A1=B9=E7=9A=84=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 ++ jero-web/src/common/lang/zh-cn.js | 2 ++ .../views/projectManagement/projectNonConformance/index.vue | 4 ++-- 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 c0af73ec7..257d7f8e5 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -809,4 +809,6 @@ module.exports = { virtualListDetails:'Virtual list details', maintainVirtualList:'Maintain virtual list', reasonsForRejection:'Reasons for rejection', + inconformity:'inconformity', + toTrack:'to track', } \ 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 10d3a802f..1c3fb1d94 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -814,4 +814,6 @@ module.exports = { virtualListDetails:'虚拟清单详情', maintainVirtualList:'维护虚拟清单', reasonsForRejection:'驳回原因', + inconformity:'不符合', + toTrack:'待追踪' } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index 040d5edac..245e8a837 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -87,12 +87,12 @@ class="box-input" v-model="queryParam.problemType" :placeholder="$t('PleaseSelect')+$t('problemType')"> - + {{ $t('nonConformity') }} - + {{ $t('Tracked') }}