diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index defff7594..f8c534ad3 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,31 +1152,31 @@ 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`; --- 月报填写表 新增一级目录字段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'); 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 @@ {{prcTypeName[text]}} + + + {{record.serialNumber}} + + + {{record.prcNum}} + + + + + {{record.title}} + + + {{record.prcName}} + + {{$t('Processing')}}