diff --git a/src/components/scInput/index.vue b/src/components/scInput/index.vue index d99b25d..08f535c 100644 --- a/src/components/scInput/index.vue +++ b/src/components/scInput/index.vue @@ -1,5 +1,5 @@ + + + + + + diff --git a/src/components/scSearch/index.vue b/src/components/scSearch/index.vue index af9d6b7..2635dc2 100644 --- a/src/components/scSearch/index.vue +++ b/src/components/scSearch/index.vue @@ -2,11 +2,11 @@
- +
- +
@@ -18,7 +18,17 @@
- +
+ +
+
+
+ +
+
+ +
+
@@ -96,7 +106,7 @@ export default { grouped[item.code] = {}; } } - if (item.type === 'text') { + if (item.type === 'text' && Array.isArray(item.code)) { item.code.forEach(code => { if(!grouped[code]){ grouped[code] = {}; @@ -123,7 +133,7 @@ export default { operator:operator, value:operator=='link'?"":[] } - grouped[item.code] = operator==''?"":params; + grouped[item.code] = operator=='' || operator== 'link'?"":params; } }) return grouped diff --git a/src/scui.js b/src/scui.js index 2d0357f..459a5d2 100644 --- a/src/scui.js +++ b/src/scui.js @@ -24,6 +24,7 @@ import ossImgListUpload from "./components/scUpload/uploadListImg"; import scDatePicker from "./components/scDatePicker"; import scMultipleSelect from "./components/scMultipleSelect"; import scInput from "./components/scInput"; +import scVgInput from "./components/scInput/inputVague"; import scSearch from "./components/scSearch"; import scStatusIndicator from './components/scMini/scStatusIndicator' @@ -73,6 +74,7 @@ export default { app.component('scDatePicker', scDatePicker); app.component('scMultipleSelect', scMultipleSelect); app.component('scInput', scInput); + app.component('scVgInput', scVgInput); app.component('scSearch', scSearch); //注册全局指令 diff --git a/src/views/setting/company/index.vue b/src/views/setting/company/index.vue index 38e4942..be50191 100644 --- a/src/views/setting/company/index.vue +++ b/src/views/setting/company/index.vue @@ -77,9 +77,12 @@ export default { selection: [], searchList:[ {name:'开通日期',type:'date',code:'activation_date'}, - {name:'公司名称',type:'multiple',code:'id', data:[], placeholder:"请选择公司名称",}, - {name:'状态',type:'select',code:'active_status', data:[], placeholder:"请选择状态",}, - {name:'关键字',type:'text',code:['domain','name','address','owner','mobile'],keyword:true}, + {name:'公司名称',type:'multiple',code:'id', data:[], placeholder:"请选择公司名称"}, + {name:'状态',type:'select',code:'active_status', data:[], placeholder:"请选择状态"}, + {name:'手机号',type:'text',code:'mobile',placeholder:"请输入手机号"}, + {name:'公司地址',type:'text',code:['address'],placeholder:"请输入公司地址"}, + {name:'负责人',type:'text',code:['owner'],placeholder:"请输入负责人"}, + {name:'关键字',type:'text',code:['domain','name'],keyword:true}, ], params: {}, }