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/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 { @@ -5837,6 +5841,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl - '{{$t('completed')}}' + '{{$t('completed')}}''{{$t('or')}}'{{$t('Filledreturn')}}''{{$t('or')}}'{{$t('ReturnedEngineer')}}' @@ -1285,7 +1285,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 } @@ -1774,15 +1774,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, 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'