commit

src/views/dataEntry_manage/thirdBase/components/edbDataDetail.vue

@@ -10,7 +10,7 @@
       <span 
         class="editsty" 
         @click="$emit('handle',{item:edbInfo,type:'addToBase'})" 
-        v-if="!edbInfo.EdbExist&&permissionBtn.isShowBtn('dataSourcePermission','sciHongqi_opera_addBase')
+        v-if="!edbInfo.EdbInfoId&&permissionBtn.isShowBtn('dataSourcePermission','sciHongqi_opera_addBase')
       "><!-- 加入指标库 -->{{$t('ManualEntryPage.add_tobase')}}</span>
 
       <span 
@@ -22,7 +22,7 @@
       <span 
         class="deletesty" 
         @click="$emit('handle',{item:edbInfo,type:'del'})" 
-        v-if="!edbInfo.EdbExist&&permissionBtn.isShowBtn('dataSourcePermission','sciHongqi_opera_del')
+        v-if="!edbInfo.EdbInfoId&&permissionBtn.isShowBtn('dataSourcePermission','sciHongqi_opera_del')
       "><!-- 删除 -->{{$t('Table.delete_btn')}}</span>
     </div>
 		<el-table

src/views/dataEntry_manage/thirdBase/zhuochuangRedStageBase.vue

@@ -22,17 +22,16 @@
           plain
           @click="handleBatchEdit"
         ><!-- 批量编辑 -->{{$t('SciHongqiPage.btn_batch_edit')}}</el-button>
-        <el-button
+      </div>
+
+      <div class="right-wrap">
+       <el-button
           v-permission="permissionBtn.dataSourcePermission.sciHongqi_export"
-          type="primary"
-          plain
-          size="medium"
+          type="text"
           @click="exportClick"
           :loading="btnload"
         ><!-- 导出Excel -->{{$t('Common.exp_excel')}}</el-button>
-      </div>
 
-      <div class="right-wrap">
         <el-select
 					v-model="leftSearchVal"
 					ref="searchRef"
@@ -336,7 +335,7 @@
       <div class="hint-dialog-wrap">
           <p style="margin-bottom: 20px;">{{ hintText }}</p>
           <ul class="hint-list">
-              <li v-for="(item,index) in showHintList" :key="index" :class="{'hint-item':item.EdbInfoId}" @click="goToEdbBase(item)">
+              <li v-for="(item,index) in showHintList" :key="index" :class="{'hint-item':!batchDelList.length}" @click="goToEdbBase(item)">
                   {{ index+1 }}、{{ item.IndexName }}({{ item.IndexCode }})
               </li>
           </ul>
@@ -525,6 +524,13 @@ export default {
       if(res.Ret !== 200) return 
 
       this.$message.success(/* '删除成功!' */this.$t('MsgPrompt.delete_msg'));
+
+      if(res.Data&&res.Data.length){
+        let haveExistStr= res.Data.map(_ => (`${_.IndexName}(${_.IndexCode})`)).join('、')
+        this.$alert(`${haveExistStr}已加入指标库，不可删除,已过滤`,this.$t('Confirm.prompt'),{
+          confirmButtonText: '知道了',
+        })
+      }
       this.getClassify();
       this.getEdbList()
     },
@@ -638,7 +644,7 @@ export default {
     intoBaseBack() {
       this.isAddIndicsDiaShow = false
       if(this.selectedEdb){
-        this.$refs.edbDetailRef.edbInfo.EdbExist=1
+        this.$refs.edbDetailRef.getEdbDetail()
       }else {
         this.getEdbList()
       }
@@ -1274,10 +1280,10 @@ export default {
     .hint-list {
       max-height: 350px;
       overflow-y: auto;
+      li { margin-bottom: 10px; }
     }
     .hint-item{
         cursor: pointer;
-        margin-bottom: 10px;
         &:hover{
             color:#409EFF;
             text-decoration: underline;