From d1748f29c5164aa912b914fc092ce65f3fc8b3d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Fri, 17 Feb 2023 16:07:11 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2=20?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E7=B1=BB=E5=9E=8B=E6=8E=A7=E4=BB=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=202.=E6=B3=95=E8=A7=84=E9=A2=84=E8=AD=A6=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  6 +++++-
 jero-web/src/common/lang/zh-cn.js             |  5 +++++
 .../components/globalAdvancedQuery/index.vue  | 20 +++++++++----------
 .../views/regulatoryEarlyWarning/index.vue    |  7 ++++++-
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 4c187d4d7..e2f58b10f 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -1378,5 +1378,9 @@ module.exports = {
   columnforced:'Confirm a forced retraction?',
   customize:'List setting',
   customColumn:'Custom column',
-
+  afterdate:'In... After the date',
+  afterdatein:'In... After date (inclusive)',
+  beforedate:'In... Before  date',
+  beforedatein:'In... Before  date (inclusive)',
+  inRecentMonthsin6:'Within 6 months (implemented)',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 5389c8ff0..ed71ce96b 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -1479,4 +1479,9 @@ module.exports = {
   contactTheFounder:'联系作者',
   customize:'列表设置',
   customColumn:'自定义列',
+  afterdate:'在...日期之后',
+  afterdatein:'在...日期之后（包含）',
+  beforedate:'在...日期之前',
+  beforedatein:'在...日期之前（包含）',
+  inRecentMonthsin6:'近6个月内（已实施）',
 }
\ No newline at end of file
diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue
index ac400b983..b8e71934d 100644
--- a/jero-web/src/components/globalAdvancedQuery/index.vue
+++ b/jero-web/src/components/globalAdvancedQuery/index.vue
@@ -96,7 +96,7 @@
                 <a-select :placeholder="$t('matchRules')" :value="item.rule"
                           :getPopupContainer="node=>node.parentNode" @change="handleRuleChange(item,$event)">
                    <!--                  等于-->
-                  <a-select-option value="eq">{{$t('beEqualTo')}}</a-select-option>
+                  <a-select-option v-if="item.type != 'date'" value="eq">{{$t('beEqualTo')}}</a-select-option>
                    <!--                  包含-->
                   <a-select-option v-if="item.type != 'date'" value="like">{{$t('contain')}}</a-select-option>
                   <!--                  以..开始-->
@@ -106,15 +106,15 @@
                   <!--                  在...中-->
                   <a-select-option v-if="item.type == 'string'" value="in">{{$t('in')}}</a-select-option>
                   <!--                  不等于-->
-                  <a-select-option value="ne">{{$t('notEqual')}}</a-select-option>
-                  <!--                  大于-->
-                  <a-select-option v-if="item.type == 'date'" value="gt">{{$t('granter')}}</a-select-option>
-                  <!--                  大于等于-->
-                  <a-select-option v-if="item.type == 'date'" value="ge">{{$t('greaterOrEqual')}}</a-select-option>
-                  <!--                  小于-->
-                  <a-select-option v-if="item.type == 'date'" value="lt">{{$t('less')}}</a-select-option>
-                  <!--                  小于等于-->
-                  <a-select-option v-if="item.type == 'date'" value="le">{{$t('lessOrEqual')}}</a-select-option>
+                  <a-select-option v-if="item.type != 'date'" value="ne">{{$t('notEqual')}}</a-select-option>
+                  <!--                  在...日期之后-->
+                  <a-select-option v-if="item.type == 'date'" value="gt">{{$t('afterdate')}}</a-select-option>
+                  <!--                  在...日期之后（包含）-->
+                  <a-select-option v-if="item.type == 'date'" value="ge" :title="$t('afterdatein')">{{$t('afterdatein')}}</a-select-option>
+                  <!--                  在...日期之前-->
+                  <a-select-option v-if="item.type == 'date'" value="lt">{{$t('beforedate')}}</a-select-option>
+                  <!--                  在...日期之前（包含）-->
+                  <a-select-option v-if="item.type == 'date'" value="le" :title="$t('beforedatein')">{{$t('beforedatein')}}</a-select-option>
                 </a-select>
               </a-col>
 
diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue
index 2e55ad9f6..d4952cef3 100644
--- a/jero-web/src/views/regulatoryEarlyWarning/index.vue
+++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue
@@ -143,6 +143,10 @@
                 value: '2',
                 name: this.$t('inRecentMonths6')
               },
+              {
+                value: '5',
+                name: this.$t('inRecentMonthsin6')
+              },
               {
                 value: '3',
                 name: this.$t('inRecentYear1')
@@ -150,7 +154,8 @@
               {
                 value: '4',
                 name: this.$t('inRecentYear2')
-              }
+              },
+
             ]
           }
         ],