commit

src/components/edb/edbSelectSearch.vue

@@ -17,7 +17,12 @@
   >
     <i slot="prefix" class="el-input__icon el-icon-search"></i>
     <div class="fixed-top">
-      <el-radio-group v-model="searchType" size="mini" @input="searchApi(current_search)">
+      <el-radio-group 
+        v-model="searchType" 
+        size="mini" 
+        @input="searchApi(current_search)"
+        v-if="!search_txt"
+      >
         <el-radio-button label="0">全部</el-radio-button>
         <el-radio-button label="1">收藏</el-radio-button>
       </el-radio-group>
@@ -57,6 +62,18 @@ export default {
     style: {
       type: String,
       default:''
+    },
+    defaultVal: {
+      type: String,
+      default: ''
+    },
+    defaultOpt: {
+      type: Array,
+      default: () => []
+    },
+    params: {  //额外的请求参
+      type:Object,
+      default: () =>{}
     }
   },
   data() {
@@ -92,7 +109,8 @@ export default {
 			dataBaseInterface.targetSearchByPage({
 				KeyWord:query,
 				CurrentIndex: page,
-        EdbCollect: this.searchType
+        EdbCollect: this.searchType,
+        ...this.params
 			}).then(res => {
 				if(res.Ret !== 200) return
 

src/views/dataEntry_manage/addChart.vue

@@ -92,6 +92,7 @@
 								</el-option>
 							</el-select>
 							
+							<!-- 指标库搜索 -->
 							<edbSelectSearch 
 								v-else
 								style="width:90%;margin-top: 10px;display: block;"

src/views/dataEntry_manage/chartSetting.vue

@@ -1050,7 +1050,7 @@ export default {
     },
   },
   methods: {
-    //控制页面按钮权限
+    //控制页面按钮权限  key编码code
 		isBtnShow(key){
 			const {chartLibPermission,checkPermissionBtn}=this.permissionBtn
 

src/views/dataEntry_manage/editChart.vue

@@ -64,6 +64,7 @@
 								</el-radio-group>
 							</div>
 							<el-select
+								v-if="edbFromType===1"
 								v-model="search_txt"
 								v-loadMore="searchLoad"
 								ref="searchRef"
@@ -98,6 +99,13 @@
 									</edbDetailPopover>
 								</el-option>
 							</el-select>
+
+							<!-- 指标库搜索 -->
+							<edbSelectSearch 
+								v-else
+								style="width:90%;margin-top: 10px;display: block;"
+								@change="selectTarget"
+							/>
 						</div>
 					</el-form-item>