From 43e289fe9013764e23ff5de57e72f3eeb85dc611 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com> Date: Fri, 26 Aug 2022 14:53:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?= =?UTF-8?q?=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/initiatingProcess.vue | 4 ++-- .../components/evaluationResultsClause.vue | 2 +- .../technologyAssessment/components/initiatingProcess.vue | 4 ++-- .../processCenter/components/evaluatorFeedbackList.vue | 7 +++++++ .../processCenter/processForm/evaluationProcess/index.vue | 2 +- .../processCenter/processForm/handshakeProcess/index.vue | 2 +- .../processCenter/processForm/regulatoryProcess/index.vue | 2 +- .../processCenter/processForm/taskListProcess/index.vue | 2 +- .../projectManagement/components/listOfRegulations.vue | 2 +- 9 files changed, 17 insertions(+), 10 deletions(-) diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue index 5d8242925..8981f9504 100644 --- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue @@ -333,7 +333,7 @@ value.id = this.getUUID() value.currentUserName = this.userInfo().username Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } @@ -364,7 +364,7 @@ let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') value.handlingTime = handlingTime Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue index 8dd8ec28a..a64a58ba0 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue @@ -217,7 +217,7 @@ }, { title: this.$t('feedbackTime'), - dataIndex: 'updateTime', + dataIndex: 'feedbackTime', align: 'center', ellipsis: true, width: 160 diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue index d851a0ecf..d5ebba0a4 100644 --- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue +++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue @@ -537,7 +537,7 @@ if (value[res] && value[res] instanceof Array) { value[res] = value[res].join(',') } - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } @@ -579,7 +579,7 @@ }, completeTask(value, taskId) { Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue index 20843f030..0e1348394 100644 --- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue +++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue @@ -98,6 +98,7 @@ import { getAction, postAction } from '@/api/manage' import uploadFile from '@/components/uploadFile/file' import viewFileModel from '@/components/viewFileModel/index' + import moment from 'moment' export default { name: 'evaluatorFeedback', @@ -345,6 +346,12 @@ return } } + if (this.$route.query.taskDefinitionKey == 'pgrqr'){ + let feedbackTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') + for (let i = 0; i < this.dataSource.length; i++) { + this.dataSource[i].feedbackTime = feedbackTime + } + } callBack && callBack(this.dataSource) }, preservationData(callBack) { diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue index 84123fb01..8176a68b9 100644 --- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue @@ -313,7 +313,7 @@ let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') value.handlingTime = handlingTime Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue index 533a748a9..cc254ac6e 100644 --- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue @@ -267,7 +267,7 @@ let operatorTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') value.operatorTime = operatorTime Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue index 71cb5ac64..43ad09a5c 100644 --- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue @@ -176,7 +176,7 @@ let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') value.handlingTime = handlingTime Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } diff --git a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue index 653d756c2..92f24d749 100644 --- a/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue +++ b/jero-web/src/views/processCenter/processForm/taskListProcess/index.vue @@ -346,7 +346,7 @@ let json = Object.assign(this.queryBy, value) let data = JSON.stringify(json).replace(/\"/g, '\'') Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') } diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 13b17f49b..8b943d1a5 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1787,7 +1787,7 @@ let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss') value.handlingTime = handlingTime Object.keys(value).forEach(res => { - if (value[res] && value[res] instanceof String) { + if (value[res] && typeof value[res] == 'string') { value[res] = value[res].replace(/\"/g, '“') value[res] = value[res].replace(/\'/g, '‘') }