Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-web/src/components/menu/SideMenu.vue

@@ -69,7 +69,7 @@
     methods: {
       onSelect(obj) {
         this.$emit('menuSelect', obj)
-      },
+      }
     }
   }
 </script>
@@ -201,5 +201,14 @@
     left: 0 !important;
     right: inherit !important;
   }
+
+</style>
+<style scoped>
+  ::v-deep .ant-menu-item a {
+    overflow: hidden !important;
+    white-space: nowrap!important;
+    text-overflow: ellipsis!important;
+    -o-text-overflow: ellipsis!important;
+  }
 </style>
 <!-- update_end author:sunjianlei date:20190530 for: 选中首页的时候不显示背景颜色 -->

jero-web/src/components/menu/index.js

@@ -109,7 +109,7 @@ export default {
         props = { to: { path: menu.path } }
       }
 
-      const attrs = { href: menu.path, target: menu.meta.target }
+      const attrs = { href: menu.path, target: menu.meta.target , title:menu.meta.title }
 
       if (menu.children && menu.alwaysShow) {
         // 把有子菜单的 并且 父菜单是要隐藏子菜单的
@@ -162,7 +162,7 @@ export default {
       span
       slot = 'title' >
         { this.renderIcon(menu.meta.icon) }
-        < span > { menu.meta.title } < /span>
+        < span title={menu.meta.title}> { menu.meta.title } < /span>
         < /span>
       {
         itemArr

jero-web/src/components/search/index.vue

@@ -223,7 +223,7 @@
         // 将半年的时间单位换算成毫秒
         var halfYear = 365 / 2 * 24 * 3600 * 1000
         // 半年前的时间（毫秒单位）
-        var pastResult = curDate - halfYear
+        var pastResult = curDate + halfYear
         // 日期函数，定义起点为半年前
         var pastDate = new Date(pastResult)
         var pastYear = pastDate.getFullYear()
@@ -235,7 +235,7 @@
         if (pastDay >= 0 && pastDay <= 9) {
           pastDay = '0' + pastDay
         }
-        var endDate = pastYear + '-' + pastMonth + '-' + pastDay
+        var endDate = pastYear + '-' + pastMonth + '-' + (pastDay + 1)
         return endDate
       },
       dateChange(item) {

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

@@ -75,7 +75,7 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <div @click="initiatingProcessClick" class="operator-text">
+      <div @click="initiatingProcessClick" v-has="'regulatoryComments:initiationProcess'" class="operator-text">
         <a-icon type="apartment"/>
         {{$t('initiatingProcess')}}
       </div>

jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue

@@ -19,10 +19,18 @@
                     <div class="title-text" :title="$t('applicableMarket')">
                       <span>{{$t('applicableMarket')}}</span>
                     </div>
-                    <j-dict-select-tag class="box-input" v-model="queryParam.applyMarket"
+                    <a-select class="box-input"
                               :placeholder="$t('PleaseSelect')+$t('applicableMarket')"
-                                       :type="'select'"
+                              style="width: 100%"
-                                       :triggerChange="false" :dictCode="'region'"/>
+                              v-model="queryParam.applyMarket">
+                      <a-select-option v-for="(item, key) in applyMarketList"
+                                       :key="key"
+                                       :value="item.value">
+                     <span style="display: inline-block;width: 100%" :title=" item.title ">
+                           {{ item.title}}
+                     </span>
+                      </a-select-option>
+                    </a-select>
                   </div>
                 </a-col>
                 <a-col :md="6" :sm="8">
@@ -150,6 +158,7 @@
           deleteBatch: '/problemKnowledgeBase/countryCardManageReleaseEO/deleteBatch'
         },
         userInfoQuery: {},
+        applyMarketList: [],
         selectedRowKeys: [],
         columns: [
           {
@@ -177,10 +186,20 @@
     mounted() {
       document.title = 'Country Card-' + this.$t('managePublishing')
       this.getList()
+      this.getApplyMarketList()
       this.userInfoQuery = this.userInfo()
     },
     methods: {
       ...mapGetters(['userInfo']),
+      getApplyMarketList() {
+        getAction('/problemKnowledgeBase/countryCardManageReleaseEO/getApplyMarketList', { queryFlag: '1' }).then((res) => {
+          if (res.success) {
+            this.applyMarketList = res.result || []
+          } else {
+            this.applyMarketList = []
+          }
+        })
+      },
       searchQuery() {
         this.pageNo = 1
         this.getList()
@@ -200,6 +219,7 @@
         this.getList()
       },
       countryCardReleaseAddForm() {
+        this.getApplyMarketList()
         this.pageNo = 1
         this.getList()
       },
@@ -256,6 +276,7 @@
                     _this.$message.success(_this.$t('OperationSuccessful'))
                     _this.selectedRowKeys = []
                     _this.getList()
+                    _this.getApplyMarketList()
                   } else {
                     _this.$message.warning(res.message)
                   }
@@ -317,6 +338,7 @@
               if (res.success) {
                 _this.$message.success(_this.$t('OperationSuccessful'))
                 _this.getList()
+                _this.getApplyMarketList()
               } else {
                 _this.$message.warning(res.message)
               }

jero-web/src/views/regulatoryEarlyWarning/index.vue

@@ -244,7 +244,7 @@
         // 将半年的时间单位换算成毫秒
         var halfYear = 365 / 2 * 24 * 3600 * 1000
         // 半年前的时间（毫秒单位）
-        var pastResult = curDate - halfYear
+        var pastResult = curDate + halfYear
         // 日期函数，定义起点为半年前
         var pastDate = new Date(pastResult)
         var pastYear = pastDate.getFullYear()
@@ -256,7 +256,7 @@
         if (pastDay >= 0 && pastDay <= 9) {
           pastDay = '0' + pastDay
         }
-        var endDate = pastYear + '-' + pastMonth + '-' + pastDay
+        var endDate = pastYear + '-' + pastMonth + '-' + (pastDay + 1)
         return endDate
       },
       pageOnChange(page) {