From fa3a63a4f4d5708be66e5164a0096e6fd3da3b36 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 23 Sep 2022 11:33:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=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 --- .../components/RegulationMonthlyFill.vue | 23 ++++++++++++++++++- jero-web/vue.config.js | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue index 35a2c70b1..008c74166 100644 --- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue +++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyFill.vue @@ -74,6 +74,7 @@ :columns="columns" > + {{$t('copy')}} {{$t('view')}} {{$t('edit')}} {{$t('deleteLib')}} @@ -181,7 +182,7 @@ title: this.$t('operation'), align: 'center', fixed: 'right', - width: 180, + width: 190, scopedSlots: { customRender: 'operation' } } ] @@ -192,6 +193,26 @@ this.getList() }, methods: { + copyClick(row){ + let _this = this + this.$confirm({ + content: _this.$t('ConfirmReplication'), + onOk() { + let query = JSON.parse(JSON.stringify(row)) + delete query.id + delete query.exportState + delete query.exportStateName + postAction('/report/lawsMonthlyReportWriteEO/add', query).then((res) => { + if (res.success) { + _this.$message.success(_this.$t('OperationSuccessful')) + _this.getList() + } else { + _this.$message.warning(res.message) + } + }) + } + }) + }, dateChange(item) { this.queryParam[item.db_field_name] = this.queryParam[item.db_field_name] ? moment(this.queryParam[item.db_field_name]).format('YYYY-MM') : '' this.queryParam = { ...this.queryParam } diff --git a/jero-web/vue.config.js b/jero-web/vue.config.js index cc121368a..f8a8eae61 100644 --- a/jero-web/vue.config.js +++ b/jero-web/vue.config.js @@ -92,7 +92,7 @@ module.exports = { } }, */ '/jero-boot': { - target: 'http://localhost:8080', //请求本地 jero-boot后台项目 + target: 'http://10.0.1.14:8080', //请求本地 jero-boot后台项目 // target: 'http://10.10.10.46:8101', //请求本地 jero-boot后台项目 // target: 'http://10.0.1.25:8080', // target: 'http://10.0.1.5:8080', From aac1bd08d7cb6f9ae49cfa1e37461d41893a8697 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 23 Sep 2022 14:38:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=92=8C=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=AF=BC=E5=85=A5?= =?UTF-8?q?(=E5=A4=87=E6=B3=A8=E7=9A=84=E5=AD=97=E7=AC=A6=E9=99=90?= =?UTF-8?q?=E5=88=B6=E7=94=B1300=E6=94=B9=E4=B8=BA1000)=20SQL(=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E5=92=8C=E8=99=9A=E6=8B=9F=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E4=B8=AD=E5=A4=87=E6=B3=A8=E5=AD=97=E6=AE=B5=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E7=94=B1300=E6=94=B9=E4=B8=BA1000)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-boot/db/蔚来标准sql/dev_third_record.sql | 10 +++++++++- .../impl/DummyInventoryInfoEOServiceImpl.java | 6 +++--- .../ProjectLawsInventoryEOServiceImpl.java | 18 +++++++++--------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/jero-boot/db/蔚来标准sql/dev_third_record.sql b/jero-boot/db/蔚来标准sql/dev_third_record.sql index ccac487e7..6eed5e5d5 100644 --- a/jero-boot/db/蔚来标准sql/dev_third_record.sql +++ b/jero-boot/db/蔚来标准sql/dev_third_record.sql @@ -1114,4 +1114,12 @@ INSERT INTO `laws_weilai`.`sys_permission`(`id`, `parent_id`, `name`, `url`, `co -- 上报库 添加项目目标市场 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`; \ No newline at end of file + ADD COLUMN `target_market` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '目标市场' AFTER `title`; + +-- 虚拟清单表修改备注字段长度由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 未同步生产环境 +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`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 1f9ce36a1..0c95df461 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -1277,12 +1277,12 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl 300){ + if(remark.length() > 1000){ String message = ""; if(CutEnum.CN.getValue().equals(dummyInventoryInfoEOTemp.getCut())){ - message = errorMsg + "备注不能超过300个字符, "; + message = errorMsg + "备注不能超过1000个字符, "; }else{ - message = errorMsg + " Note The value cannot exceed 300 characters, "; + message = errorMsg + " Note The value cannot exceed 1000 characters, "; } msgList.add(message); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 58d92b7c3..798986f11 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -5199,12 +5199,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 300){ + if(remark.length() > 1000){ String message = ""; if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ - message = errorMsg + "备注不能超过300个字符, "; + message = errorMsg + "备注不能超过1000个字符, "; }else{ - message = errorMsg + " Note The value cannot exceed 300 characters, "; + message = errorMsg + " Note The value cannot exceed 1000 characters, "; } msgList.add(message); } @@ -5517,12 +5517,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 300){ + if(remark.length() > 1000){ String message = ""; if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ - message = errorMsg + "备注不能超过300个字符, "; + message = errorMsg + "备注不能超过1000个字符, "; }else{ - message = errorMsg + " Note The value cannot exceed 300 characters, "; + message = errorMsg + " Note The value cannot exceed 1000 characters, "; } msgList.add(message); } @@ -5824,12 +5824,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 300){ +// if(remark.length() > 1000){ // String message = ""; // if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ -// message = errorMsg + "备注不能超过300个字符, "; +// message = errorMsg + "备注不能超过1000个字符, "; // }else{ -// message = errorMsg + " Note The value cannot exceed 300 characters, "; +// message = errorMsg + " Note The value cannot exceed 1000 characters, "; // } // msgList.add(message); // }