diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index 33d95004a..fca266f32 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -79,13 +79,15 @@ public class ParamsManifestEOController extends JeroController rows = pageList.getRecords(); - // 处理 状态 中英文 - Map stateMap = ManifestStateEnum.toMap(cut); - rows.forEach(manifestEO -> { - manifestEO.setProjectName(paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion(),paramsManifestEO.getCut()).getProjectName()); - manifestEO.setState(stateMap.get(manifestEO.getState())); - }); +// List rows = pageList.getRecords(); +// // 处理 状态 中英文 +// Map stateMap = ManifestStateEnum.toMap(cut); +// rows.forEach(manifestEO -> { +// manifestEO.setProjectName(paramsManifestEOService.getProjectById(manifestEO.getProjectId(), manifestEO.getProjectVersion(),paramsManifestEO.getCut()).getProjectName()); +// manifestEO.setState(stateMap.get(manifestEO.getState())); +// }); + + pageList.setRecords(paramsManifestEOService.queryList(paramsManifestEO)); return Result.OK(cut, pageList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java index 91f022a42..f81d672da 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java @@ -128,4 +128,8 @@ public class ParamsManifestEO implements Serializable { // 参数项清单的参考列配置id(对应上报库参数配置表(params_report_config)中的id) private String referencesColId; + + //是否为历史记录数据(0:不是;1:是) + @TableField(exist = false) + private String isHistory; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java index 1f69ce4a9..461fbd58a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestEOService.java @@ -21,6 +21,11 @@ import java.util.Map; */ public interface IParamsManifestEOService extends IService { + /** + * 查询列表 + */ + List queryList(ParamsManifestEO paramsManifestEO); + /** * 保存 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java index 5d30be7c2..fdf54cc72 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsManifestHistoryEOService.java @@ -18,5 +18,7 @@ public interface IParamsManifestHistoryEOService extends IService getHistoryVersionList(String paramsManifestId); + List getHistoryList(String paramsManifestId); + void deleteAllHistoryVersion(List paramsManifestIdList); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 8bffda745..db2c27b3b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1509,7 +1509,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl queryList(ParamsManifestEO paramsManifestEO) { + List resList = new ArrayList<>(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if(StringUtils.isNotEmpty(paramsManifestEO.getTitle())){ + queryWrapper.eq(ParamsManifestEO::getTitle, paramsManifestEO.getTitle()); + } + queryWrapper.eq(ParamsManifestEO::getProjectId, paramsManifestEO.getProjectId()); + List paramsManifestEOList = list(queryWrapper); + resList.addAll(paramsManifestEOList); + for (ParamsManifestEO pm : paramsManifestEOList) { + pm.setIsHistory("0"); + List hisList = paramsManifestHistoryEOService.getHistoryList(pm.getId()); + if(CollectionUtils.isNotEmpty(hisList)){ + for (ParamsManifestHistoryEO his : hisList) { + his.setIsHistory("1"); + resList.add(his); + } + } + } + return resList; + } + /** * 保存 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java index 2e4531945..c5e9b2275 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestHistoryEOServiceImpl.java @@ -133,6 +133,16 @@ public class ParamsManifestHistoryEOServiceImpl extends ServiceImpl getHistoryList(String paramsManifestId) { + // 历史版本和当前版本通过id进行关联 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ParamsManifestHistoryEO::getSourceParamsManifestId, paramsManifestId) + .orderByAsc(ParamsManifestHistoryEO::getVersion); + List list = list(queryWrapper); + return list; + } + @Override public List getHistoryVersionList(String paramsManifestId) { // 历史版本和当前版本通过id进行关联 diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 6e9b8951b..7affbefb3 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -786,7 +786,7 @@ module.exports = { modifyprojectInterfacePerson: 'Modify Project Interface Person', operatethisbutton: 'You do not have permission to operate this button', ParameterLibrary: 'Parameter Library', - referenceparameter: 'Copy Parameter', + referenceparameter: 'Reference parameter', tempSave: 'Save', Assignedby: 'Assign', CompulsoryWithdrawal: 'Revoke', @@ -1386,8 +1386,8 @@ module.exports = { contactTheFounder:'Contact author', certificationCategoryNumber: 'certification Category Number', historicalrecord:'Revision History', - Referenceparametercolumn:'Reference Parameter Column', - Updateparametercolumn:'Update The Parameter Column', + Referenceparametercolumn:'Set reference parameter', + Updateparametercolumn:'Update reference parameter', columnfirst:'Reference the parameter column first', columnforced:'Confirm a forced retraction?', customize:'List Setting', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 9e565898f..963d9d20c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -804,7 +804,7 @@ module.exports = { modifyprojectInterfacePerson: '修改工程接口人', operatethisbutton: '没有权限操作此按钮', ParameterLibrary: '参数库', - referenceparameter: '复制参数', + referenceparameter: '引用参数', tempSave: '暂存', Assignedby: '分配填写人', CompulsoryWithdrawal: '强制撤回', @@ -1484,8 +1484,8 @@ module.exports = { CuiBan: '催办', certificationCategoryNumber: '认证类别编号', historicalrecord: '历史记录', - Referenceparametercolumn: '引用参数列', - Updateparametercolumn: '更新参数列', + Referenceparametercolumn: '设置参考列', + Updateparametercolumn: '更新参考列', columnfirst: '请先引用参数列', columnforced: '确认强制撤回?', brand: '品牌', @@ -2711,7 +2711,7 @@ module.exports = { modifyprojectInterfacePerson: '修改工程接口人', operatethisbutton: '没有权限操作此按钮', ParameterLibrary: '参数库', - referenceparameter: '复制参数', + referenceparameter: '引用参数', tempSave: '暂存', Assignedby: '分配填写人', CompulsoryWithdrawal: '强制撤回', @@ -3389,8 +3389,8 @@ module.exports = { CuiBan: '催办', certificationCategoryNumber: '认证类别编号', historicalrecord: '历史记录', - Referenceparametercolumn: '引用参数列', - Updateparametercolumn: '更新参数列', + Referenceparametercolumn: '设置参考列', + Updateparametercolumn: '更新参考列', columnfirst: '请先引用参数列', columnforced: '确认强制撤回?', brand: '品牌', diff --git a/jero-web/src/views/parameter/ParameterTemplate/index.vue b/jero-web/src/views/parameter/ParameterTemplate/index.vue index e9d82b960..6f82ac1a6 100644 --- a/jero-web/src/views/parameter/ParameterTemplate/index.vue +++ b/jero-web/src/views/parameter/ParameterTemplate/index.vue @@ -69,6 +69,9 @@ {{ text && text.length > 50 ? text.slice(0, 49) + '...' : text }} + {{record.status && record.status == '1'? $t('withdraw') : $t('release')}} {{$t('edit')}} {{$t('deleteLib')}} @@ -193,6 +196,13 @@ export default { // ellipsis: true, // dataIndex: 'region_dictText', // }, + { + title: this.$t('VersionNumber'), + align: 'left', + width: 120, + ellipsis: true, + dataIndex: 'version' + }, { title: this.$t('creater'), align: 'left', @@ -282,6 +292,34 @@ export default { this.visible = false; this.$refs['ruleForm'].resetFields() }, + withdrawOrRelease(item){ + let _this = this + this.$confirm({ + content: item.status && item.status == '1' ? _this.$t('confirmWithdraw') : _this.$t('confirmRelease'), + onOk() { + if (item.status && item.status == '1'){ + getAction('params/paramsInfo/withdraw', { paramsTemplateId: item.id }).then((res) => { + if (res.success) { + _this.$message.success(res.result) + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) + }else{ + getAction('params/paramsInfo/publish', { paramsTemplateId: item.id }).then((res) => { + if (res.success) { + _this.$message.success(res.result) + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) + } + } + }) + + }, //批量删除 handleDel() { let param={ diff --git a/jero-web/src/views/parameter/parameterlist/index.vue b/jero-web/src/views/parameter/parameterlist/index.vue index 1efb39f1a..a6dd547cd 100644 --- a/jero-web/src/views/parameter/parameterlist/index.vue +++ b/jero-web/src/views/parameter/parameterlist/index.vue @@ -57,10 +57,10 @@
-
- - {{$t('releaseVersion')}} -
+ + + +
{{$t('BatchDelete')}} diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 9e6979a44..5b6210cd2 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -64,26 +64,31 @@ - {{$t('configure')}} - {{$t('edit')}} + {{$t('configure')}} + {{$t('edit')}} {{$t('deleteLib')}} - {{$t('historicalVersion')}} +
-
- -
+ + + + + + + + + + + + { - if (res.result) { - // localStorage.setItem('paramsManifest', JSON.stringify(item)) - let newUrl = _this.$router.resolve({ - path: '/ParameterItemCollection', - query: item - // projectName:this.$route.query.projectName - }) - window.open(newUrl.href, '_blank') - } else { - _this.$message.warning(_this.$t('NoConfigurationNotStart')) - } - }) + if (item.isHistory == '1'){ + let newUrl = _this.$router.resolve({ + path: '/ParameterItemCollection', + query: {it: item.id, + ...item + } + // projectName:this.$route.query.projectName + }) + window.open(newUrl.href, '_blank') + }else{ + getAction(this.url.verifyConfig, { paramsManifestId: item.id }).then((res) => { + if (res.result) { + // localStorage.setItem('paramsManifest', JSON.stringify(item)) + item.projectName = this.$route.query.projectName + let newUrl = _this.$router.resolve({ + path: '/ParameterItemCollection', + query: item + // projectName:this.$route.query.projectName + }) + window.open(newUrl.href, '_blank') + } else { + _this.$message.warning(_this.$t('NoConfigurationNotStart')) + } + }) + } }, deleteLib(val) { if (val.state === '已完成' || val.state === 'Finished' || val.state === '未收集' || val.state === 'Uncollected') { @@ -456,8 +473,8 @@ this.selectedRowKeys = [] let query = { projectId: this.$route.query.parentId ? this.$route.query.parentId : this.$route.query.id, - pageSize: this.pageSize, - pageNo: this.pageNo, + // pageSize: this.pageSize, + // pageNo: this.pageNo, orderBy: this.orderBy, orderByField: this.orderByField, ...this.queryParam diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue index f154dc397..1325e29f6 100644 --- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue +++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue @@ -21,6 +21,29 @@ @@ -338,6 +361,7 @@ data() { return { toggleSearchStatus: false, + firstLevelDutyTerritoryList:[], visible: false, queryParam: {}, selectVisible: false, @@ -547,6 +571,15 @@ }, methods: { ...mapGetters(['userInfo']), + getFirstLevelDutyTerritory() { + getAction('/sys/dictItem/getFirstLevelDutyTerritory', {}).then((res) => { + if (res.success) { + this.firstLevelDutyTerritoryList = res.result + } else { + this.firstLevelDutyTerritoryList = [] + } + }) + }, handleToggleSearch() { this.toggleSearchStatus = !this.toggleSearchStatus }, @@ -684,6 +717,7 @@ } }) } + this.getFirstLevelDutyTerritory() this.getList() this.queryCertificationEngineer() },