From 46835c4640dfab2b7caed877649545c706c98a83 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Jul 2022 14:38:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=AB=A0=E8=8A=82=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...onthlyReportTitleTemplateEOController.java | 53 ++++++++------- .../LawsMonthlyReportTitleTemplateEO.java | 1 - ...wsMonthlyReportTitleTemplateEOService.java | 16 +++-- ...nthlyReportTitleTemplateEOServiceImpl.java | 65 +++++++++++++++++-- .../vo/LawsMonthlyReportTitleTemplateVO.java | 51 +++++++++++++++ 5 files changed, 146 insertions(+), 40 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/vo/LawsMonthlyReportTitleTemplateVO.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java index b5ecaf9ed..db6a7d163 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/controller/LawsMonthlyReportTitleTemplateEOController.java @@ -1,25 +1,30 @@ package com.jero.modules.report.controller; -import java.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; -import com.jero.common.system.query.QueryGenerator; +import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.system.base.controller.JeroController; import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO; import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.extern.slf4j.Slf4j; -import com.jero.common.system.base.controller.JeroController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; +import com.jero.modules.report.vo.LawsMonthlyReportTitleTemplateVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import com.jero.common.aspect.annotation.AutoLog; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Arrays; +import java.util.List; /** @@ -52,23 +57,21 @@ public class LawsMonthlyReportTitleTemplateEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportTitleTemplateEO, req.getParameterMap()); -// Page page = new Page(pageNo, pageSize); -// IPage pageList = lawsMonthlyReportTitleTemplateEOService.page(page, queryWrapper); - IPage pageList = lawsMonthlyReportTitleTemplateEOService.getPageInfo(pageNo,pageSize, queryWrapper); - return Result.OK(pageList); + List pageList = lawsMonthlyReportTitleTemplateEOService.getPageInfo(lawsMonthlyReportTitleTemplateEO, req); + Page pages = lawsMonthlyReportTitleTemplateEOService.getPages(pageNo, pageSize, pageList); + return Result.OK(pages); } /** - * 列表查询 + * 章节目录 * * @return */ - @AutoLog(value = "月报标题模板-列表查询") - @ApiOperation(value="月报标题模板-列表查询", notes="月报标题模板-列表查询") + @AutoLog(value = "章节目录") + @ApiOperation(value="章节目录", notes="章节目录") @GetMapping(value = "/list") - public Result> queryList() { - List list = lawsMonthlyReportTitleTemplateEOService.queryList(); + public Result> queryList(String cut) { + List list = lawsMonthlyReportTitleTemplateEOService.queryList(cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java index ab1b5a6c6..7b9888886 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java @@ -81,5 +81,4 @@ public class LawsMonthlyReportTitleTemplateEO implements Serializable { //排序 private int sort; - } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java index 51def4c31..6a2b744c1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/ILawsMonthlyReportTitleTemplateEOService.java @@ -1,10 +1,11 @@ package com.jero.modules.report.service; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO; +import com.jero.modules.report.vo.LawsMonthlyReportTitleTemplateVO; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -60,16 +61,15 @@ public interface ILawsMonthlyReportTitleTemplateEOService extends IService queryList(); + List queryList(String cut); /** * 分页 - * @param pageNo - * @param pageSize - * @param queryWrapper + * @param lawsMonthlyReportTitleTemplateEO * @return */ - IPage getPageInfo(Integer pageNo,Integer pageSize, QueryWrapper queryWrapper); + List getPageInfo(LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO, + HttpServletRequest req); /** * 一级菜单 @@ -81,4 +81,6 @@ public interface ILawsMonthlyReportTitleTemplateEOService extends IService lawsMonthlyReportTitleTemplateEOS); + + Page getPages(Integer currentPage, Integer pageSize, List list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java index 02ba9a702..151bfe9d2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java @@ -2,15 +2,18 @@ package com.jero.modules.report.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; +import com.jero.common.system.query.QueryGenerator; import com.jero.modules.report.entity.LawsMonthlyReportTitleTemplateEO; import com.jero.modules.report.mapper.LawsMonthlyReportTitleTemplateEOMapper; import com.jero.modules.report.service.ILawsMonthlyReportTitleTemplateEOService; +import com.jero.modules.report.vo.LawsMonthlyReportTitleTemplateVO; import com.jero.modules.system.util.StringUtils; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; @@ -115,13 +118,62 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl queryList() { - return list(); + public List queryList(String cut) { + List lawsMonthlyReportTitleTemplateEOS = this.list(); + //数据结构重组 + List lawsMonthlyReportTitleTemplateVOS = new ArrayList<>(); + for (LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO : lawsMonthlyReportTitleTemplateEOS) { + LawsMonthlyReportTitleTemplateVO lawsMonthlyReportTitleTemplateVO = new LawsMonthlyReportTitleTemplateVO(); + lawsMonthlyReportTitleTemplateVO.setId(lawsMonthlyReportTitleTemplateEO.getId()); + lawsMonthlyReportTitleTemplateVO.setKey(lawsMonthlyReportTitleTemplateEO.getId()); + lawsMonthlyReportTitleTemplateVO.setValue(lawsMonthlyReportTitleTemplateEO.getId()); + lawsMonthlyReportTitleTemplateVO.setParentId(lawsMonthlyReportTitleTemplateEO.getParentId()); + lawsMonthlyReportTitleTemplateVO.setSort(lawsMonthlyReportTitleTemplateEO.getSort()); + if(CutEnum.CN.getValue().equals(cut)){ + lawsMonthlyReportTitleTemplateVO.setTitle(lawsMonthlyReportTitleTemplateEO.getTitleCn()); + }else{ + lawsMonthlyReportTitleTemplateVO.setTitle(lawsMonthlyReportTitleTemplateEO.getTitleEn()); + } + lawsMonthlyReportTitleTemplateVOS.add(lawsMonthlyReportTitleTemplateVO); + } + + List parentList = lawsMonthlyReportTitleTemplateVOS.stream() + .filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList()); + Collections.sort(parentList, new Comparator() { + @Override + public int compare(LawsMonthlyReportTitleTemplateVO p1, LawsMonthlyReportTitleTemplateVO p2) { + return String.valueOf(p1.getSort()).compareTo(String.valueOf(p2.getSort())); + } + }); + + for (LawsMonthlyReportTitleTemplateVO lawsMonthlyReportTitleTemplateVO : parentList) { + List children = lawsMonthlyReportTitleTemplateVOS.stream() + .filter(e -> lawsMonthlyReportTitleTemplateVO.getId().equals(e.getParentId())).collect(Collectors.toList()); + if(children.size() != 0){ + Collections.sort(children, new Comparator() { + @Override + public int compare(LawsMonthlyReportTitleTemplateVO p1, LawsMonthlyReportTitleTemplateVO p2) { + return String.valueOf(p1.getSort()).compareTo(String.valueOf(p2.getSort())); + } + }); + for (LawsMonthlyReportTitleTemplateVO child : children) { + if(child.getChildren().size() == 0){ + child.setChildren(null); + } + } + lawsMonthlyReportTitleTemplateVO.setChildren(children); + } + else{ + lawsMonthlyReportTitleTemplateVO.setChildren(null); + } + } + return parentList; } @Override - public IPage getPageInfo( Integer pageNo,Integer pageSize,QueryWrapper queryWrapper) { - List lawsMonthlyReportTitleTemplateEOS = this.list(); + public List getPageInfo(LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEOTemp, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportTitleTemplateEOTemp, req.getParameterMap()); + List lawsMonthlyReportTitleTemplateEOS = this.list(queryWrapper); List parentList = lawsMonthlyReportTitleTemplateEOS.stream() .filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList()); Collections.sort(parentList, new Comparator() { @@ -152,8 +204,7 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl children = new ArrayList<>(); + + private int sort; + + +} From ab2e18b18a42abc493793ee874ae67b8aa83ee13 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 6 Jul 2022 15:22:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E5=A1=AB=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/LawsMonthlyReportWriteEO.java | 15 +++-------- .../report/entity/NewOpinionTemplateEO.java | 5 +--- .../report/entity/NewStandardTemplateEO.java | 10 ++------ .../LawsMonthlyReportWriteEOServiceImpl.java | 25 +++++++++++++------ 4 files changed, 23 insertions(+), 32 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java index 92462c36b..16af6ede5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportWriteEO.java @@ -128,25 +128,16 @@ public class LawsMonthlyReportWriteEO implements Serializable { private java.lang.String implementCar; /**发布日期*/ - @Excel(name = "发布日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "发布日期") - private java.util.Date issueTime; + private java.lang.String issueTime; /**新车型实施日期*/ - @Excel(name = "新车型实施日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "新车型实施日期") - private java.util.Date newCarImplementTime; + private java.lang.String newCarImplementTime; /**在产车实施日期*/ - @Excel(name = "在产车实施日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "在产车实施日期") - private java.util.Date productionCarImplementTime; + private java.lang.String productionCarImplementTime; /**主要内容中文*/ @Excel(name = "主要内容中文", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java index fcd2ec8d8..766d08c50 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewOpinionTemplateEO.java @@ -82,10 +82,7 @@ public class NewOpinionTemplateEO implements Serializable { private java.lang.String standardNameEn; /**征求意见截止日期*/ - @Excel(name = "征求意见截止日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "征求意见截止日期") - private java.util.Date expirationDate; + private java.lang.String expirationDate; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java index ca7363247..e680c4e80 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/NewStandardTemplateEO.java @@ -82,17 +82,11 @@ public class NewStandardTemplateEO implements Serializable { private java.lang.String standardNameEn; /**发布日期*/ - @Excel(name = "发布日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "发布日期") - private java.util.Date issueTime; + private java.lang.String issueTime; /**实施日期*/ - @Excel(name = "实施日期", width = 15, format = "yyyy-MM-dd") - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "实施日期") - private java.util.Date implementTime; + private java.lang.String implementTime; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java index 2377af0f0..8906e352a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; @@ -235,23 +236,31 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl lawsMonthlyReportTitleTemplateEOList = lawsMonthlyReportTitleTemplateEOService.list(); //新征求意见清单模板 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); - List newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper); + List newOpinionTemplateEOList = new ArrayList<>(); + if(lawsMonthlyReportIdList.size() != 0){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(NewOpinionTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); + newOpinionTemplateEOList = iNewOpinionTemplateEOService.list(wrapper); + } + //新发布标准清单模板 - LambdaQueryWrapper qrapperTemp = new LambdaQueryWrapper<>(); - qrapperTemp.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); - List newStandardTemplateEOList = iNewStandardTemplateEOService.list(qrapperTemp); + List newStandardTemplateEOList = new ArrayList<>(); + if(lawsMonthlyReportIdList.size() != 0){ + LambdaQueryWrapper qrapperTemp = new LambdaQueryWrapper<>(); + qrapperTemp.in(NewStandardTemplateEO::getLawsMonthlyReportWriteId,lawsMonthlyReportIdList); + newStandardTemplateEOList = iNewStandardTemplateEOService.list(qrapperTemp); + } + for (LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO : pageInfo.getRecords()) { //处理章节目录 if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapter())){ List lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream() .filter(e -> lawsMonthlyReportWriteEO.getMemoriesChapter().equals(e.getId())).collect(Collectors.toList()); - if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEO.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ + if(CutEnum.CN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleCn()); - }else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEO.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ + }else if(CutEnum.EN.getValue().equals(lawsMonthlyReportWriteEOTemp.getCut()) && lawsMonthlyReportTitleTemplateEOS.size() != 0){ lawsMonthlyReportWriteEO.setMemoriesChapterName(lawsMonthlyReportTitleTemplateEOS.get(0).getTitleEn()); } } From 785476c50c3f4fe1e71fb59112d151fa61902a34 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 6 Jul 2022 15:48:09 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=94=B6=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/initiatingProcess.vue | 10 ++++++ .../components/feedbackInformation.vue | 32 +++++++++-------- .../processForm/regulatoryProcess/index.vue | 34 ++++++++++++++++++- 3 files changed, 61 insertions(+), 15 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index a0c3d8489..83b65895a 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -293,6 +293,15 @@ dateChange(item) { this.formInline[item] = this.formInline[item] ? moment(this.formInline[item]).format('YYYY-MM-DD') : '' }, + getUUID(){ + var str=[]; + var Chars='0123456789abcdefghijklmnopqrstuvwxyz'; + for(var i=0;i<36;i++){ + str[i]=Chars.substr(Math.floor(Math.random()*16),1) + } + str[0]=str[8]=str[13]=str[18]=str[23]='-'; + return str.join("") + }, submit() { this.$refs.ruleForm.validate(valid => { if (valid) { @@ -302,6 +311,7 @@ let value = Object.assign(this.formInline, this.selectedRowKeysRecord[0]) value.standId = value.id delete value.id + value.id = this.getUUID() value.currentUserName = this.userInfo().username Object.keys(value).forEach(res => { if (value[res] && value[res] instanceof String) { diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue index 5e82f8b97..559d8ce6f 100644 --- a/jero-web/src/views/processCenter/components/feedbackInformation.vue +++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue @@ -26,10 +26,10 @@ * {{$t('relevantSections')}} - + @@ -41,10 +41,10 @@ {{$t('questionsSuggestions')}} - + @@ -58,8 +58,8 @@ @@ -71,9 +71,9 @@ - {{ (formInline.accessoryFile === 'null' || formInline.accessoryFile === '' || - formInline.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') + @click="clickButtonToUpload('accessoryFile',index)"> + {{ (item.accessoryFile === 'null' || item.accessoryFile === '' || + item.accessoryFile == null) ? $t('clickUpload') : $t('viewUploadedFiles') }} @@ -83,6 +83,7 @@ + @@ -104,7 +105,9 @@ data() { return { formInline: {}, + disabled:false, rules: {}, + uploadIndex:'', dataList: [ { relatedSection: '', @@ -116,10 +119,11 @@ } }, methods: { - clickButtonToUpload(item) { + clickButtonToUpload(item,index) { this.$refs.uploadFile.perentHandleFunc() this.$refs.uploadFile.visible = true this.uploadName = item + this.uploadIndex = index getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => { if (res.success) { this.$refs.uploadFile.perentHandleFunc(res.result) @@ -137,8 +141,8 @@ }) } /** 赋值给当前对应的表单文件 */ - this.formInline[this.uploadName] = attIdList.join(',') - this.formInline = { ...this.formInline } + this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',') + this.dataList = [...this.dataList] }, addData() { this.dataList.push({ diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index 5f980019f..a79ddd595 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -13,6 +13,7 @@ :standardContentQuery="queryProject" /> @@ -35,6 +36,7 @@ import circulationHistory from '../../components/regulatoryCirculationHistory' import footerProcess from '../../components/footerProcess' import feedbackInformation from '../../components/feedbackInformation' + import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage' export default { name: 'index', @@ -49,7 +51,10 @@ return { title: this.$t('collectionOfRegulatoryOpinions'), - url: {}, + url: { + queryTaskDetailByTaskIds: '/task/queryTaskDetailByTaskIds', + list: '/lawsOpinionGather/lawsOpinionAssessmentResultEO/list' + }, isDisplay: true, queryProject: {}, standardContentList: [ @@ -87,8 +92,35 @@ } }, mounted() { + this.queryTaskDetailByTask(() => { + this.lawsOpinionAssessmentResult() + }) }, methods: { + queryTaskDetailByTask(callback) { + this.loading = true + getAction(this.url.queryTaskDetailByTaskIds, { taskIds: this.$route.query.taskIds }).then((res) => { + if (res instanceof String) { + this.queryProject = JSON.parse(res) || {} + callback && callback() + } else { + this.queryProject = res || {} + callback && callback() + } + }) + }, + lawsOpinionAssessmentResult() { + getAction(this.url.list, { + lawsOpinionGatherId: this.queryProject.id, + actiProcInstId: this.$route.query.prcId + }).then((res) => { + if (res.success) { + this.loading = false + } else { + this.loading = false + } + }) + }, preservation() { },