布局法规技术评估

jero-web/src/views/businessSupport/technologyAssessment/index.vue

@@ -92,9 +92,10 @@
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
       >
+<!--         v-if="record.gatherResult == 'Completed'"-->
          <span slot="operation" slot-scope="text,record">
            <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>
-           <a class="text-operation" v-if="record.gatherResult == 'Completed'"
+           <a class="text-operation"
               @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
         </span>
       </a-table>
@@ -186,11 +187,11 @@
         whetherTobringList: [
           {
             value: '1',
-            name: '是'
+            name: this.$t('yes')
           },
           {
             value: '2',
-            name: '否'
+            name: this.$t('not')
           }
         ],
         gatherResultList: [
@@ -221,21 +222,21 @@
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'technologyTerritory'
+            dataIndex: 'technologyTerritoryName'
           },
           {
             title: this.$t('evaluationMethod'),
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'evaluationMethods'
+            dataIndex: 'evaluationMethodsName'
           },
           {
             title: this.$t('ProcessStatus'),
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'flowStatus'
+            dataIndex: 'flowStatusName'
           },
           {
             title: this.$t('dateOfInitiation'),
@@ -363,7 +364,11 @@
         window.open(newUrl.href, '_blank')
       },
       evaluationResultsClick(row) {
-        this.$refs.evaluationResultsListRef.getData(JSON.parse(JSON.stringify(row)))
+        let newUrl = this.$router.resolve({
+          path: '/evaluationResultsWhole',
+          query: row
+        })
+        window.open(newUrl.href, '_blank')
       }
     }
   }