From 97f6c5d28e8f979dd82e14158b639e0cdcb366aa Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Fri, 9 Sep 2022 18:04:05 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=A4=E8=AF=81=20=E5=BA=95=E8=89=B2?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tableCollection/index.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index b2974fbfc..9aa4527cc 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -879,14 +879,14 @@ border: none !important; padding: 0 !important; } - ::v-deep .ant-table-row:first-child { - background: #fff!important; - /*opacity: 0.9;*/ - } - - ::v-deep .ant-table-body { - background: transparent!important; - } + //::v-deep .ant-table-row:first-child { + // background: #fff!important; + // /*opacity: 0.9;*/ + //} + // + //::v-deep .ant-table-body { + // background: transparent!important; + //} .content-text { width: 100%; display: flex; @@ -940,7 +940,7 @@ } .rowClassRed { - background: #f3d9de; + background: #f3d9de ; } .rowClassRedYellow { From 09f523dc3c8531b6fb801b2750be79382554c1ad Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 9 Sep 2022 18:04:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=A1=B9=E6=94=B6=E9=9B=86-=E5=89=8D=E7=AB=AF=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E6=9A=82=E5=AD=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/tableCollection/index.vue | 4 +-- .../ParameterItemCollectionList.vue | 35 +++++++++++-------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index b2974fbfc..ba87350bd 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -33,7 +33,7 @@ + v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "变更" || record.state == "To be collected" || record.state == "Rejected by eng. interface" || record.state == "Modify"'> {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue}} @@ -49,7 +49,7 @@ + v-if='record.state == "待发起收集" || record.state == "工程接口人退回" || record.state == "To be collected" || record.state == "Rejected by eng. interface"'> {{ (record.dataValue == null || record.dataValue == 'undefined')? '--': record.dataValue }} diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index aaef47f42..1eae46f47 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -739,6 +739,11 @@ this.$nextTick(()=>{ this.formInlineRoleSwitching.roleSwitchingCode = this.currentPersonRole this.$refs.ruleFormRoleSwitching.clearValidate() + setTimeout(() => { + if (this.currentPersonRole == 'dre') { + this.handlePreservation() + } + }, 10000) }) }, GetgetLoginUserType() { @@ -769,7 +774,7 @@ } else { this.selectedRowKeysValue.forEach((item, index) => { // 状态不符合，不能下发收集 - if (item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'Wait Collect' && item.state !== 'Sdt Back' && item.state !== 'Change') { + if (item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'To be collected' && item.state !== 'Rejected by eng. interface' && item.state !== 'Modify') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -796,7 +801,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '已提交' && item.state !== 'Submit') { + if (item.state !== '已提交' && item.state !== 'Submitted') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'homoTH' flag = 0 @@ -814,7 +819,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'Wait Sdt' && item.state !== 'Dre Back') { + if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'To be processed by eng. interface' && item.state !== 'Rejected by the applicant') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'sdtTH' flag = 0 @@ -832,7 +837,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'Wait Fill' && item.state !== 'Cert Back') { + if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled' && item.state !== 'Rejected by homo engineer') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'dreTH' flag = 0 @@ -894,7 +899,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'Wait Collect' && item.state !== 'Sdt Back' && item.state !== 'Change') { + if (item.state !== '待发起收集' && item.state !== '工程接口人退回' && item.state !== '变更' && item.state !== 'To be collected' && item.state !== 'Rejected by eng. interface' && item.state !== 'Modify') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -913,7 +918,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '已提交' && item.state !== '变更' && item.state !== 'Submit' && item.state !== 'Change') { + if (item.state !== '已提交' && item.state !== '变更' && item.state !== 'Submitted' && item.state !== 'Modify') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -932,7 +937,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待发起收集' && item.state !== 'Wait Collect') { + if (item.state !== '待发起收集' && item.state !== 'To be collected') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -953,7 +958,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'Wait Sdt' && item.state !== 'Dre Back') { + if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'To be processed by eng. interface' && item.state !== 'Rejected by the applicant') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'homoQZTH' flag = 0 @@ -972,7 +977,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待填写' && item.state !== 'Wait Fill') { + if (item.state !== '待填写' && item.state !== 'To be filled') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'sdtQZTH' flag = 0 @@ -990,7 +995,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '已提交' && item.state !== 'Submit') { + if (item.state !== '已提交' && item.state !== 'Submitted') { this.NotSelectedRowKeysValue.push(item) this.jurisdiction = 'dreQZTH' flag = 0 @@ -1011,7 +1016,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'Wait Sdt' && item.state !== 'Dre Back') { + if (item.state !== '待工程接口人处理' && item.state !== '填写人退回' && item.state !== 'To be processed by eng. interface' && item.state !== 'Rejected by the applicant') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -1030,7 +1035,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'Wait Fill' && item.state !== 'Cert Back') { + if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled' && item.state !== 'Rejected by homo engineer') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -1048,7 +1053,7 @@ this.$message.warning(this.$t('selectLeastOne')) } else { this.selectedRowKeysValue.forEach((item, index) => { - if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'Wait Fill' && item.state !== 'Cert Back') { + if (item.state !== '待填写' && item.state !== '认证工程师退回' && item.state !== 'To be filled' && item.state !== 'Rejected by homo engineer') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -1295,8 +1300,8 @@ let data = JSON.parse(JSON.stringify(this.$refs.CollectionTabel.dataSource)) let selectedRowKeysValue = [] data.forEach(res => { - if (res.state == 'Wait Fill' || res.state == '待填写' || res.state == '认证工程师退回' || - res.state == 'Cert Back') { + if (res.state == 'To be filled' || res.state == '待填写' || res.state == '认证工程师退回' || + res.state == 'Rejected by homo engineer') { selectedRowKeysValue.push(res) } }) From 894d6b0d9d314a86954ecf3cf599cfffe002d054 Mon Sep 17 00:00:00 2001 From: gaosong Date: Fri, 9 Sep 2022 20:26:59 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index c67f5a79d..c825ea6b8 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1044,7 +1044,7 @@ DROP INDEX `uniq_sys_user_work_no`; ALTER TABLE `laws_weilai_wkflow`.`bus_process_name` ADD COLUMN `PRC_NAME_EN` varchar(255) NULL COMMENT '流程名称（英文）' AFTER `PROJECT_LAWS_INVENTORY_ID`; --- 法规月报填写 新增字段 2022-08-25 未同步生产环境 +-- 法规月报填写 新增字段 2022-08-25 已同步生产环境 ALTER TABLE `laws_weilai`.`laws_monthly_report_write` ADD COLUMN `related_areas_cn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关领域中文' AFTER `export_state`, ADD COLUMN `related_areas_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关领域英文' AFTER `related_areas_cn`, @@ -1053,17 +1053,17 @@ ADD COLUMN `time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci ADD COLUMN `source_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源英文' AFTER `time`; --- 法规技术评估 条款项评估结果表增加字段。 2022-08-26 +-- 法规技术评估 条款项评估结果表增加字段。 2022-08-26 已同步生产环境 ALTER TABLE `laws_weilai`.`laws_technology_evaluation_item_result` ADD COLUMN `feedback_time` datetime NULL COMMENT '反馈时间' AFTER `laws_technology_evaluation_id`; --- 表字段 英文修改 2022-08-31 +-- 表字段 英文修改 2022-08-31已同步生产环境 UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Sort Number' WHERE `id` = '1529373706885799937'; --- 增加角色，countryCard管理员。 2022-08-31 +-- 增加角色，countryCard管理员。 2022-08-31已同步生产环境 INSERT INTO `laws_weilai`.`sys_role` (`id`, `role_name`, `role_code`, `description`, `create_by`, `create_time`, `update_by`, `update_time`, `parent_code`, `role_order`) VALUES ('1564916346120916993', 'countryCard管理员', 'countryCardManage', 'countryCard最大权限', 'admin', '2022-08-31 18:01:46', NULL, NULL, NULL, NULL); --- 清单确认，拒绝原因表 2022-09-01 +-- 清单确认，拒绝原因表 2022-09-01 已同步生产环境 CREATE TABLE `laws_weilai`.`project_laws_inventory_reject_cause` ( `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL , `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人' , @@ -1084,12 +1084,12 @@ COMMENT='清单确认-拒绝原因表' ROW_FORMAT=DYNAMIC ; --- 增加 中国台湾 国旗数据 2022-09-06 +-- 增加 中国台湾 国旗数据 2022-09-06已同步生产环境 INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `country_name_cn`, `country_name_en`, `national_flag_id`, `national_flag_url`) VALUES ('28', NULL, NULL, NULL, NULL, NULL, '中国台湾', 'Tai Wan China', NULL, '/jero-boot/nationalFlag/TaiWanChina.png'); --- 增加 中国台湾 数据字典数据 2022-09-06 +-- 增加 中国台湾 数据字典数据 2022-09-06已同步生产环境 INSERT INTO `laws_weilai`.`sys_dict_item` (`id`, `dict_id`, `item_text`, `item_value`, `description`, `sort_order`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `is_tag_dict`, `is_read_only`, `attribute_type`, `del_flag`, `en_name`) VALUES ('1567085557701386242', '1493782108399820801', '中国台湾', '96d49ba5797d4791906ce2baee87d4bc', '中国台湾', 1, 1, 'admin', '2022-09-06 17:41:27', 'admin', '2022-09-06 17:41:35', 1, NULL, NULL, '0', 'Tai Wan China'); --- 问题知识库-评论回复表。 2022-09-07 +-- 问题知识库-评论回复表。 2022-09-07已同步生产环境 CREATE TABLE `laws_weilai`.`problem_knowledge_base_reply` ( `id` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `create_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人', @@ -1102,7 +1102,7 @@ CREATE TABLE `laws_weilai`.`problem_knowledge_base_reply` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '问题知识库-评论回复表' ROW_FORMAT = Dynamic; --- 增加法规技术评估菜单权限数据 2022-09-08 +-- 增加法规技术评估菜单权限数据 2022-09-08已同步生产环境 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 ('1567712620460294145', '1546316593837740034', '法规技术评估-发起流程', NULL, NULL, NULL, NULL, 2, 'regulatoryAndTechnicalAssessment:initiationProcess', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-08 11:13:10', NULL, NULL, 0, 0, '1', 0, 'Regulatory and technical assessment - Initiation Process'); 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 ('1567712238313062402', '1546316593837740034', '法规技术评估-批量删除', NULL, NULL, NULL, NULL, 2, 'regulatoryAndTechnicalAssessment::batchDelete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-08 11:11:39', NULL, NULL, 0, 0, '1', 0, 'Regulatory and technical assessment - batch Delete'); 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 ('1567712001896923137', '1546316593837740034', '法规技术评估-删除', NULL, NULL, NULL, NULL, 2, 'regulatoryAndTechnicalAssessment:delete', '1', 1.00, 0, NULL, 1, 1, 0, 0, NULL, 'admin', '2022-09-08 11:10:43', 'admin', '2022-09-08 11:12:55', 0, 0, '1', 0, 'Regulatory and technical assessment - delete');