Karsa пре 3 месеци
родитељ
комит
33c871aba7
1 измењених фајлова са 24 додато и 14 уклоњено
  1. 24 14
      src/views/dataEntry_manage/thirdBase/zhuochuangRedStageBase.vue

+ 24 - 14
src/views/dataEntry_manage/thirdBase/zhuochuangRedStageBase.vue

@@ -109,7 +109,7 @@
                 </span>
               </div
               >
-              <div v-if="select_node === data.UniqueCode">
+              <div v-if="select_node===data.UniqueCode&&data.ClassifyId">
                 <img
                   src="~@/assets/img/data_m/move_ico.png"
                   v-if="permissionBtn.isShowBtn('dataSourcePermission','sciHongqi_classify_move')"
@@ -334,8 +334,8 @@
       center>
       <div class="hint-dialog-wrap">
           <p style="margin-bottom: 20px;">{{ hintText }}</p>
-          <ul>
-              <li v-for="(item,index) in (existEdbList||batchDelList)" :key="index" class="hint-item" @click="goToEdbBase(item)">
+          <ul class="hint-list">
+              <li v-for="(item,index) in showHintList" :key="index" class="hint-item" @click="goToEdbBase(item)">
                   {{ index+1 }}、{{ item.IndexName }}({{ item.IndexCode }})
               </li>
           </ul>
@@ -401,6 +401,10 @@ export default {
             2:this.$t('YsDataPage.haved_some_msg'),//指标库中已存在以下指标,会自动过滤!
             3: this.$t('SciHongqiPage.del_msg')
         }[key]
+    },
+
+    showHintList() {
+      return this.existEdbList.length ? this.existEdbList : this.batchDelList;
     }
   },
   watch: {
@@ -539,16 +543,18 @@ export default {
 
      //跳转至指标详情
     goToEdbBase(data){
-        const {EdbClassifyId,EdbInfoId,EdbUniqueCode} = data||{}
-        const { href } = this.$router.resolve({
-            path:'/database',
-            query:{
-                code:EdbUniqueCode,
-                id:EdbInfoId,
-                classifyId:EdbClassifyId,
-            }
-        })
-        window.open(href,"_blank")
+      if(!EdbInfoId) return
+
+      const {EdbClassifyId,EdbInfoId,EdbUniqueCode} = data||{}
+      const { href } = this.$router.resolve({
+          path:'/database',
+          query:{
+              code:EdbUniqueCode,
+              id:EdbInfoId,
+              classifyId:EdbClassifyId,
+          }
+      })
+      window.open(href,"_blank")
     },
 
     /* 获取所有批量操作的指标信息 */
@@ -847,7 +853,7 @@ export default {
       this.selectClassify = data.BaseFromSciHqIndexId?0:data.ClassifyId;
       this.selectEdb = data.BaseFromSciHqIndexId;
 
-      if(this.selectClassify){
+      if(!this.selectEdb){
         this.page_no = 1;
         this.getEdbList();
       }
@@ -1260,6 +1266,10 @@ export default {
 }
 .hint-dialog-wrap{
     padding-bottom:30px;
+    .hint-list {
+      max-height: 350px;
+      overflow-y: auto;
+    }
     .hint-item{
         cursor: pointer;
         margin-bottom: 10px;