From c3f89cb94f57514b2e96c19992cab42becbb4129 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 22 Aug 2022 11:57:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=AF=B7=E5=8D=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F=E7=BB=B4=E6=8A=A4=E8=BF=9B?= =?UTF-8?q?=E5=BA=A6=20=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 2 + jero-web/src/common/lang/zh-cn.js | 3 + .../components/ParameterLibraryAdd/index.vue | 5 +- .../projectManagement/components/TaskList.vue | 6 + .../components/batchModel.vue | 724 ++++++++++++++++++ 5 files changed, 738 insertions(+), 2 deletions(-) create mode 100644 jero-web/src/views/projectManagement/components/batchModel.vue diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 1ef1adf3f..fb80a5808 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1269,4 +1269,6 @@ module.exports = { source:'Source', sourceEn:'Source (English)', onlyone:'Only one merge delimiter can be entered', + BatchMaintenanceProgress:'Batch Maintenance Progress', + BatchChangeStatus:'Batch Change Status', } \ 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 c8118e520..f0fb7a901 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1371,4 +1371,7 @@ module.exports = { source: '来源', sourceEn: '来源(英文)', onlyone:'只能输入一个合并分隔符', + BatchMaintenanceProgress:'批量维护进度', + BatchChangeStatus:'批量修改状态', + } \ No newline at end of file diff --git a/jero-web/src/components/ParameterLibraryAdd/index.vue b/jero-web/src/components/ParameterLibraryAdd/index.vue index 537bd69ab..26bbbd538 100644 --- a/jero-web/src/components/ParameterLibraryAdd/index.vue +++ b/jero-web/src/components/ParameterLibraryAdd/index.vue @@ -42,7 +42,7 @@ - @@ -68,7 +68,8 @@ - --> +
+ {{$t('BatchMaintenanceProgress')}} +
+
+ {{$t('BatchChangeStatus')}} +
{{$t('CertificationDirectory')}} diff --git a/jero-web/src/views/projectManagement/components/batchModel.vue b/jero-web/src/views/projectManagement/components/batchModel.vue new file mode 100644 index 000000000..6b10ef02e --- /dev/null +++ b/jero-web/src/views/projectManagement/components/batchModel.vue @@ -0,0 +1,724 @@ + + + + + + \ No newline at end of file From b680701cf8055f4cdb5f53b1e1ca8a828082ce58 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Mon, 22 Aug 2022 11:59:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/batchChangeModel.vue | 724 ++++++++++++++++++ 1 file changed, 724 insertions(+) create mode 100644 jero-web/src/views/projectManagement/components/batchChangeModel.vue diff --git a/jero-web/src/views/projectManagement/components/batchChangeModel.vue b/jero-web/src/views/projectManagement/components/batchChangeModel.vue new file mode 100644 index 000000000..6b10ef02e --- /dev/null +++ b/jero-web/src/views/projectManagement/components/batchChangeModel.vue @@ -0,0 +1,724 @@ + + + + + + \ No newline at end of file From 7f17f41351482818661741b44d261f9482362f50 Mon Sep 17 00:00:00 2001 From: xiaowenyu Date: Mon, 22 Aug 2022 12:35:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql=E6=96=87=E4=BB=B6?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E6=B3=A8=E5=B7=B2=E5=90=8C=E6=AD=A5=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E7=8E=AF=E5=A2=83?= 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 e31b0a1fc..f52e1d14e 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -928,7 +928,7 @@ UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Responsible Fi UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Filled by' WHERE `id` = 'a371f6d49781c0921a48f317d1ba69b6'; UPDATE `laws_weilai`.`onl_cgform_field` SET `db_field_en_name` = 'Eng. Interface' WHERE `id` = '58c3d5a50c86be19d5ab0cd5ac4d6d8b'; --- 国家国旗表 增加旗帜 2022-08-16 +-- 国家国旗表 增加旗帜 2022-08-16 已同步生产环境 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 ('14', NULL, NULL, NULL, NULL, NULL, '海湾地区', 'GCC', NULL, '/jero-boot/nationalFlag/GCC.png'); 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 ('15', NULL, NULL, NULL, NULL, NULL, '巴西', 'Brazil', NULL, '/jero-boot/nationalFlag/Brazil.png'); 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 ('16', NULL, NULL, NULL, NULL, NULL, '德国', 'Germany', NULL, '/jero-boot/nationalFlag/Germany.png'); @@ -946,15 +946,15 @@ INSERT INTO `laws_weilai`.`country_national_flag` (`id`, `create_by`, `create_ti -- 删除之前的3中国香港 和8海湾地区 delete from country_national_flag where id in ('3','8'); --- 法规流程历史表增加字段 审批意见 2022-08-16 +-- 法规流程历史表增加字段 审批意见 2022-08-16 已同步生产环境 ALTER TABLE `laws_weilai`.`laws_process_history` ADD COLUMN `approval_opinion` varchar(2000) NULL COMMENT '审批意见' AFTER `flow_type`; ---- 用户表 删除工号唯一索引 2022-08-18 +--- 用户表 删除工号唯一索引 2022-08-18 已同步生产环境 ALTER TABLE `laws_weilai`.`sys_user` DROP INDEX `uniq_sys_user_work_no`; --- 工作流 流程表增加流程名称 英文字段 2022-08-19 +-- 工作流 流程表增加流程名称 英文字段 2022-08-19 已同步生产环境 ALTER TABLE `laws_weilai_wkflow`.`bus_process_name` ADD COLUMN `PRC_NAME_EN` varchar(255) NULL COMMENT '流程名称（英文）' AFTER `PROJECT_LAWS_INVENTORY_ID`;