|
@ -27,14 +27,12 @@ |
|
|
<el-option v-for="dict in allDictOptions[item.column]" :key="dict.value" :label="dict.label" |
|
|
<el-option v-for="dict in allDictOptions[item.column]" :key="dict.value" :label="dict.label" |
|
|
:value="dict.value" /> |
|
|
:value="dict.value" /> |
|
|
</el-select> --> |
|
|
</el-select> --> |
|
|
|
|
|
|
|
|
<el-select |
|
|
<el-select |
|
|
v-else-if="getInputType(item.column) == 'select' " |
|
|
v-else-if="getInputType(item.column) == 'select' " |
|
|
v-model="item.value1" |
|
|
v-model="item.value1" |
|
|
:multiple="item.action == 'in' || item.action == 'notIn' ? true : false" |
|
|
:multiple="item.action == 'in' || item.action == 'notIn' ? true : false" |
|
|
collapse-tags |
|
|
collapse-tags |
|
|
collapse-tags-tooltip |
|
|
collapse-tags-tooltip |
|
|
filterable |
|
|
|
|
|
remote |
|
|
remote |
|
|
reserve-keyword |
|
|
reserve-keyword |
|
|
:placeholder="请选择内容" |
|
|
:placeholder="请选择内容" |
|
@ -64,7 +62,7 @@ |
|
|
</el-form> |
|
|
</el-form> |
|
|
<!-- 添加筛选条件 --> |
|
|
<!-- 添加筛选条件 --> |
|
|
<div class="moreListPush-btn"> |
|
|
<div class="moreListPush-btn"> |
|
|
<span @click="moreListPush">+ {{ 添加筛选条件 }}</span> |
|
|
<span @click="moreListPush">+ 添加筛选条件</span> |
|
|
</div> |
|
|
</div> |
|
|
<!-- 按钮 --> |
|
|
<!-- 按钮 --> |
|
|
<div class="moreListBaseBts" > |
|
|
<div class="moreListBaseBts" > |
|
@ -299,15 +297,18 @@ const resetSelect = (val) => { |
|
|
} |
|
|
} |
|
|
// 范围改变 |
|
|
// 范围改变 |
|
|
const actionSelect = (val)=>{ |
|
|
const actionSelect = (val)=>{ |
|
|
|
|
|
console.log(val) |
|
|
if(val.action=='isNull'|| val.action == 'isNotNull'|| val.action == 'isStr'|| val.action == 'isNotStr'){ |
|
|
if(val.action=='isNull'|| val.action == 'isNotNull'|| val.action == 'isStr'|| val.action == 'isNotStr'){ |
|
|
val.disabled = true |
|
|
val.disabled = true |
|
|
}else{ |
|
|
}else{ |
|
|
val.disabled = false |
|
|
val.disabled = false |
|
|
} |
|
|
} |
|
|
// val.value1 = undefined |
|
|
val.value1 ='' |
|
|
|
|
|
val.value = '' |
|
|
// nextTick(()=>{ |
|
|
// nextTick(()=>{ |
|
|
// val.value1 =[] |
|
|
// val.value1 ='' |
|
|
// val.value = '' |
|
|
// val.value = '' |
|
|
|
|
|
// console.log(val) |
|
|
// }) |
|
|
// }) |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|