From d097e13a2ac2c55491bfd07e58b09580338520a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 24 Mar 2023 11:07:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E6=B5=81?=
=?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/views/dashboard/components/myList.vue | 45 +-
.../components/SentList.vue | 13 +
.../components/doneList.vue | 13 +
.../views/virtualAuthenticationList/index.vue | 774 +++++++++---------
4 files changed, 449 insertions(+), 396 deletions(-)
diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue
index a3f743475..3bd57aa82 100644
--- a/jero-web/src/views/dashboard/components/myList.vue
+++ b/jero-web/src/views/dashboard/components/myList.vue
@@ -10,11 +10,11 @@
-
{{item.projectName+'-'+ item.flowTypeShow}}
-
+
{{item.serialNumber+'-'+item.flowTypeShow}}
@@ -31,17 +31,22 @@
{{$t('dataLoading')}}
+
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
index 4b4c5c89a..739c4de1c 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
@@ -208,6 +208,19 @@
}
})
window.open(newUrl.href, '_blank')
+ } else if (row.flowType == '21') {
+ let newUrl = this.$router.resolve({
+ path: '/ProjectDetails',
+ query: {
+ id: row.projectLibraryId,
+ projectName: row.projectName,
+ projectNameId: row.projectNameId,
+ targetMarket: row.targetMarket,
+ studioEngineer: row.studioEngineer,
+ type: '106'
+ }
+ })
+ window.open(newUrl.href, '_blank')
} else if (row.flowType == '2') {
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
index 74873bffe..239842f2a 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
@@ -203,6 +203,19 @@
}
})
window.open(newUrl.href, '_blank')
+ } else if (row.flowType == '21') {
+ let newUrl = this.$router.resolve({
+ path: '/ProjectDetails',
+ query: {
+ id: row.projectLibraryId,
+ projectName: row.projectName,
+ projectNameId: row.projectNameId,
+ targetMarket: row.targetMarket,
+ studioEngineer: row.studioEngineer,
+ type: '106'
+ }
+ })
+ window.open(newUrl.href, '_blank')
}else if(row.flowType == '2'){
row.taskId = row.taskId + ''
if (row.taskId.length > 30) {
diff --git a/jero-web/src/views/virtualAuthenticationList/index.vue b/jero-web/src/views/virtualAuthenticationList/index.vue
index 5c5fe7dd3..10c635433 100644
--- a/jero-web/src/views/virtualAuthenticationList/index.vue
+++ b/jero-web/src/views/virtualAuthenticationList/index.vue
@@ -49,7 +49,7 @@
:loading="loading"
:pagination="false"
:scroll="{x: '100%',y:'calc(100vh - 300px)'}"
- rowKey="id"
+ :rowKey="(record)=>JSON.stringify(record)"
:data-source="dataSource"
:columns="columns"
@change="tableOnChange"
@@ -113,7 +113,8 @@
*
- {{$t('CertificationListName')}}
+ {{$t('CertificationListName')}}