From 798250342898bdfd2e5cd9c2e7fc78ebf2a21fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Sun, 16 Apr 2023 15:09:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=E4=B8=BA=E6=B3=95=E8=A7=84=E5=B7=A5=E7=A8=8B=E5=B8=88?=
=?UTF-8?q?=E9=80=80=E5=9B=9E=E7=9A=84=E6=95=B0=E6=8D=AE=E5=8F=AF=E4=BB=A5?=
=?UTF-8?q?=E5=86=8D=E6=AC=A1=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
jero-web/src/common/lang/en-us.js | 6 ++-
jero-web/src/common/lang/zh-cn.js | 6 ++-
.../components/listEditModel.vue | 12 ++---
.../components/listOfRegulations.vue | 45 +++++++++++++------
.../components/confirmationDrawer.vue | 2 +-
.../components/designCompliance.vue | 2 +-
6 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 040338da3..578c718d8 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1115,7 +1115,7 @@ module.exports = {
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',
theProjectContactEmpty: 'The project contact person of cannot be empty',
- pleaseSelectinitiatedOrRejected: 'Please select the data whose design compliance confirmation process status is List to be Published or whose verification compliance confirmation process status is List to be Published',
+ pleaseSelectinitiatedOrRejected: 'Please select the data whose design compliance confirmation process status is List Pending Release, Regulatory Engineer Returned or Verification Compliance Confirmation Process status is List Pending Release, Regulatory Engineer Returned',
TheEngineerAndCertification: 'The regulatory engineer of cannot be empty',
pleaseSelectTheDataverificationVerified:'Please select the data whose design compliance confirmation process status is List Pending Verification, Responsible Person Rejected, or Verification Compliance Confirmation process status is List Pending Verification, Responsible Person Rejected',
theResponsiblePersonAndDeadlineClank: 'The responsible person and deadline of cannot be blank',
@@ -1748,7 +1748,7 @@ module.exports = {
databasereportingtime:'Synchronize the database reporting time',
synchronizationtime:'Synchronization time',
listToBeReleased:'List to be released',
- listToBeChecked:'List to be checked',
+ listToBeChecked:'Task to be initiated',
taskToBeConfirmed:'Task to be confirmed',
resultsToBeSubmitted:'Results to be submitted',
resultsToBeReviewed:'Results to be reviewed',
@@ -1788,4 +1788,6 @@ module.exports = {
cannotSetResponsibilityAreas:'Cannot set an interface person due to different responsibility areas',
lidar:'lidar',
history:'History',
+ deliveryDate:'Delivery Date',
+ regulatoryEngineerReturns:'Regulatory engineer returns',
}
\ 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 325de7d36..781dbddd3 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -710,7 +710,7 @@ module.exports = {
listConfirmation: '清单确认',
ListConfirmationDeadline: '清单确认截止时间',
dataConfirmation: '请选择清单确认状态为未发起或拒绝的数据,以及法规工程师、认证工程师不为空',
- pleaseSelectinitiatedOrRejected: '请选择设计符合性确认流程状态为清单待发布或验证符合性确认流程状态为清单待发布的数据',
+ pleaseSelectinitiatedOrRejected: '请选择设计符合性确认流程状态为清单待发布、法规工程师退回或验证符合性确认流程状态为清单待发布、法规工程师退回的数据',
pleaseSelectTheDataverificationVerified: '请选择设计符合性确认流程状态为清单待校核、责任人拒绝或验证符合性确认流程状态为清单待校核、责任人拒绝的数据',
TheEngineerAndCertification: '的法规工程师不能为空',
taskDataConfirmation: '请选择清单确认状态为接受及任务确认状态为未发起或拒绝的数据,以及工程接口人不为空',
@@ -1850,7 +1850,7 @@ module.exports = {
databasereportingtime: '同步上报库时间',
synchronizationtime: '同步时间',
listToBeReleased: '清单待发布',
- listToBeChecked: '清单待校核',
+ listToBeChecked: '任务待发起',
taskToBeConfirmed: '任务待确认',
resultsToBeSubmitted: '结果待提交',
resultsToBeReviewed: '结果待审查',
@@ -1890,4 +1890,6 @@ module.exports = {
cannotSetResponsibilityAreas:'所属不同责任领域，不能设置接口人',
lidar:'激光雷达',
history:'历史',
+ deliveryDate:'交付日期',
+ regulatoryEngineerReturns:'法规工程师退回',
}
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 31834d650..19c079083 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -211,14 +211,14 @@
*
{{$t('cutoffTime')}}
+ :title="$t('deliveryDate')">{{$t('deliveryDate')}}
+ message: $t('deliveryDate') + $t('cannotEmpty'), trigger: 'change'}]">
*
{{$t('cutoffTime')}}
+ :title="$t('deliveryDate')">{{$t('deliveryDate')}}
+ message: $t('deliveryDate') + $t('cannotEmpty'), trigger: 'change'}]">
{{text}}
@@ -355,7 +358,8 @@
{{text}}
@@ -776,7 +780,7 @@
ellipsis: true
},
{
- title: this.$t('TaskCutOffTime'),
+ title: this.$t('deliveryDate'),
dataIndex: 'designDueDate',
align: 'left',
ellipsis: true,
@@ -822,7 +826,7 @@
sorter: true
},
{
- title: this.$t('TaskCutOffTime'),
+ title: this.$t('deliveryDate'),
dataIndex: 'verifyDueDate',
align: 'left',
ellipsis: true,
@@ -1048,9 +1052,9 @@
},
{
sort: '',
- name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('TaskCutOffTime'),
+ name: this.$t('confirmationOfDesignConformity') + '/' + this.$t('deliveryDate'),
headFieldCn: '截止时间',
- headFieldEn: 'Due Date',
+ headFieldEn: 'Delivery Date',
field: 'designDueDate',
affirmFlag: '1',
key: 23,
@@ -1098,9 +1102,9 @@
},
{
sort: '',
- name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('TaskCutOffTime'),
- headFieldCn: '截止时间',
- headFieldEn: 'Due Date',
+ name: this.$t('verificationAndConformityconfirmation') + '/' + this.$t('deliveryDate'),
+ headFieldCn: '交付日期',
+ headFieldEn: 'Delivery Date',
field: 'verifyDueDate',
affirmFlag: '3',
key: 33,
@@ -1240,6 +1244,11 @@
key: 'List to be released',
label: this.$t('listToBeReleased')
},
+ {
+ value: 'Regulatory engineer returns',
+ key: 'Regulatory engineer returns',
+ label: this.$t('regulatoryEngineerReturns')
+ },
{
value: 'Duty Person Rejected',
key: 'Duty Person Rejected',
@@ -1296,6 +1305,11 @@
key: 'List to be released',
label: this.$t('listToBeReleased')
},
+ {
+ value: 'Regulatory engineer returns',
+ key: 'Regulatory engineer returns',
+ label: this.$t('regulatoryEngineerReturns')
+ },
{
value: 'Duty Person Rejected',
key: 'Duty Person Rejected',
@@ -1749,9 +1763,9 @@
}
}
}
- if (!isTrue){
- this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code,content[0])
- }else{
+ if (!isTrue) {
+ this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code, content[0])
+ } else {
this.$refs.batSettingRef.edit(JSON.parse(JSON.stringify(this.selectedRowKeys)), code)
}
} else {
@@ -2369,7 +2383,7 @@
if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
for (let k = 0; k < this.columnsAll[j].children.length; k++) {
for (let l = 0; l < this.column[i].children.length; l++) {
- if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) {
+ if (this.columnsAll[j].children[k].dataIndex == this.column[i].children[l].dataIndex) {
this.columnsAll[j].children[k] = this.column[i].children[l]
}
}
@@ -2381,7 +2395,7 @@
if (this.columnsAll[j].children && this.columnsAll[j].children.length > 0) {
for (let k = 0; k < this.columnsAll[j].children.length; k++) {
for (let l = 0; l < this.column[i].children.length; l++) {
- if (this.columnsAll[j].children[k].title == this.column[i].children[l].title) {
+ if (this.columnsAll[j].children[k].dataIndex == this.column[i].children[l].dataIndex) {
this.columnsAll[j].children[k] = this.column[i].children[l]
}
}
@@ -2475,7 +2489,10 @@
}
}
for (let i = 0; i < dataSource.length; i++) {
- if (dataSource[i].verifyFlowStatus == 'List to be released' || dataSource[i].designFlowStatus == 'List to be released') {
+ if (dataSource[i].verifyFlowStatus == 'List to be released' ||
+ dataSource[i].verifyFlowStatus == 'Regulatory engineer returns' ||
+ dataSource[i].designFlowStatus == 'List to be released' ||
+ dataSource[i].designFlowStatus == 'Regulatory engineer returns') {
if (dataSource[i].regulationOwnerId) {
this.detailedSuccessList.push(dataSource[i])
} else {
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue
index 5803af6d8..77a1dc0a6 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/confirmationDrawer.vue
@@ -180,7 +180,7 @@
width: 120
},
{
- title: this.$t('closingDate'),
+ title: this.$t('deliveryDate'),
align: 'left',
dataIndex: 'endTime',
ellipsis: true,
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
index df825bea2..3def13ac9 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/designCompliance.vue
@@ -221,7 +221,7 @@
value: this.queryData.personLiable
},
{
- title: this.$t('cutoffTime'),
+ title: this.$t('deliveryDate'),
value: this.queryData.DueDate
},
{