From 6286549c8cdf297716920adeb7578fc5a11767d8 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Wed, 13 Jul 2022 18:36:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/TermInformation.vue            |  2 +-
 .../components/evaluatorFeedbackList.vue      | 59 ++++++++++++++-----
 .../processForm/evaluationProcess/index.vue   | 57 ++++++++++++++++--
 3 files changed, 98 insertions(+), 20 deletions(-)

diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
index 89f862ffc..620a72018 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
@@ -92,7 +92,7 @@
           },
           {
             title: this.$t('evaluationMethod'),
-            dataIndex: 'evaluationMethod',
+            dataIndex: 'evaluationMethods',
             align: 'center',
             scopedSlots: { customRender: 'evaluationMethod' }
           },
diff --git a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
index 1711ad4fe..bd94d2b08 100644
--- a/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
+++ b/jero-web/src/views/processCenter/components/evaluatorFeedbackList.vue
@@ -14,6 +14,14 @@
         :data-source="dataSource"
         :columns="columns"
       >
+        <div slot="clauseContent" slot-scope="text,result">
+          <a-tooltip placement="topLeft">
+            <template slot="title">
+              <span v-html="text"></span>
+            </template>
+            <div class="clauseContent-text" v-html="text"></div>
+          </a-tooltip>
+        </div>
       </a-table>
     </div>
     <uploadFile ref="uploadFile" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
@@ -23,8 +31,10 @@
 <script>
   import { getAction, postAction } from '@/api/manage'
   import uploadFile from '@/components/uploadFile/file'
+
   export default {
     name: 'evaluatorFeedback',
+
     components: {
       uploadFile
     },
@@ -33,31 +43,38 @@
         type: String,
         default: ''
       },
+      evaluatorFeedbackList: {
+        type: Array,
+        default: (() => {
+          return []
+        })
+      }
     },
     data() {
       return {
-        disabled:false,
-        loading:false,
-        uploadIndex:'',
-        dataSource:[],
-        columns:[
+        disabled: false,
+        loading: false,
+        uploadIndex: '',
+        dataSource: [],
+        columns: [
           {
             title: this.$t('clauseNo'),
-            dataIndex: 'items_num',
+            dataIndex: 'itemNum',
             align: 'center',
             ellipsis: true
           },
           {
             title: this.$t('clauseName'),
-            dataIndex: 'items_name',
+            dataIndex: 'itemName',
             align: 'center',
             ellipsis: true
           },
           {
             title: this.$t('clauseContent'),
-            dataIndex: 'iterms_conditions',
+            dataIndex: 'itemContent',
             align: 'center',
-            ellipsis: true
+            ellipsis: true,
+            scopedSlots: { customRender: 'clauseContent' }
           },
           {
             title: this.$t('evaluationMethod'),
@@ -94,15 +111,17 @@
             dataIndex: 'complianceResults',
             align: 'center',
             ellipsis: true
-          },
-        ],
+          }
+        ]
       }
     },
     mounted() {
-
+      if (this.evaluatorFeedbackList && this.evaluatorFeedbackList.length > 0) {
+        this.dataSource = this.evaluatorFeedbackList
+      }
     },
     methods: {
-      clickButtonToUpload(item,index) {
+      clickButtonToUpload(item, index) {
         this.$refs.uploadFile.perentHandleFunc()
         this.$refs.uploadFile.visible = true
         this.uploadName = item
@@ -126,7 +145,7 @@
         /** 赋值给当前对应的表单文件 */
         this.dataList[this.uploadIndex][this.uploadName] = attIdList.join(',')
         this.dataList = [...this.dataList]
-      },
+      }
     }
   }
 </script>
@@ -214,4 +233,16 @@
     margin-left: 8px;
     cursor: pointer;
   }
+  .clauseContent-text {
+    width: 100%;
+    overflow: hidden;
+    display: -webkit-box;
+    text-overflow: ellipsis;
+    /*! autoprefixer: off */
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    /*! autoprefixer: on;*/
+    text-justify: inter-ideograph;
+    word-break: break-all
+  }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
index 17fcc8177..c7e7b5d10 100644
--- a/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/evaluationProcess/index.vue
@@ -21,6 +21,7 @@
         />
         <evaluatorFeedbackList
           v-if="isDisplay && isTrue"
+          :evaluatorFeedbackList="evaluatorFeedbackList"
           ref="evaluatorFeedbackListRef"
           :title="$t('evaluatorFeedback')"
         />
@@ -72,11 +73,13 @@
         isDisplay: true,
         feedbackDataList: [],
         queryProject: {},
+        evaluatorFeedbackList: [],
         complianceResult: {},
         isPreservation: false,
         isSendBack: false,
         isTrue: false,
-        standardContentList: [
+        standardContentList:[],
+        standardContent: [
           {
             title: this.$t('standard'),
             value: 'serialNumber'
@@ -106,7 +109,35 @@
             title: this.$t('processBackground'),
             value: 'processBackground'
           }
-        ]
+        ],
+        evaluatorFeedback:[
+          {
+            title: this.$t('standard'),
+            value: 'serialNumber'
+          },
+          {
+            title: this.$t('title'),
+            value: 'title'
+          },
+          {
+            title: this.$t('regulatoryEngineer'),
+            value: 'regulationOwnerName'
+          },
+          {
+            title: this.$t('closingDate'),
+            value: 'endTime'
+          },
+          {
+            title: this.$t('RelevantMaterials'),
+            value: 'relatedDataFileId',
+            type: 2
+          },
+          {},
+          {
+            title: this.$t('processBackground'),
+            value: 'processBackground'
+          }
+        ],
       }
     },
     mounted() {
@@ -132,14 +163,30 @@
           }
           this.isTrue = this.queryProject.evaluationType == 'Feedback evaluation' ? false : true
           if (this.isTrue) {
-            this.standardContentList = this.standardContentList.filter(res => {
-              return res.title != this.$t('evaluationMethod')
-            })
+            this.standardContentList = this.evaluatorFeedback
+            this.lawsTechnologyEvaluationItem()
           } else {
+            this.standardContentList = this.standardContent
             this.lawsOpinionAssessmentResult()
           }
         })
       },
+      lawsTechnologyEvaluationItem() {
+        getAction('/lawsTechnologyEvaluation/lawsTechnologyEvaluationItemResultEO/list', {
+          lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,
+          actiProcInstId: this.$route.query.prcId,
+          createBy: this.userInfo().username
+        }).then((res) => {
+          if (res.success) {
+            this.evaluatorFeedbackList = res.result || []
+            this.loading = false
+          } else {
+            this.evaluatorFeedbackList = []
+            this.loading = false
+          }
+          this.isDisplay = true
+        })
+      },
       lawsOpinionAssessmentResult() {
         getAction(this.url.list, {
           lawsTechnologyEvaluationId: this.queryProject.lawsTechnologyEvaluationId,