diff --git a/policeManagement/src/components/form/FormProMax.vue b/policeManagement/src/components/form/FormProMax.vue index 63361fe..756c79a 100644 --- a/policeManagement/src/components/form/FormProMax.vue +++ b/policeManagement/src/components/form/FormProMax.vue @@ -40,12 +40,15 @@ /> + + + @@ -162,7 +165,13 @@ const getResponsive = (item: FormProMaxItemProps): Grid => { } //优先级: 组件本身=》formItem=》label -const getPlaceholder = (item: FormProMaxItemProps) => item.componentsProps?.placeholder ?? item.placeholder ?? (item.type.includes('input') ? `请输入${item.label}` : `请选择${item.label}`) +const getPlaceholder = function (item: FormProMaxItemProps) { + // console.log('getPlaceholder____________________________', item) + console.log('getPlaceholder_______________________placeholder', item.placeholder) + console.log(item.componentsProps?.placeholder ?? item.placeholder ?? (item.type.includes('input') ? `请输入${item.label}` : `请选择${item.label}`)) + + return item.componentsProps?.placeholder ?? item.placeholder ?? (item.type.includes('input') ? `请输入${item.label}` : `请选择${item.label}`) +} defineExpose({ validate: (nameList, options) => formProMaxRef.value?.validate(nameList, options), diff --git a/policeManagement/src/views/query/publicUnit.vue b/policeManagement/src/views/query/publicUnit.vue index db20764..da78032 100644 --- a/policeManagement/src/views/query/publicUnit.vue +++ b/policeManagement/src/views/query/publicUnit.vue @@ -31,6 +31,7 @@ import { AutoComplete, Button, Input, message, Modal, Space } from 'ant-design-v import { debounce } from 'lodash-es' import FormProMax from '@/components/form/FormProMax.vue' import api from '@/axios' +// createVNode import { ref, reactive, computed, onMounted } from 'vue' import TableProMax from '@/components/table/TableProMax.vue' import { TableProMaxProps } from '@/types/components/table/index.ts' @@ -238,6 +239,7 @@ const saveOrUpdateEnterprisesUnit = (params: _FormType, callback: Function) => { type: 'select', label: '单位类型', required: true, + placeholder: '请选择单位类型', // @ts-ignore options: dictSelectNodes('EnterprisesUnitType'), }, @@ -387,6 +389,18 @@ const formItemOptions = ref { + // if (option.label.toLowerCase().includes(input?.toLowerCase())) { + // console.log(111111111111111) + // } + return option.label.toLowerCase().includes(input?.toLowerCase()) + }, + }, }, type: { type: 'radioGroup', @@ -635,6 +649,21 @@ const expandedRowRender: TableProMaxProps['expandedRowRender'] = ({ record }) => formParams.value.houseTotal = record.houseTotal //户数 formParams.value.staffTotal = record.staffTotal //工作人员数量 formParams.value.securityUserTotal = record.securityUserTotal //保安人员数量 + { + /* Modal.confirm({ + title: serviceTitle.value, + icon: createVNode('div'), + width: 600, + centered: true, + content: () => , + onOk: async () => { + await submit() + }, + onCancel: async () => { + await closeModal() + }, + }) */ + } }} > 编辑 @@ -713,5 +742,18 @@ onMounted(async () => { const addService = function (record) { formParams.value.enterprisesUnitId = record.snowFlakeId //企事业单位Id visible.value = true + //Modal.confirm({ + // title: serviceTitle.value, + // icon: createVNode('div'), + // width: 600, + // centered: true, + // content: () => , + // onOk: async () => { + // await submit() + // }, + // onCancel: async () => { + // await closeModal() + // }, + //}) }