Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

# Conflicts:
#	jero-web/src/common/lang/en-us.js
#	jero-web/src/common/lang/zh-cn.js
This commit is contained in:
zyx.net
2023-03-16 09:17:15 +08:00
39 changed files with 3319 additions and 538 deletions
+5
View File
@@ -907,6 +907,7 @@ module.exports = {
pleaseConformityVerification: '请补全验证符合性确认的数据',
virtualListDetails: '虚拟清单详情',
virtualAuthenticationListDetails: '虚拟认证清单详情',
VirtualAuthenticationList: '虚拟认证清单',
maintainVirtualList: '维护虚拟清单',
certificationListMaintenance: '认证清单维护',
reasonsForRejection: '驳回原因',
@@ -1533,6 +1534,10 @@ module.exports = {
onlyDataSelected:'只能选择流程状态为任务待确认、结果待提交、审查退回的数据',
youCannotStatusListToBeReleasedAndApproved:'不能选择流程状态为清单待发布、审查通过的数据',
batchmodify:'是否批量修改',
onlyDataListReleasedAndCertificationReturnCanSelected:'只能选择流程状态为清单待发布和认证退回的数据',
type:'类型',
select:'选择',
onlyDataWithProcessStatusDeleted:'只能删除流程状态为清单待发布和审查通过的数据',
registrationnumber:'产品登记编号',
noticebatch:'《公告》批次',
producttrademark:'产品商标',