From d1c4cfd8cae5d022f431f12f0b33d0052d9d158b Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Fri, 12 Aug 2022 09:54:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8E=86=E5=8F=B2=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=B4=E5=9B=BA=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/exporthistory/index.vue    |  2 +-
 .../collectionOfRegulatoryOpinions/index.vue  |  1 +
 .../technologyAssessment/index.vue            |  1 +
 .../regulationsKanban/components/addModel.vue | 34 ++++++++++++++++---
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/jero-web/src/components/exporthistory/index.vue b/jero-web/src/components/exporthistory/index.vue
index 6bec68ea0..a2d883e27 100644
--- a/jero-web/src/components/exporthistory/index.vue
+++ b/jero-web/src/components/exporthistory/index.vue
@@ -40,7 +40,7 @@
       :dataSource='areaTable'
       :pagination='false'
       :loading='loading'
-      :scroll="{x: '100%',y:600}"
+      :scroll="{x: '100%',y:370}"
       :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
       @change='handleTableChange'>
 
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
index 0a13a4202..66551a844 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
@@ -232,6 +232,7 @@
       searchReset() {
         this.queryParam = {}
         this.$route.query.serialNumber = ''
+        this.$route.query.gatherResult = ''
         this.pageNo = 1
         this.getList()
       },
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index c2c5935ac..acee733dc 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -301,6 +301,7 @@
       searchReset() {
         this.queryParam = {}
         this.$route.query.serialNumber = ''
+        this.$route.query.flowStatus = ''
         this.pageNo = 1
         this.getList()
       },
diff --git a/jero-web/src/views/regulationsKanban/components/addModel.vue b/jero-web/src/views/regulationsKanban/components/addModel.vue
index 608c4c436..b3a67398c 100644
--- a/jero-web/src/views/regulationsKanban/components/addModel.vue
+++ b/jero-web/src/views/regulationsKanban/components/addModel.vue
@@ -57,6 +57,30 @@
       :scroll='{x: 600}'
 
       @change='handleTableChange'>
+      <span slot="status" slot-scope="text,record" :title="text" >
+        <a v-if="record.designFlowTaskStatus_dicText == '符合'" style='color: #26BD4B'>{{ text }}</a>
+        <a v-if="record.designFlowTaskStatus_dicText == '不符合'" style='color: #E83030'>{{ text }}</a>
+        <a v-if="record.designFlowTaskStatus_dicText == '待追踪'" style='color: #FDA71C'>{{ text }}</a>
+        <a v-if="record.designFlowTaskStatus_dicText == '不涉及'" style='color: #707486'>{{ text }}</a>
+        <a v-if="record.designFlowTaskStatus_dicText == '待确认'" style='color: #00B3BE'>{{ text }}</a>
+        <a v-if="record.designFlowTaskStatus_dicText == '任务终止'" style='color: #E83030'>{{ text }}</a>
+      </span>
+      <span slot="statusprehomo" slot-scope="text,record" :title="text" >
+        <a v-if="record.prehomoFlowTaskStatus_dicText == '符合'" style='color: #26BD4B'>{{ text }}</a>
+        <a v-if="record.prehomoFlowTaskStatus_dicText == '不符合'" style='color: #E83030'>{{ text }}</a>
+        <a v-if="record.prehomoFlowTaskStatus_dicText == '待追踪'" style='color: #FDA71C'>{{ text }}</a>
+        <a v-if="record.prehomoFlowTaskStatus_dicText == '不涉及'" style='color: #707486'>{{ text }}</a>
+        <a v-if="record.prehomoFlowTaskStatus_dicText == '待确认'" style='color: #00B3BE'>{{ text }}</a>
+        <a v-if="record.prehomoFlowTaskStatus_dicText == '任务终止'" style='color: #E83030'>{{ text }}</a>
+      </span>
+      <span slot="filstatuse" slot-scope="text,record" :title="text" >
+        <a v-if="record.verifyFlowTaskStatus_dicText == '符合'" style='color: #26BD4B'>{{ text }}</a>
+        <a v-if="record.verifyFlowTaskStatus_dicText == '不符合'" style='color: #E83030'>{{ text }}</a>
+        <a v-if="record.verifyFlowTaskStatus_dicText == '待追踪'" style='color: #FDA71C'>{{ text }}</a>
+        <a v-if="record.verifyFlowTaskStatus_dicText == '不涉及'" style='color: #707486'>{{ text }}</a>
+        <a v-if="record.verifyFlowTaskStatus_dicText == '待确认'" style='color: #00B3BE'>{{ text }}</a>
+        <a v-if="record.verifyFlowTaskStatus_dicText == '任务终止'" style='color: #E83030'>{{ text }}</a>
+      </span>
 
 <!--      <template slot="file" slot-scope="text, record">-->
 <!--        <a class="action-edit" href="javascript:;" @click="dowloadfile(record)" v-has="'bqnrzdpzxlbj'">{{record.exportFileName}}</a>-->
@@ -125,22 +149,24 @@ export default {
           title: this.$t('designComplianceReview'),
           align: 'center',
           width: 250,
-          dataIndex: 'designStatus_dicText',
+          dataIndex: 'designFlowTaskStatus_dicText',
+          scopedSlots: { customRender: 'status' },
           ellipsis: true
         },
         {
           title: this.$t('preHomeConfirmation'),
           align: 'center',
           width: 270,
-          dataIndex: 'prehomoStatus_dicText',
+          dataIndex: 'prehomoFlowTaskStatus_dicText',
+          scopedSlots: { customRender: 'statusprehomo' },
           ellipsis: true
         },
         {
           title: this.$t('verificationComplianceReview'),
           align: 'center',
           width: 270,
-          dataIndex: 'verifyStatus_dicText',
-          scopedSlots: { customRender: 'file' },
+          dataIndex: 'verifyFlowTaskStatus_dicText',
+          scopedSlots: { customRender: 'filstatuse' },
           ellipsis: true
         }
       ],