From 804f26b9044385b6ae53f2b4d68ad68434c5d80d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Mon, 5 Sep 2022 09:54:07 +0800 Subject: [PATCH 01/18] =?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 --- jero-web/src/views/documentManage/splitting/index.vue | 10 ++++++++-- .../documentManage/splitting/modules/ImportResult.vue | 6 +++--- .../documentManage/splitting/modules/SplitText.vue | 11 +++++------ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/jero-web/src/views/documentManage/splitting/index.vue b/jero-web/src/views/documentManage/splitting/index.vue index 6ca1cbee4..938451ce0 100644 --- a/jero-web/src/views/documentManage/splitting/index.vue +++ b/jero-web/src/views/documentManage/splitting/index.vue @@ -244,11 +244,17 @@ }) }, - sVisible(val) { + sVisible(val,num) { this.splitVisible = false + if (num == 1){ + eventBUs.$emit('searchGetData') + } }, - iVisible(val) { + iVisible(val,num) { this.importsVisible = val + if (num == 1){ + eventBUs.$emit('searchGetData') + } }, //查询 searchQuery() { diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue index c6dda8495..101bdb159 100644 --- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue +++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue @@ -43,6 +43,7 @@ @click="cancleImports">{{$t('cancel')}} {{$t('submit')}} @@ -57,7 +58,7 @@
- {{$t('Submitting')}} + @@ -290,10 +291,9 @@ }).then(res => { if (res.data.success) { this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchGetData') this.visible = false this.loading = false - this.$emit('visible', false) + this.$emit('visible', false,1) } else { this.loading = false // this.$message.warning(res.data.message) diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue index b5108ebad..92249066a 100644 --- a/jero-web/src/views/documentManage/splitting/modules/SplitText.vue +++ b/jero-web/src/views/documentManage/splitting/modules/SplitText.vue @@ -68,12 +68,12 @@ {{$t('cancel')}} - {{$t('submit')}} - {{$t('Submitting')}} + @@ -244,10 +244,9 @@ postAction(`split/sarFileSplitInfo/add`, params).then(res => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchGetData') this.visible = false this.loading = false - this.$emit('visible', false) + this.$emit('visible', false,1) } else { this.loading = false this.$message.warning(res.message) @@ -281,10 +280,10 @@ postAction(`split/sarFileSplitInfo/add`, params).then(res => { if (res.success) { this.$message.success(this.$t('OperationSuccessful')) - eventBUs.$emit('searchGetData') + // eventBUs.$emit('searchGetData') this.visible = false this.loading = false - this.$emit('visible', false) + this.$emit('visible', false,1) } else { this.loading = false this.$message.warning(res.message) From 1ab9ee7d2d678d482cc12e910f4c99dfd6963557 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Mon, 5 Sep 2022 10:23:28 +0800 Subject: [PATCH 02/18] =?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 --- .../processForm/handshakeProcess/index.vue | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index db3de9707..ec731f550 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -183,19 +183,34 @@ } }) }, + 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.join(','), + rejectType:'0', + } + postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => { + + }) + }, completeTask(value, handlingTime) { let json = Object.assign(this.queryBy, { handlingTime: handlingTime }, value) - let data = JSON.stringify(json).replace(/\"/g, '\'') - Object.keys(data).forEach(res => { - if (data[res] && typeof data[res] == 'string') { - data[res] = data[res].replace(/\"/g, '“') - data[res] = data[res].replace(/\'/g, '‘') + // if (json.flag == '1'){ + // this.rejectCauseAdd(value.approvalOpinion,this.queryBy.id) + // } + Object.keys(json).forEach(res => { + if (json[res] && typeof json[res] == 'string') { + json[res] = json[res].replace(/\"/g, '“') + json[res] = json[res].replace(/\'/g, '‘') } }) let query = { userid: this.userInfo().id, taskId: this.$route.query.taskId || this.$route.query.taskIds, - json: data + json: JSON.stringify(json).replace(/\"/g, '\'') } postAction('/workFlow/completeTask', query).then((res) => { if (res.success) { From b062aeb75116e163f15bb4a9f3abff8b5187aa9d Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 5 Sep 2022 11:22:20 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A8=A1=E6=9D=BF,=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=A1=AB=E5=86=99--=E5=BB=BA=E8=A1=A8SQL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index a5292221a..516796223 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -94,6 +94,58 @@ ALTER TABLE `laws_weilai`.`params_report` PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +-- 法规月报标题模板(生成环境未同步) +CREATE TABLE `laws_monthly_report_title_template` ( + `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 '创建人', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `parent_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '父id', + `title_cn` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '中文标题', + `title_en` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '英文标题', + `sort` int(10) NULL DEFAULT NULL COMMENT '排序', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- 法规月报填写(生成环境未同步) +CREATE TABLE `laws_monthly_report_write` ( + `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 '创建人', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `month` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '月份', + `memories_chapter` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '章节目录', + `content_template` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '内容模板', + `title_cn` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '中文标题', + `title_en` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '英文标题', + `technology_territory` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关领域', + `apply_car` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '适用车型', + `apply_scope` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '适用范围', + `state` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '状态', + `use_method` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用法', + `implement_car` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实施车型', + `issue_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布日期', + `new_car_implement_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '新车型实施日期', + `production_car_implement_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '在产车实施日期', + `content_cn` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '主要内容中文', + `content_en` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '主要内容英文', + `work_progress_cn` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'NIO工作进展中文', + `work_progress_en` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT 'NIO工作进展英文', + `laws_contact` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '法规联系人', + `link` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '链接', + `export_state` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '导出状态', + `related_areas_cn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关领域中文', + `related_areas_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '相关领域英文', + `source_cn` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源中文', + `time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期', + `source_en` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '来源英文', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + -- 参数清单表 修改字段长度 ALTER TABLE `laws_weilai`.`params_manifest` MODIFY COLUMN `title` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题' AFTER `sys_org_code`; From c595afddf68da8a764ac4510cb2291be3b891855 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 5 Sep 2022 14:04:16 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E6=96=B0=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E8=A1=A8sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 516796223..5a528b8e5 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -146,6 +146,22 @@ CREATE TABLE `laws_monthly_report_write` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +-- 法规月报新征求意见模板表(生成环境未同步) +CREATE TABLE `new_opinion_template` ( + `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 '创建人', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `laws_monthly_report_write_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '月报填写表id', + `plan_number_cn` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '计划号中文', + `standard_name_cn` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准名称中文', + `standard_name_en` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准名称英文', + `expiration_date` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '征求意见截止日期', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + -- 参数清单表 修改字段长度 ALTER TABLE `laws_weilai`.`params_manifest` MODIFY COLUMN `title` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题' AFTER `sys_org_code`; From 812fb421490fb444b7a449d651d7d40939601a43 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 5 Sep 2022 14:19:33 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5?= =?UTF-8?q?=E6=96=B0=E5=8F=91=E5=B8=83=E6=A0=87=E5=87=86=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E8=A1=A8sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index 5a528b8e5..295717364 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -162,6 +162,23 @@ CREATE TABLE `new_opinion_template` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +-- 法规月报新发布标准模板表(生成环境未同步) +CREATE TABLE `new_standard_template` ( + `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 '创建人', + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime(0) NULL DEFAULT NULL COMMENT '更新日期', + `sys_org_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属部门', + `laws_monthly_report_write_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '月报填写表id', + `standard_number` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准编号', + `standard_name_cn` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准名称中文', + `standard_name_en` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标准名称英文', + `issue_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布日期', + `implement_time` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实施日期', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + -- 参数清单表 修改字段长度 ALTER TABLE `laws_weilai`.`params_manifest` MODIFY COLUMN `title` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题' AFTER `sys_org_code`; From 14ab36a5ed6ff23dafcb9850eaf45dee5714b454 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 5 Sep 2022 14:28:53 +0800 Subject: [PATCH 06/18] =?UTF-8?q?SQL=E5=90=8C=E6=AD=A5=E7=8A=B6=E6=80=81?= 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 295717364..69fe0390a 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -79,7 +79,7 @@ ALTER TABLE `laws_weilai`.`params_report_config_data` ALTER TABLE `laws_weilai`.`params_report` ADD COLUMN `params_template_publish_version` int(11) NULL DEFAULT NULL COMMENT '对应参数模板发布版本' AFTER `old_params_manifest_id`; --- 法规月报管理表 +-- 法规月报管理表(生成环境已同步) CREATE TABLE `laws_monthly_report_manage` ( `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 '创建人', @@ -94,7 +94,7 @@ ALTER TABLE `laws_weilai`.`params_report` PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; --- 法规月报标题模板(生成环境未同步) +-- 法规月报标题模板(生成环境已同步) CREATE TABLE `laws_monthly_report_title_template` ( `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 '创建人', @@ -109,7 +109,7 @@ CREATE TABLE `laws_monthly_report_title_template` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; --- 法规月报填写(生成环境未同步) +-- 法规月报填写(生成环境已同步) CREATE TABLE `laws_monthly_report_write` ( `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 '创建人', @@ -146,7 +146,7 @@ CREATE TABLE `laws_monthly_report_write` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; --- 法规月报新征求意见模板表(生成环境未同步) +-- 法规月报新征求意见模板表(生成环境已同步) CREATE TABLE `new_opinion_template` ( `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 '创建人', @@ -162,7 +162,7 @@ CREATE TABLE `new_opinion_template` ( PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; --- 法规月报新发布标准模板表(生成环境未同步) +-- 法规月报新发布标准模板表(生成环境已同步) CREATE TABLE `new_standard_template` ( `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 '创建人', From aa04cf9cec6057e88e0e502807865c1e72592ab6 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 5 Sep 2022 16:31:09 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/entity/LawsMonthlyReportTitleTemplateEO.java | 3 +++ .../impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java index 7b9888886..4a66c3f86 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/entity/LawsMonthlyReportTitleTemplateEO.java @@ -81,4 +81,7 @@ public class LawsMonthlyReportTitleTemplateEO implements Serializable { //排序 private int sort; + + @TableField(exist = false) + private String key; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java index 20950cba4..8852e0412 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportTitleTemplateEOServiceImpl.java @@ -220,6 +220,10 @@ public class LawsMonthlyReportTitleTemplateEOServiceImpl extends ServiceImpl getPageInfo(LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEOTemp, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsMonthlyReportTitleTemplateEOTemp, req.getParameterMap()); List lawsMonthlyReportTitleTemplateEOS = this.list(queryWrapper); + for (LawsMonthlyReportTitleTemplateEO lawsMonthlyReportTitleTemplateEO : lawsMonthlyReportTitleTemplateEOS) { + //前端需要的特殊数据格式 + lawsMonthlyReportTitleTemplateEO.setKey(lawsMonthlyReportTitleTemplateEO.getId()); + } List parentList = lawsMonthlyReportTitleTemplateEOS.stream() .filter(e -> StringUtils.isBlank(e.getParentId())).collect(Collectors.toList()); Collections.sort(parentList, new Comparator() { From 0fb59689e973d21b58ac7a9b9f49524861955245 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Mon, 5 Sep 2022 18:04:06 +0800 Subject: [PATCH 08/18] =?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 --- .../components/virtualListDetails.vue | 54 +++++++++++ .../processForm/processDetails/index.vue | 2 +- .../components/listOfRegulations.vue | 91 +++++++++++++++++-- 3 files changed, 138 insertions(+), 9 deletions(-) diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue index 31e0b904d..e647e1e68 100644 --- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue +++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue @@ -725,6 +725,29 @@ getAction(this.url.list, query).then((res) => { if (res.success) { this.dataSource = res.result || [] + if (this.dataSource.length == 0) { + this.$nextTick(() => { + let anttablebody = document.getElementsByClassName('ant-table-body') + let antfixedLeft = document.querySelectorAll('.ant-table-fixed-left .ant-table-body-inner') + let antfixedRight = document.querySelectorAll('.ant-table-fixed-right .ant-table-body-inner') + anttablebody[0].classList.add('ant-table-body-one') + antfixedLeft[0].classList.add('antfixedLeft') + antfixedRight[0].classList.add('antfixedRight') + }) + } else { + let anttablebody = document.getElementsByClassName('ant-table-body-one') + let antfixedLeft = document.getElementsByClassName('antfixedLeft') + let antfixedRight = document.getElementsByClassName('antfixedRight') + if (anttablebody && anttablebody.length > 0) { + anttablebody[0].classList.remove('ant-table-body-one') + } + if (antfixedLeft && antfixedLeft.length > 0) { + antfixedLeft[0].classList.remove('antfixedLeft') + } + if (antfixedRight && antfixedRight.length > 0) { + antfixedRight[0].classList.remove('antfixedRight') + } + } this.loading = false } else { this.loading = false @@ -1030,6 +1053,37 @@ ::v-deep .ant-table-body { background: transparent!important; } + + ::v-deep .ant-table-fixed-header .ant-table-body-inner { + overflow: visible; + } + + ::v-deep .ant-table-body { + padding-bottom: 7px; + } + + ::v-deep .ant-table-body-inner { + padding-bottom: 16px; + } + + ::v-deep .ant-table-scroll .ant-table-header::-webkit-scrollbar { + /*height: 0;*/ + width: 0; + } + + ::v-deep .ant-table-body-one { + padding-bottom: 0!important; + } + + ::v-deep .antfixedLeft { + padding-bottom: 0!important; + overflow: scroll!important; + } + + ::v-deep .antfixedRight { + padding-bottom: 0!important; + overflow: scroll!important; + } \ No newline at end of file diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue index 50ee8e69f..5c8328c34 100644 --- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue +++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue @@ -18,6 +18,7 @@