From adbcd211e482fb4998422c4b34a655ce91506d50 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 27 Sep 2022 17:44:15 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/examineInformation.vue | 7 +++++ .../processForm/handshakeProcess/index.vue | 28 +++++++++++-------- .../components/batchProcessing.vue | 3 ++ 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/jero-web/src/views/processCenter/components/examineInformation.vue b/jero-web/src/views/processCenter/components/examineInformation.vue index e640eec56..385c860df 100644 --- a/jero-web/src/views/processCenter/components/examineInformation.vue +++ b/jero-web/src/views/processCenter/components/examineInformation.vue @@ -24,6 +24,9 @@ {{$t('inquiry')}} + + {{$t('sendBack')}} + @@ -106,6 +109,10 @@ title: { type: String, default: '' + }, + isSendBack:{ + type: Boolean, + default: false } }, components: { diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index 41fa34ad3..c19d1eb3c 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -31,6 +31,7 @@ v-if="isDisplay" isApprovalOpinion :title="titleName" + :isSendBack="isSendBackOne" ref="examineInformationRef" :url="url"/> @@ -145,6 +146,11 @@ return false } return true + }, + isSendBackOne() { + if (this.$route.query.taskDefinitionKey == 'zrrqr') { + return true + } } }, methods: { @@ -183,14 +189,14 @@ } }) }, - rejectCauseAdd(rejectCause,ids) { + rejectCauseAdd(rejectCause, ids) { let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') let query = { - rejectUserId:this.userInfo().id, - rejectTime:rejectTime, - rejectCause:rejectCause, - projectLawsInventoryId:ids, - rejectType:'1', + rejectUserId: this.userInfo().id, + rejectTime: rejectTime, + rejectCause: rejectCause, + projectLawsInventoryId: ids, + rejectType: '1' } postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => { @@ -198,8 +204,8 @@ }, completeTask(value, handlingTime) { let json = Object.assign(this.queryBy, { handlingTime: handlingTime }, value) - if (json.flag == '1'){ - this.rejectCauseAdd(value.approvalOpinion,this.queryBy.id) + if (json.flag == '1') { + this.rejectCauseAdd(value.approvalOpinion, this.queryBy.id) } Object.keys(json).forEach(res => { if (json[res] && typeof json[res] == 'string') { @@ -269,7 +275,7 @@ } postAction('/workFlow/startProcess', query).then((res) => { if (res.success) { - this.completeTaskDesign(value, res.result,true) + this.completeTaskDesign(value, res.result, true) } }) }, @@ -277,7 +283,7 @@ getAction('/workFlow/deleteProcessInstanceByTaskId', { taskId: taskId }).then((res) => { }) }, - completeTaskDesign(value, taskId,isTrue) { + completeTaskDesign(value, taskId, isTrue) { value.reviewResult = 'launch' let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') value.operatorTime = operatorTime @@ -302,7 +308,7 @@ // this.$router.push({ // path: '/ProcessCenter' // }) - }else{ + } else { if (isTrue) { this.deleteProcessInstanceByTask(taskId) } diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue index 108dcf2d3..26af9622c 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/components/batchProcessing.vue @@ -27,6 +27,9 @@ {{$t('inquiry')}} + + {{$t('sendBack')}} + From 0cf53352e6861c434edb96573b4110cac1a23569 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Wed, 28 Sep 2022 18:02:27 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tabComponents/processCenter/index.vue | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue index 0a37d733a..1d0c31769 100644 --- a/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue +++ b/jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue @@ -70,6 +70,22 @@ {{prcTypeName[text]}} + + + {{record.serialNumber}} + + + {{record.prcNum}} + + + + + {{record.title}} + + + {{record.prcName}} + + {{$t('Processing')}} @@ -142,14 +158,16 @@ dataIndex: 'prcNum', align: 'center', width: 180, - ellipsis: true + ellipsis: true, + scopedSlots: { customRender: 'standard' } }, { title: this.$t('title'), dataIndex: 'prcName', align: 'center', width: 180, - ellipsis: true + ellipsis: true, + scopedSlots: { customRender: 'titleIndex' } }, { title: this.$t('ProcessType'), From 4f0cf1f6c8e239b866bb3cf7c35da25a8b5aeaf1 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Wed, 28 Sep 2022 18:16:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=BE=85=E5=8A=9E=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?-=E5=8D=95=E7=8B=AC=E5=A4=84=E7=90=86=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE=E3=80=82?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=E7=BC=96=E5=8F=B7=E3=80=81=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E4=B8=BA=20=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E7=9A=84?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E3=80=81=E6=A0=87=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/entity/ProjectLibraryBase.java | 5 ++ .../service/IProjectLibraryBaseService.java | 2 + .../impl/ProjectLibraryBaseServiceImpl.java | 42 ++++++++- .../wkflow/controller/TaskController.java | 89 +++++++++++++++++++ .../modules/wkflow/entity/BusProcessName.java | 4 + 5 files changed, 139 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java index 46cdba5bb..d5cb571ac 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLibraryBase.java @@ -105,4 +105,9 @@ public class ProjectLibraryBase implements Serializable { @TableField(exist = false) private String endTime; + + /**目标市场展示名称*/ + @TableField(exist = false) + private java.lang.String targetMarketName; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java index d031986f3..f6f29e54c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryBaseService.java @@ -89,4 +89,6 @@ public interface IProjectLibraryBaseService extends IService void exportProjectDetailsStatisticsGroupByTerritoryXls(HttpServletResponse response, HttpServletRequest request, Map params); void checkData(String id, String cut); + + void disposeData(List records,String cut,boolean disposeTargetMarketFlag); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 783666259..2dd66c1b9 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -6,6 +6,7 @@ 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.exception.JeroBootException; +import com.jero.common.system.vo.DictModel; import com.jero.common.system.vo.LoginUser; import com.jero.modules.cert.collect.service.IParamsManifestEOService; import com.jero.modules.enums.DictCodeEnum; @@ -17,8 +18,10 @@ import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.project.service.IProjectLibraryRoleRelEOService; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.enums.DicCodeEnum; import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.mapper.SysUserMapper; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; @@ -93,6 +96,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl queryById(String id) { List records = projectLibraryBaseMapper.queryById(id); - disposeData(records); + disposeData(records,"",false); for(ProjectLibraryBase projectLibraryBase: records){ if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){ projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() + "-" + projectLibraryBase.getYearName()); @@ -362,7 +368,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl result = projectLibraryBaseMapper.queryPageList(page, params); List records = result.getRecords(); - disposeData(records); + disposeData(records,"",false); for(ProjectLibraryBase projectLibraryBase: records){ if(StringUtils.isNotBlank(projectLibraryBase.getYearName())){ projectLibraryBase.setProjectName(projectLibraryBase.getProjectName() + "-" + projectLibraryBase.getYearName()); @@ -371,7 +377,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl records) { + @Override + public void disposeData(List records,String cut,boolean disposeTargetMarketFlag) { + List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); for (ProjectLibraryBase projectLibraryBase : records) { List sysUsers = new ArrayList<>(); //认证工程师多个id查询 @@ -402,6 +410,34 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl { + boolean flag = false; + for (String s : targetMarketArr) { + if (StringUtils.equals(s, targetMarket.getValue())) { + flag = true; + } + } + return flag; + }).map(DictModel::getTextEn).collect(Collectors.joining(",")); + }else { + targetMarketName = targetMarketList.stream().filter(targetMarket -> { + boolean flag = false; + for (String s : targetMarketArr) { + if (StringUtils.equals(s, targetMarket.getValue())) { + flag = true; + } + } + return flag; + }).map(DictModel::getText).collect(Collectors.joining(",")); + } + projectLibraryBase.setTargetMarketName(targetMarketName); + } + } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java index 590fa4d09..67cd210d7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/controller/TaskController.java @@ -1,20 +1,31 @@ package com.jero.modules.wkflow.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.project.entity.ProjectLawsInventoryEO; +import com.jero.modules.project.entity.ProjectLibraryBase; +import com.jero.modules.project.entity.ProjectNameInfoEO; +import com.jero.modules.project.entity.ProjectYearNameInfoEO; +import com.jero.modules.project.service.IProjectLawsInventoryEOService; +import com.jero.modules.project.service.IProjectLibraryBaseService; +import com.jero.modules.project.service.IProjectNameInfoEOService; +import com.jero.modules.project.service.IProjectYearNameInfoEOService; import com.jero.modules.wkflow.entity.BusMes; import com.jero.modules.wkflow.entity.BusProcessName; import com.jero.modules.wkflow.entity.BusProcessNew; import com.jero.modules.wkflow.entity.TaskCommonQuery; +import com.jero.modules.wkflow.enums.FlowTypeEnum; import com.jero.modules.wkflow.feginClient.impl.TaskFeignClientImpl; import com.jero.modules.wkflow.page.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import me.zhyd.oauth.utils.StringUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,6 +33,7 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Slf4j @Api(tags="待办任务") @@ -31,6 +43,14 @@ public class TaskController { @Autowired private TaskFeignClientImpl taskFeignClient; + @Autowired + private IProjectLawsInventoryEOService projectLawsInventoryEOService; + @Autowired + private IProjectLibraryBaseService projectLibraryBaseService; + @Autowired + private IProjectNameInfoEOService projectNameInfoEOService; + @Autowired + private IProjectYearNameInfoEOService projectYearNameInfoEOService; /** * 通用接口 @@ -75,6 +95,7 @@ public class TaskController { List list1 = this.startPage(busProcessNames, taskCommonQuery.getCurrent(), taskCommonQuery.getSize()); Page pageInfo = new Page(); if(busProcessNames!=null){ + this.disposeTaskToConfirm(busProcessNames,taskCommonQuery); pageInfo.setList(list1); pageInfo.setPageNo(taskCommonQuery.getCurrent()); pageInfo.setCount(Long.valueOf(busProcessNames.size())); @@ -89,6 +110,74 @@ public class TaskController { return pageInfo; } + + /** + * 处理任务确认流程回显数据 + * @param busProcessNames + */ + public void disposeTaskToConfirm(List busProcessNames,TaskCommonQuery taskCommonQuery){ + List projectLawsInventoryIdList = busProcessNames.stream().filter(busProcessName -> { + boolean flag = false; + if(org.apache.commons.lang3.StringUtils.equals(busProcessName.getPrcType(), FlowTypeEnum.RWQRLC.getValue())){ + flag = true; + } + return flag; + }).map(BusProcessName::getProjectLawsInventoryId).distinct().collect(Collectors.toList()); + List projectLibraryBaseList = new ArrayList<>(); + List projectLawsInventoryEOList = new ArrayList<>(); + + if(CollectionUtils.isNotEmpty(projectLawsInventoryIdList)){ + QueryWrapper lawsInventoryQueryWrap = new QueryWrapper<>(); + lawsInventoryQueryWrap.lambda().in(ProjectLawsInventoryEO::getId,projectLawsInventoryIdList); + projectLawsInventoryEOList = this.projectLawsInventoryEOService.list(lawsInventoryQueryWrap); + + List projectLibraryIdList = projectLawsInventoryEOList.stream().map(ProjectLawsInventoryEO::getProjectLibraryId).distinct().collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(projectLibraryIdList)){ + QueryWrapper libraryBaseQueryWrap = new QueryWrapper<>(); + libraryBaseQueryWrap.lambda().in(ProjectLibraryBase::getId,projectLibraryIdList); + projectLibraryBaseList = this.projectLibraryBaseService.list(libraryBaseQueryWrap); + this.projectLibraryBaseService.disposeData(projectLibraryBaseList,taskCommonQuery.getCut(),true); + } + for (BusProcessName busProcessName : busProcessNames) { + if(org.apache.commons.lang3.StringUtils.equals(busProcessName.getPrcType(),FlowTypeEnum.RWQRLC.getValue())){ + if(CollectionUtils.isNotEmpty(projectLawsInventoryEOList)){ + List projectLawsInventoryS = projectLawsInventoryEOList.stream().filter(lawsInventory -> { + boolean flag = false; + if(org.apache.commons.lang3.StringUtils.equals(busProcessName.getProjectLawsInventoryId(),lawsInventory.getId())){ + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(projectLawsInventoryS) && CollectionUtils.isNotEmpty(projectLibraryBaseList)){ + ProjectLawsInventoryEO projectLawsInventoryEO = projectLawsInventoryS.get(0); + busProcessName.setSerialNumber(projectLawsInventoryEO.getSerialNumber()); + busProcessName.setTitle(projectLawsInventoryEO.getTitle()); + + List projectLibraryBaseS = projectLibraryBaseList.stream().filter(projectLibraryBase -> { + boolean flag = false; + if (org.apache.commons.lang3.StringUtils.equals(projectLibraryBase.getId(), projectLawsInventoryEO.getProjectLibraryId())) { + flag = true; + } + return flag; + }).collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(projectLibraryBaseS)){ + ProjectLibraryBase projectLibraryBase = projectLibraryBaseS.get(0); + ProjectNameInfoEO projectNameInfoEO = this.projectNameInfoEOService.getOne( + new QueryWrapper().lambda().eq(ProjectNameInfoEO::getId, projectLibraryBase.getProjectNameId()) + ); + ProjectYearNameInfoEO projectYearNameInfoEO = this.projectYearNameInfoEOService.getOne( + new QueryWrapper().lambda().eq(ProjectYearNameInfoEO::getId, projectLibraryBase.getYearNameId()) + ); + + busProcessName.setProjectName(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + "-" +projectLibraryBase.getTargetMarketName()); + } + } + } + } + } + } + } + @AutoLog(value = "查询草稿") @ApiOperation(value="查询草稿", notes="查询草稿") @PostMapping("/queryTaskDraft") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusProcessName.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusProcessName.java index 29eeb524d..2b5bb65a1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusProcessName.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/wkflow/entity/BusProcessName.java @@ -74,4 +74,8 @@ public class BusProcessName implements Serializable { private String handlingTime; private String projectLawsInventoryId; + + private String serialNumber; + + private String title; } From e091c50215ddb74bbb78fa50138a9254fb06e1ca Mon Sep 17 00:00:00 2001 From: gaosong Date: Fri, 30 Sep 2022 20:05:46 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 817aa74a6..5b257dc75 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1112,11 +1112,11 @@ INSERT INTO `laws_weilai`.`sys_permission` (`id`, `parent_id`, `name`, `url`, `c -- 上报库删除按钮 2022-09-14已同步生产环境 INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `component`, `component_name`, `redirect`, `menu_type`, `perms`, `perms_type`, `sort_no`, `always_show`, `icon`, `is_route`, `is_leaf`, `keep_alive`, `hidden`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `del_flag`, `rule_flag`, `status`, `internal_or_external`, `menu_en`) VALUES ('1569609701240446977', '1539429224550457346', '删除', NULL, NULL, NULL, NULL, 2, 'params:report:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-13 16:51:29', NULL, NULL, 0, 0, '1', 0, 'Delete'); --- 上报库 添加项目目标市场 2022-09-19 +-- 上报库 添加项目目标市场 2022-09-19已同步生产环境 ALTER TABLE `laws_weilai`.`params_report` ADD COLUMN `target_market` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '目标市场' AFTER `title`; --- 参数项清单 修改字段长度 2022-09-23 +-- 参数项清单 修改字段长度 2022-09-23已同步生产环境 ALTER TABLE `laws_weilai`.`params_info` MODIFY COLUMN `nio_number` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'nio编号' AFTER `sys_org_code`, MODIFY COLUMN `params_name` varchar(350) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `is_must`; @@ -1152,11 +1152,11 @@ ALTER TABLE `laws_weilai`.`report_cert_category_params_info` MODIFY COLUMN `params_name` varchar(350) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数名称' AFTER `params_number`, MODIFY COLUMN `nio_number` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'NIO编号' AFTER `description`; --- 虚拟清单表修改备注字段长度由300改为1000 2022-09-23 未同步生产环境 +-- 虚拟清单表修改备注字段长度由300改为1000 2022-09-23 已同步生产环境 ALTER TABLE `laws_weilai`.`dummy_inventory_info` MODIFY COLUMN `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `duty_territory`; --- 法规清单表修改备注字段长度由300改为1000 2022-09-23 未同步生产环境 +-- 法规清单表修改备注字段长度由300改为1000 2022-09-23 已同步生产环境 ALTER TABLE `laws_weilai`.`project_laws_inventory` MODIFY COLUMN `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `engineering_interface_person`; From 7e6a0bd3a13d185dd893846fbfe34bd13a686a56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 30 Sep 2022 21:26:05 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8A=A5=E5=91=8A-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9=E4=BA=BA=E5=91=98=E5=92=8C?= =?UTF-8?q?=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 9c37b784a..f8c534ad3 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1160,23 +1160,23 @@ MODIFY COLUMN `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_gener ALTER TABLE `laws_weilai`.`project_laws_inventory` MODIFY COLUMN `remark` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注' AFTER `engineering_interface_person`; --- 月报填写表 新增一级目录字段2022-09-25 未同步生产环境 +-- 月报填写表 新增一级目录字段2022-09-25 已同步生产环境 ALTER TABLE `laws_weilai`.`laws_monthly_report_write` ADD COLUMN `memories_chapter_one` varchar(255) NULL COMMENT '章节目录对应的一级标题' AFTER `source_en`; --- 法规意见收集-评估结果表 增加字段 条款内容 2022-09-27 未同步生产环境 +-- 法规意见收集-评估结果表 增加字段 条款内容 2022-09-27 已同步生产环境 ALTER TABLE `laws_weilai`.`laws_opinion_assessment_result` ADD COLUMN `clause_content` varchar(600) NULL COMMENT '条款内容' AFTER `acti_proc_inst_id`; --- 法规意见收集 增加字段 评估人id 2022-09-27 未同步生产环境 +-- 法规意见收集 增加字段 评估人id 2022-09-27 已同步生产环境 ALTER TABLE `laws_weilai`.`laws_opinion_gather` ADD COLUMN `evaluator_ids` varchar(4000) NULL COMMENT '评估人ids，多个之间使用英文逗号分隔' AFTER `opinion_archive_id`; --- 标签管理，文档拆分字段 处理查询 技术领域id:ccf68e6578a0a446a6ac34018f0a477d、信息类别id:09fa6530229280174071eae0514e0f63。 2022-09-27 未同步生产环境 +-- 标签管理，文档拆分字段 处理查询 技术领域id:ccf68e6578a0a446a6ac34018f0a477d、信息类别id:09fa6530229280174071eae0514e0f63。 2022-09-27 已同步生产环境 update onl_cgform_field set is_query = '1' where id = 'ccf68e6578a0a446a6ac34018f0a477d'; update onl_cgform_field set is_query = '1', is_read_only = '1' where id = '09fa6530229280174071eae0514e0f63'; --- 配置表，增加问题知识库预览图片配置 2022-09-27 未同步生产环境 +-- 配置表，增加问题知识库预览图片配置 2022-09-27 已同步生产环境 INSERT INTO `laws_weilai`.`sys_config` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `config`, `config_name`) VALUES ('4', 'admin', '2022-09-28 14:35:30', NULL, NULL, 'A01', 'http://grp.nioint.com/', 'domianWebImgURL'); From 65e64ba2586b7872500c36896f5be326a9567861 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 30 Sep 2022 21:38:19 +0800 Subject: [PATCH 6/6] =?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 --- .../src/components/PersonnelSelection/index.vue | 15 +++++++++++++-- jero-web/src/views/externalReports/index.vue | 4 ++-- .../processForm/handshakeProcess/index.vue | 1 - 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index 3586254e2..a3e26e2bc 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -322,12 +322,23 @@ content.push(res) } } else if (res.type == 'Depart') { + if (!this.selectDepartment) { + res.disabled = true + } content.push(res) } }) this.gData = this.toTree(content) } else { - this.gData = this.toTree(JSON.parse(gData)) + let content = JSON.parse(gData) + if (!this.selectDepartment) { + content.forEach(res => { + if (res.type == 'Depart') { + res.disabled = true + } + }) + } + this.gData = this.toTree(content) } } this.defaultCheckedKeys = this.userIds @@ -524,6 +535,6 @@ } .treeWrap { - height: 600px; + height: calc(100vh - 240px); } \ No newline at end of file diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue index 64f59d9b7..8fd7b0010 100644 --- a/jero-web/src/views/externalReports/index.vue +++ b/jero-web/src/views/externalReports/index.vue @@ -208,7 +208,7 @@ @@ -226,7 +226,7 @@