- {{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/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
index e3cdc3930..f611b6cbc 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
+++ b/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 = ''
})
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 || []
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
index 2e445401c..a282c6bd0 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/SentList.vue
@@ -21,8 +21,8 @@
{{text}}
-
- {{text+'、'+record.title}}
+
+ {{text}}
--
@@ -63,7 +63,7 @@
{
title: this.$t('standardInformation'),
align: 'center',
- dataIndex: 'serialNumber',
+ dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
width: 170
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
index 7e7b36dc4..118d34cae 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
@@ -22,8 +22,8 @@
{{text}}
-
- {{text+'、'+record.title}}
+
+ {{text}}
--
@@ -64,7 +64,7 @@
{
title: this.$t('standardInformation'),
align: 'center',
- dataIndex: 'serialNumber',
+ dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 170
@@ -331,7 +331,8 @@
text-align: right;
margin-top: 20px;
}
- .activeRed{
- color: red;
+
+ .activeRed {
+ color: red;
}
\ No newline at end of file
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
index 559e9f016..ec3a33458 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/doneList.vue
@@ -23,8 +23,8 @@
-
- {{text+'、'+record.title}}
+
+ {{text}}
--
@@ -69,7 +69,7 @@
{
title: this.$t('standardInformation'),
align: 'center',
- dataIndex: 'serialNumber',
+ dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 170
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
index a97b542c2..bd405bd48 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/index.vue
@@ -18,7 +18,7 @@
{{$t('standardInformation')}}
+ v-model="queryParam.standardInfo">
diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue
index fb13eae0c..03459bc80 100644
--- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue
+++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/SentList.vue
@@ -18,8 +18,8 @@
@click="viewClick(record)">{{$t('view')}}
-
- {{text+'、'+record.title}}
+
+ {{text}}
@@ -54,7 +54,7 @@
{
title: this.$t('standardInformation'),
align: 'center',
- dataIndex: 'serialNumber',
+ dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
width: 170
diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue
index eba3c634c..f37f9d6b6 100644
--- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue
+++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/dealtWith.vue
@@ -19,8 +19,8 @@
{{text}}
-
- {{text+'、'+record.title}}
+
+ {{text}}
@@ -52,7 +52,7 @@
{
title: this.$t('standardInformation'),
align: 'center',
- dataIndex: 'serialNumber',
+ dataIndex: 'standardInfo',
scopedSlots: { customRender: 'standardInformation' },
ellipsis: true,
width: 170
diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue
index efc218fae..febfb2bf7 100644
--- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue
+++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/components/doneList.vue
@@ -18,8 +18,8 @@
@click="viewClick(record)">{{$t('view')}}
-
- {{text+'、'+record.title}}
+
+ {{text}}
@@ -51,7 +51,7 @@
{
title: this.$t('standardInformation'),
align: 'center',
- dataIndex: 'serialNumber',
+ dataIndex: 'standardInfo',
ellipsis: true,
scopedSlots: { customRender: 'standardInformation' },
width: 170
diff --git a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue
index 3b8ff22f4..7849db357 100644
--- a/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue
+++ b/jero-web/src/views/toDoCenter/regulatoryAssessmentTasks/index.vue
@@ -9,7 +9,7 @@
{{$t('standardInformation')}}
+ v-model="queryParam.standardInfo">