From bb76e4f2f5f4024185487456326b0d1e30aa8fab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Wed, 12 Apr 2023 10:35:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=85=E5=8A=9E=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B=E6=89=B9=E9=87=8F=E4=BB=BB=E5=8A=A1=E7=A1=AE=E8=AE=A4?=
=?UTF-8?q?=EF=BC=8C=E6=89=B9=E9=87=8F=E7=AC=A6=E5=90=88=E6=80=A7=E7=A1=AE?=
=?UTF-8?q?=E8=AE=A4=20-->=20=E5=A2=9E=E5=8A=A0=E6=89=B9=E9=87=8F=E4=BA=8C?=
=?UTF-8?q?=E5=AD=97=EF=BC=8C=E6=8F=90=E9=86=92=E7=94=A8=E6=88=B7?=
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 ++
.../src/views/dashboard/components/myList.vue | 4 ++--
.../components/listOfRegulations.vue | 4 ++--
.../components/SentList.vue | 17 ++++++++-------
.../components/dealtWith.vue | 7 ++++---
.../components/designCompliance.vue | 3 ++-
.../components/doneList.vue | 9 ++++----
.../components/projectInformation.vue | 21 ++++++++++++++++++-
.../projectRegulationTasks/index.vue | 4 ++--
10 files changed, 51 insertions(+), 22 deletions(-)
diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index a5e9d9183..db9e8da99 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1774,4 +1774,6 @@ module.exports = {
theVerificationComplianceProcessCannotBeEmpty:'The delivery type of the verification compliance process cannot be empty',
deadlineForConfirmationDesignComplianceResponsibility:'Deadline for Confirmation of Design Compliance Responsibility',
deadlineForVerifyingComplianceResponsibilityConfirmation:'Deadline for verifying compliance responsibility confirmation',
+ batchTaskResponsibilityConfirmation:'Batch task responsibility confirmation',
+ batchComplianceConfirmation:'Batch compliance confirmation',
}
\ 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 cbea2722d..07dbc2a18 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1876,4 +1876,6 @@ module.exports = {
theVerificationComplianceProcessCannotBeEmpty:'验证符合性流程的交付物类型不能为空',
deadlineForConfirmationDesignComplianceResponsibility:'设计符合性责任确认截止日期',
deadlineForVerifyingComplianceResponsibilityConfirmation:'验证符合性责任确认截止日期',
+ batchTaskResponsibilityConfirmation:'批量任务责任确认',
+ batchComplianceConfirmation:'批量符合性确认',
}
\ No newline at end of file
diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue
index 3bd57aa82..43fb63f6e 100644
--- a/jero-web/src/views/dashboard/components/myList.vue
+++ b/jero-web/src/views/dashboard/components/myList.vue
@@ -175,7 +175,7 @@
projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId,
}
- this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview'))
+ this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceProcess'))
} else if (row.flowType == '3') {
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
@@ -238,7 +238,7 @@
projectNameId: row.projectNameId,
primaryKeyId: row.primaryKeyId,
}
- this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('verificationComplianceReview'))
+ this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('validationComplianceProcess'))
}
}
}
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 6983c1bd0..e36b83c5a 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -339,7 +339,7 @@
:title="text">
{{text}}
- {{text}}
@@ -348,7 +348,7 @@
:title="text">
{{text}}
- {{text}}
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
index fc450034b..01d12004f 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
@@ -20,7 +20,8 @@
@click="viewClick(record)">{{$t('view')}}
- {{text}}
+
+ {{text}}
@@ -49,10 +50,11 @@
import { getAction, postAction, deleteAction } from '@/api/manage'
import { ResizeHeader, ResizeColumnProvide } from '@/mixins/header'
import designCompliance from './designCompliance'
+
export default {
name: 'SentList',
- mixins:[ResizeHeader, ResizeColumnProvide],
- components:{
+ mixins: [ResizeHeader, ResizeColumnProvide],
+ components: {
designCompliance
},
data() {
@@ -227,7 +229,7 @@
if (row.taskId.length > 30) {
row.taskId = ''
}
- if (row.taskDefinitionKey == 'fqlc'){
+ if (row.taskDefinitionKey == 'fqlc') {
row.taskId = ''
}
query = {
@@ -259,7 +261,7 @@
// query: query
// })
// window.open(newUrl.href, '_blank')
- this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceReview'))
+ this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('designComplianceProcess'))
} else if (row.flowType == '3') {
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
@@ -295,7 +297,7 @@
if (row.taskId.length > 30) {
row.taskId = ''
}
- if (row.taskDefinitionKey == 'fqlc'){
+ if (row.taskDefinitionKey == 'fqlc') {
row.taskId = ''
}
query = {
@@ -322,7 +324,7 @@
primaryKeyId: row.primaryKeyId,
PersonChargeFeedback: row.personChargeFeedback
}
- this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('verificationComplianceReview'))
+ this.$refs.designComplianceRef.getList(JSON.parse(JSON.stringify(query)), this.$t('validationComplianceProcess'))
}
},
searchQuery(value) {
@@ -391,6 +393,7 @@