WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangzhijiang
2023-04-06 17:43:57 +08:00
parent 5adc74d1de 07b0e182b4
commit 3476d10b25
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/common/lang/en-us.js
+4
View File
@@ -1761,4 +1761,8 @@ module.exports = {
reviewAndReturn:'Review and return',
marketRegulationListDetails:'Market Regulation List Details',
marketRegulationList:'Market Regulation List',
onlyDataWithTheCurrentCanBeManipulated:'Only data with the current user as the responsible person can be manipulated',
andTheAndTaskPendingConfirmation:'And the process status is Result Pending Submission, Review Returned, and Task Pending Confirmation',
andProcessStatusIsTaskPendingConfirmation:'And the process status is Task Pending Confirmation',
andPendingSubmissionReviewReturned:'And the process status is result pending submission, review returned',
}
jero-web/src/common/lang/zh-cn.js
+4
View File
@@ -1863,4 +1863,8 @@ module.exports = {
electroniccontrollerparameter:'电子控制器参数',
marketRegulationListDetails:'市场法规清单详情',
marketRegulationList:'市场法规清单',
onlyDataWithTheCurrentCanBeManipulated:'仅能操作责任人为当前用户的数据',
andTheAndTaskPendingConfirmation:'并且流程状态为结果待提交、审查退回、任务待确认',
andProcessStatusIsTaskPendingConfirmation:'并且流程状态为任务待确认',
andPendingSubmissionReviewReturned:'并且流程状态为结果待提交、审查退回',
}
jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+1 -1
View File
@@ -1594,7 +1594,7 @@
font-weight: 400;
color: #6F7385;
display: inline-block;
width: 100px;
width: 130px;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
jero-web/src/views/projectManagement/components/certificationList/index.vue
+5 -3
View File
@@ -1542,7 +1542,7 @@
}
this.toDoData = ''
if (this.toDoNotConditions && this.toDoNotConditions.length > 0) {
this.toDoData = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + this.toDoNotConditions.join('、') + '"' + this.$t('data')
this.toDoData = this.$t('operationWithoutPermission') + ';'+this.$t('onlyDataWithTheCurrentCanBeManipulated')+';'+this.$t('andTheAndTaskPendingConfirmation')
}
if (this.toDoIds && this.toDoIds.length > 0) {
this.$refs.SelectedByRef.getPush()
@@ -1714,7 +1714,8 @@
}
let data = ''
if (notConditions && notConditions.length > 0) {
data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data')
// data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data')
data = this.$t('operationWithoutPermission') + ';'+this.$t('onlyDataWithTheCurrentCanBeManipulated')+';'+this.$t('andProcessStatusIsTaskPendingConfirmation')
}
if (ids && ids.length > 0) {
this.submitTask(value, prompt, ids, notConditions, data)
@@ -1769,7 +1770,8 @@
}
let data = ''
if (notConditions && notConditions.length > 0) {
data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data')
// data = this.$t('operationWithoutPermission') + this.$t('inspectionItems') + '"' + notConditions.join('、') + '"' + this.$t('data')
data = this.$t('operationWithoutPermission') + ';'+this.$t('onlyDataWithTheCurrentCanBeManipulated')+';'+this.$t('andPendingSubmissionReviewReturned')
}
if (ids && ids.length > 0) {
this.submitTask(value, prompt, ids, notConditions, data)