diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index 831ba4f35..d983996b4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -673,4 +673,17 @@ public class ParamsCollectManifestEOController extends JeroController certifiedEngineerUpdateDreBatch(ParamsCollectManifestVO paramsCollectManifestVO) { return this.paramsCollectManifestEOService.certifiedEngineerUpdateDreBatch(paramsCollectManifestVO); } + + /** + * 认证工程师-批量编辑截止时间 + * + * @param paramsCollectManifestVO + * @return + */ + @AutoLog(value = "参数项收集清单-认证工程师-批量编辑截止时间") + @ApiOperation(value="参数项收集清单-认证工程师-批量编辑截止时间", notes="参数项收集清单-认证工程师-批量编辑截止时间") + @PostMapping(value = "/batchEditDeadline") + public Result batchEditDeadline(@RequestBody ParamsCollectManifestVO paramsCollectManifestVO) { + return this.paramsCollectManifestEOService.batchEditDeadline(paramsCollectManifestVO); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index b4978b2fd..a7d0a23e0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -197,4 +197,7 @@ public interface IParamsCollectManifestEOService extends IService queryConditionVOList, StringBuilder sqlJoin); + + // 认证工程师-批量编辑截止时间 + Result batchEditDeadline(ParamsCollectManifestVO paramsCollectManifestVO); } 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 2e6b61e4c..101213375 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 @@ -174,6 +174,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl batchEditDeadline(ParamsCollectManifestVO paramsCollectManifestVO) { + if (StringUtils.isEmpty(paramsCollectManifestVO.getIds())) { + throw new JeroBootException("参数不能为空！"); + } + + String paramsCollectManifestIds = paramsCollectManifestVO.getIds(); + List paramsCollectManifestIdList = Arrays.asList(paramsCollectManifestIds.split(",")).stream().distinct().collect(Collectors.toList()); + + LambdaUpdateWrapper manifestUpdateWrap = new LambdaUpdateWrapper<>(); + manifestUpdateWrap.set(ParamsCollectManifestEO::getDeadline,paramsCollectManifestVO.getDeadline()); + manifestUpdateWrap.in(ParamsCollectManifestEO::getId,paramsCollectManifestIdList); + this.update(manifestUpdateWrap); + + return Result.OK("批量编辑截止时间成功！"); + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java index 8ad2c2c07..5a8aa9b66 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java @@ -83,6 +83,20 @@ public class BussDocumentLibraryEO implements Serializable { @ApiModelProperty(value = "对应标准") private java.lang.String correspondingStandard; + + /**代替标准*/ + @ApiModelProperty(value = "代替标准") + @Dict(dicCode ="replace_standard") + private java.lang.String replaceStandard; + + + /**被代替标准*/ + @ApiModelProperty(value = "被代替标准") + @Dict(dicCode ="replaced_standard") + private java.lang.String replacedStandard; + + + @TableField(exist = false) private java.lang.String cut; 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 4ae922337..9e33fac5b 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 @@ -269,31 +269,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl stateDictItemList = dictItemList.stream() - .filter(e -> "type".equals(e.getDictCode()) && finalCategory.equals(e.getItemValue())) - .collect(Collectors.toList()); - if(stateDictItemList.size() != 0){ - if(CutEnum.CN.getValue().equals(cut)){ - category = stateDictItemList.get(0).getItemText(); - }else{ - category = stateDictItemList.get(0).getEnName(); - } - - } - }else { - category = ""; - } - - //文档动态------------------- - String hrefTemp =category + " " + "" + serialNumber + "" + " " + titleEn + ","; sbTemp.append(hrefTemp); - serialNumberListTemp.add(category + " " + serialNumber + " " + titleEn); - serialNumberListTempCn.add(category + " " + serialNumber + " " + title); + serialNumberListTemp.add(serialNumber + " " + titleEn); + serialNumberListTempCn.add(serialNumber + " " + title); //--------------------------- if (documentIds.size() != 0 && documentIds.contains((String) map.get("id"))) { serialNumberList.add(serialNumber); @@ -539,8 +521,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl !"serial_number".equals(e.getDbFieldName()) && !"title".equals(e.getDbFieldName()) - && !"title_en".equals(e.getDbFieldName()) - && !"state".equals(e.getDbFieldName())) + && !"title_en".equals(e.getDbFieldName())) .collect(Collectors.toList()); if (fieldList.size() != 0) { @@ -1756,6 +1737,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl userIdList = domainUserRelService.queryDomainUserRelInfo(mapTemp); String title = StringUtils.valueOf(map.get("title")); String serialNumber = StringUtils.valueOf(map.get("serial_number")); - String category = StringUtils.valueOf(map.get("lei4_bie2")); - String categoryCn = ""; String titleEn = StringUtils.valueOf(map.get("title_en")); List dictItemList = sysDictItemServiceImpl.selectItemsAll(); - if(StringUtils.isNotBlank(category)){ - String finalCategory = category; - List stateDictItemList = dictItemList.stream() - .filter(e -> "type".equals(e.getDictCode()) && finalCategory.equals(e.getItemValue())) - .collect(Collectors.toList()); - if(stateDictItemList.size() != 0){ - category = stateDictItemList.get(0).getEnName(); - categoryCn = stateDictItemList.get(0).getItemText(); - } - }else{ - category = ""; - } Set technologyTerritorySet = new HashSet<>(); String technologyTerritoryId = ""; @@ -2256,19 +2246,19 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl" + serialNumber + "" + " "+ titleEn + " "; - String hrefCn = categoryCn + " " + "" + serialNumber + "" + " "+ title; //文档动态, 文档库中新增了标准XXXX homeDocumentDynamicEOService //The standard GB 7258-2017 Technical specifications has been added to the document library. - String msgContentCn = "文档库中新增了"+categoryCn+" "+serialNumber+" "+title; + String msgContentCn = "文档库中新增了" + serialNumber + " "+title; String msgContentInfoCn = "文档库中新增了"+hrefCn; HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO(); - homeDocumentDynamicEO.setMsgContent("The " + category + " " + serialNumber + " " + titleEn + " has been added to the document library."); - homeDocumentDynamicEO.setMsgContentInfo("The " + href + " has been added to the document library."); + homeDocumentDynamicEO.setMsgContent(serialNumber + " " + titleEn + " has been added to the document library."); + homeDocumentDynamicEO.setMsgContentInfo(href + " has been added to the document library."); homeDocumentDynamicEO.setMsgContentCn(msgContentCn); homeDocumentDynamicEO.setMsgContentInfoCn(msgContentInfoCn); homeDocumentDynamicEOService.save(homeDocumentDynamicEO); @@ -2286,7 +2276,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl" + serialNumber + ""; //消息英文--不带标签 String contentNo = "In the "+ technologyTerritoryName + " technical field you subscribed to, the "+ - category + " " + serialNumber +" has been updated.";; + serialNumber +" has been updated.";; //消息英文--带标签 String contentYes = "In the "+ technologyTerritoryName + " technical field you subscribed to, the "+ - category + " " + hrefYes +" has been updated.";; + hrefYes +" has been updated.";; //消息中文--不带标签 - String contentInfoNo = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + category + " " + serialNumber;; + String contentInfoNo = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + serialNumber;; //消息中文--带标签 - String contentInfoYes = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + category + " " + hrefYes;; + String contentInfoYes = "您所订阅的" + technologyTerritoryName + "技术领域中更新了" + hrefYes;; //封装消息的实体类 @@ -2330,9 +2320,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl list = this.list(); List serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); String serialNumber = StringUtils.valueOf(map.get("serial_number")); - String category = StringUtils.valueOf(map.get("lei4_bie2")); String id = StringUtils.valueOf(map.get("id")); String title = StringUtils.valueOf(map.get("title")); String titleEn = StringUtils.valueOf(map.get("title_en")); @@ -2378,7 +2367,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl dictItemList = sysDictItemServiceImpl.selectItemsAll(); //编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件 - homeDocumentDynamic(cut,map, serialNumber, id, title, dataList, fieldList,dictItemList,category,titleEn); + homeDocumentDynamic(cut,map, serialNumber, id, title, dataList, fieldList,dictItemList,titleEn); try { @@ -2694,8 +2683,28 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> dataList, List fieldList, List dictItemList, - String category, String titleEn) { - String categoryCn = ""; - if(StringUtils.isNotBlank(category)){ - String finalCategory = category; - List stateDictItemList = dictItemList.stream() - .filter(e -> "type".equals(e.getDictCode()) && finalCategory.equals(e.getItemValue())) - .collect(Collectors.toList()); - if(stateDictItemList.size() != 0){ - category = stateDictItemList.get(0).getEnName(); - categoryCn = stateDictItemList.get(0).getItemText(); - } - }else{ - category = ""; - } //文件类型字段 List onlCgformFieldList = fieldList.stream() .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); @@ -2825,13 +2820,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fileIdLIstTemp = new ArrayList<>(); @@ -3533,22 +3528,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl dictItemList = sysDictItemServiceImpl.selectItemsAll(); - String finalCategory = category; - List stateDictItemList = dictItemList.stream() - .filter(e -> "type".equals(e.getDictCode()) && finalCategory.equals(e.getItemValue())) - .collect(Collectors.toList()); - if(stateDictItemList.size() != 0){ - category = stateDictItemList.get(0).getEnName(); - categoryCn = stateDictItemList.get(0).getItemText(); - } - }else{ - category = ""; - } //只要修改了标准,就需要向订阅用户发送消息(内容为-->XXX对“GB 7258 进行了修改请及时查看”) //向订阅领域管理中订阅了该技术领域的人和文档库中订阅了该条文档的人发送消息 // 只有技术领域变更为订阅的技术领域这一种情况发消息, 假如订阅了技术领域A,编辑的文档的技术领域也是A,这时编辑的是其他的字段,这种情况不发消息 @@ -3614,9 +3594,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl", "").replaceAll("", ""); //您订阅的XXX已被修改 - content = "In the "+category + " " + serialNumber+" you subscribed to, has been modified,Please pay attention to check."; + content = "In the "+ serialNumber+" you subscribed to, has been modified,Please pay attention to check."; //内容详情--英文(不带标签) - String contentInfoNo = "In the "+category + " " + serialNumber+" you subscribed to, "+ sbStr.toString(); + String contentInfoNo = "In the "+ serialNumber+" you subscribed to, "+ sbStr.toString(); //内容详情--英文(带标签) - String contentInfoYes = "In the "+category + " " + href+" you subscribed to, "+ sbStr.toString(); + String contentInfoYes = "In the "+ href+" you subscribed to, "+ sbStr.toString(); String msgTitle = serialNumber + " you subscribed to has been updated"; //内容详情-中文(不带标签) String sbStrCnTemp = sbStrCn.replaceAll("", "").replaceAll("", ""); - String contentCnNo = "您所订阅的"+categoryCn+serialNumber+","+sbStrCnTemp; + String contentCnNo = "您所订阅的"+serialNumber+","+sbStrCnTemp; //内容详情--中文(带标签) String contentInfoCnReplace = sbStrCn.replaceAll("","").replaceAll("",""); - String contentInfoCnYes ="您所订阅的"+categoryCn+href+","+contentInfoCnReplace;; + String contentInfoCnYes ="您所订阅的"+href+","+contentInfoCnReplace;; //封装消息的实体类 SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdListUpdate, msgTitle, @@ -3715,9 +3695,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl { @Override public int compareTo(ProjectLibraryBase o) { - return Integer.valueOf(this.projectVersion)-Integer.valueOf(o.projectVersion);//升序 -// return o.id-this.id;//降序 + if (!this.getProjectName().equals(o.getProjectName())) { + return this.getProjectName().compareTo(o.getProjectName());//升序 + } + if (!this.getYearName().equals(o.getYearName())) { + if (this.getYearName().length() != o.getYearName().length()) { + return this.getYearName().length() - o.getYearName().length(); + } else { + return this.getYearName().compareTo(o.getYearName());//升序 + } + } + if (!this.getTargetMarket().equals(o.getTargetMarket())) { + return this.getTargetMarket().compareTo(o.getTargetMarket());//升序 + } + if (!this.getProjectVersion().equals(o.getProjectVersion())) { + return Integer.valueOf(this.projectVersion) - Integer.valueOf(o.projectVersion);//升序 + } + return 0; } - public String getShowName(){ - return projectName+yearName+targetMarket+projectVersion; + public String getShowName() { + return projectName + " " + yearName + "-" + targetMarket + "-" + projectVersion; } @Override 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 3c8556943..1101f29cf 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 @@ -10340,7 +10340,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryProjectTaskInventoryWrapper = new QueryWrapper<>(); - queryProjectTaskInventoryWrapper.isNotNull("design_p_id"); + queryProjectTaskInventoryWrapper.isNotNull("design_p_id").or().isNotNull("verify_p_id"); queryProjectTaskInventoryWrapper.lambda().eq(ProjectTaskInventoryEO::getProjectLawsInventoryId, projectLawsInventoryId); List list = projectTaskInventoryEOService.list(queryProjectTaskInventoryWrapper); @@ -10359,8 +10359,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectRelatedPersonnelList = projectRelatedPersonnelMapper.queryPageList(id, DictCodeEnum.DUTY_TERRITORY.getValue(), @@ -334,6 +338,33 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl wrapperVer = new LambdaQueryWrapper<>(); + //查找其他统计子版本项目 + wrapperVer.eq(ProjectLibraryBase::getParentId, id); + wrapperVer.orderByAsc(ProjectLibraryBase::getProjectVersion); + List clist = this.list(wrapperVer); + int tmpInt = Integer.parseInt(version); + for (ProjectLibraryBase plb : clist) { + int ver = Integer.parseInt(plb.getProjectVersion()); + if(!plb.getId().equals(projectId) && ver == tmpInt){ + tmpInt++; + String verStr = String.valueOf(tmpInt); + if(verStr.length() <= 1){ + verStr= "0" + verStr; + } + plb.setProjectVersion(verStr); + this.updateById(plb); + } + } + } + /**检查车型名称id,年款号,目标市场,版本同时存在,报错*/ public void checkExitData(ProjectLibraryBase projectLibraryBase){ @@ -412,6 +443,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl deleteLibraryRoleRelWrapper = new QueryWrapper<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java index a63cbbc76..898f2ebfc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectStatusBoardServiceImpl.java @@ -117,7 +117,6 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService } } - List projectLibraryBaseLinkedList = new LinkedList<>(); for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { if(StringUtils.isBlank(libraryBase.getParentId())){ @@ -131,13 +130,13 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService projectLibraryBaseLinkedList.addAll(projectLibraryBaseListTemp); } } - projectLibraryBaseList.sort(Comparator.comparing(ProjectLibraryBase::getShowName)); + Collections.sort(projectLibraryBaseList); List dictItemList = sysDictItemServiceImpl.selectItemsByDictCode("region"); for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { targetMarket(projectLibraryBase, dictItemList, libraryBase); Map mapList = new HashMap<>(); - List> collect = new ArrayList<>(); + List> collect; if(ObjectUtils.isNotEmpty(startTime) && ObjectUtils.isNotEmpty(endTime)){ collect = listNew.stream().filter(e -> libraryBase.getId().equals(e.get(0).getProjectId())).collect(Collectors.toList()); }else{ @@ -147,8 +146,9 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService if(collect.size() != 0){ index ++; mapList.put("index",index); - mapList.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket()+"-"+libraryBase.getProjectVersion()); + mapList.put("projectName",libraryBase.getShowName()); mapList.put("data",collect); + mapList.put("projectInfo",libraryBase); result.add(mapList); } } @@ -215,9 +215,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService lambdaQueryWrapper.in(ProjectTaskInventoryEO::getProjectLawsInventoryId,projectLawsInventoryEOIdAll); projectTaskInventoryEOList = projectTaskInventoryEOService.list(lambdaQueryWrapper); } - - - projectLibraryBaseList.sort(Comparator.comparing(ProjectLibraryBase::getShowName)); + Collections.sort(projectLibraryBaseList); for (ProjectLibraryBase libraryBase : projectLibraryBaseList) { //处理目标市场 targetMarket(projectLibraryBase, dictItemList, libraryBase); @@ -234,7 +232,7 @@ public class ProjectStatusBoardServiceImpl implements IProjectStatusBoardService projectVersion = "00"; } Map map = new HashMap<>(); - map.put("projectName",libraryBase.getProjectName()+" "+libraryBase.getYearName()+"-"+libraryBase.getTargetMarket()+"-"+projectVersion);//项目名称 + map.put("projectName",libraryBase.getShowName());//项目名称 map.put("targetMarket",libraryBase.getTargetMarket());//目标市场 //1. 项目当前状态--projectState(蓝/红/黄/绿)-->studio视角下的数据 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java index e1645260d..52343e473 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java @@ -56,11 +56,10 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl 0) { - let content = JSON.parse(JSON.stringify(this.selectedRowKeys)) - // this.content.forEach(res => { - // content.push(res.serial_number) - // replace_standard_id.push(res.id) - // }) - this.$emit('input', content.join(',')) - // this.$emit('change', this.query.db_field_name, replace_standard_id.join(',')) + // let content = JSON.parse(JSON.stringify(this.selectedRowList)) + this.selectedRowList.forEach(res => { + serial_number.push(res.serial_number) + replace_standard_id.push(res.id) + }) + this.$emit('input', serial_number.join(',')) + console.log(replace_standard_id) + this.$emit('change', this.query.db_field_name, replace_standard_id.join(',')) // this.$emit('changecontent', this.content) this.visible = false } else { @@ -168,9 +170,11 @@ indexclick(event) { this.$emit('input', event.target.value) }, - onSelectChange(value) { + onSelectChange(value,row) { console.log(value) + console.log(row) this.selectedRowKeys = value + this.selectedRowList = row // this.content = [] // value.forEach(val => { // this.dataList.forEach((res) => { diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index 0002a45f7..b8fa241f1 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -169,6 +169,7 @@ @@ -832,10 +833,11 @@ this.type = 'add' this.getForm() }, - // StandardselectionChange(value, id) { - // this.formInline[value + '_id'] = id - // this.formInline = { ...this.formInline } - // }, + StandardselectionChange(value, id) { + console.log(id) + this.formInline[value + '_id'] = id + this.formInline = { ...this.formInline } + }, PersonnelSelectionChange(value, id) { this.formInline[value + '_id'] = id this.formInline = { ...this.formInline } diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue index bd3307777..6eb8a71be 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/listAddModel.vue @@ -31,17 +31,17 @@ v-model="queryParam.title"> - -
-
- {{$t('status')}} -
- -
- + + + + + + + + + + + diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue index a0f74948c..4f7986148 100644 --- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue +++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue @@ -1,7 +1,7 @@