From 7c04ab447cf305d68db17c3bdad2b113d3f1d514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Thu, 6 Apr 2023 09:11:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E7=B1=BB=E5=88=AB=E5=9B=9E=E6=98=BE=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/views/documentManage/library/docDetail/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index dac92f625..ecab1cebb 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -58,7 +58,7 @@ {{ol.db_field_txt}} {{ol.db_field_txt}} {{ol.value ? ol.value+'的时间更好的付款就给和看景点风光和的空间古典风格' : '--'}} + :title="ol.value">{{ol.value ? ol.value : '--'}} {{ol.value ? ol.value : '--'}} From d581ebe7a048b53d8f7e2f5754a850462608c562 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Thu, 6 Apr 2023 09:14:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?bug67836=20=E5=92=8Cbug67160?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tCertificationInventoryDutyEnginnerEO.java | 219 ++++++++++++++++++ ...ertificationInventoryDutyEnginnerEOEn.java | 219 ++++++++++++++++++ ...ctCertificationInventoryEOServiceImpl.java | 56 ++++- 3 files changed, 484 insertions(+), 10 deletions(-) create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEO.java create mode 100644 jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOEn.java diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEO.java new file mode 100644 index 000000000..3aa2f9a18 --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEO.java @@ -0,0 +1,219 @@ +package com.jero.modules.project.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; + + +/** + * @Description: 认证清单工程接口人和责任人导出类 + * @Author: jero-boot + * @Date: 2023-03-03 + * @Version: V1.0 + */ +@Data +@TableName("project_certification_inventory") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表") +public class ProjectCertificationInventoryDutyEnginnerEO implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**类别*/ + @Excel(name = "类别", width = 20) + @ApiModelProperty(value = "类别") + private String category; + + /**检验项目*/ + @Excel(name = "检验项目", width = 20) + @ApiModelProperty(value = "检验项目") + private String inspectionItem; + + /**配置项*/ + @Excel(name = "配置项", width = 20) + @ApiModelProperty(value = "配置项") + @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4") + private String configItem; + + /**WVTA ID*/ + @Excel(name = "WVTA ID", width = 20) + @ApiModelProperty(value = "WVTA ID") + private String wvtaId; + + /**标准编号*/ + @Excel(name = "标准编号", width = 20) + @ApiModelProperty(value = "标准编号") + private String serialNumber; + + /**责任领域*/ + @ApiModelProperty(value = "责任领域") + private String dutyTerritory; + /**责任领域名称**/ + @Excel(name = "责任领域", width = 20) + @TableField(exist = false) + private String dutyTerritoryName; + /**责任领域名称-英文**/ + @TableField(exist = false) + private String dutyTerritoryNameEn; + + /**工程接口人*/ + @ApiModelProperty(value = "工程接口人") + private String sdt; + /**工程接口人名称**/ + @Excel(name = "工程接口人", width = 20) + @TableField(exist = false) + private String sdtName; + + /**责任人*/ + @ApiModelProperty(value = "责任人") + private String dutyPerson; + /**责任人名称**/ + @Excel(name = "责任人", width = 20) + @TableField(exist = false) + private String dutyPersonName; + + /**交付物模板*/ + @ApiModelProperty(value = "交付物模板") + private String deliverableTemplate; + /**交付物模板名称**/ + @TableField(exist = false) + @Excel(name = "交付物模板", width = 20) + private String deliverableTemplateName; + + /**交付物类型*/ + @ApiModelProperty(value = "交付物类型") + private String deliverableType; + // 交付物类型名称 + @Excel(name = "交付物类型", width = 20) + @TableField(exist = false) + private String deliverableTypeName; + // 交付物类型名称-英文 + @TableField(exist = false) + private String deliverableTypeNameEn; + + /**交付物*/ +// @Excel(name = "交付物", width = 15) + @ApiModelProperty(value = "交付物") + private String deliverable; + + /**文档库id*/ +// @Excel(name = "文档库id", width = 15) + @ApiModelProperty(value = "文档库id") + private String bussDocumentLibraryId; + + + + /**交付结果*/ + @Excel(name = "交付结果", width = 20) + @ApiModelProperty(value = "交付结果") + private String deliveryResult; + + /**截止日期*/ + @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "截止日期") + private Date endTime; + /**流程状态*/ + @ApiModelProperty(value = "流程状态") + private String flowStatus; + // 流程状态展示名称 + @Excel(name = "流程状态", width = 20) + @TableField(exist = false) + private String flowStatusName; + + /**报告编号*/ +// @Excel(name = "报告编号", width = 20) + @ApiModelProperty(value = "报告编号") + private String reportNumber; + + /**产品型号*/ +// @Excel(name = "产品型号", width = 20) + @ApiModelProperty(value = "产品型号") + private String productModel; + + /**生产企业名称*/ +// @Excel(name = "生产企业名称", width = 20) + @ApiModelProperty(value = "生产企业名称") + private String productionEnterpriseName; + + /**认证进度*/ + + @ApiModelProperty(value = "认证进度") + private String certificationProgress; + + /**认证进度展示名称**/ +// @Excel(name = "认证进度", width = 20) + @TableField(exist = false) + private String certificationProgress_dictText; + +// @Excel(name = "认证进度备注", width = 15) + @ApiModelProperty(value = "认证进度备注") + private String certificationProgressRemark; + + /**项目库id*/ + @ApiModelProperty(value = "项目库id") + private String projectLibraryId; + + @TableField(exist = false) + private String cut; + + @TableField(exist = false) + private String ids; + + @TableField(exist = false) + private String roleCode; + + /**值类型，对应SysCategoryValueTypeEnum中value**/ + @TableField(exist = false) + private String valueType; + + @TableField(exist = false) + private String excelName; + +// @Excel(name = "*截止日期", width = 20, format = "yyyy-MM-dd") + @TableField(exist = false) + private String endTimeStr; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOEn.java new file mode 100644 index 000000000..0c890822e --- /dev/null +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectCertificationInventoryDutyEnginnerEOEn.java @@ -0,0 +1,219 @@ +package com.jero.modules.project.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.jero.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + + +/** + * @Description: 认证清单工程接口人和责任人导出类 + * @Author: jero-boot + * @Date: 2023-03-03 + * @Version: V1.0 + */ +@Data +@TableName("project_certification_inventory") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="project_certification_inventory对象", description="项目库-认证清单表") +public class ProjectCertificationInventoryDutyEnginnerEOEn implements Serializable { + private static final long serialVersionUID = 1L; + + /**主键*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "主键") + private String id; + + /**创建人*/ + @ApiModelProperty(value = "创建人") + private String createBy; + + /**创建日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "创建日期") + private java.util.Date createTime; + + /**更新人*/ + @ApiModelProperty(value = "更新人") + private String updateBy; + + /**更新日期*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新日期") + private java.util.Date updateTime; + + /**所属部门*/ + @ApiModelProperty(value = "所属部门") + private String sysOrgCode; + + /**类别*/ + @Excel(name = "Category", width = 20) + @ApiModelProperty(value = "类别") + private String category; + + /**检验项目*/ + @Excel(name = "Inspection Items", width = 20) + @ApiModelProperty(value = "检验项目") + private String inspectionItem; + + /**配置项*/ + @Excel(name = "Configuration Item", width = 20) + @ApiModelProperty(value = "配置项") + @Dict(dicCode = "ren4_zheng4_qing1_dan1_-_pei4_zhi4_xiang4") + private String configItem; + + /**WVTA ID*/ + @Excel(name = "WVTA ID", width = 20) + @ApiModelProperty(value = "WVTA ID") + private String wvtaId; + + /**标准编号*/ + @Excel(name = "Standard No", width = 20) + @ApiModelProperty(value = "标准编号") + private String serialNumber; + + /**责任领域*/ + @ApiModelProperty(value = "责任领域") + private String dutyTerritory; + /**责任领域名称**/ + @Excel(name = "Responsible Field", width = 20) + @TableField(exist = false) + private String dutyTerritoryName; + /**责任领域名称-英文**/ + @TableField(exist = false) + private String dutyTerritoryNameEn; + + /**工程接口人*/ + @ApiModelProperty(value = "工程接口人") + private String sdt; + /**工程接口人名称**/ + @Excel(name = "Eng. Interface", width = 20) + @TableField(exist = false) + private String sdtName; + + /**责任人*/ + @ApiModelProperty(value = "责任人") + private String dutyPerson; + /**责任人名称**/ + @Excel(name = "Assignee", width = 20) + @TableField(exist = false) + private String dutyPersonName; + + /**交付物模板*/ + @ApiModelProperty(value = "交付物模板") + private String deliverableTemplate; + /**交付物模板名称**/ + @TableField(exist = false) + @Excel(name = "Deliverable Template", width = 40) + private String deliverableTemplateName; + + /**交付物类型*/ + @ApiModelProperty(value = "交付物类型") + private String deliverableType; + // 交付物类型名称 + @Excel(name = "Deliverable Type", width = 20) + @TableField(exist = false) + private String deliverableTypeName; + // 交付物类型名称-英文 + @TableField(exist = false) + private String deliverableTypeNameEn; + + /**交付物*/ +// @Excel(name = "交付物", width = 15) + @ApiModelProperty(value = "交付物") + private String deliverable; + + /**文档库id*/ +// @Excel(name = "文档库id", width = 15) + @ApiModelProperty(value = "文档库id") + private String bussDocumentLibraryId; + + + + /**交付结果*/ + @Excel(name = "Deliverables Result", width = 20) + @ApiModelProperty(value = "交付结果") + private String deliveryResult; + + /**截止日期*/ + @Excel(name = "Due Date", width = 20, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "截止日期") + private java.util.Date endTime; + + /**流程状态*/ + @ApiModelProperty(value = "流程状态") + private String flowStatus; + // 流程状态展示名称 + @Excel(name = "Process Status", width = 20) + @TableField(exist = false) + private String flowStatusName; + + /**报告编号*/ +// @Excel(name = "Report No", width = 20) + @ApiModelProperty(value = "报告编号") + private String reportNumber; + + /**产品型号*/ +// @Excel(name = "Product Model", width = 20) + @ApiModelProperty(value = "产品型号") + private String productModel; + + /**生产企业名称*/ +// @Excel(name = "Name Of Manufacturer", width = 40) + @ApiModelProperty(value = "生产企业名称") + private String productionEnterpriseName; + + /**认证进度*/ + + @ApiModelProperty(value = "认证进度") + private String certificationProgress; + + /**认证进度展示名称**/ + @TableField(exist = false) +// @Excel(name = "Homologation Progress", width = 40) + private String certificationProgress_dictText; + + // @Excel(name = "认证进度备注", width = 15) + @ApiModelProperty(value = "认证进度备注") + private String certificationProgressRemark; + + /**项目库id*/ + @ApiModelProperty(value = "项目库id") + private String projectLibraryId; + + @TableField(exist = false) + private String cut; + + @TableField(exist = false) + private String ids; + + @TableField(exist = false) + private String roleCode; + + /**值类型，对应SysCategoryValueTypeEnum中value**/ + @TableField(exist = false) + private String valueType; + + @TableField(exist = false) + private String excelName; + + // @Excel(name = "截止日期", width = 20, format = "yyyy-MM-dd") + @TableField(exist = false) + private String endTimeStr; +} diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index da023aabc..1030bf105 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -3760,6 +3760,12 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl List copy(List list, + Class clazz) { + String oldOb = JSON.toJSONString(list); + return JSON.parseArray(oldOb, clazz); + } + /** * 导出数据 @@ -3776,6 +3782,18 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl params = new HashMap<>(); + params.put("projectLibraryId",projectId); + params.put("userId",currentUser.getId()); + params.put("modelType",RoleRelModelTypeEnum.CERTIFICATION_INVENTORY.getValue()); + ProjectLibraryRoleRelEO projectLibraryRoleRelEO = projectLibraryRoleRelEOService.queryByProjectLibraryIdAndUserId(params); + String roleCode = projectLibraryRoleRelEO.getRoleCode(); + // 创建查询权限 + this.createQueryPermission(queryWrapper,roleCode); //导出的数据 dataList = this.list(queryWrapper); //文件 @@ -3791,6 +3809,9 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl copy = copy(dataList,ProjectCertificationInventoryDutyEnginnerEO.class); + + OutputStream os = null; try { @@ -3851,19 +3872,34 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl dataListEn = new ArrayList<>(); - for (ProjectCertificationInventoryEO projectCertificationInventoryEOTemp : dataList) { - ProjectCertificationInventoryEOEn projectCertificationInventoryEOEn = new ProjectCertificationInventoryEOEn(); - BeanUtils.copyProperties(projectCertificationInventoryEOTemp,projectCertificationInventoryEOEn); - dataListEn.add(projectCertificationInventoryEOEn); + if(ProjectRoleEnum.INTERFACE_PERSON.getValue().equals(roleCode) || + ProjectRoleEnum.PERSON_LIABLE.getValue().equals(roleCode)){ + workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEO.class, copy); + }else{ + workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEO.class, dataList); } - //下拉选中英文转换 + }else{ + if(ProjectRoleEnum.INTERFACE_PERSON.getValue().equals(roleCode) || + ProjectRoleEnum.PERSON_LIABLE.getValue().equals(roleCode)){ + List copyEn = new ArrayList<>(); + for (ProjectCertificationInventoryDutyEnginnerEO projectCertificationInventoryDutyEnginnerEOTemp : copy) { + ProjectCertificationInventoryDutyEnginnerEOEn projectCertificationInventoryDutyEnginnerEOEn = new ProjectCertificationInventoryDutyEnginnerEOEn(); + BeanUtils.copyProperties(projectCertificationInventoryDutyEnginnerEOTemp,projectCertificationInventoryDutyEnginnerEOEn); + copyEn.add(projectCertificationInventoryDutyEnginnerEOEn); + } + workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryDutyEnginnerEOEn.class, copyEn); + }else{ + List dataListEn = new ArrayList<>(); + for (ProjectCertificationInventoryEO projectCertificationInventoryEOTemp : dataList) { + ProjectCertificationInventoryEOEn projectCertificationInventoryEOEn = new ProjectCertificationInventoryEOEn(); + BeanUtils.copyProperties(projectCertificationInventoryEOTemp,projectCertificationInventoryEOEn); + dataListEn.add(projectCertificationInventoryEOEn); + } + //下拉选中英文转换 // transition(dataListEn,projectCertificationInventoryEO); - workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOEn.class, dataListEn); + workbook = ExcelExportUtil.exportExcel(exportParams, ProjectCertificationInventoryEOEn.class, dataListEn); + } } - workbook.write(excelOS); excelOS.flush(); From 04f870c770d4b5a08afcb5c5ade51f0da18521f1 Mon Sep 17 00:00:00 2001 From: cuijiaming <1410452759@qq.com> Date: Thu, 6 Apr 2023 09:21:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectCertificationInventoryEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java index 1030bf105..8cb3bba76 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectCertificationInventoryEOServiceImpl.java @@ -3781,7 +3781,7 @@ public class ProjectCertificationInventoryEOServiceImpl extends ServiceImpl Date: Thu, 6 Apr 2023 09:31:41 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=A0=87=E5=8F=B7=E5=A2=9E=E5=8A=A0=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E5=BA=93=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 8 +++++--- jero-web/src/common/lang/zh-cn.js | 8 +++++--- .../components/certificationList/components/addModel.vue | 4 ++-- .../components/certificationList/index.vue | 4 ++-- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 19caccf21..87fa00ebf 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1409,7 +1409,7 @@ module.exports = { itemInformation:'Item Information', modifyHistory:'Historical Record', returnToStudio:'Return to Studio', - Approved:'Review and pass', + Approved:'Approved', returnedForApproval:'Returned For Approval', changeSetting:'Change Setting', referenceDeliverables:'Reference Deliverables', @@ -1430,8 +1430,8 @@ module.exports = { onlyDataStatusSubmittedCanBeSelected:'Only data with process status of result to be submitted can be selected', operationWithoutPermission:'Operation without permission', data:"'s data", - confirmApproval:'Confirm approval?', - confirmReturnForApproval:'Confirm return for approval ?', + confirmApproval:'Confirm pass review?', + confirmReturnForApproval:'Confirm Return for review ?', onlyDataStatusResultReviewedCanBeSelected:'Only data with process status of result to be reviewed can be selected', confirmResetProcess:'Confirm reset process?', confirmUrging:'Confirm urging ?', @@ -1756,4 +1756,6 @@ module.exports = { nonCompliance:'Non-Compliance', toBeTracked:'To be tracked', NA:'NA', + reviewAndPass:'Review and pass', + reviewAndReturn:'Review and return', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index c59ba232c..69345e424 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1511,7 +1511,7 @@ module.exports = { itemInformation:'条目信息', modifyHistory:'历史记录', returnToStudio:'退回至Studio', - Approved:'审查通过', + Approved:'审批通过', returnedForApproval:'审批退回', changeSetting:'修改配置', referenceDeliverables:'引用交付物', @@ -1532,8 +1532,8 @@ module.exports = { data:"的数据", compliancereport:'生成合规报告', todocenter:'待办中心', - confirmApproval:'确认通过审批？', - confirmReturnForApproval:'确认退回审批？', + confirmApproval:'确认通过审查？', + confirmReturnForApproval:'确认退回审查？', onlyDataStatusResultReviewedCanBeSelected:'只能选择流程状态为结果待审查的数据', confirmResetProcess:'确认重置流程?', confirmUrging:'确认催办', @@ -1858,4 +1858,6 @@ module.exports = { nonCompliance:'不符合', toBeTracked:'待追踪', NA:'不涉及', + reviewAndPass:'审查通过', + reviewAndReturn:'审查退回', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue index d881e97b0..ca0a3eb54 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/components/addModel.vue @@ -29,7 +29,7 @@ + :value="item.standId"> {{ item.serialNumber}} @@ -808,7 +808,7 @@ return res.id === value }) if (content && content.length > 0) { - this.formInline.bussDocumentLibraryId = content[0].id + this.formInline.bussDocumentLibraryId = content[0].standId this.formInline.serialNumber = content[0].serialNumber } }, diff --git a/jero-web/src/views/projectManagement/components/certificationList/index.vue b/jero-web/src/views/projectManagement/components/certificationList/index.vue index 1317235d0..f171c2343 100644 --- a/jero-web/src/views/projectManagement/components/certificationList/index.vue +++ b/jero-web/src/views/projectManagement/components/certificationList/index.vue @@ -205,14 +205,14 @@
- {{ $t('Approved') }} + {{ $t('reviewAndPass') }}
- {{ $t('returnedForApproval') }} + {{ $t('reviewAndReturn') }}