diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java index bb2c8280b..47722dd22 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/IOSSFileService.java @@ -24,6 +24,8 @@ public interface IOSSFileService extends IService { public List getFileInfos(String id); + public List getFileInfoAll(String id); + public List getFileInfosByConnectId(String connectId); boolean delete(OSSFile ossFile); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index 31b01c9ab..c812e6a41 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -290,6 +290,19 @@ public class OSSFileServiceImpl extends ServiceImpl impl } return list; } + @Override + public List getFileInfoAll(String id) { + if (com.jero.modules.system.util.StringUtils.isEmpty(id)) { + return new ArrayList<>(); + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(OSSFile::getId, id.split(",")); + List list = this.list(wrapper); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(OSSFile::getConnectId, id.split(",")); + list.addAll(this.list(lambdaQueryWrapper)); + return list; + } @Override public List getFileInfosByConnectId(String connectId) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 830910af5..659e28fe9 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -16,6 +16,7 @@ import com.jero.modules.enums.FixedFieldEnum; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.model.TreeSelectModel; import com.jero.modules.system.service.ISysCategoryService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; @@ -27,6 +28,7 @@ import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; @@ -44,6 +46,7 @@ import java.util.stream.Collectors; * @Date: 2019-05-29 * @Version: V1.0 */ +@Api(tags="标签内容-树形结构") @RestController @RequestMapping("/sys/category") @Slf4j @@ -94,6 +97,14 @@ public class SysCategoryController { result.setResult(list); return result; } + @AutoLog(value = "标签内容-查询字典配置的父级名称") + @ApiOperation(value = "标签内容-查询字典配置的父级名称", notes = "标签内容-查询字典配置的父级名称") + @GetMapping(value = "/queryPid") + public Result> queryPid() { + List list = sysCategoryService.queryPid(); + + return Result.OK(list); + } /**标签内容-树形结构列表 * @@ -118,6 +129,7 @@ public class SysCategoryController { @PostMapping(value = "/add") public Result add(@RequestBody SysCategory sysCategory) { Result result = new Result(); + sysCategoryService.setAddOrdderNum(sysCategory); sysCategory.setName(sysCategory.getName().replace(" ","")); sysCategoryService.addSysCategory(sysCategory); result.success("添加成功！"); @@ -133,6 +145,7 @@ public class SysCategoryController { @PutMapping(value = "/edit") public Result edit(@RequestBody SysCategory sysCategory) { Result result = new Result(); + sysCategoryService.setEditOrderNum(sysCategory); SysCategory sysCategoryEntity = sysCategoryService.getById(sysCategory.getId()); if(sysCategoryEntity==null) { result.error500("未找到对应实体"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 064aa382c..c25f4d9b1 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -436,7 +436,7 @@ public class SysDictController { @RequiresPermissions("dict:edit") public Result edit(@RequestBody SysDict sysDict) { Result result = new Result(); - sysDictService.setEditOrdderNum(sysDict); + sysDictService.setEditOrderNum(sysDict); SysDict sysdict = sysDictService.getById(sysDict.getId()); if (sysdict == null) { result.error500("未找到对应实体"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 46eacf4ed..0a360f37e 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -84,6 +84,7 @@ public class SysDictItemController { @CacheEvict(value= CacheConstant.SYS_DICT_CACHE, allEntries=true) public Result add(@RequestBody SysDictItem sysDictItem) { Result result = new Result(); + sysDictItemService.setAddOrdderNum(sysDictItem); //查询同名数据 List exitDictItemList = sysDictItemMapper.selctItemByName(sysDictItem.getItemText(),sysDictItem.getDictId()); if(CollectionUtils.isNotEmpty(exitDictItemList)){ @@ -127,6 +128,7 @@ public class SysDictItemController { @CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true) public Result edit(@RequestBody SysDictItem sysDictItem) { Result result = new Result(); + sysDictItemService.setEditOrderNum(sysDictItem); SysDictItem sysdict = sysDictItemService.getById(sysDictItem.getId()); if (sysdict == null) { result.error500("未找到对应实体"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java index 9e95752fe..793ced8fe 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java @@ -85,4 +85,10 @@ public interface ISysCategoryService extends IService { public void updateDictDelFlag(int delFlag,String id); List queryByTreeDicCode(String dicCode); + + void setAddOrdderNum(SysCategory sysCategory); + + void setEditOrderNum(SysCategory sysCategory); + + List queryPid(); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java index 21fd8cc2e..0d59ef710 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java @@ -30,4 +30,8 @@ public interface ISysDictItemService extends IService { * @param id */ public void updateDictDelFlag(int delFlag,String id); + + void setAddOrdderNum(SysDictItem sysDictItem); + + void setEditOrderNum(SysDictItem sysDictItem); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java index 3deed8b29..a73c187ec 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java @@ -172,5 +172,5 @@ public interface ISysDictService extends IService { void setAddOrdderNum(SysDict sysDict); - void setEditOrdderNum(SysDict sysDict); + void setEditOrderNum(SysDict sysDict); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index 5868d597d..d060ca6d6 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -309,4 +309,88 @@ public class SysCategoryServiceImpl extends ServiceImpl queryByTreeDicCode(String dicCode) { return sysCategoryMapper.queryByTreeDicCode(dicCode); } + + @Override + public void setAddOrdderNum(SysCategory sysCategory) { + Integer inputOrderNum = sysCategory.getSortOrder(); + if(inputOrderNum != null) { + //查询展示顺序相同的 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("sys_dict_id",sysCategory.getSysDictId()) + .eq("del_flag", CommonConstant.DEL_FLAG_0) + .orderByAsc("sort_order"); + queryWrapper.eq("sort_order", inputOrderNum); + Integer orderNumCount = sysCategoryMapper.selectCount(queryWrapper); + if (orderNumCount > 0) {//有重复展示顺序的,后面的号全+1 + //设置排序 + QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); + orderNumQueryWrapper.ge("sort_order", inputOrderNum) + .eq("sys_dict_id",sysCategory.getSysDictId()) + .eq("del_flag", CommonConstant.DEL_FLAG_0) + .orderByAsc("sort_order"); + List geOrderNumList = list(orderNumQueryWrapper); + + //判断相邻的序号,去掉不邻的 + for (int i = 0; i < geOrderNumList.size(); i++) { + if (geOrderNumList.size() == 1) { + break; + } else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) { + int deleteStart = geOrderNumList.get(i + 1).getSortOrder(); + geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList()); + break; + } + } + + geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1)); + saveOrUpdateBatch(geOrderNumList); + } + } + } + + @Override + public void setEditOrderNum(SysCategory sysCategory) { + Integer inputOrderNum = sysCategory.getSortOrder(); + if(inputOrderNum != null) { + //查询展示顺序相同的 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("sys_dict_id",sysCategory.getSysDictId()) + .eq("del_flag", CommonConstant.DEL_FLAG_0) + .orderByAsc("sort_order"); + Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysCategory.getId())) + .map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0); + queryWrapper.eq("sort_order", inputOrderNum); + Integer orderNumCount = sysCategoryMapper.selectCount(queryWrapper); + if (orderNumCount > 0 && !orderNumData.equals(inputOrderNum)) {//有重复展示顺序的,后面的号全+1 + //设置排序 + QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); + orderNumQueryWrapper.ge("sort_order", inputOrderNum) + .eq("sys_dict_id",sysCategory.getSysDictId()) + .eq("del_flag", CommonConstant.DEL_FLAG_0) + .orderByAsc("sort_order"); + List geOrderNumList = list(orderNumQueryWrapper); + + //判断相邻的序号,去掉不邻的 + for (int i = 0; i < geOrderNumList.size(); i++) { + if (geOrderNumList.size() == 1) { + break; + } else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) { + int deleteStart = geOrderNumList.get(i + 1).getSortOrder(); + geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList()); + break; + } + } + + geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1)); + saveOrUpdateBatch(geOrderNumList); + } + } + } + + @Override + public List queryPid() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("pid",0); + List list = list(queryWrapper); + return list; + } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java index 6b07d515c..394f168f3 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java @@ -1,6 +1,8 @@ package com.jero.modules.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.CommonConstant; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.service.ISysDictItemService; @@ -8,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.stream.Collectors; /** *

@@ -52,4 +55,80 @@ public class SysDictItemServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0) + .eq("dict_id",sysDictItem.getDictId()) + .orderByAsc("order_num"); + queryWrapper.eq("order_num", inputOrderNum); + Integer orderNumCount = sysDictItemMapper.selectCount(queryWrapper); + if (orderNumCount > 0) {//有重复展示顺序的,后面的号全+1 + //设置排序 + QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); + orderNumQueryWrapper.ge("order_num", inputOrderNum) + .eq("dict_id",sysDictItem.getDictId()) + .eq("del_flag", CommonConstant.DEL_FLAG_0) + .orderByAsc("order_num"); + List geOrderNumList = list(orderNumQueryWrapper); + + //判断相邻的序号,去掉不邻的 + for (int i = 0; i < geOrderNumList.size(); i++) { + if (geOrderNumList.size() == 1) { + break; + } else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) { + int deleteStart = geOrderNumList.get(i + 1).getSortOrder(); + geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList()); + break; + } + } + + geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1)); + saveOrUpdateBatch(geOrderNumList); + } + } + } + + @Override + public void setEditOrderNum(SysDictItem sysDictItem) { + Integer inputOrderNum = sysDictItem.getSortOrder(); + if(inputOrderNum != null) { + //查询展示顺序相同的 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0) + .eq("dict_id",sysDictItem.getDictId()) + .orderByAsc("sort_order"); + Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysDictItem.getId())) + .map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0); + queryWrapper.eq("sort_order", inputOrderNum); + Integer orderNumCount = sysDictItemMapper.selectCount(queryWrapper); + if (orderNumCount > 0 && !orderNumData.equals(inputOrderNum)) {//有重复展示顺序的,后面的号全+1 + //设置排序 + QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); + orderNumQueryWrapper.ge("sort_order", inputOrderNum) + .eq("dict_id",sysDictItem.getDictId()) + .eq("del_flag", CommonConstant.DEL_FLAG_0) + .orderByAsc("sort_order"); + List geOrderNumList = list(orderNumQueryWrapper); + + //判断相邻的序号,去掉不邻的 + for (int i = 0; i < geOrderNumList.size(); i++) { + if (geOrderNumList.size() == 1) { + break; + } else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) { + int deleteStart = geOrderNumList.get(i + 1).getSortOrder(); + geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList()); + break; + } + } + + geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1)); + saveOrUpdateBatch(geOrderNumList); + } + } + } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java index ee647db3f..23b6dfd8c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java @@ -484,7 +484,7 @@ public class SysDictServiceImpl extends ServiceImpl impl } @Override - public void setEditOrdderNum(SysDict sysDict) { + public void setEditOrderNum(SysDict sysDict) { Integer inputOrderNum = sysDict.getOrderNum(); if(inputOrderNum != null) { //查询展示顺序相同的 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 5257f4a84..0fc2f46ea 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 @@ -2032,6 +2032,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl serialNumberList = list.stream().map(BussDocumentLibraryEO::getSerialNumber).collect(Collectors.toList()); String serialNumber = (String)map.get("serial_number"); String id = (String) map.get("id"); + String title = (String) map.get("title"); //通过id查询数据 List> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id); if(dataList.size() != 0){ @@ -2040,6 +2041,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); + //普通数据字典 + List dictItemList = sysDictItemServiceImpl.selectItemsAll(); + //编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件 + homeDocumentDynamic(cut,map, serialNumber, id, title, dataList, fieldList,dictItemList); + try { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); @@ -2063,27 +2071,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); - //标准选择字段 -// List standardOnlCgformFieldList = fieldList.stream() -// .filter(e -> FieldTypeEnum.STANDARD.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); -// if(standardOnlCgformFieldList.size() != 0){ -// List collect = standardOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); -// List standardList = new ArrayList<>(); -// for (Map.Entry entry : map.entrySet()) { -// String key = entry.getKey(); -// if(collect.contains(key)){ -// standardList.add(key); -// } -// } -// if(standardList.size() != 0){ -// for (String standard : standardList) { -// map.put(standard, map.get(standard+"_id")); -// map.remove(standard+"_id"); -// } -// } -// } + + map.remove("cut"); //获取搜索中心字段 @@ -2121,8 +2110,6 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl categoryList = sysCategoryService.list(); - //普通数据字典 - List dictItemList = sysDictItemServiceImpl.selectItemsAll(); //查询所有 List> listMap = bussDocumentLibraryEOMapper.selectMapsAll(null); @@ -2360,6 +2347,145 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map, + String serialNumber, + String id, String title, + List> dataList, + List fieldList, + List dictItemList) { + //文件类型字段 + List onlCgformFieldList = fieldList.stream() + .filter(e -> FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); + + List fileFieldList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + + //编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件 + String href = "" + serialNumber + ","; + + StringBuilder msgContentSb = new StringBuilder("标准" + serialNumber); + StringBuilder msgContentInfoSb = new StringBuilder("标准" + href); + + List fileIdLIstTemp = new ArrayList<>(); + for (Map.Entry entry : dataList.get(0).entrySet()) { + String key = entry.getKey(); + String value = String.valueOf(entry.getValue()); + //文件 + if(fileFieldList.contains(key)&& !"null".equals(value) && StringUtils.isNotBlank(value)){ + fileIdLIstTemp.addAll(Arrays.asList(value.split(","))); + } + } + List fileIdLIst = new ArrayList<>(); + for (Map.Entry entry : map.entrySet()) { + String key = entry.getKey(); + String value = String.valueOf(entry.getValue()); + //文件 + if(fileFieldList.contains(key) && !"null".equals(value) && StringUtils.isNotBlank(value)){ + fileIdLIst.addAll(Arrays.asList(value.split(","))); + } + } + //之前的文件 + List fileListTemp = new ArrayList<>(); + if(fileIdLIstTemp.size() != 0){ + fileListTemp = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIstTemp,",")); + } + List fileNameListTemp = fileListTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList()); + + + //编辑的文件 + List fileList = new ArrayList<>(); + if(fileIdLIst.size() != 0){ + fileList = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIst,",")); + } + List fileNameList = fileList.stream().map(OSSFile::getFileName).collect(Collectors.toList()); + //删除的文件 + + List deleteFileList = new ArrayList<>(); + for (String fileName : fileNameListTemp) { + if(fileNameList.size() != 0 && !fileNameList.contains(fileName)){ + deleteFileList.add(fileName); + } + } + //上传的文件 + List upFileList = new ArrayList<>(); + for (String fileName : fileNameList) { + if(!fileNameListTemp.contains(fileName)){ + upFileList.add(fileName); + } + } + int count = 0; + + for (Map.Entry entry : map.entrySet()) { + String key = entry.getKey(); + String value = String.valueOf(entry.getValue()); + //状态 + if("state".equals(key) && !value.equals((String)dataList.get(0).get("state"))){ + count++; + //数据字典转换 dictItemList + String finalValue = value; + List stateDictItemList = dictItemList.stream() + .filter(e -> "state".equals(e.getDictCode()) && finalValue.equals(e.getItemValue())) + .collect(Collectors.toList()); + if(stateDictItemList.size() != 0){ + if(CutEnum.CN.getValue().equals(cut)){ + value = stateDictItemList.get(0).getItemText(); + }else{ + value = stateDictItemList.get(0).getEnName(); + } + } + msgContentSb.append("状态改为" + value + ","); + msgContentInfoSb.append("状态改为" + value + ","); + } + //适用车型 car_type + if("shi4_yong4_che1_xing2".equals(key) && !value.equals((String)dataList.get(0).get("shi4_yong4_che1_xing2"))){ + count++; + //数据字典转换 dictItemList + List stateDictItemList = dictItemList.stream() + .filter(e -> "car_type".equals(e.getDictCode())) + .collect(Collectors.toList()); + + StringBuilder sb = new StringBuilder(); + for (String s : value.split(",")) { + List collect = stateDictItemList.stream().filter(e -> s.equals(e.getItemValue())).collect(Collectors.toList()); + if(collect.size() != 0){ + if(CutEnum.CN.getValue().equals(cut)){ + sb.append(collect.get(0).getItemText()+","); + }else{ + sb.append(collect.get(0).getEnName()+","); + } + } + } + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + value = substring; + } + + msgContentSb.append("适用车型改为" + value + ","); + msgContentInfoSb.append("适用车型改为" + value + ","); + } + } + if(upFileList.size() != 0){ + count++; + msgContentSb.append("上传了" + StringUtils.join(upFileList,",") + ","); + msgContentInfoSb.append("上传了" + StringUtils.join(upFileList,",") + ","); + } + if(deleteFileList.size() != 0){ + count++; + msgContentSb.append("删除了" + StringUtils.join(deleteFileList,",") + ","); + msgContentInfoSb.append("删除了" + StringUtils.join(deleteFileList,",") + ","); + } + if(count > 0){ + String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1); + String msgContentInfo = msgContentInfoSb.substring(0, msgContentInfoSb.length() - 1); + HomeDocumentDynamicEO homeDocumentDynamicEO = new HomeDocumentDynamicEO(); + homeDocumentDynamicEO.setMsgContent(msgContent); + homeDocumentDynamicEO.setMsgContentInfo(msgContentInfo); + homeDocumentDynamicEOService.save(homeDocumentDynamicEO); + } + } + private String updateEsInfo(Map map, List searchFieldList, StringBuilder sbCn, StringBuilder sbEn, List fileInfos, List> mapListTempCn, List> mapListTempEn, String cutCn, String cutEn) { Map mapBaseDateCn = new HashMap<>(); Map mapBaseDateEn = new HashMap<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeDocumentDynamicEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeDocumentDynamicEOController.java index 544850663..5b7e571b5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeDocumentDynamicEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeDocumentDynamicEOController.java @@ -53,6 +53,7 @@ public class HomeDocumentDynamicEOController extends JeroController queryWrapper = QueryGenerator.initQueryWrapper(homeDocumentDynamicEO, req.getParameterMap()); + queryWrapper.orderByDesc("create_time"); Page page = new Page(pageNo, pageSize); IPage pageList = homeDocumentDynamicEOService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeFunctionModuleEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeFunctionModuleEOController.java index a84d94b8f..195b8a586 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeFunctionModuleEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeFunctionModuleEOController.java @@ -76,8 +76,8 @@ public class HomeFunctionModuleEOController extends JeroController> queryList() { - List list = homeFunctionModuleEOService.queryList(); + public Result> queryList(String cut) { + List list = homeFunctionModuleEOService.queryList(cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/IHomeFunctionModuleEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/IHomeFunctionModuleEOService.java index ae22e63d8..b798f06be 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/IHomeFunctionModuleEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/IHomeFunctionModuleEOService.java @@ -59,5 +59,5 @@ public interface IHomeFunctionModuleEOService extends IService queryList(); + List queryList(String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java index 6eeac2d66..ee0d28743 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.home.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.LoginUser; import com.jero.modules.home.entity.HomeFunctionModuleEO; import com.jero.modules.home.mapper.HomeFunctionModuleEOMapper; @@ -99,7 +100,7 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl queryList() { + public List queryList(String cut) { LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); //所有的图表(state=0) @@ -111,9 +112,19 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl wrapperTemp = new LambdaQueryWrapper<>(); wrapperTemp.in(HomeFunctionModuleEO::getCreateBy,loginUser.getUsername()).orderByAsc(HomeFunctionModuleEO::getState).orderByAsc(HomeFunctionModuleEO::getSort); List homeFunctionModuleEOS = this.list(wrapperTemp); - if(homeFunctionModuleEOS.size() == 0){ + if(homeFunctionModuleEOList.size() == 0){ + if(CutEnum.EN.getValue().equals(cut)){ + for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOList) { + homeFunctionModuleEO.setIconName(homeFunctionModuleEO.getIconNameEn()); + } + } return homeFunctionModuleEOList; }else{ + if(CutEnum.EN.getValue().equals(cut)){ + for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOS) { + homeFunctionModuleEO.setIconName(homeFunctionModuleEO.getIconNameEn()); + } + } return homeFunctionModuleEOS; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java index 98dcaa01f..4b6f6c130 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRelatedPersonnel.java @@ -15,6 +15,7 @@ import org.jeecgframework.poi.excel.annotation.ExcelTarget; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.util.List; /** @@ -60,7 +61,8 @@ public class ProjectRelatedPersonnel implements Serializable { @TableField(exist = false) @Excel(name = "认证工程师,Homologation Engineer", width = 15,orderNum = "4") private java.lang.String certificationEngineerName; - + @TableField(exist = false) + private List certificationEngineerNameList; /**备注*/ @Excel(name = "备注,Comments", width = 15,orderNum = "5") private java.lang.String remark; @@ -88,55 +90,4 @@ public class ProjectRelatedPersonnel implements Serializable { /**中英切换标志*/ @TableField(exist = false) private String cut; -} - /* *//**责任领域*//* - @Excel(name = "责任领域,Responsible Field", width = 15,orderNum = "1",dicCode = "duty_territory") - @Dict(dicCode = "duty_territory") - private java.lang.String dutyTerritory; - - *//**法规工程师*//* - private java.lang.String lawEngineer; - @TableField(exist = false) - @Excel(name = "法规工程师,Regulation Engineer", width = 15,orderNum = "2") - private java.lang.String lawEngineerName; - - *//**工程接口人*//* - private java.lang.String engineeringInterfacePerson; - @TableField(exist = false) - @Excel(name = "工程接口人,Engineering Interface", width = 15,orderNum = "3") - private java.lang.String engineeringInterfacePersonName; - - *//**认证工程师*//* - private java.lang.String certificationEngineer; - @TableField(exist = false) - @Excel(name = "认证工程师,Homologation Engineer", width = 15,orderNum = "4") - private java.lang.String certificationEngineerName; - - *//**备注*//* - @Excel(name = "备注,Comments", width = 15,orderNum = "5") - private java.lang.String remark; - - *//**创建人*//* - private java.lang.String createBy; - - *//**创建日期*//* - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private java.util.Date createTime; - - *//**更新人*//* - private java.lang.String updateBy; - - *//**更新日期*//* - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - private java.util.Date updateTime; - - *//**所属部门*//* - @ApiModelProperty(value = "所属部门") - private String sysOrgCode; - - *//**中英切换标志*//* - @TableField(exist = false) - private String cut; -}*/ +} \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 9d1c62ef2..2039f36fc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -996,79 +996,43 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl records) { -//// List records = projectRelatedPersonnelMapper.queryById(projectRelatedPersonnel.getId()); -// for (ProjectRelatedPersonnel projectRelatedPersonnel : records) { -//// //法规工程师 -//// String lawString = projectRelatedPersonnel.getLawEngineer(); -//// //去重 -//// if(StringUtils.isNotBlank(lawString)) { -//// List lawList = Arrays.asList(lawString.split(",")); -//// String lawDistinct = lawList.stream().distinct().collect(Collectors.joining(",")); -//// projectRelatedPersonnel.setLawEngineer(lawDistinct); -//// } -//// -//// //工程接口人 -//// String interfaceString = projectRelatedPersonnel.getEngineeringInterfacePerson(); -//// //去重 -//// if(StringUtils.isNotBlank(interfaceString)) { -//// List interfaceList = Arrays.asList(interfaceString.split(",")); -//// String interfaceDistinct = interfaceList.stream().distinct().collect(Collectors.joining(",")); -//// projectRelatedPersonnel.setEngineeringInterfacePerson(interfaceDistinct); -//// } -//// -////// 工程接口人 -//// String certificationString = projectRelatedPersonnel.getCertificationEngineer(); -//// //去重 -//// if(StringUtils.isNotBlank(certificationString)) { -//// List certificationList = Arrays.asList(certificationString.split(",")); -//// String certificationDistinct = certificationList.stream().distinct().collect(Collectors.joining(",")); -//// projectRelatedPersonnel.setCertificationEngineer(certificationDistinct); -//// } -//// -//// if (StringUtils.isBlank(data.getRemark())) {//数据库里备注是空的 -//// projectRelatedPersonnel.setRemark(projectRelatedPersonnel.getRemark()); -//// } else { -//// projectRelatedPersonnel.setRemark(""); -//// } -// -// Date now = new Date(); -// projectRelatedPersonnel.setUpdateTime(now); -// LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); -// projectRelatedPersonnel.setUpdateBy(sysUser.getUsername()); -// updateById(projectRelatedPersonnel); -// } -// } - @Override public List queryCertificationEngineer(String projectId) { + //查询数据库中的数据 QueryWrapper queryWrapper = new QueryWrapper<>(); - List list = list(queryWrapper.eq("project_id",projectId)); - + List list = list(queryWrapper.eq("project_id", projectId)); + List certificationEngineerList = new ArrayList<>(); //查询基础表认证工程师的值 QueryWrapper baseQueryWrapper = new QueryWrapper<>(); List baseDataList = projectLibraryBaseService.list(baseQueryWrapper.eq("id", projectId)); - String baseCertificationEngineer = baseDataList.get(0).getCertificationEngineer(); + if (CollectionUtils.isNotEmpty(baseDataList)) { + String baseCertificationEngineer = baseDataList.get(0).getCertificationEngineer(); + List baseCertificationEngineerIdList = Arrays.asList(baseCertificationEngineer.split(",")); + String certificationEngineerName; + QueryWrapper userqueryWrapper = new QueryWrapper<>(); + userqueryWrapper.in("id ", baseCertificationEngineerIdList); + List userList = sysUserMapper.selectList(userqueryWrapper); + if (CollectionUtils.isNotEmpty(userList)) { + for (String baseUserId : baseCertificationEngineerIdList) { - if(StringUtils.isNotBlank(baseCertificationEngineer)) { - for (ProjectRelatedPersonnel projectRelatedPersonnel : list) { - projectRelatedPersonnel.setCertificationEngineer(baseCertificationEngineer); + if (StringUtils.isNotEmpty(baseUserId)) { + certificationEngineerName = userList.stream().filter(e -> baseUserId.equals(e.getId())) + .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); + ProjectRelatedPersonnel relatedPersonnel =new ProjectRelatedPersonnel(); + relatedPersonnel.setCertificationEngineer(baseUserId); + relatedPersonnel.setCertificationEngineerName(certificationEngineerName); + certificationEngineerList.add(relatedPersonnel); + } + + } } } - disposeData(list); - List certificationEngineerList = new ArrayList<>(); - for(ProjectRelatedPersonnel personnel : list){ - ProjectRelatedPersonnel relatedPersonnel =new ProjectRelatedPersonnel(); - relatedPersonnel.setCertificationEngineer(personnel.getCertificationEngineer()); - relatedPersonnel.setCertificationEngineerName(personnel.getCertificationEngineerName()); - certificationEngineerList.add(relatedPersonnel); - } + certificationEngineerList = certificationEngineerList.stream().distinct().collect(Collectors.toList()); return certificationEngineerList; + } - } diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index cdbb79f99..bd6ea6376 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -786,10 +786,10 @@ module.exports = { importTemplate: 'Import Template', verificationConfirmationDeadline: 'Verification compliance confirmation deadline', technicalEvaluationResults: 'Technical Evaluation Results', - engineeringConfirmation: 'EngineeringConfirmation', + engineeringConfirmation: 'Project Delivery', feedbackFromTheEngineer: 'Feedback From The Engineer', - completedBy: 'Completed by', - completedTime: 'Completed time', + completedBy: 'Completed By', + completedTime: 'Completed Time', replyFromProjectContactPerson: 'Responsible Persons reply', answer: 'Answer', distributionEngineer: 'Distribution Engineer', @@ -891,4 +891,5 @@ module.exports = { custom:'Custom', notSelected:'Not selected', ExportReport:'Export Report', + basicInformation:'Basic Information', } \ 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 0343b852e..6dd6e00ee 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -794,7 +794,7 @@ module.exports = { importTemplate: '导入模板', verificationConfirmationDeadline: '验证符合性确认截止时间', technicalEvaluationResults: '技术评估结果', - engineeringConfirmation: '工程确认', + engineeringConfirmation: '工程交付', feedbackFromTheEngineer: '工程师反馈意见', completedBy: '填写人', completedTime: '填写时间', @@ -804,7 +804,7 @@ module.exports = { reminderHandling: '提醒办理', addFeedback: '添加反馈', engineer: '工程师', - engineeringConfirmationDetails: '工程确认详情', + engineeringConfirmationDetails: '工程交付详情', reminder: '提醒', adopt: '通过', reviewedByThePersonInCharge: '负责人审核', @@ -896,4 +896,5 @@ module.exports = { custom:'自定义', notSelected:'未选择', ExportReport:'导出报告', + basicInformation:'基础信息', } \ No newline at end of file diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index 7a564e16b..b275fbeea 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -34,6 +34,16 @@ {{text && text.length > 18?text.slice(0,17)+'...':text}} + + + + + + + + + +

diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue index 7186dfc37..23b266d1f 100644 --- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue @@ -51,7 +51,7 @@ - + {{item.name}} @@ -248,8 +248,24 @@ }else if(this.dictVal='tree'){ this.parentVisible=true this.editPId='' + // + // this.getAllTree() } }, + // getAllTree() { + // postAction(`sys/category/queryPageList`,{ + // sysDictId:this.record.id, + // isTagDict:1 + // }).then(res=>{ + // console.log(res,'res,,,') + // // this.tabletreeDataSource=[...res.result.records] + // // this.total=res.result.total + // // let data = this.toTree(this.tabletreeDataSource) + // // this.tabletreeData=data + // // this.parentData=this.getParents + // // this.dataFlag=true + // }) + // }, //保存 hideModal(){ this.$refs.ruleForm.validate(valid => { @@ -318,7 +334,7 @@ this.loadData() this.newVisible = false } else { - this.$message.warning(this.$t('operationFailed')) + this.$message.warning(res.message) } }).finally(()=>{ this.flag=false diff --git a/jero-web/src/views/processCenter/components/footerProcess.vue b/jero-web/src/views/processCenter/components/footerProcess.vue index 090db92d7..48821c688 100644 --- a/jero-web/src/views/processCenter/components/footerProcess.vue +++ b/jero-web/src/views/processCenter/components/footerProcess.vue @@ -107,8 +107,8 @@ box-sizing: border-box; .process-header-title { - height: 68px; - line-height: 68px; + /*height: 68px;*/ + /*line-height: 68px;*/ background: #FFFFFF; text-align: right; diff --git a/jero-web/src/views/processCenter/components/projectInformation.vue b/jero-web/src/views/processCenter/components/projectInformation.vue index 102b8611d..65e75b9f7 100644 --- a/jero-web/src/views/processCenter/components/projectInformation.vue +++ b/jero-web/src/views/processCenter/components/projectInformation.vue @@ -2,7 +2,7 @@
- {{$t('essentialInformation')}} + {{title}}
@@ -49,6 +49,10 @@ queryProject: { type: Object, default: {} + }, + title: { + type: String, + default: '' } }, data() { diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue index 2bbc1a265..e7ebead41 100644 --- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue @@ -1,7 +1,7 @@ @@ -75,6 +75,9 @@ this.getData() }, methods: { + responsibility(item) { + this.$emit('currentStatus', item) + }, getData() { getAction(this.url.getProjectDetailsStatistics, { id: this.$route.query.id }).then((res) => { if (res.success) { diff --git a/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue b/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue index d83b48662..7c0157783 100644 --- a/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue +++ b/jero-web/src/views/projectManagement/components/currentStatusOfTheProjectEcharts.vue @@ -26,7 +26,7 @@
- +
@@ -174,8 +174,10 @@ }) } this.getEcharts('main-left', this.$t('CurrentStatusOfTheProject'), color, data) + }, + responsibility(item) { + this.$emit('currentStatus', item) } - } } diff --git a/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue b/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue index 6c120bd6a..31a91e2a7 100644 --- a/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue +++ b/jero-web/src/views/projectManagement/components/deliverableStatusEchart.vue @@ -21,7 +21,7 @@
- + @@ -250,6 +250,9 @@ , mainBottomEcharts(data, color) { this.getEcharts('main-bottom', this.$t('verificationComplianceConfirmationProgress'), color, data, 5) + }, + responsibility(item) { + this.$emit('currentStatus', item) } } } diff --git a/jero-web/src/views/projectManagement/components/responsibilityList.vue b/jero-web/src/views/projectManagement/components/responsibilityList.vue index cd0f0aea9..7cda45c34 100644 --- a/jero-web/src/views/projectManagement/components/responsibilityList.vue +++ b/jero-web/src/views/projectManagement/components/responsibilityList.vue @@ -26,6 +26,9 @@ :data-source="dataSource" :columns="columns" > + + {{text}} + @@ -53,15 +56,16 @@ title: this.$t('areaOfResponsibility'), dataIndex: 'dutyTerritory', align: 'center', - width:400, - ellipsis: true + width: 400, + ellipsis: true, + scopedSlots: { customRender: 'areaOfResponsibility' } }, { title: this.$t('Quantity'), dataIndex: 'amount', align: 'center', ellipsis: true, - width:300, + width: 300 } ] } @@ -92,6 +96,9 @@ }, handleCancel() { this.visible = false + }, + areaOfResponsibilityClick(item) { + this.$emit('responsibility', item) } } }