From 546ea0e4a6b4892d2a3cfec2fa094451c41b49ed Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 6 May 2022 16:36:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/cert/collect/ParamsConfigVO.java | 19 +++ .../controller/ParamsConfigEOController.java | 116 +++--------------- .../ParamsManifestEOController.java | 4 +- .../cert/collect/entity/ParamsConfigEO.java | 23 ++-- .../cert/collect/entity/ParamsManifestEO.java | 1 + .../mapper/ParamsConfigDataEOMapper.java | 7 +- .../collect/mapper/ParamsConfigEOMapper.java | 12 +- .../mapper/xml/ParamsConfigDataEOMapper.xml | 8 ++ .../mapper/xml/ParamsConfigEOMapper.xml | 27 ++++ .../service/IParamsConfigEOService.java | 8 +- .../impl/ParamsConfigEOServiceImpl.java | 69 +++++++++-- 11 files changed, 166 insertions(+), 128 deletions(-) create mode 100644 jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/ParamsConfigVO.java diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/ParamsConfigVO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/ParamsConfigVO.java new file mode 100644 index 000000000..68ea94e61 --- /dev/null +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/ParamsConfigVO.java @@ -0,0 +1,19 @@ +package com.jero.modules.cert.collect; + +import com.jero.modules.cert.collect.entity.ParamsConfigEO; +import lombok.Data; + +import java.util.List; + +/** + * @Author: liyawei + * @Description: + * @Date: Created in 11:50 2022/5/6 + */ +@Data +public class ParamsConfigVO { + + private String paramsManifestId; + private String deleteConfigIds; + private List paramsConfigEOList; +} diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java index 2b5950150..d016ebd15 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsConfigEOController.java @@ -4,19 +4,16 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.system.base.controller.JeroController; +import com.jero.modules.cert.collect.ParamsConfigVO; import com.jero.modules.cert.collect.entity.ParamsConfigEO; import com.jero.modules.cert.collect.service.IParamsConfigEOService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; 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 javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; import java.util.List; @@ -46,104 +43,25 @@ public class ParamsConfigEOController extends JeroController queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ParamsConfigEO::getParamsManifestId, paramsManifestId); + queryWrapper.orderByAsc(ParamsConfigEO::getDisplaySeq); List list = paramsConfigEOService.list(queryWrapper); return Result.OK(cut, list); } - /** - * 添加 - * - * @param paramsConfigEO - * @return - */ - @AutoLog(value = "参数配置-添加") - @ApiOperation(value="参数配置-添加", notes="参数配置-添加") - @PostMapping(value = "/add") - public Result add(@Validated @RequestBody ParamsConfigEO paramsConfigEO) { - paramsConfigEOService.add(paramsConfigEO); + /** + * 批量添加 + * @param paramsConfigVO + * @return + */ + @AutoLog(value = "参数配置-批量添加") + @ApiOperation(value="参数配置-批量添加", notes="参数配置-批量添加") + @PostMapping(value = "/addBatch") + public Result addBatch(@RequestBody ParamsConfigVO paramsConfigVO) { + String paramsManifestId = paramsConfigVO.getParamsManifestId(); + if (StringUtils.isBlank(paramsManifestId)) { + return Result.error("参数不能为空"); + } + paramsConfigEOService.addBatch(paramsConfigVO); return Result.OK("添加成功！"); } - - /** - * 编辑 - * - * @param paramsConfigEO - * @return - */ - @AutoLog(value = "参数配置-编辑") - @ApiOperation(value="参数配置-编辑", notes="参数配置-编辑") - @PutMapping(value = "/edit") - public Result edit(@Validated @RequestBody ParamsConfigEO paramsConfigEO) { - paramsConfigEOService.editById(paramsConfigEO); - return Result.OK("编辑成功!"); - } - - /** - * 通过id删除 - * - * @param id - * @return - */ - @AutoLog(value = "参数配置-通过id删除") - @ApiOperation(value="参数配置-通过id删除", notes="参数配置-通过id删除") - @DeleteMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { - paramsConfigEOService.deleteById(id); - return Result.OK("删除成功!"); - } - - /** - * 批量删除 - * - * @param ids - * @return - */ - @AutoLog(value = "参数配置-批量删除") - @ApiOperation(value="参数配置-批量删除", notes="参数配置-批量删除") - @DeleteMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { - this.paramsConfigEOService.deleteByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功!"); - } - - /** - * 通过id查询 - * - * @param id - * @return - */ - @AutoLog(value = "参数配置-通过id查询") - @ApiOperation(value="参数配置-通过id查询", notes="参数配置-通过id查询") - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name="id",required=true) String id) { - ParamsConfigEO paramsConfigEO = paramsConfigEOService.queryById(id); - if(paramsConfigEO==null) { - return Result.error("未找到对应数据"); - } - return Result.OK(paramsConfigEO); - } - - /** - * 导出excel - * - * @param request - * @param paramsConfigEO - */ - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, ParamsConfigEO paramsConfigEO) { - return super.exportXls(request, paramsConfigEO, ParamsConfigEO.class, "参数配置"); - } - - /** - * 通过excel导入数据 - * - * @param request - * @param response - * @return - */ - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, ParamsConfigEO.class); - } - } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index 730dca29b..8d5490fcc 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -137,7 +137,7 @@ public class ParamsManifestEOController extends JeroController delete(@RequestParam(name="id",required=true) String id) { paramsManifestEOService.deleteById(id); return Result.OK("删除成功!"); @@ -151,7 +151,7 @@ public class ParamsManifestEOController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.paramsManifestEOService.deleteByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java index f9bd8debc..4d9e46535 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsConfigEO.java @@ -1,21 +1,18 @@ package com.jero.modules.cert.collect.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -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 com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** @@ -71,6 +68,11 @@ public class ParamsConfigEO implements Serializable { @ApiModelProperty(value = "版本") private String version; + /**车型*/ + @Excel(name = "车型", width = 15) + @ApiModelProperty(value = "车型") + private String carType; + /**电池*/ @Excel(name = "电池", width = 15) @ApiModelProperty(value = "电池") @@ -86,4 +88,9 @@ public class ParamsConfigEO implements Serializable { @ApiModelProperty(value = "参数清单id") private String paramsManifestId; + /**展示顺序*/ + @Excel(name = "展示顺序", width = 15) + @ApiModelProperty(value = "展示顺序") + private Integer displaySeq; + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java index c8c106fc6..4a0ed34f2 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java @@ -14,6 +14,7 @@ import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.List; /** diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java index 9d17c32b9..edb6d79da 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigDataEOMapper.java @@ -1,10 +1,8 @@ package com.jero.modules.cert.collect.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.cert.collect.entity.ParamsConfigDataEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.cert.collect.entity.ParamsConfigDataEO; +import org.apache.ibatis.annotations.Param; /** * @Description: 参数配置数据 @@ -14,4 +12,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ParamsConfigDataEOMapper extends BaseMapper { + int deleteByParamsConfigIds(@Param("paramsConfigIds") String paramsConfigIds); } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigEOMapper.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigEOMapper.java index 1b3aa689b..5288b020a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigEOMapper.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/ParamsConfigEOMapper.java @@ -1,10 +1,10 @@ package com.jero.modules.cert.collect.mapper; -import java.util.List; - -import org.apache.ibatis.annotations.Param; -import com.jero.modules.cert.collect.entity.ParamsConfigEO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.jero.modules.cert.collect.entity.ParamsConfigEO; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @Description: 参数配置 @@ -14,4 +14,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ParamsConfigEOMapper extends BaseMapper { + int deleteByParamsManifestIds(@Param("paramsManifestIds") String paramsManifestIds); + + int updateForeach(@Param("list") List list); + } diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml index 3c62b14d7..250e0b1d5 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigDataEOMapper.xml @@ -14,4 +14,12 @@ + + + delete from params_config_data + where params_config_id in + + #{item} + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml index 821f83d29..3ac473775 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/mapper/xml/ParamsConfigEOMapper.xml @@ -10,8 +10,35 @@ + + + + + + update params_config + + config_name = #{item.configName, jdbcType=VARCHAR}, + version = #{item.version, jdbcType=VARCHAR}, + car_type = #{item.carType, jdbcType=VARCHAR}, + battery = #{item.battery, jdbcType=VARCHAR}, + motor = #{item.motor, jdbcType=VARCHAR}, + display_seq = #{item.displaySeq, jdbcType=INTEGER}, + update_by = #{item.updateBy, jdbcType=VARCHAR}, + update_time = #{item.updateTime, jdbcType=TIMESTAMP}, + + where id = #{item.id, jdbcType=VARCHAR} + ; + + + + delete from params_config + where params_manifest_id in + + #{item} + + \ No newline at end of file diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java index 1fbc02fba..da1b6b28a 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/IParamsConfigEOService.java @@ -1,7 +1,9 @@ package com.jero.modules.cert.collect.service; -import com.jero.modules.cert.collect.entity.ParamsConfigEO; import com.baomidou.mybatisplus.extension.service.IService; +import com.jero.modules.cert.collect.ParamsConfigVO; +import com.jero.modules.cert.collect.entity.ParamsConfigEO; + import java.util.List; /** @@ -15,10 +17,10 @@ public interface IParamsConfigEOService extends IService { /** * 保存 * - * @param paramsConfigEO + * @param paramsConfigVO * @return */ - void add(ParamsConfigEO paramsConfigEO); + void addBatch(ParamsConfigVO paramsConfigVO); /** * 更新 diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java index d2f0528f2..d97897269 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsConfigEOServiceImpl.java @@ -1,12 +1,22 @@ package com.jero.modules.cert.collect.service.impl; +import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.system.vo.LoginUser; +import com.jero.modules.cert.collect.ParamsConfigVO; import com.jero.modules.cert.collect.entity.ParamsConfigEO; +import com.jero.modules.cert.collect.mapper.ParamsConfigDataEOMapper; import com.jero.modules.cert.collect.mapper.ParamsConfigEOMapper; import com.jero.modules.cert.collect.service.IParamsConfigEOService; +import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; + +import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.List; /** * @Description: 参数配置 @@ -17,18 +27,61 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @Service public class ParamsConfigEOServiceImpl extends ServiceImpl implements IParamsConfigEOService { + @Autowired + private ParamsConfigEOMapper paramsConfigEOMapper; + @Autowired + private ParamsConfigDataEOMapper paramsConfigDataEOMapper; + /** * 保存 * - * @param paramsConfigEO + * @param paramsConfigVO * @return */ @Override - public void add(ParamsConfigEO paramsConfigEO) { - Date now = new Date(); - paramsConfigEO.setCreateTime(now); - paramsConfigEO.setUpdateTime(now); - save(paramsConfigEO); + public void addBatch(ParamsConfigVO paramsConfigVO) { + String paramsManifestId = paramsConfigVO.getParamsManifestId(); + List paramsConfigEOList = paramsConfigVO.getParamsConfigEOList(); + + int ind = 1; + List addConfigList = new ArrayList<>(); // 新增的配置 + List updateConfigList = new ArrayList<>(); // 修改的配置 + for (ParamsConfigEO paramsConfigEO : paramsConfigEOList) { + paramsConfigEO.setParamsManifestId(paramsManifestId); + paramsConfigEO.setDisplaySeq(ind); + if (StringUtils.isEmpty(paramsConfigEO.getId())) { + addConfigList.add(paramsConfigEO); + } else { + updateConfigList.add(paramsConfigEO); + } + ind++; + } + + // 删除的配置 + String deleteConfigIds = paramsConfigVO.getDeleteConfigIds(); + if (StringUtils.isNotBlank(deleteConfigIds)) { + List deleteConfigIdList = Arrays.asList(deleteConfigIds.split(",")); + paramsConfigEOMapper.deleteBatchIds(deleteConfigIdList); + // 级联删除配置数据 + paramsConfigDataEOMapper.deleteByParamsConfigIds(deleteConfigIds); + } + // 新增的配置 + if (CollectionUtil.isNotEmpty(addConfigList)) { + addConfigList.forEach(paramsConfigEO -> { + paramsConfigEO.setParamsManifestId(paramsManifestId); + }); + saveBatch(addConfigList); + } + // 修改的配置 + if (CollectionUtil.isNotEmpty(updateConfigList)) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + updateConfigList.forEach(paramsConfigEO -> { + Date now = new Date(); + paramsConfigEO.setUpdateBy(sysUser.getUsername()); + paramsConfigEO.setUpdateTime(now); + }); + paramsConfigEOMapper.updateForeach(updateConfigList); + } } /** From 7b365267cf7118f45bdd96ef49995ac51e16b8f2 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 6 May 2022 17:44:33 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=B8=83=E5=B1=80=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E6=80=A7=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 15 + jero-web/src/common/lang/zh-cn.js | 15 + jero-web/src/components/layouts/TabLayout.vue | 1 + jero-web/src/config/router.config.js | 5 + .../components/engineeringConfirmation.vue | 504 ++++++++++++++++++ .../components/examineInformation.vue | 7 + .../components/headerProcess.vue | 11 +- .../components/projectInformation.vue | 22 +- .../reviewedByThePersonInCharge.vue | 166 ++++++ .../components/standardContent.vue | 29 +- .../processForm/taskListProcess/index.vue | 218 ++++++++ 11 files changed, 988 insertions(+), 5 deletions(-) create mode 100644 jero-web/src/views/processCenter/components/engineeringConfirmation.vue create mode 100644 jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue create mode 100644 jero-web/src/views/processCenter/processForm/taskListProcess/index.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 513053f61..608f7d1e4 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -756,4 +756,19 @@ module.exports = { VirtualList:'VirtualList', importTemplate:'import template', verificationConfirmationDeadline:'Verification compliance confirmation deadline', + technicalEvaluationResults:'technical evaluation results', + engineeringConfirmation:'engineeringConfirmation', + feedbackFromTheEngineer:'Feedback from the Engineer', + completedBy:'Completed by', + completedTime:'Completed time', + replyFromProjectContactPerson:'Reply from project contact person', + answer:'answer', + distributionEngineer:'Distribution Engineer', + reminderHandling:'Reminder handling', + addFeedback:'Add feedback', + engineer:'engineer', + engineeringConfirmationDetails:'Engineering confirmation details', + reminder:'reminder', + adopt:'adopt', + reviewedByThePersonInCharge:'Reviewed by the person in charge', } \ 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 2e078e997..dca0943de 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -761,4 +761,19 @@ module.exports = { standardInformation:'标准信息', importTemplate:'导入模板', verificationConfirmationDeadline:'验证符合性确认截止时间', + technicalEvaluationResults:'技术评估结果', + engineeringConfirmation:'工程确认', + feedbackFromTheEngineer:'工程师反馈意见', + completedBy:'填写人', + completedTime:'填写时间', + replyFromProjectContactPerson:'工程接口人回复', + answer:'回复', + distributionEngineer:'分发工程师', + reminderHandling:'提醒办理', + addFeedback:'添加反馈', + engineer:'工程师', + engineeringConfirmationDetails:'工程确认详情', + reminder:'提醒', + adopt:'通过', + reviewedByThePersonInCharge:'负责人审核', } \ No newline at end of file diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index 8dc37c162..6e2f408d4 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -90,6 +90,7 @@ this.$route.path == '/system/MessageDetails' || this.$route.path == '/ProcessMapping' || this.$route.path == '/virtualListDetails' || + this.$route.path == '/taskListProcess' || this.$route.path == '/ProjectDetails' || this.$route.path == '/handshakeProcess' || this.$route.path == '/historicalVersion' || diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index b63bf562a..bbe87b83f 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -337,6 +337,11 @@ export const constantRouterMap = [ name: 'ProjectDetails', component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/ProjectDetails/index') }, + { + path: '/taskListProcess', + name: 'taskListProcess', + component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/taskListProcess/index') + }, { path: '/handshakeProcess', name: 'handshakeProcess', diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue new file mode 100644 index 000000000..924bdf4cf --- /dev/null +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -0,0 +1,504 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/examineInformation.vue b/jero-web/src/views/processCenter/components/examineInformation.vue index 35f7a1bc9..2ebaeba43 100644 --- a/jero-web/src/views/processCenter/components/examineInformation.vue +++ b/jero-web/src/views/processCenter/components/examineInformation.vue @@ -133,6 +133,13 @@ message: this.$t('selectIssuer') + this.$t('cannotEmpty'), trigger: 'change' } + ], + approvalOpinion: [ + { + max: 300, + message: this.$t('feedbackMessage') + this.$t('cannotExceed') + 300 + this.$t('Characters'), + trigger: 'blur' + } ] } } diff --git a/jero-web/src/views/processCenter/components/headerProcess.vue b/jero-web/src/views/processCenter/components/headerProcess.vue index cce5f446f..9f552f7fc 100644 --- a/jero-web/src/views/processCenter/components/headerProcess.vue +++ b/jero-web/src/views/processCenter/components/headerProcess.vue @@ -19,6 +19,7 @@ {{$t('sendBack')}} + {{$t('adopt')}} @@ -59,6 +60,10 @@ type: Boolean, default: false }, + isAdopt:{ + type: Boolean, + default: false + }, }, methods: { terminationProcess() { @@ -81,7 +86,11 @@ }, backTo() { - } + }, + adopt(){ + let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + this.$emit('adopt',handlingTime) + }, } } diff --git a/jero-web/src/views/processCenter/components/projectInformation.vue b/jero-web/src/views/processCenter/components/projectInformation.vue index 741df14d7..7ee7a03e7 100644 --- a/jero-web/src/views/processCenter/components/projectInformation.vue +++ b/jero-web/src/views/processCenter/components/projectInformation.vue @@ -8,13 +8,23 @@
{{item.title}} + {{queryForm[item.value]}} {{queryForm[item.value]}}
- + + + + \ No newline at end of file diff --git a/jero-web/src/views/processCenter/components/standardContent.vue b/jero-web/src/views/processCenter/components/standardContent.vue index 11a198058..722669fca 100644 --- a/jero-web/src/views/processCenter/components/standardContent.vue +++ b/jero-web/src/views/processCenter/components/standardContent.vue @@ -8,13 +8,25 @@
{{item.title}} - {{queryForm[item.value]}} + + {{queryForm[item.value]}}
- + @@ -98,6 +116,11 @@ color: #040B29; font-weight: 400; } + + .text-field-right-url { + color: #00B3BE !important; + cursor: pointer; + } } } \ No newline at end of file diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue new file mode 100644 index 000000000..d0796936e --- /dev/null +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -0,0 +1,218 @@ + + + + + \ No newline at end of file From 2e06ed2496b4ba58a55b10833e3b2a9ad9241298 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 6 May 2022 18:02:34 +0800 Subject: [PATCH 3/5] =?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/editModel.vue | 2 +- .../components/listOfRelevantPersonnel.vue | 38 ++++++++++++++++--- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/editModel.vue b/jero-web/src/views/documentTools/virtualList/components/editModel.vue index 9401e5bb7..1f365c633 100644 --- a/jero-web/src/views/documentTools/virtualList/components/editModel.vue +++ b/jero-web/src/views/documentTools/virtualList/components/editModel.vue @@ -57,7 +57,7 @@
WVTA ID
- + {{$t('remarks')}} - + { this.formInline = JSON.parse(JSON.stringify(item)) + this.$refs.ruleForm.clearValidate() }) }, PersonnelSelectionChange(value, id) { From 852c70953a5278cf61514134b5b92278039c50d5 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Fri, 6 May 2022 18:13:23 +0800 Subject: [PATCH 4/5] =?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 | 17 ++++++++--------- jero-web/src/common/lang/zh-cn.js | 1 - 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 608f7d1e4..6ccd21d38 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -336,7 +336,7 @@ module.exports = { Users: 'users', reduction: 'reduction', UsersSucceeded: 'users succeeded!', - standard: 'serial number', + standard: 'Number', title: 'title', TextStatus: 'TextStatus', PleaseEnter: 'Please enter', @@ -523,7 +523,7 @@ module.exports = { newClause: 'new clause', clauseNo: 'clause No.', functionalAreas: 'functional areas', - technicalField: 'technical field', + technicalField: 'Technical Field', informationCategory: 'information category', contentValidity: 'content validity', content: 'content', @@ -554,11 +554,10 @@ module.exports = { newNode: 'new node', modifyNode: 'modify node', deleteNode: 'delete node', - ImplementationDate: 'Implementation Date', - vehicleInProductionDate: 'vehicle in Production Date', + ImplementationDate: 'New Type Execute Date', + vehicleInProductionDate: 'New Vehicle Execute Date', deleteNodes: 'If there are child nodes under this node, they will be deleted synchronously. Are you sure to delete this data?', leastTwo: 'please select at least two pieces of data', - vehicleInProductionDate: 'vehicle in Production Date', mergeTerms: 'determine merger terms', documentSplitTemplate: 'document split template', batSetting: 'batch setting', @@ -581,14 +580,14 @@ module.exports = { withdraw: 'withdraw', maintenanceList: 'Maintenance list', instructionForUse: 'instruction for use', - subtitle: 'subtitle', + subtitle: 'Sub-Title', scopeOfApplication: 'Scope of application', correspondingStandard: 'Corresponding standard', implementationCategory: 'Implementation category', certificationType: 'Certification Type', - certificationLevel: 'Certification level', - areaOfResponsibility: 'Area of responsibility', - confirmationOfDesignConformity: 'Confirmation of design conformity', + certificationLevel: 'Certification Level', + areaOfResponsibility: 'Responsible Field', + confirmationOfDesignConformity: 'Design Compliance Check Deliverable', Deliverables: 'Deliverables', personLiable: 'person liable', PrehomoConfirmation: 'Prehomo confirmation', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index dca0943de..34867ed23 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -560,7 +560,6 @@ module.exports = { deleteNode: '删除节点', ImplementationDate: '新车型实施日期', vehicleInProductionDate: '在产车实施日期', - vehicleInProductionDate: '在产车实施日期', deleteNodes: '该节点下若有子节点将同步删除，确认删除该条数据？', leastTwo: '请选择至少两条数据', mergeTerms: '确定合并条款', From e3a509ecbb10e1fe3545636a7af2c974f431e0dc Mon Sep 17 00:00:00 2001 From: zhaomeijing Date: Fri, 6 May 2022 18:16:37 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[add]=20=E8=AE=A4=E8=AF=81=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=94=B6=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/TaskParameterCollection.vue | 48 +++-- .../dialog/ParameterTemplate.vue | 168 +++++++++--------- 2 files changed, 124 insertions(+), 92 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 4024e9ff2..b27623bbb 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -35,17 +35,31 @@
+ class='table-area' + ref='table' + size='middle' + rowKey='id' + :columns='columns' + :dataSource='dataSource' + :pagination='false' + :loading='loading' + :scroll='{x: 600}' + :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' + @change='handleTableChange'> + + + + + + + + + + + {{$t('edit')}} + {{$t('deleteLib')}}
@@ -61,7 +75,7 @@ /> - + @@ -144,6 +158,16 @@ this.getlist() }, methods:{ + deleteLib() { + + }, + handleTableChange() { + + }, + handleCancel(val) { + this.areaVisible = val + this.getlist() + }, searchQuery() { this.pageNo = 1 this.getlist() @@ -153,8 +177,8 @@ this.pageNo = 1 this.getlist() }, - onSelectChange() { - + onSelectChange(val,valdate) { + this.selectedRowKeys = val }, edit(edit){ diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue index fb815287b..4ccb88b4f 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplate.vue @@ -11,9 +11,9 @@ > - + + v-model='templatetitle' /> @@ -77,9 +77,11 @@ export default { components: {}, data() { return { + templatetitle: '', title: this.$t('add'), total: 0, selectedRowKeys: [], + selectedRowKeysDate: {}, loading: false, ipagination: true, editId: '', @@ -109,10 +111,9 @@ export default { }, form: {}, rules: { - title: [ - { required: true, message: this.$t('enterTitle'), trigger: 'blur' }, - { min: 1, max: 50, message: this.$t('charactersLength'), trigger: 'blur' } - ] + // templatetitle: [ + // { required: true, message: this.$t('enterTitle'), trigger: 'blur' } + // ] }, areaTable: [], flag: false, //表单提交标识 @@ -147,17 +148,13 @@ export default { this.loadData() }, handleCancel() { - + this.$emit('areaVisible',false) }, - handleSubmit() { - - }, - onSelectChange(selectedRowKeys) { - // console.log('selectedRowKeys changed: ', selectedRowKeys); + onSelectChange(selectedRowKeys,selectedRowKeysDate) { + this.selectedRowKeysDate = selectedRowKeysDate this.selectedRowKeys = selectedRowKeys }, - handleTableChange() { - + handleTableChange(val) { }, showModal() { this.title = this.$t('add') @@ -165,74 +162,85 @@ export default { this.form = {} }, //新增 - hideModal() { - this.$refs.ruleForm.validate(valid => { - if (valid) { - this.flag = true - this.spinLoading = true - //编辑 - if (this.form.id) { - putAction(`tag/onlCgformArea/edit`, this.form).then((res) => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.loadData() - this.form = { - isModel: '', - showArea: '', - enName: '', - sort: '' - } - } else { - this.$message.warning(res.message) - this.form = { - isModel: '', - showArea: '', - enName: '', - sort: '' - } - } - }).finally(() => { - this.flag = false - this.spinLoading = false - this.newVisible = false - this.form = { - isModel: '', - showArea: '', - enName: '', - sort: '' - } - }) - } else { - //新增 - postAction(`/tag/onlCgformArea/add`, this.form).then(res => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.loadData() - this.form = { - isModel: '', - showArea: '', - enName: '', - sort: '' + handleSubmit() { + if(this.selectedRowKeys.length == 0) { + this.$message.warning(this.$t('pleaseSelectData')) + } else if(this.selectedRowKeys.length > 1) { + this.$message.warning(this.$t('OnlyOneSelected')) + } else { + this.$refs.ruleForm.validate(valid => { + if (valid) { + this.flag = true + this.spinLoading = true + //编辑 + if (this.form.id) { + // putAction(`tag/onlCgformArea/edit`, this.form).then((res) => { + // if (res.success) { + // this.$message.success(this.$t('OperationSuccessful')) + // this.loadData() + // this.form = { + // isModel: '', + // showArea: '', + // enName: '', + // sort: '' + // } + // } else { + // this.$message.warning(res.message) + // this.form = { + // isModel: '', + // showArea: '', + // enName: '', + // sort: '' + // } + // } + // }).finally(() => { + // this.flag = false + // this.spinLoading = false + // this.newVisible = false + // this.form = { + // isModel: '', + // showArea: '', + // enName: '', + // sort: '' + // } + // }) + } else { + // 新增之前 判断 标题唯一 + getAction(`params/manifest/verifyTitle?projectId=${this.$route.query.id}&title=${this.templatetitle}`, {}).then(res => { + if (res.success) { + console.log(this.selectedRowKeys[0]) + let postDate = { + title: this.templatetitle, + paramsTemplateId : this.selectedRowKeysDate[0].id, + paramsTemplatePublishVersion: this.selectedRowKeysDate[0].version + } + //新增 + postAction(`params/manifest/add`, postDate).then(res => { + if (res.success) { + this.newVisible = false + this.$emit('areaVisible',false) + this.$message.success(this.$t('OperationSuccessful')) + } else { + this.$message.warning(res.message) + } + } + ).finally(() => { + this.flag = false + this.spinLoading = false + this.newVisible = false + }) + } else { + this.$message.warning(res.message) } - } else { - // this.$message.warning(this.$t('operationFailed')) - this.$message.warning(res.message) - - } - } - ).finally(() => { - this.flag = false - this.spinLoading = false - this.newVisible = false - }) + }).finally(() => { + this.loading = false + }) + } + } else { + return false } - - } else { - // console.log('error submit!!'); - return false - } - }) - + }) + } }, cancelModel() { this.newVisible = false