From 12adb40a616f31a8b5d786ee6ffb6762a85215fa Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 20 Feb 2023 13:46:57 +0800 Subject: [PATCH 1/5] =?UTF-8?q?uat=E6=B8=85=E5=8D=95-49-=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E7=9A=84=E7=BB=9F=E8=AE=A1=E5=BA=94=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=BA=E5=BE=85=E5=BC=80=E5=A7=8B=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_2nd_period.sql | 9 +++++++++ .../service/impl/ProjectLawsInventoryEOServiceImpl.java | 5 +++++ .../service/impl/ProjectTaskInventoryEOServiceImpl.java | 1 + 3 files changed, 15 insertions(+) diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 2c10b0303..4faf12f61 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -201,3 +201,12 @@ ADD COLUMN `msg_content_info_cn` text NULL COMMENT '消息内容（中文）' AF -- 上报库-参数项查看页表头 责任领域更新为展示列表sql 2023-02-17 未同步生产环境 UPDATE `laws_weilai`.`onl_cgform_field` SET `is_show_list` = 1 WHERE `id` = 'c31d68e204960c073b1fb8126a443492'; + +-- 任务清单-初始化 认证进度状态sql 2023-02-20 未同步生产环境 +UPDATE `laws_weilai`.`project_task_inventory` +SET `certification_progress` = 'Not start' +WHERE + `id` IN ( select temp.temp_id from ( + SELECT id as temp_id FROM `laws_weilai`.`project_task_inventory` WHERE certification_progress IS NULL + ) temp + ); 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 4dfb665ff..2a9e6a82e 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 @@ -348,6 +348,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl { @@ -5837,6 +5841,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Mon, 20 Feb 2023 14:58:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?uat-58=E3=80=8161=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterItemCollectionList.vue | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index d0789a960..d27179eb0 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -463,7 +463,7 @@ - '{{$t('completed')}}' + '{{$t('completed')}}''{{$t('or')}}'{{$t('Filledreturn')}}''{{$t('or')}}'{{$t('ReturnedEngineer')}}' @@ -1200,7 +1200,7 @@ } else { this.selectedRowKeysValue.forEach((item, index) => { console.log(item.state) - if (item.state !== '待填写' && item.state !== 'To be filled') { + if (item.state !== '待填写' && item.state !== 'To be filled' && item.state !== '填写人退回' && item.state !== 'Rejected by the applicant' && item.state !== '认证工程师退回' && item.state !== 'Rejected by homo engineer') { this.NotSelectedRowKeysValue.push(item) flag = 0 } @@ -1665,15 +1665,20 @@ this.returnData() } else if (homoJurisdictionReturn == 0) { this.visibleoperationFailed = true + this.returnData() } }, // 退回 returnData() { // todo 退回没有选择数据 let _array = [] + this.selectedRowKeysValue = this.selectedRowKeysValue.filter(item => item.state == '已提交' || item.state == 'Submitted') this.selectedRowKeysValue.forEach((item, index) => { _array.push(item.id) }) + if(_array.length == 0){ + return + } let _this = this let param = { ids: _array.join(','), currentPersonRole: this.currentPersonRole, From 2328ef18ecee404416f0186b122a3517dc227339 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Mon, 20 Feb 2023 15:28:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?uat-68-=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6excel=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dummy/service/impl/DummyInventoryInfoEOServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 be56b93b6..4ce6816a3 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 @@ -2310,9 +2310,9 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl Date: Mon, 20 Feb 2023 17:45:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?uat-83-=E6=B6=88=E6=81=AF=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=A1=A8=E5=8D=95=E4=B8=AD=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=97=A0=E5=B8=82=E5=9C=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectLibraryBaseServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index d456e24ec..4e2cfb5af 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -747,7 +747,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl Date: Wed, 22 Feb 2023 10:13:49 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=A4=B4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/listOfRegulations.vue | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index cb43f661f..fa45597e2 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1950,14 +1950,10 @@ export default { this.columnsAll = this.column } this.columnsAll.forEach((item, index) => { - if (item.title != '设计符合性确认' && item.title != 'Pre-Homo确认' && item.title != '验证符合性确认') { + if (item.title != '设计符合性确认' && item.title != 'Pre-Homo确认' && item.title != '验证符合性确认' && item.title != '操作') { item.width = 180 item.align = 'left' - if (item.title == '操作') { - item.scopedSlots = { - customRender: 'operationOne' - } - } else if (item.title == '编号') { + if (item.title == '编号') { item.sorter = true item.scopedSlots = { customRender: 'standard'