From 0bff8017c708d5f39f188a9d08fd2a87925902ec Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 16 Aug 2022 09:29:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/countryCardList.vue            |  2 +
 .../components/countryCardRelease.vue         |  2 +
 .../views/regulatoryEarlyWarning/index.vue    | 39 ++++++++++++++++++-
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue
index 4c2368253..d1da96f8f 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardList.vue
@@ -10,6 +10,8 @@
               </div>
               <a-select :placeholder="$t('PleaseSelect')+$t('applicableMarket')"
                         :disabled="false"
+                        style="z-index: 100"
+                        :getPopupContainer="triggerNode=> triggerNode.parentNode"
                         v-model="queryParam.applyMarket">
                 <a-select-option v-for="(item, key) in applyMarketList"
                                  :key="key"
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
index 367fa4314..be473f0cb 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue
@@ -20,6 +20,7 @@
                       <span>{{$t('applicableMarket')}}</span>
                     </div>
                     <a-select class="box-input"
+                              :getPopupContainer="triggerNode=> triggerNode.parentNode"
                               :placeholder="$t('PleaseSelect')+$t('applicableMarket')"
                               style="width: 100%"
                               v-model="queryParam.applyMarket">
@@ -39,6 +40,7 @@
                       <span>{{$t('releaseStatus')}}</span>
                     </div>
                     <a-select class="box-input"
+                              :getPopupContainer="triggerNode=> triggerNode.parentNode"
                               :placeholder="$t('PleaseSelect')+$t('releaseStatus')"
                               style="width: 100%"
                               v-model="queryParam.releaseStatus">
diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue
index a2d0ce102..4e9e49ab0 100644
--- a/jero-web/src/views/regulatoryEarlyWarning/index.vue
+++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue
@@ -35,6 +35,39 @@
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
       >
+        <span slot="vehicleInProductionDate" slot-scope="text,result">
+              <span v-if="result.xin1_che1_xing2_shi2_shi1_ri4_qi1 == 'yellow'">
+                   {{text}}
+              </span>
+               <span v-else-if="result.xin1_che1_xing2_shi2_shi1_ri4_qi1 == 'red'">
+                   {{text}}
+              </span>
+               <span v-else>
+                   {{text}}
+               </span>
+        </span>
+        <span slot="ImplementationDate" slot-scope="text,result">
+              <span v-if="result.new_colour == 'yellow'" style="color: #fdd835">
+                   {{text}}
+              </span>
+               <span v-else-if="result.new_colour == 'red'" style="color: red">
+                   {{text}}
+              </span>
+               <span v-else>
+                   {{text}}
+               </span>
+        </span>
+        <span slot="vehicleInProductionDate" slot-scope="text,result">
+              <span v-if="result.implement_colour == 'yellow'" style="color: #fdd835">
+                   {{text}}
+              </span>
+               <span v-else-if="result.implement_colour == 'red'" style="color: red">
+                   {{text}}
+              </span>
+               <span v-else>
+                   {{text}}
+               </span>
+        </span>
       </a-table>
       <div class="page" v-if="dataSource && dataSource.length > 0">
         <a-pagination
@@ -138,14 +171,16 @@
             align: 'center',
             ellipsis: true,
             width: 210,
-            dataIndex: 'implement_time'
+            dataIndex: 'implement_time',
+            scopedSlots: { customRender: 'vehicleInProductionDate' }
           },
           {
             title: this.$t('ImplementationDate'),
             align: 'center',
             ellipsis: true,
             width: 210,
-            dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1'
+            dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1',
+            scopedSlots: { customRender: 'ImplementationDate' }
           }
         ]
       }