|
|
@ -23,8 +23,8 @@ |
|
|
<!-- 数字输入框 --> |
|
|
<!-- 数字输入框 --> |
|
|
<el-input-number v-else-if="getInputType(item.column) == 'inputNumber'" v-model="item.value" :precision="getInputPrecision(item.column)" :disabled="item.disabled"/> |
|
|
<el-input-number v-else-if="getInputType(item.column) == 'inputNumber'" v-model="item.value" :precision="getInputPrecision(item.column)" :disabled="item.disabled"/> |
|
|
<!-- 下拉框 --> |
|
|
<!-- 下拉框 --> |
|
|
<el-select v-else-if="getInputType(item.column) == 'select'" v-model="item.value1" :placeholder="t('ts.请选择内容')" :filterable="true" clearable :disabled="item.disabled" :multiple="item.action=='in' || item.action=='notIn' ? true : false" collapse-tags collapse-tags-tooltip :key="item.action"> |
|
|
<el-select v-else-if="getInputType(item.column) == 'select'" v-model="item.value1" :placeholder="t('ts.请选择内容')" :filterable="getFilterable(item.column)" clearable :disabled="item.disabled" :multiple="item.action=='in' || item.action=='notIn' ? true : false" collapse-tags collapse-tags-tooltip :key="item.action"> |
|
|
<el-option v-for="dict in initSelectOptions(item.column)" :key="dict.value" :label="t(`ts.${dict.label}`).replace('ts.','')" |
|
|
<el-option v-for="dict in allDictOptions[item.column]" :key="dict.value" :label="t(`ts.${dict.label}`).replace('ts.','')" |
|
|
:value="dict.value" /> |
|
|
:value="dict.value" /> |
|
|
<!-- <el-option v-for="(op, index) in initSelectOptions(item.column)" :label="op[item.optionsLabel] || op.label" |
|
|
<!-- <el-option v-for="(op, index) in initSelectOptions(item.column)" :label="op[item.optionsLabel] || op.label" |
|
|
:value="op[item.optionsValue] || op.value" :key="index" /> --> |
|
|
:value="op[item.optionsValue] || op.value" :key="index" /> --> |
|
|
@ -57,8 +57,19 @@ |
|
|
import { Minus } from '@element-plus/icons-vue' |
|
|
import { Minus } from '@element-plus/icons-vue' |
|
|
import * as defaultButtons from '@/utils/disposition/defaultButtons' |
|
|
import * as defaultButtons from '@/utils/disposition/defaultButtons' |
|
|
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' |
|
|
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' |
|
|
|
|
|
import * as UserApi from '@/api/system/user' |
|
|
const { t } = useI18n() |
|
|
const { t } = useI18n() |
|
|
|
|
|
|
|
|
|
|
|
const userListAll = ref([]) |
|
|
|
|
|
UserApi.getUserListAll().then((res) => { |
|
|
|
|
|
userListAll.value = res.map(item => { |
|
|
|
|
|
return { |
|
|
|
|
|
label: item.nickname, |
|
|
|
|
|
value: item.id |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
const props = defineProps({ |
|
|
const props = defineProps({ |
|
|
// 主组件name值 |
|
|
// 主组件name值 |
|
|
routeName: { |
|
|
routeName: { |
|
|
@ -142,7 +153,7 @@ const moreListOptions = ref({ |
|
|
|
|
|
|
|
|
const type = searchOption_high.value.find(item => (item.field == val)) |
|
|
const type = searchOption_high.value.find(item => (item.field == val)) |
|
|
let data = 'input' |
|
|
let data = 'input' |
|
|
if (type?.dictType) { |
|
|
if (type?.dictType || type?.field == 'creator') { |
|
|
data = 'select' |
|
|
data = 'select' |
|
|
} else if (type?.form?.component == 'InputNumber') { |
|
|
} else if (type?.form?.component == 'InputNumber') { |
|
|
data = 'inputNumber' |
|
|
data = 'inputNumber' |
|
|
@ -155,6 +166,16 @@ const moreListOptions = ref({ |
|
|
} |
|
|
} |
|
|
return data |
|
|
return data |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
const getFilterable = (val) => { |
|
|
|
|
|
const type = searchOption_high.value.find(item => (item.field == val)) |
|
|
|
|
|
// 下拉列表过长，去掉筛选功能 |
|
|
|
|
|
if (type?.field == 'creator') { |
|
|
|
|
|
return false |
|
|
|
|
|
}else{ |
|
|
|
|
|
return true |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
// 判断数字输入框小数点位数 |
|
|
// 判断数字输入框小数点位数 |
|
|
const getInputPrecision = (val) => { |
|
|
const getInputPrecision = (val) => { |
|
|
const type = searchOption_high.value.find(item => (item.field == val)) |
|
|
const type = searchOption_high.value.find(item => (item.field == val)) |
|
|
@ -231,7 +252,7 @@ const buttonBaseClick = (val) => { |
|
|
let data = [] |
|
|
let data = [] |
|
|
moreListData.value.filters.forEach(item => { |
|
|
moreListData.value.filters.forEach(item => { |
|
|
let obj = {} |
|
|
let obj = {} |
|
|
if(item.value1&&item.value1.length>0){ |
|
|
if(item.value1&&item.value1.length>0 || (item.value1&&typeof item.value1 === 'number')){ |
|
|
obj = { |
|
|
obj = { |
|
|
column: item.column, |
|
|
column: item.column, |
|
|
action: item.action, |
|
|
action: item.action, |
|
|
@ -265,6 +286,25 @@ const buttonBaseClick = (val) => { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
watch(()=>popoverVisible.value,()=>{ |
|
|
|
|
|
if(popoverVisible.value){ |
|
|
|
|
|
getDictOptions() |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
const allDictOptions = ref({}) //所有下拉框选项 |
|
|
|
|
|
const getDictOptions = ()=>{ |
|
|
|
|
|
let selectList = searchOption_high.value.filter(item=>getInputType(item.field) == 'select') |
|
|
|
|
|
selectList.forEach(item=>{ |
|
|
|
|
|
// allDictOptions.value[item.field] = getStrDictOptions(item.dictType) |
|
|
|
|
|
if (item.dictType) { |
|
|
|
|
|
allDictOptions.value[item.field] = getStrDictOptions(item.dictType) |
|
|
|
|
|
} else if(item.field == 'creator'){ |
|
|
|
|
|
allDictOptions.value[item.field] = userListAll.value |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
console.log(888,userListAll.value) |
|
|
|
|
|
console.log(999,allDictOptions.value) |
|
|
|
|
|
} |
|
|
// 初始化下拉option值 |
|
|
// 初始化下拉option值 |
|
|
const initSelectOptions = (item) => { |
|
|
const initSelectOptions = (item) => { |
|
|
return getStrDictOptions(searchOption_high.value.find(searchOptionItem => (searchOptionItem.field == item)).dictType) |
|
|
return getStrDictOptions(searchOption_high.value.find(searchOptionItem => (searchOptionItem.field == item)).dictType) |
|
|
@ -290,6 +330,7 @@ const changeDateTimePicker = (e, val,from) =>{ |
|
|
val.value = e.join(',') |
|
|
val.value = e.join(',') |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
defineExpose({ |
|
|
defineExpose({ |
|
|
popoverVisible |
|
|
popoverVisible |
|
|
}) |
|
|
}) |
|
|
|
chenfang
2 months ago
