布局法规技术评估

jero-web/src/common/lang/en-us.js

@@ -1124,4 +1124,5 @@ module.exports = {
   engineerFeedbackResults:'Engineer feedback results',
   fileExport:'File export',
   feedbackTime:'Feedback time',
+  regulatoryTechnologyAssessmentProcess:'Regulatory technology assessment process',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1128,4 +1128,5 @@ module.exports = {
   engineerFeedbackResults:'工程师反馈结果',
   fileExport:'文件导出',
   feedbackTime:'反馈时间',
+  regulatoryTechnologyAssessmentProcess:'法规技术评估流程',
 }

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

@@ -92,10 +92,10 @@
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
       >
-<!--         v-if="record.gatherResult == 'Completed'"-->
+        <!--         -->
-         <span slot="operation" slot-scope="text,record">
+        <span slot="operation" slot-scope="text,record">
            <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>
-           <a class="text-operation"
+           <a class="text-operation" v-if="record.flowStatus == 'Completed'"
               @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
         </span>
       </a-table>

jero-web/src/views/dashboard/components/myList.vue

@@ -100,6 +100,12 @@
             query: row
           })
           window.open(newUrl.href, '_blank')
+        }else if (row.prcType == '6') {
+          let newUrl = this.$router.resolve({
+            path: '/evaluationProcess',
+            query: row
+          })
+          window.open(newUrl.href, '_blank')
         }
       }
     }

jero-web/src/views/processCenter/processForm/processDetails/index.vue

@@ -13,7 +13,7 @@
     </div>
     <div class="action-bar">
     </div>
-    <regulatoryCirculationHistory v-if="$route.query.prcType == '5'"/>
+    <regulatoryCirculationHistory v-if="$route.query.prcType == '5' || $route.query.prcType == '6'"/>
     <circulationHistory v-else/>
   </div>
 </template>

jero-web/src/views/processCenter/processList/tabComponents/alreadyProcess/index.vue

@@ -51,7 +51,8 @@
         selectedRowKeys: [],
         prcTypeName: {
           1: this.$t('taskConfirmationProcess'),
-          5:this.$t('collectionOfRegulatoryOpinionsProcess')
+          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
+          6:this.$t('regulatoryTechnologyAssessmentProcess')
         },
         columns: [
           {

jero-web/src/views/processCenter/processList/tabComponents/alreadySend/index.vue

@@ -52,7 +52,8 @@
         selectedRowKeys: [],
         prcTypeName: {
           1: this.$t('taskConfirmationProcess'),
-          5:this.$t('collectionOfRegulatoryOpinionsProcess')
+          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
+          6:this.$t('regulatoryTechnologyAssessmentProcess')
         },
         columns: [
           {

jero-web/src/views/processCenter/processList/tabComponents/monitorProcess/index.vue

@@ -52,7 +52,8 @@
         selectedRowKeys: [],
         prcTypeName: {
           1: this.$t('taskConfirmationProcess'),
-          5:this.$t('collectionOfRegulatoryOpinionsProcess')
+          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
+          6:this.$t('regulatoryTechnologyAssessmentProcess')
         },
         columns: [
           {

jero-web/src/views/processCenter/processList/tabComponents/processCenter/index.vue

@@ -50,7 +50,8 @@
         selectedRowKeys: [],
         prcTypeName: {
           1: this.$t('taskConfirmationProcess'),
-          5:this.$t('collectionOfRegulatoryOpinionsProcess')
+          5:this.$t('collectionOfRegulatoryOpinionsProcess'),
+          6:this.$t('regulatoryTechnologyAssessmentProcess')
         },
         columns: [
           {
@@ -168,6 +169,12 @@
             query: row
           })
           window.open(newUrl.href, '_blank')
+        } else if (row.prcType == '6') {
+          let newUrl = this.$router.resolve({
+            path: '/evaluationProcess',
+            query: row
+          })
+          window.open(newUrl.href, '_blank')
         }
       },
       onChange(page, pageSize) {