From 4c0d8d6dd287bf1d7ad730a23b31220562c636e7 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 14 Oct 2022 10:31:44 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89nio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 12 ++++++------ jero-web/src/common/lang/zh-cn.js | 16 ++++++++-------- jero-web/src/components/tools/Logo.vue | 10 +++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 93cd90b7e..6cd960033 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -632,7 +632,7 @@ module.exports = { TaskRequirements: 'Task Requirements', CertificationProgress: 'Homologation Progress', CurrentProjectStatusEvaluation: 'Current State', - NiONumber: 'NIO Number', + NiONumber: 'Number',//NIO Number ParameterName: 'Parameter Name', ParameterDescription: 'Parameter Description', Version: 'Version', @@ -730,7 +730,7 @@ module.exports = { // 认证 // 认证状态 timeOperation: 'You have permission to operate this button.', - NiOnumberis: 'NiO number is', + NiOnumberis: 'Number is',//NiO number is NoOperationPermissionForthisbutton: 'No Operation permission for this button', Attentionfreeze: 'Note: Note: The item can no longer be configured after its frozen. ', Filledperson: 'The project contact person has not been filled in. Please fill in the project contact person before issuing and collecting.', @@ -799,7 +799,7 @@ module.exports = { templateName: 'Template Name', pleaseSelectData: 'Please Select Data', templateCopy: 'Template Copy', - NiOnumberalreadyexists: 'NiO number already exists, please replace NiO number', + NiOnumberalreadyexists: 'Number already exists, please replace number',//NiO number already exists, please replace NiO number attachmentTemplate: 'Attachment Template', controlAlternatives: 'Control Component', controlVerification: 'Validate Component', @@ -1016,8 +1016,8 @@ module.exports = { implementationModel: 'Implementation Model', primaryCoverageCn: 'Description (Cn)', primaryCoverageEn: 'Description (En)', - workProgressCn: 'NIO Work Progress (Cn)', - workProgressEn: 'NIO Work Progress (En)', + workProgressCn: 'Work Progress (Cn)',//NIO Work Progress (Cn) + workProgressEn: 'Work Progress (En)',//NIO Work Progress (En) initiatingProcess: 'Initiate Process', collectResults: 'Collect Results', dateOfInitiation: 'Date Of Initiation', @@ -1054,7 +1054,7 @@ module.exports = { Aftersynchronization: 'After synchronization, the parameter items cannot be modified.', FNumber: 'Number', NNNiONumber: 'Number', - NNiONumber: 'NIO Number', + NNiONumber: 'Number',//NIO Number ParameterNo: 'Number', NRequired: 'Required', NParameterName: 'Para Name', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index e76df82f0..48e6dd292 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -642,7 +642,7 @@ module.exports = { TaskRequirements: '任务要求', CertificationProgress: '认证进度', CurrentProjectStatusEvaluation: '当前项目状态评估', - NiONumber: 'NIO编号', + NiONumber: '编号',//NIO编号 ParameterName: '参数名称', ParameterDescription: '参数说明', Version: '版本', @@ -746,7 +746,7 @@ module.exports = { // 认证 // 认证状态 timeoperation: '时，才有权限操作此按钮。', - NiOnumberis: 'NIO编号为', + NiOnumberis: '编号为',//NIO编号为 NoOperationPermissionForthisbutton: '没有此按钮的操作权限', Attentionfreeze: '注：冻结后该冻结配置内容不可进行编辑。', Filledperson: '工程接口人没有填写,请填写完工程接口人再进行下发收集。', @@ -815,7 +815,7 @@ module.exports = { templateName: '模板名称', pleaseSelectData: '请选择数据', templateCopy: '模板复制', - NiOnumberalreadyexists: 'NIO编号已存在,请更换NIO编号', + NiOnumberalreadyexists: '编号已存在,请更换编号',//NIO编号已存在,请更换NIO编号 attachmentTemplate: '附件模板', controlAlternatives: '控件备选值', controlVerification: '控件校验', @@ -1026,8 +1026,8 @@ module.exports = { implementationModel: '实施车型', primaryCoverageCn: '主要内容(中文)', primaryCoverageEn: '主要内容(英文)', - workProgressCn: 'NIO工作进展(中文)', - workProgressEn: 'NIO工作进展(英文)', + workProgressCn: '工作进展(中文)',//NIO工作进展(中文) + workProgressEn: '工作进展(英文)',//NIO工作进展(英文) initiatingProcess: '发起流程', collectResults: '收集结果', dateOfInitiation: '发起日期', @@ -1064,8 +1064,8 @@ module.exports = { Synchronizedatabase: '是否同步选中行数据至上报库?', Aftersynchronization: '同步后的参数项将不可修改', FNumber: '账号', - NNNiONumber: 'NIO编号', - NNiONumber: 'NIO编号', + NNNiONumber: '编号',//NIO编号 + NNiONumber: '编号',//NIO编号 ParameterNo: '编号', NRequired: '是否必填', NParameterName: '参数名称', @@ -1101,7 +1101,7 @@ module.exports = { NFourDecimalplaces: '四位小数', Copyparameterlist: '复制参数清单', Templatenamelist: '模板名称-参数项收集清单', - newNiONumber: 'NIO编号', + newNiONumber: '编号',//NIO编号 English: '英文', requiredParametersEmpty: '必填参数不能为空', theResponsiblePersonAndDeadlineClank: '的责任人、截止时间不能为空', diff --git a/jero-web/src/components/tools/Logo.vue b/jero-web/src/components/tools/Logo.vue index 42ec433a4..00c56fbec 100644 --- a/jero-web/src/components/tools/Logo.vue +++ b/jero-web/src/components/tools/Logo.vue @@ -1,13 +1,13 @@ From f1c3c67dd3de396adb61d0749e2f2f25f72e4f82 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 14 Oct 2022 15:39:57 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E3=80=81nio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 12 ++++++------ jero-web/src/common/lang/zh-cn.js | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 6cd960033..ca606c0c3 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -632,7 +632,7 @@ module.exports = { TaskRequirements: 'Task Requirements', CertificationProgress: 'Homologation Progress', CurrentProjectStatusEvaluation: 'Current State', - NiONumber: 'Number',//NIO Number + NiONumber: 'Parameter Number',//NIO Number ParameterName: 'Parameter Name', ParameterDescription: 'Parameter Description', Version: 'Version', @@ -730,7 +730,7 @@ module.exports = { // 认证 // 认证状态 timeOperation: 'You have permission to operate this button.', - NiOnumberis: 'Number is',//NiO number is + NiOnumberis: 'Parameter Number is',//NiO number is NoOperationPermissionForthisbutton: 'No Operation permission for this button', Attentionfreeze: 'Note: Note: The item can no longer be configured after its frozen. ', Filledperson: 'The project contact person has not been filled in. Please fill in the project contact person before issuing and collecting.', @@ -799,7 +799,7 @@ module.exports = { templateName: 'Template Name', pleaseSelectData: 'Please Select Data', templateCopy: 'Template Copy', - NiOnumberalreadyexists: 'Number already exists, please replace number',//NiO number already exists, please replace NiO number + NiOnumberalreadyexists: 'Parameter Number already exists, please replace parameter number',//NiO number already exists, please replace NiO number attachmentTemplate: 'Attachment Template', controlAlternatives: 'Control Component', controlVerification: 'Validate Component', @@ -1053,8 +1053,8 @@ module.exports = { Synchronizedatabase: 'Synchronize the data of the selected row to the database?', Aftersynchronization: 'After synchronization, the parameter items cannot be modified.', FNumber: 'Number', - NNNiONumber: 'Number', - NNiONumber: 'Number',//NIO Number + NNNiONumber: 'Parameter Number', + NNiONumber: 'Parameter Number',//NIO Number ParameterNo: 'Number', NRequired: 'Required', NParameterName: 'Para Name', @@ -1091,7 +1091,7 @@ module.exports = { yes: 'Yes', Copyparameterlist: 'Copy Parameter List', Templatenamelist: 'Template name - parameter item collection list', - newNiONumber: 'Number', + newNiONumber: 'Parameter Number', English: 'English', requiredParametersEmpty: 'Required parameters cannot be empty', PleaseTaskConfirmationRejected: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 48e6dd292..14815100c 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -642,7 +642,7 @@ module.exports = { TaskRequirements: '任务要求', CertificationProgress: '认证进度', CurrentProjectStatusEvaluation: '当前项目状态评估', - NiONumber: '编号',//NIO编号 + NiONumber: '参数编号',//NIO编号 ParameterName: '参数名称', ParameterDescription: '参数说明', Version: '版本', @@ -746,7 +746,7 @@ module.exports = { // 认证 // 认证状态 timeoperation: '时，才有权限操作此按钮。', - NiOnumberis: '编号为',//NIO编号为 + NiOnumberis: '参数编号为',//NIO编号为 NoOperationPermissionForthisbutton: '没有此按钮的操作权限', Attentionfreeze: '注：冻结后该冻结配置内容不可进行编辑。', Filledperson: '工程接口人没有填写,请填写完工程接口人再进行下发收集。', @@ -815,7 +815,7 @@ module.exports = { templateName: '模板名称', pleaseSelectData: '请选择数据', templateCopy: '模板复制', - NiOnumberalreadyexists: '编号已存在,请更换编号',//NIO编号已存在,请更换NIO编号 + NiOnumberalreadyexists: '参数编号已存在,请更换参数编号',//NIO编号已存在,请更换NIO编号 attachmentTemplate: '附件模板', controlAlternatives: '控件备选值', controlVerification: '控件校验', @@ -1064,8 +1064,8 @@ module.exports = { Synchronizedatabase: '是否同步选中行数据至上报库?', Aftersynchronization: '同步后的参数项将不可修改', FNumber: '账号', - NNNiONumber: '编号',//NIO编号 - NNiONumber: '编号',//NIO编号 + NNNiONumber: '参数编号',//NIO编号 + NNiONumber: '参数编号',//NIO编号 ParameterNo: '编号', NRequired: '是否必填', NParameterName: '参数名称', @@ -1101,7 +1101,7 @@ module.exports = { NFourDecimalplaces: '四位小数', Copyparameterlist: '复制参数清单', Templatenamelist: '模板名称-参数项收集清单', - newNiONumber: '编号',//NIO编号 + newNiONumber: '参数编号',//NIO编号 English: '英文', requiredParametersEmpty: '必填参数不能为空', theResponsiblePersonAndDeadlineClank: '的责任人、截止时间不能为空', From a0caadfe7737e5e2606089292552ec4ce6247d11 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 14 Oct 2022 16:03:49 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8E=BB=E6=8E=89nio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/CertCategoryParamsInfoEO.java | 2 +- .../cert/template/entity/ParamsInfoEO.java | 2 +- .../service/impl/ParamsInfoEOServiceImpl.java | 62 +++++++++---------- .../vo/CertCategoryParamsInfoCnImport.java | 2 +- .../vo/CertCategoryParamsInfoEnExport.java | 2 +- .../vo/CertCategoryParamsInfoEnImport.java | 2 +- .../cert/template/vo/ParamsInfoCnImport.java | 2 +- .../cert/template/vo/ParamsInfoEnExport.java | 2 +- .../cert/template/vo/ParamsInfoEnImport.java | 2 +- 9 files changed, 39 insertions(+), 39 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java index 4f4b9b081..3bc88251f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/CertCategoryParamsInfoEO.java @@ -75,7 +75,7 @@ public class CertCategoryParamsInfoEO implements Serializable { private String description; /**nio编号*/ - @Excel(name = "*NIO编号", width = 15, orderNum = "1") + @Excel(name = "*参数编号", width = 15, orderNum = "1") @ApiModelProperty(value = "nio编号") private String nioNumber; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java index 1df1f9a2e..d28b0bc1b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/entity/ParamsInfoEO.java @@ -62,7 +62,7 @@ public class ParamsInfoEO implements Serializable { private String sysOrgCode; /**nio编号*/ - @Excel(name = "*NIO编号", width = 15) + @Excel(name = "*参数编号", width = 15) @ApiModelProperty(value = "nio编号") private String nioNumber; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java index 90c23b1e2..40ff65cb0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/template/service/impl/ParamsInfoEOServiceImpl.java @@ -102,9 +102,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEOList = list(queryWrapper); if (CollectionUtil.isNotEmpty(paramsInfoEOList)) { if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { - throw new JeroBootException("NIO编号已存在！"); + throw new JeroBootException("参数编号已存在！"); } else { - throw new JeroBootException("NIO number already exists!"); + throw new JeroBootException("Parameter number already exists!"); } } @@ -180,9 +180,9 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEOList = list(queryWrapper); if (CollectionUtil.isNotEmpty(paramsInfoEOList)) { if (CutEnum.CN.getValue().equals(paramsInfoEO.getCut())) { - throw new JeroBootException("NIO编号已存在！"); + throw new JeroBootException("参数编号已存在！"); } else { - throw new JeroBootException("NIO number already exists!"); + throw new JeroBootException("Parameter number already exists!"); } } } @@ -449,16 +449,16 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl paramsInfoEOListEn = resultEn.getList(); copyParamsInfoList(paramsInfoEOListEn, paramsInfoEOList); } else { - String fields[] ={ "*NIO编号", "*是否必填", "*参数名称","*参数批次","*责任领域", + String fields[] ={ "*参数编号", "*是否必填", "*参数名称","*参数批次","*责任领域", "参数说明", "*控件类型", "控件校验", "控件备选值", "默认值", "附件模板"}; params.setImportFields(fields); @@ -950,14 +950,14 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl list = new ArrayList<>(); if (CutEnum.EN.getValue().equals(cut)) { - String fields[] ={ "*NIO Number", "*Number", "*Para Name","Description"}; + String fields[] ={ "*Parameter Number", "*Number", "*Para Name","Description"}; params.setImportFields(fields); ExcelImportResult resultEn = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoEnImport.class, params); List listEn = resultEn.getList(); copycertCategoryParamsInfoList(listEn, list); } else { - String fields[] ={ "*NIO编号", "*编号", "*参数名称","参数说明"}; + String fields[] ={ "*参数编号", "*编号", "*参数名称","参数说明"}; params.setImportFields(fields); ExcelImportResult result = ExcelImportUtil.importExcelMore(excelfile, CertCategoryParamsInfoCnImport.class, params); @@ -1225,7 +1225,7 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl resultMap = new HashMap<>(); // nio编号 String nioNumber = dto.getNioNumber(); - resultMap = validateMustAndLength(nioNumber, "NIO编号", "NIO Number", IsMustEnum.YES.getValue(),"20", false, cut); + resultMap = validateMustAndLength(nioNumber, "参数编号", "Parameter Number", IsMustEnum.YES.getValue(),"20", false, cut); errorMsg += (String)resultMap.get("errorMsg"); countError += (int)resultMap.get("countError"); if (StringUtils.isNotEmpty(dto.getNioNumber())) { @@ -1233,18 +1233,18 @@ public class ParamsInfoEOServiceImpl extends ServiceImpl Date: Fri, 14 Oct 2022 17:36:16 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= 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 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index e023b31b2..020cda583 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1270,7 +1270,7 @@ module.exports = { pleaseDecompositionStandardOrder:'Please import or bring in at least one decomposition standard order', currentlyTheFirstOneThatCannotMovedUp:'Currently the first one that cannot be moved up', currentlyTheLastOneCannotmovedDown:'Currently the last one cannot be moved down', - weilaiRegulationMonthlyReport:'Weilai Regulation Monthly Report', + weilaiRegulationMonthlyReport:'Regulation Monthly Report',//Weilai onlyTheDataWhoseStatusNotInitiatedAcceptedChanged:'Only the data whose list confirmation status is accepted and the task list status is not initiated or the task list status is accepted can be changed', thereTitleWhichCannotBeDeleted:'There are new contents under this title, which cannot be deleted', industryInformationDynamicTemplate:'Industry information dynamic template', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 0af128961..614155e71 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1372,7 +1372,7 @@ module.exports = { pleaseDecompositionStandardOrder:'请导入或带入至少一条分解标准单', currentlyTheFirstOneThatCannotMovedUp:'当前已是第一个无法进行上移', currentlyTheLastOneCannotmovedDown:'当前已是最后一个无法进行下移', - weilaiRegulationMonthlyReport:'蔚来法规月报', + weilaiRegulationMonthlyReport:'法规月报',//蔚来 onlyTheDataWhoseStatusNotInitiatedAcceptedChanged:'只能变更清单确认状态为接受并且任务清单状态为未发起或任务清单状态为接受的数据', thereTitleWhichCannotBeDeleted: '该标题下存在新增内容,不能删除', industryInformationDynamicTemplate: '行业资讯动态模板', From 63d4075d1a396cf7cf4f766f4bbb1daecaac7158 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Fri, 14 Oct 2022 17:54:44 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/.env | 2 +- jero-web/public/index.html | 2 +- jero-web/src/components/layouts/Tabcrumbs.vue | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jero-web/.env b/jero-web/.env index 0b4331426..fd3cb5c08 100644 --- a/jero-web/.env +++ b/jero-web/.env @@ -1,3 +1,3 @@ NODE_ENV=production -VUE_APP_PLATFORM_NAME=蔚来全球法规平台 +VUE_APP_PLATFORM_NAME=全球法规平台 VUE_APP_SSO=false \ No newline at end of file diff --git a/jero-web/public/index.html b/jero-web/public/index.html index a25deeb75..08ee8b5e9 100644 --- a/jero-web/public/index.html +++ b/jero-web/public/index.html @@ -5,7 +5,7 @@ - 蔚来全球法规平台 + 全球法规平台 diff --git a/jero-web/src/components/layouts/Tabcrumbs.vue b/jero-web/src/components/layouts/Tabcrumbs.vue index 0e780947d..735dec841 100644 --- a/jero-web/src/components/layouts/Tabcrumbs.vue +++ b/jero-web/src/components/layouts/Tabcrumbs.vue @@ -41,7 +41,7 @@ this.$route.meta.title === ' Home Page') { this.Navigation = this.$route.meta.title this.subNavigation = null - let projectTitle = '蔚来全球法规平台' + let projectTitle = '全球法规平台' document.title = projectTitle } else { this.updateMenu() @@ -49,7 +49,7 @@ }, methods: { updateMenu() { - let projectTitle = '蔚来全球法规平台' + let projectTitle = '全球法规平台' const routes = this.$route.matched.concat() const { hidden } = this.$route.meta if (routes.length >= 3 && hidden) { From bcd5eeb60dac9f1781d2bcc0badf9e0ff13b1c96 Mon Sep 17 00:00:00 2001 From: sunFlower <787203167@qq.com> Date: Tue, 15 Nov 2022 09:20:52 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=9A=84=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectManagement/components/TaskList.vue | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue index 9c409e443..cf8ae6625 100644 --- a/jero-web/src/views/projectManagement/components/TaskList.vue +++ b/jero-web/src/views/projectManagement/components/TaskList.vue @@ -420,6 +420,10 @@ let query = {} switch (num) { case 1: + val.designTaskId = val.designTaskId + '' + if (val.designTaskId.length > 30) { + val.designTaskId = '' + } query = { taskIds: val.designTaskId, actiProcInstId: val.designPId, @@ -445,6 +449,10 @@ } break case 2: + val.prehomoTaskId = val.prehomoTaskId + '' + if (val.prehomoTaskId.length > 30) { + val.prehomoTaskId = '' + } query = { taskIds: val.prehomoTaskId, actiProcInstId: val.prehomoPId, @@ -470,6 +478,10 @@ } break case 3: + val.verifyTaskId = val.verifyTaskId + '' + if (val.verifyTaskId.length > 30) { + val.verifyTaskId = '' + } query = { taskIds: val.verifyTaskId, actiProcInstId: val.verifyPId, @@ -618,17 +630,17 @@ } }, - // 催办 - cuibanClick(){ - if(this.selectionRowsArray.length <1){ - this.$message.warning(this.$t('selectLeastOne')) - }else{ - this.$refs.cModelRef.getData(this.selectionRowsArray) - } - }, - cibanModel(){ - this.getList() - }, + // // 催办 + // cuibanClick(){ + // if(this.selectionRowsArray.length <1){ + // this.$message.warning(this.$t('selectLeastOne')) + // }else{ + // this.$refs.cModelRef.getData(this.selectionRowsArray) + // } + // }, + // cibanModel(){ + // this.getList() + // }, cancleoperationFailed(){ this.visibleoperationFailed = false },