Merge remote-tracking branch 'origin/feature_dev_20221008_TODO' into dev_2nd_period_test

jero-web/src/views/processCenter/components/evaluatorFeedback.vue

@@ -15,7 +15,15 @@
                 <span class="title-text-text" :title="$t('complianceResults')">{{$t('complianceResults')}}</span>
               </div>
               <div class="title-text-right" v-if="disabled">
-                {{formInline.complianceResult == 'Compliance'?$t('accord'):$t('nonConformity')}}
+                <span v-if="formInline.complianceResult == 'Compliance'">
+                   {{$t('accord')}}
+                </span>
+                <span v-else-if="formInline.complianceResult == 'Non-Compliance'">
+                    {{$t('nonConformity')}}
+                </span>
+                <span v-else>
+                   --
+                </span>
               </div>
               <a-form-model-item class="itemModel" v-if="!disabled" :prop="!disabled?'complianceResult':''">
                 <a-radio-group style="margin-top: 2px" class="box-input"
@@ -51,7 +59,7 @@
                   <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
                 </div>
                 <div class="title-text-right" :title="item.relatedSection" v-if="disabled">
-                  {{item.relatedSection}}
+                  {{item.relatedSection ?item.relatedSection : '--'}}
                 </div>
                 <a-form-model-item class="itemModel" v-if="!disabled"
                                    :prop="'dataList.'+index+'.relatedSection'"
@@ -73,7 +81,7 @@
                         :title="$t('problemDescription')">{{$t('problemDescription')}}</span>
                 </div>
                 <div class="title-text-right" :title="item.issueOrSuggest" v-if="disabled">
-                  {{item.issueOrSuggest}}
+                  {{item.issueOrSuggest ? item.issueOrSuggest :'--'}}
                 </div>
                 <a-form-model-item class="itemModel" :prop="'dataList.'+index+'.issueOrSuggest'" v-if="!disabled"
                                    :rules="[{ required: true, message: $t('problemDescription') + $t('cannotEmpty'), trigger: 'blur'},
@@ -121,7 +129,7 @@
                   <span class="title-text-text" :title="$t('relevantSections')">{{$t('relevantSections')}}</span>
                 </div>
                 <div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="item.relatedSection">
-                  {{item.relatedSection}}
+                  {{item.relatedSection?item.relatedSection : '--'}}
                 </div>
               </div>
             </a-col>
@@ -132,7 +140,7 @@
                         :title="$t('problemDescription')">{{$t('problemDescription')}}</span>
                 </div>
                 <div class="title-text-right" :class="{'title-text-right-text':disabled}" :title="item.issueOrSuggest">
-                  {{item.issueOrSuggest}}
+                  {{item.issueOrSuggest ? item.issueOrSuggest:'--'}}
                 </div>
               </div>
             </a-col>

jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue

@@ -373,7 +373,11 @@
             antTableHeader[0].style = 'margin-bottom: -8px;padding-bottom: 0px;min-width: 8px;overflow: hidden'
           })
         }
-        if (this.$route.query.taskDefinitionKey != 'pgrqr') {
+        let disabled = false
+        if (this.$route.query.isDisabled) {
+          disabled = JSON.parse(this.$route.query.isDisabled)
+        }
+        if (this.$route.query.taskDefinitionKey != 'pgrqr' && !disabled) {
           this.dataSource.forEach(res => {
             res.sponsorFeedback = ''
           })

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 || []