diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
index 66b4c56aa..85420a896 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedback.vue
@@ -15,7 +15,15 @@
{{$t('complianceResults')}}
- {{formInline.complianceResult == 'Compliance'?$t('accord'):$t('nonConformity')}}
+
+ {{$t('accord')}}
+
+
+ {{$t('nonConformity')}}
+
+
+ --
+
{{$t('relevantSections')}}
- {{item.relatedSection}}
+ {{item.relatedSection ?item.relatedSection : '--'}}
{{$t('problemDescription')}}
- {{item.issueOrSuggest}}
+ {{item.issueOrSuggest ? item.issueOrSuggest :'--'}}
{{$t('relevantSections')}}
- {{item.relatedSection}}
+ {{item.relatedSection?item.relatedSection : '--'}}
@@ -132,7 +140,7 @@
:title="$t('problemDescription')">{{$t('problemDescription')}}
- {{item.issueOrSuggest}}
+ {{item.issueOrSuggest ? item.issueOrSuggest:'--'}}
diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index dfb95253c..181c1f247 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -124,10 +124,16 @@
})
},
lawsOpinionAssessmentResult() {
+ let createBy = ''
+ if (this.$route.query.taskDefinitionKey == 'gcsfq' && this.disabled){
+ createBy = ''
+ }else{
+ createBy = this.userInfo().username
+ }
getAction(this.url.list, {
lawsOpinionGatherId: this.queryProject.id,
actiProcInstId: this.$route.query.prcId,
- createBy: this.userInfo().username
+ createBy: createBy
}).then((res) => {
if (res.success) {
this.feedbackDataList = res.result || []