1.高级搜索 日期类型控件修改

2.法规预警搜索条件修改

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)',
 }

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

@@ -1479,4 +1479,9 @@ module.exports = {
   contactTheFounder:'联系作者',
   customize:'列表设置',
   customColumn:'自定义列',
+  afterdate:'在...日期之后',
+  afterdatein:'在...日期之后（包含）',
+  beforedate:'在...日期之前',
+  beforedatein:'在...日期之前（包含）',
+  inRecentMonthsin6:'近6个月内（已实施）',
 }

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>
 

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')
-              }
+              },
+
             ]
           }
         ],