diff --git a/src/components/Upload/Images.vue b/src/components/Upload/Images.vue index a59d95e..2044754 100644 --- a/src/components/Upload/Images.vue +++ b/src/components/Upload/Images.vue @@ -171,7 +171,7 @@ import { useNotification } from 'naive-ui' if (props.multiple) { emit('upload', fileList.value, props.zIndex); } else { - uploadRef.value!.clearFiles(); + uploadRef.value!.clear(); emit('upload', '', props.zIndex); } options.onError(error as any); diff --git a/src/components/numberInput/index.vue b/src/components/numberInput/index.vue index f078a2c..581479f 100644 --- a/src/components/numberInput/index.vue +++ b/src/components/numberInput/index.vue @@ -2,7 +2,7 @@ diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue new file mode 100644 index 0000000..99f9abd --- /dev/null +++ b/src/views/system/tenant/index.vue @@ -0,0 +1,184 @@ + + + + + diff --git a/src/views/system/tenant/querySchemas.ts b/src/views/system/tenant/querySchemas.ts new file mode 100644 index 0000000..66b83da --- /dev/null +++ b/src/views/system/tenant/querySchemas.ts @@ -0,0 +1,56 @@ +import { FormSchema } from '@/components/Form/index'; +import { getRoleAllList } from '@/api/system/role'; +export const loadSelectData = async (res) => { + //这里可以进行数据转换处理 + return (await getRoleAllList({ ...res })).map((item, index) => { + return { + ...item, + label: item.name, + value: item.id, + index, + }; + }); +}; +export const schemas: FormSchema[] = [ + { + field: 'realname', + component: 'NInput', + label: '用户名', + componentProps: { + placeholder: '请输入用户名', + }, + }, + // { + // field: 'role', + // component: 'BasicSelect', + // label: '角色', + // componentProps: { + // placeholder: '请选择角色', + // block:true, + // multiple:true, + // request: loadSelectData, + // onChange: (e: any) => { + // console.log(e); + // }, + // }, + // }, + { + field: 'status', + component: 'NSelect', + label: '状态', + componentProps: { + placeholder: '请选择状态', + clearable: true, + options: [ + { + label: '正常', + value: '1', + }, + { + label: '禁用', + value: '2', + }, + ], + }, + }, +]; diff --git a/src/views/system/user/edit.vue b/src/views/system/user/edit.vue index 87fb701..36dc530 100644 --- a/src/views/system/user/edit.vue +++ b/src/views/system/user/edit.vue @@ -118,7 +118,7 @@ import { getUserDetail, userAdd, userUpdate } from '@/api/system/user'; import { upload } from '@/api/common'; import { Cropper } from '@/components/Cropper'; import chinaArea from '@/components/ChinaArea/index.vue'; -import { ref, onMounted, reactive, shallowRef } from 'vue'; +import { ref, onMounted, reactive } from 'vue'; import { getRoleAllList } from '@/api/system/role'; import { getDeptList } from '@/api/system/dept'; import { getLevelAllList } from '@/api/system/level'; diff --git a/src/views/system/user/userUpload.vue b/src/views/system/user/userUpload.vue index 0ecf841..206f6e4 100644 --- a/src/views/system/user/userUpload.vue +++ b/src/views/system/user/userUpload.vue @@ -44,7 +44,6 @@ import { CloudUploadOutlined } from '@vicons/antd'; import { useMessage } from 'naive-ui'; import { useUserStore } from '@/store/modules/user'; - import type { UploadChangeParam } from 'ant-design-vue'; /** * 定义接收的参数 @@ -102,7 +101,7 @@ * 执行上传文件 * @param param0 参数 */ - const handleChange = ({ file }: UploadChangeParam) => { + const handleChange = ({ file }) => { const status = file.status; if (status === 'done') { let data = file.response;