diff --git a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClient.java b/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClient.java index 4ad345bdc..e9c837dfd 100644 --- a/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClient.java +++ b/yudao-framework/yudao-spring-boot-starter-file/src/main/java/cn/iocoder/yudao/framework/file/core/client/ftp/FtpFileClient.java @@ -10,7 +10,6 @@ import cn.iocoder.yudao.framework.file.core.client.AbstractFileClient; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.File; /** * Ftp 文件客户端 diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm index d02892265..7d1b18b4f 100644 --- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm +++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/index.vue.vm @@ -19,11 +19,6 @@ }) const { getList, setSearchParams, delList, exportList } = methods - // 导出操作 - const handleExport = async () => { - await exportList('数据.xls') - } - // ========== CRUD 相关 ========== const actionLoading = ref(false) // 遮罩层 const actionType = ref('') // 操作按钮的类型 @@ -74,11 +69,6 @@ } } - // 删除操作 - const handleDelete = (row: ${simpleClassName}VO) => { - delList(row.id, false) - } - // ========== 详情相关 ========== const detailRef = ref() // 详情 Ref @@ -108,7 +98,7 @@ type="warning" v-hasPermi="['${permissionPrefix}:export']" :loading="tableObject.exportLoading" - @click="handleExport" + @click="exportList('数据.xls')" > {{ t('action.export') }} @@ -161,7 +151,7 @@ link type="primary" v-hasPermi="['${permissionPrefix}:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/package.json b/yudao-ui-admin-vue3/package.json index 8cc567bab..7d4fda0b0 100644 --- a/yudao-ui-admin-vue3/package.json +++ b/yudao-ui-admin-vue3/package.json @@ -26,8 +26,8 @@ }, "dependencies": { "@iconify/iconify": "^2.2.1", - "@vueuse/core": "^8.9.4", - "@wangeditor/editor": "^5.1.10", + "@vueuse/core": "^9.0.0", + "@wangeditor/editor": "^5.1.14", "@wangeditor/editor-for-vue": "^5.1.10", "@zxcvbn-ts/core": "^2.0.3", "animate.css": "^4.1.1", @@ -35,7 +35,7 @@ "dayjs": "^1.11.4", "echarts": "^5.3.3", "echarts-wordcloud": "^2.0.0", - "element-plus": "2.2.9", + "element-plus": "2.2.11", "intro.js": "^6.0.0", "jsencrypt": "^3.2.1", "lodash-es": "^4.17.21", @@ -49,14 +49,14 @@ "vue": "3.2.37", "vue-cropper": "^1.0.3", "vue-i18n": "9.1.10", - "vue-router": "^4.1.2", + "vue-router": "^4.1.3", "vue-types": "^4.2.0", "web-storage-cache": "^1.1.1" }, "devDependencies": { "@commitlint/cli": "^17.0.3", "@commitlint/config-conventional": "^17.0.3", - "@iconify/json": "^2.1.82", + "@iconify/json": "^2.1.84", "@intlify/vite-plugin-vue-i18n": "^5.0.1", "@purge-icons/generated": "^0.8.1", "@types/intro.js": "^5.1.0", @@ -83,7 +83,7 @@ "postcss-less": "^6.0.0", "prettier": "^2.7.1", "rimraf": "^3.0.2", - "rollup": "^2.77.0", + "rollup": "^2.77.2", "stylelint": "^14.9.1", "stylelint-config-html": "^1.1.0", "stylelint-config-prettier": "^9.0.3", @@ -100,7 +100,7 @@ "vite-plugin-style-import": "^1.4.1", "vite-plugin-svg-icons": "^2.0.1", "vite-plugin-windicss": "^1.8.7", - "vue-tsc": "^0.39.0", + "vue-tsc": "^0.39.2", "windicss": "^3.5.6", "windicss-analysis": "^0.3.5" }, diff --git a/yudao-ui-admin-vue3/src/api/bpm/form/index.ts b/yudao-ui-admin-vue3/src/api/bpm/form/index.ts new file mode 100644 index 000000000..23f2fce0b --- /dev/null +++ b/yudao-ui-admin-vue3/src/api/bpm/form/index.ts @@ -0,0 +1,48 @@ +import { useAxios } from '@/hooks/web/useAxios' +import { FormVO } from './types' +const request = useAxios() + +// 创建工作流的表单定义 +export const createFormApi = async (data: FormVO) => { + return await request.post({ + url: '/bpm/form/create', + data: data + }) +} + +// 更新工作流的表单定义 +export const updateFormApi = async (data: FormVO) => { + return await request.put({ + url: '/bpm/form/update', + data: data + }) +} + +// 删除工作流的表单定义 +export const deleteFormApi = async (id: number) => { + return await request.delete({ + url: '/bpm/form/delete?id=' + id + }) +} + +// 获得工作流的表单定义 +export const getFormApi = async (id: number) => { + return await request.get({ + url: '/bpm/form/get?id=' + id + }) +} + +// 获得工作流的表单定义分页 +export const getFormPageApi = async (params) => { + return await request.get({ + url: '/bpm/form/page', + params + }) +} + +// 获得动态表单的精简列表 +export const getSimpleFormsApi = async () => { + return await request.get({ + url: '/bpm/form/list-all-simple' + }) +} diff --git a/yudao-ui-admin-vue3/src/api/bpm/form/types.ts b/yudao-ui-admin-vue3/src/api/bpm/form/types.ts new file mode 100644 index 000000000..2bc8b6912 --- /dev/null +++ b/yudao-ui-admin-vue3/src/api/bpm/form/types.ts @@ -0,0 +1,9 @@ +export type FormVO = { + id: number + name: string + conf: string + fields: string[] + status: number + remark: string + createTime: string +} diff --git a/yudao-ui-admin-vue3/src/api/bpm/leave/index.ts b/yudao-ui-admin-vue3/src/api/bpm/leave/index.ts new file mode 100644 index 000000000..7f266cdf4 --- /dev/null +++ b/yudao-ui-admin-vue3/src/api/bpm/leave/index.ts @@ -0,0 +1,18 @@ +import { useAxios } from '@/hooks/web/useAxios' +import { LeaveVO } from './types' +const request = useAxios() + +// 创建请假申请 +export const createLeaveApi = async (data: LeaveVO) => { + return await request.post({ url: '/bpm/oa/leave/create', data: data }) +} + +// 获得请假申请 +export const getLeaveApi = async (id: number) => { + return await request.get({ url: '/bpm/oa/leave/get?id=' + id }) +} + +// 获得请假申请分页 +export const getLeavePageApi = async (params) => { + return await request.get({ url: '/bpm/oa/leave/page', params }) +} diff --git a/yudao-ui-admin-vue3/src/api/bpm/leave/types.ts b/yudao-ui-admin-vue3/src/api/bpm/leave/types.ts new file mode 100644 index 000000000..60b4bf831 --- /dev/null +++ b/yudao-ui-admin-vue3/src/api/bpm/leave/types.ts @@ -0,0 +1,10 @@ +export type LeaveVO = { + id: number + result: number + type: number + reason: string + processInstanceId: string + startTime: string + endTime: string + createTime: string +} diff --git a/yudao-ui-admin-vue3/src/api/bpm/model/index.ts b/yudao-ui-admin-vue3/src/api/bpm/model/index.ts new file mode 100644 index 000000000..cc577a7fc --- /dev/null +++ b/yudao-ui-admin-vue3/src/api/bpm/model/index.ts @@ -0,0 +1,36 @@ +import { useAxios } from '@/hooks/web/useAxios' +import { ModelVO } from './types' +const request = useAxios() + +export const getModelPage = async (params) => { + return await request.get({ url: '/bpm/model/page', params }) +} + +export const getModel = async (id: number) => { + return await request.get({ url: '/bpm/model/get?id=' + id }) +} + +export const updateModel = async (data: ModelVO) => { + return await request.put({ url: '/bpm/model/update', data: data }) +} + +// 任务状态修改 +export const updateModelState = async (id: number, state: string) => { + const data = { + id: id, + state: state + } + return await request.put({ url: '/bpm/model/update-state', data: data }) +} + +export const createModel = async (data: ModelVO) => { + return await request.post({ url: '/bpm/model/create', data: data }) +} + +export const deleteModel = async (id: number) => { + return await request.delete({ url: '/bpm/model/delete?id=' + id }) +} + +export const deployModel = async (id: number) => { + return await request.post({ url: '/bpm/model/deploy?id=' + id }) +} diff --git a/yudao-ui-admin-vue3/src/api/bpm/model/types.ts b/yudao-ui-admin-vue3/src/api/bpm/model/types.ts new file mode 100644 index 000000000..96266fab3 --- /dev/null +++ b/yudao-ui-admin-vue3/src/api/bpm/model/types.ts @@ -0,0 +1,15 @@ +export type ModelVO = { + id: number + formName: string + key: string + name: string + description: string + category: string + formType: number + formId: number + formCustomCreatePath: string + formCustomViewPath: string + status: number + remark: string + createTime: string +} diff --git a/yudao-ui-admin-vue3/src/api/bpm/processInstance/index.ts b/yudao-ui-admin-vue3/src/api/bpm/processInstance/index.ts new file mode 100644 index 000000000..b49dfa615 --- /dev/null +++ b/yudao-ui-admin-vue3/src/api/bpm/processInstance/index.ts @@ -0,0 +1,23 @@ +import { useAxios } from '@/hooks/web/useAxios' +import { ProcessInstanceVO } from './types' +const request = useAxios() + +export const getMyProcessInstancePage = async (params) => { + return await request.get({ url: '/bpm/process-instance/my-page', params }) +} + +export const createProcessInstance = async (data: ProcessInstanceVO) => { + return await request.post({ url: '/bpm/process-instance/create', data: data }) +} + +export const cancelProcessInstance = async (id: number, reason: string) => { + const data = { + id: id, + reason: reason + } + return await request.delete({ url: '/bpm/process-instance/cancel', data: data }) +} + +export const getProcessInstance = async (id: number) => { + return await request.get({ url: '/bpm/process-instance/get?id=' + id }) +} diff --git a/yudao-ui-admin-vue3/src/api/bpm/processInstance/types.ts b/yudao-ui-admin-vue3/src/api/bpm/processInstance/types.ts new file mode 100644 index 000000000..3ab506389 --- /dev/null +++ b/yudao-ui-admin-vue3/src/api/bpm/processInstance/types.ts @@ -0,0 +1,18 @@ +export type task = { + id: string + name: string +} +export type ProcessInstanceVO = { + id: number + name: string + processDefinitionId: string + category: string + result: number + tasks: task[] + fields: string[] + status: number + remark: string + businessKey: string + createTime: string + endTime: string +} diff --git a/yudao-ui-admin-vue3/src/api/bpm/task/index.ts b/yudao-ui-admin-vue3/src/api/bpm/task/index.ts new file mode 100644 index 000000000..7967f5e37 --- /dev/null +++ b/yudao-ui-admin-vue3/src/api/bpm/task/index.ts @@ -0,0 +1,36 @@ +import { useAxios } from '@/hooks/web/useAxios' + +const request = useAxios() + +export const getTodoTaskPage = async (params) => { + return await request.get({ url: '/bpm/task/todo-page', params }) +} + +export const getDoneTaskPage = async (params) => { + return await request.get({ url: '/bpm/task/done-page', params }) +} + +export const completeTask = async (data) => { + return await request.put({ url: '/bpm/task/complete', data: data }) +} + +export const approveTask = async (data) => { + return await request.put({ url: '/bpm/task/approve', data: data }) +} + +export const rejectTask = async (data) => { + return await request.put({ url: '/bpm/task/reject', data: data }) +} +export const backTask = async (data) => { + return await request.put({ url: '/bpm/task/back', data: data }) +} + +export const updateTaskAssignee = async (data) => { + return await request.put({ url: '/bpm/task/update-assignee', data: data }) +} + +export const getTaskListByProcessInstanceId = async (processInstanceId) => { + return await request.get({ + url: '/bpm/task/list-by-process-instance-id?processInstanceId=' + processInstanceId + }) +} diff --git a/yudao-ui-admin-vue3/src/api/bpm/task/types.ts b/yudao-ui-admin-vue3/src/api/bpm/task/types.ts new file mode 100644 index 000000000..2bc8b6912 --- /dev/null +++ b/yudao-ui-admin-vue3/src/api/bpm/task/types.ts @@ -0,0 +1,9 @@ +export type FormVO = { + id: number + name: string + conf: string + fields: string[] + status: number + remark: string + createTime: string +} diff --git a/yudao-ui-admin-vue3/src/api/bpm/taskAssignRule/index.ts b/yudao-ui-admin-vue3/src/api/bpm/taskAssignRule/index.ts new file mode 100644 index 000000000..f6105293d --- /dev/null +++ b/yudao-ui-admin-vue3/src/api/bpm/taskAssignRule/index.ts @@ -0,0 +1,21 @@ +import { useAxios } from '@/hooks/web/useAxios' +import { TaskAssignVO } from './types' +const request = useAxios() + +export const getTaskAssignRuleList = async (params) => { + return await request.get({ url: '/bpm/task-assign-rule/list', params }) +} + +export const createTaskAssignRule = async (data: TaskAssignVO) => { + return await request.post({ + url: '/bpm/task-assign-rule/create', + data: data + }) +} + +export const updateTaskAssignRule = async (data: TaskAssignVO) => { + return await request.put({ + url: '/bpm/task-assign-rule/update', + data: data + }) +} diff --git a/yudao-ui-admin-vue3/src/api/bpm/taskAssignRule/types.ts b/yudao-ui-admin-vue3/src/api/bpm/taskAssignRule/types.ts new file mode 100644 index 000000000..e9340e7ea --- /dev/null +++ b/yudao-ui-admin-vue3/src/api/bpm/taskAssignRule/types.ts @@ -0,0 +1,9 @@ +export type TaskAssignVO = { + id: number + modelId: string + processDefinitionId: string + taskDefinitionKey: string + taskDefinitionName: string + options: string[] + type: number +} diff --git a/yudao-ui-admin-vue3/src/api/bpm/userGroup/index.ts b/yudao-ui-admin-vue3/src/api/bpm/userGroup/index.ts new file mode 100644 index 000000000..e7cd3f507 --- /dev/null +++ b/yudao-ui-admin-vue3/src/api/bpm/userGroup/index.ts @@ -0,0 +1,39 @@ +import { useAxios } from '@/hooks/web/useAxios' +import { UserGroupVO } from './types' +const request = useAxios() + +// 创建用户组 +export const createUserGroupApi = async (data: UserGroupVO) => { + return await request.post({ + url: '/bpm/user-group/create', + data: data + }) +} + +// 更新用户组 +export const updateUserGroupApi = async (data: UserGroupVO) => { + return await request.put({ + url: '/bpm/user-group/update', + data: data + }) +} + +// 删除用户组 +export const deleteUserGroupApi = async (id: number) => { + return await request.delete({ url: '/bpm/user-group/delete?id=' + id }) +} + +// 获得用户组 +export const getUserGroupApi = async (id: number) => { + return await request.get({ url: '/bpm/user-group/get?id=' + id }) +} + +// 获得用户组分页 +export const getUserGroupPageApi = async (params) => { + return await request.get({ url: '/bpm/user-group/page', params }) +} + +// 获取用户组精简信息列表 +export const listSimpleUserGroupsApi = async () => { + return await request.get({ url: '/bpm/user-group/list-all-simple' }) +} diff --git a/yudao-ui-admin-vue3/src/api/bpm/userGroup/types.ts b/yudao-ui-admin-vue3/src/api/bpm/userGroup/types.ts new file mode 100644 index 000000000..d0d67ad43 --- /dev/null +++ b/yudao-ui-admin-vue3/src/api/bpm/userGroup/types.ts @@ -0,0 +1,9 @@ +export type UserGroupVO = { + id: number + name: string + description: string + memberUserIds: number[] + status: number + remark: string + createTime: string +} diff --git a/yudao-ui-admin-vue3/src/api/system/user/index.ts b/yudao-ui-admin-vue3/src/api/system/user/index.ts index f4a484eaf..5085d5c11 100644 --- a/yudao-ui-admin-vue3/src/api/system/user/index.ts +++ b/yudao-ui-admin-vue3/src/api/system/user/index.ts @@ -55,3 +55,8 @@ export const updateUserStatusApi = (id: number, status: number) => { } return request.put({ url: '/system/user/update-status', data: data }) } + +// 获取用户精简信息列表 +export const getListSimpleUsersApi = () => { + return request.get({ url: '/system/user/list-all-simple' }) +} diff --git a/yudao-ui-admin-vue3/src/api/system/user/profile/index.ts b/yudao-ui-admin-vue3/src/api/system/user/profile/index.ts index bf3d322f1..a5a24490f 100644 --- a/yudao-ui-admin-vue3/src/api/system/user/profile/index.ts +++ b/yudao-ui-admin-vue3/src/api/system/user/profile/index.ts @@ -24,6 +24,6 @@ export const updateUserPwdApi = (oldPassword: string, newPassword: string) => { } // 用户头像上传 -export const uploadAvatarApi = (data) => { - return request.put({ url: '/system/user/profile/update-avatar', data: data }) +export const uploadAvatarApi = (params) => { + return request.upload({ url: '/system/user/profile/update-avatar', params }) } diff --git a/yudao-ui-admin-vue3/src/hooks/web/useAxios.ts b/yudao-ui-admin-vue3/src/hooks/web/useAxios.ts index f8aacd087..331969c6e 100644 --- a/yudao-ui-admin-vue3/src/hooks/web/useAxios.ts +++ b/yudao-ui-admin-vue3/src/hooks/web/useAxios.ts @@ -42,12 +42,19 @@ async function downloadFn(option: AxiosConfig): Promise { return res as unknown as Promise } +async function uploadFn(option: AxiosConfig): Promise { + option.headersType = 'multipart/form-data' + const res = await request({ method: 'PUT', ...option }) + return res as unknown as Promise +} + export const useAxios = () => { return { get: getFn, post: postFn, delete: deleteFn, put: putFn, - download: downloadFn + download: downloadFn, + upload: uploadFn } } diff --git a/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue b/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue index e65e0ca22..bb876e0a3 100644 --- a/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue +++ b/yudao-ui-admin-vue3/src/views/Login/components/LoginForm.vue @@ -47,12 +47,17 @@ const iconHouse = useIcon({ icon: 'ep:house' }) const iconAvatar = useIcon({ icon: 'ep:avatar' }) const iconLock = useIcon({ icon: 'ep:lock' }) const iconCircleCheck = useIcon({ icon: 'ep:circle-check' }) -const LoginRules = { +const LoginCaptchaRules = { tenantName: [required], username: [required], password: [required], code: [required] } +const LoginRules = { + tenantName: [required], + username: [required], + password: [required] +} const loginLoading = ref(false) const loginData = reactive({ codeImg: '', @@ -76,8 +81,11 @@ const loginData = reactive({ // 获取验证码 const getCode = async () => { const res = await LoginApi.getCodeImgApi() - loginData.codeImg = 'data:image/gif;base64,' + res.img - loginData.loginForm.uuid = res.uuid + loginData.captchaEnable = res.enable + if (res.enable) { + loginData.codeImg = 'data:image/gif;base64,' + res.img + loginData.loginForm.uuid = res.uuid + } } //获取租户ID const getTenantId = async () => { @@ -159,7 +167,7 @@ onMounted(async () => { diff --git a/yudao-ui-admin-vue3/src/views/bpm/form/form.data.ts b/yudao-ui-admin-vue3/src/views/bpm/form/form.data.ts new file mode 100644 index 000000000..32de7da57 --- /dev/null +++ b/yudao-ui-admin-vue3/src/views/bpm/form/form.data.ts @@ -0,0 +1,61 @@ +import { reactive } from 'vue' +import { useI18n } from '@/hooks/web/useI18n' +import { required } from '@/utils/formRules' +import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas' +import { DICT_TYPE } from '@/utils/dict' +const { t } = useI18n() // 国际化 + +// 表单校验 +export const rules = reactive({ + name: [required] +}) + +// CrudSchema +const crudSchemas = reactive([ + { + label: t('common.index'), + field: 'id', + type: 'index', + form: { + show: false + }, + detail: { + show: false + } + }, + { + label: '表单名', + field: 'name', + search: { + show: true + } + }, + { + label: t('common.status'), + field: 'status', + dictType: DICT_TYPE.COMMON_STATUS + }, + { + label: '备注', + field: 'remark' + }, + { + label: t('common.createTime'), + field: 'createTime', + form: { + show: false + } + }, + { + label: t('table.action'), + field: 'action', + width: '240px', + form: { + show: false + }, + detail: { + show: false + } + } +]) +export const { allSchemas } = useCrudSchemas(crudSchemas) diff --git a/yudao-ui-admin-vue3/src/views/bpm/form/index.vue b/yudao-ui-admin-vue3/src/views/bpm/form/index.vue index b03cb75c8..fc509207b 100644 --- a/yudao-ui-admin-vue3/src/views/bpm/form/index.vue +++ b/yudao-ui-admin-vue3/src/views/bpm/form/index.vue @@ -1,7 +1,169 @@ - + + + + + + + +
+ + {{ t('action.add') }} + +
+ + + + + +
+
- + + +
+ + + + + + + +
+ diff --git a/yudao-ui-admin-vue3/src/views/bpm/group/group.data.ts b/yudao-ui-admin-vue3/src/views/bpm/group/group.data.ts new file mode 100644 index 000000000..78b3270e8 --- /dev/null +++ b/yudao-ui-admin-vue3/src/views/bpm/group/group.data.ts @@ -0,0 +1,72 @@ +import { reactive } from 'vue' +import { useI18n } from '@/hooks/web/useI18n' +import { required } from '@/utils/formRules' +import { CrudSchema, useCrudSchemas } from '@/hooks/web/useCrudSchemas' +import { DICT_TYPE } from '@/utils/dict' +const { t } = useI18n() // 国际化 + +// 表单校验 +export const rules = reactive({ + name: [required] +}) + +// CrudSchema +const crudSchemas = reactive([ + { + label: t('common.index'), + field: 'id', + type: 'index', + form: { + show: false + }, + detail: { + show: false + } + }, + { + label: '组名', + field: 'name', + search: { + show: true + } + }, + { + label: '成员', + field: 'memberUserIds' + }, + { + label: '描述', + field: 'description' + }, + { + label: t('common.status'), + field: 'status', + dictType: DICT_TYPE.COMMON_STATUS + }, + { + label: '备注', + field: 'remark', + table: { + show: false + } + }, + { + label: t('common.createTime'), + field: 'createTime', + form: { + show: false + } + }, + { + label: t('table.action'), + field: 'action', + width: '240px', + form: { + show: false + }, + detail: { + show: false + } + } +]) +export const { allSchemas } = useCrudSchemas(crudSchemas) diff --git a/yudao-ui-admin-vue3/src/views/bpm/group/index.vue b/yudao-ui-admin-vue3/src/views/bpm/group/index.vue index b03cb75c8..aa6af4cf2 100644 --- a/yudao-ui-admin-vue3/src/views/bpm/group/index.vue +++ b/yudao-ui-admin-vue3/src/views/bpm/group/index.vue @@ -1,7 +1,224 @@ - + + + + + + + +
+ + {{ t('action.add') }} + +
+ + + + + + +
+
- + + + + + + + + + + + + + + + diff --git a/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue b/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue index bf7dbaedf..f6d2e44ed 100644 --- a/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue +++ b/yudao-ui-admin-vue3/src/views/infra/apiErrorLog/index.vue @@ -23,10 +23,6 @@ const { getList, setSearchParams, exportList } = methods const detailRef = ref() // 详情 Ref const dialogVisible = ref(false) // 是否显示弹出层 const dialogTitle = ref('') // 弹出层标题 -// 导出操作 -const handleExport = async () => { - await exportList('用户数据.xls') -} // 详情操作 const handleDetail = (row: ApiErrorLogVO) => { @@ -57,7 +53,7 @@ getList() - + {{ t('action.export') }} diff --git a/yudao-ui-admin-vue3/src/views/infra/codegen/index.vue b/yudao-ui-admin-vue3/src/views/infra/codegen/index.vue index 7583abb4a..fb56ea9fb 100644 --- a/yudao-ui-admin-vue3/src/views/infra/codegen/index.vue +++ b/yudao-ui-admin-vue3/src/views/infra/codegen/index.vue @@ -49,10 +49,6 @@ const handleGenTable = async (row: CodegenTableVO) => { const res = await CodegenApi.downloadCodegenApi(row.id) download.zip(res, 'codegen-' + row.className + '.zip') } -// 删除操作 -const handleDelete = (row: CodegenTableVO) => { - delList(row.id, false) -} // 查询操作 const handleQuery = () => { getList() @@ -112,7 +108,7 @@ getList() link type="primary" v-hasPermi="['infra:codegen:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/infra/config/index.vue b/yudao-ui-admin-vue3/src/views/infra/config/index.vue index 6b1a8bd38..991c47a9b 100644 --- a/yudao-ui-admin-vue3/src/views/infra/config/index.vue +++ b/yudao-ui-admin-vue3/src/views/infra/config/index.vue @@ -19,11 +19,6 @@ const { register, tableObject, methods } = useTable({ }) const { getList, setSearchParams, delList, exportList } = methods -// 导出操作 -const handleExport = async () => { - await exportList('参数配置.xls') -} - // ========== CRUD 相关 ========== const actionLoading = ref(false) // 遮罩层 const actionType = ref('') // 操作按钮的类型 @@ -74,11 +69,6 @@ const submitForm = async () => { } } -// 删除操作 -const handleDelete = (row: ConfigVO) => { - delList(row.id, false) -} - // ========== 详情相关 ========== const detailRef = ref() // 详情 Ref @@ -108,7 +98,7 @@ getList() type="warning" v-hasPermi="['infra:config:export']" :loading="tableObject.exportLoading" - @click="handleExport" + @click="exportList('参数配置.xls')" > {{ t('action.export') }} @@ -156,7 +146,7 @@ getList() link type="primary" v-hasPermi="['infra:config:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue b/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue index 1c49c173c..dd70921b9 100644 --- a/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue +++ b/yudao-ui-admin-vue3/src/views/infra/fileConfig/index.vue @@ -79,11 +79,6 @@ const submitForm = async () => { } } -// 删除操作 -const handleDelete = (row: FileConfigVO) => { - delList(row.id, false) -} - // ========== 详情相关 ========== const detailRef = ref() // 详情 Ref @@ -169,7 +164,7 @@ getList() link type="primary" v-hasPermi="['infra:file-config:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue b/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue index 18872adfb..855efb667 100644 --- a/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue +++ b/yudao-ui-admin-vue3/src/views/infra/fileList/index.vue @@ -69,10 +69,6 @@ const excelUploadError = (): void => { const detailRef = ref() // 详情 Ref const dialogVisible = ref(false) // 是否显示弹出层 const dialogTitle = ref('') // 弹出层标题 -// 删除操作 -const handleDelete = (row: FileVO) => { - delList(row.id, false) -} // 详情操作 const handleDetail = (row: FileVO) => { // 设置数据 @@ -128,7 +124,7 @@ getList() link type="primary" v-hasPermi="['infra:file:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue b/yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue index 477d78a09..1648c8fc3 100644 --- a/yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue +++ b/yudao-ui-admin-vue3/src/views/infra/job/JobLog.vue @@ -25,10 +25,6 @@ const getTableList = async () => { } await getList() } -// 导出操作 -const handleExport = async () => { - await exportList('定时任务日志.xls') -} // ========== CRUD 相关 ========== const dialogVisible = ref(false) // 是否显示弹出层 @@ -63,7 +59,7 @@ onMounted(() => { type="warning" v-hasPermi="['infra:job:export']" :loading="tableObject.exportLoading" - @click="handleExport" + @click="exportList('定时任务日志.xls')" > {{ t('action.export') }} diff --git a/yudao-ui-admin-vue3/src/views/infra/job/index.vue b/yudao-ui-admin-vue3/src/views/infra/job/index.vue index 510b8907e..14742bbe2 100644 --- a/yudao-ui-admin-vue3/src/views/infra/job/index.vue +++ b/yudao-ui-admin-vue3/src/views/infra/job/index.vue @@ -22,11 +22,6 @@ const { register, tableObject, methods } = useTable({ }) const { getList, setSearchParams, delList, exportList } = methods -// 导出操作 -const handleExport = async () => { - await exportList('定时任务.xls') -} - // ========== CRUD 相关 ========== const actionLoading = ref(false) // 遮罩层 const actionType = ref('') // 操作按钮的类型 @@ -92,11 +87,6 @@ const submitForm = async () => { } } -// 删除操作 -const handleDelete = (row: JobVO) => { - delList(row.id, false) -} - // ========== 详情相关 ========== const detailRef = ref() // 详情 Ref @@ -126,7 +116,7 @@ getList() type="warning" v-hasPermi="['infra:job:export']" :loading="tableObject.exportLoading" - @click="handleExport" + @click="exportList('定时任务.xls')" > {{ t('action.export') }} @@ -157,7 +147,12 @@ getList() {{ t('action.detail') }} - + {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/pay/app/index.vue b/yudao-ui-admin-vue3/src/views/pay/app/index.vue index f0cf4ffdd..36ded7be7 100644 --- a/yudao-ui-admin-vue3/src/views/pay/app/index.vue +++ b/yudao-ui-admin-vue3/src/views/pay/app/index.vue @@ -19,11 +19,6 @@ const { register, tableObject, methods } = useTable({ }) const { getList, setSearchParams, delList, exportList } = methods -// 导出操作 -const handleExport = async () => { - await exportList('应用数据.xls') -} - // ========== CRUD 相关 ========== const actionLoading = ref(false) // 遮罩层 const actionType = ref('') // 操作按钮的类型 @@ -74,11 +69,6 @@ const submitForm = async () => { } } -// 删除操作 -const handleDelete = (row: AppVO) => { - delList(row.id, false) -} - // ========== 详情相关 ========== const detailRef = ref() // 详情 Ref @@ -108,7 +98,7 @@ getList() type="warning" v-hasPermi="['system:post:export']" :loading="tableObject.exportLoading" - @click="handleExport" + @click="exportList('应用数据.xls')" > {{ t('action.export') }} @@ -153,7 +143,7 @@ getList() link type="primary" v-hasPermi="['system:post:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/pay/merchant/index.vue b/yudao-ui-admin-vue3/src/views/pay/merchant/index.vue index 5ed7a230f..e30cad5ef 100644 --- a/yudao-ui-admin-vue3/src/views/pay/merchant/index.vue +++ b/yudao-ui-admin-vue3/src/views/pay/merchant/index.vue @@ -19,11 +19,6 @@ const { register, tableObject, methods } = useTable({ }) const { getList, setSearchParams, delList, exportList } = methods -// 导出操作 -const handleExport = async () => { - await exportList('商户数据.xls') -} - // ========== CRUD 相关 ========== const actionLoading = ref(false) // 遮罩层 const actionType = ref('') // 操作按钮的类型 @@ -74,11 +69,6 @@ const submitForm = async () => { } } -// 删除操作 -const handleDelete = (row: MerchantVO) => { - delList(row.id, false) -} - // ========== 详情相关 ========== const detailRef = ref() // 详情 Ref @@ -108,7 +98,7 @@ getList() type="warning" v-hasPermi="['system:post:export']" :loading="tableObject.exportLoading" - @click="handleExport" + @click="exportList('商户数据.xls')" > {{ t('action.export') }} @@ -153,7 +143,7 @@ getList() link type="primary" v-hasPermi="['system:post:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/pay/order/index.vue b/yudao-ui-admin-vue3/src/views/pay/order/index.vue index ff1dfd5e8..63a8da7d2 100644 --- a/yudao-ui-admin-vue3/src/views/pay/order/index.vue +++ b/yudao-ui-admin-vue3/src/views/pay/order/index.vue @@ -17,10 +17,6 @@ const { register, tableObject, methods } = useTable({ exportListApi: OrderApi.exportOrderApi }) const { getList, setSearchParams, delList, exportList } = methods -// 导出操作 -const handleExport = async () => { - await exportList('订单数据.xls') -} // ========== CRUD 相关 ========== const actionLoading = ref(false) // 遮罩层 const actionType = ref('') // 操作按钮的类型 @@ -71,11 +67,6 @@ const submitForm = async () => { } } -// 删除操作 -const handleDelete = (row: OrderVO) => { - delList(row.id, false) -} - // ========== 详情相关 ========== const detailRef = ref() // 详情 Ref @@ -105,7 +96,7 @@ getList() type="warning" v-hasPermi="['pay:order:export']" :loading="tableObject.exportLoading" - @click="handleExport" + @click="exportList('订单数据.xls')" > {{ t('action.export') }} @@ -133,7 +124,12 @@ getList() {{ t('action.detail') }} - + {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/pay/refund/index.vue b/yudao-ui-admin-vue3/src/views/pay/refund/index.vue index 3047d936e..1f4315099 100644 --- a/yudao-ui-admin-vue3/src/views/pay/refund/index.vue +++ b/yudao-ui-admin-vue3/src/views/pay/refund/index.vue @@ -17,20 +17,10 @@ const { register, tableObject, methods } = useTable({ }) const { getList, setSearchParams, delList, exportList } = methods -// 导出操作 -const handleExport = async () => { - await exportList('退款订单.xls') -} - // ========== CRUD 相关 ========== const dialogVisible = ref(false) // 是否显示弹出层 const dialogTitle = ref('edit') // 弹出层标题 -// 删除操作 -const handleDelete = (row: RefundVO) => { - delList(row.id, false) -} - // ========== 详情相关 ========== const detailRef = ref() // 详情 Ref @@ -58,7 +48,7 @@ getList() type="warning" v-hasPermi="['system:post:export']" :loading="tableObject.exportLoading" - @click="handleExport" + @click="exportList('退款订单.xls')" > {{ t('action.export') }} @@ -95,7 +85,7 @@ getList() link type="primary" v-hasPermi="['system:post:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/system/dict/index.vue b/yudao-ui-admin-vue3/src/views/system/dict/index.vue index 7c0ddc3ae..a49354591 100644 --- a/yudao-ui-admin-vue3/src/views/system/dict/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/dict/index.vue @@ -38,10 +38,6 @@ const handleTypeUpdate = async (row: DictTypeVO) => { const res = await DictTypeApi.getDictTypeApi(row.id) unref(typeFormRef)?.setValues(res) } -// 字典分类删除操作 -const handleTypeDelete = async (row: DictTypeVO) => { - await delTypeList(row.id, false) -} // ========== 字典数据列表相关 ========== const tableTypeSelect = ref(false) @@ -71,10 +67,6 @@ const handleDataUpdate = async (row: DictDataVO) => { const res = await DictDataApi.getDictDataApi(row.id) unref(dataFormRef)?.setValues(res) } -// 字典数据删除操作 -const handleDataDelete = async (row: DictTypeVO) => { - await delDataList(row.id, false) -} // 字典分类点击行事件 const parentType = ref('') const onClickType = async (data: { [key: string]: any }) => { @@ -195,7 +187,7 @@ onMounted(async () => { link type="primary" v-hasPermi="['system:dict:delete']" - @click="handleTypeDelete(row)" + @click="delTypeList(row.id, false)" > {{ t('action.del') }} @@ -252,7 +244,7 @@ onMounted(async () => { link type="primary" v-hasPermi="['system:dict:delete']" - @click="handleDataDelete(row)" + @click="delDataList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/system/errorCode/index.vue b/yudao-ui-admin-vue3/src/views/system/errorCode/index.vue index 3a04a5800..b35579fd1 100644 --- a/yudao-ui-admin-vue3/src/views/system/errorCode/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/errorCode/index.vue @@ -68,11 +68,6 @@ const submitForm = async () => { } } -// 删除操作 -const handleDelete = (row: ErrorCodeVO) => { - delList(row.id, false) -} - // ========== 详情相关 ========== const detailRef = ref() // 详情 Ref @@ -139,7 +134,7 @@ getList() link type="primary" v-hasPermi="['system:error-code:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/system/notice/index.vue b/yudao-ui-admin-vue3/src/views/system/notice/index.vue index 7cd3d928f..44fe19091 100644 --- a/yudao-ui-admin-vue3/src/views/system/notice/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/notice/index.vue @@ -67,11 +67,6 @@ const submitForm = async () => { } } -// 删除操作 -const handleDelete = (row: NoticeVO) => { - delList(row.id, false) -} - // ========== 详情相关 ========== const detailRef = ref() // 详情 Ref @@ -141,7 +136,7 @@ getList() link type="primary" v-hasPermi="['system:notice:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue b/yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue index fadc430f7..eccb66b0f 100644 --- a/yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue @@ -68,11 +68,6 @@ const submitForm = async () => { } } -// 删除操作 -const handleDelete = (row: OAuth2ClientVo) => { - delList(row.id, false) -} - // ========== 详情相关 ========== const detailRef = ref() // 详情 Ref @@ -152,7 +147,7 @@ getList() link type="primary" v-hasPermi="['system:oauth2-client:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/system/operatelog/index.vue b/yudao-ui-admin-vue3/src/views/system/operatelog/index.vue index 2d863f2a8..b190674ba 100644 --- a/yudao-ui-admin-vue3/src/views/system/operatelog/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/operatelog/index.vue @@ -18,10 +18,6 @@ const detailRef = ref() // 详情 Ref const dialogVisible = ref(false) // 是否显示弹出层 const dialogTitle = ref(t('action.detail')) // 弹出层标题 const { getList, setSearchParams, exportList } = methods -// 导出操作 -const handleExport = async () => { - await exportList('操作日志.xls') -} // 详情 const handleDetail = (row: OperateLogVO) => { // 设置数据 @@ -41,7 +37,7 @@ getList() type="warning" v-hasPermi="['system:operate-log:export']" :loading="tableObject.exportLoading" - @click="handleExport" + @click="exportList('操作日志.xls')" > {{ t('action.export') }} diff --git a/yudao-ui-admin-vue3/src/views/system/post/index.vue b/yudao-ui-admin-vue3/src/views/system/post/index.vue index ce9e9c3c7..3995b6759 100644 --- a/yudao-ui-admin-vue3/src/views/system/post/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/post/index.vue @@ -19,11 +19,6 @@ const { register, tableObject, methods } = useTable({ }) const { getList, setSearchParams, delList, exportList } = methods -// 导出操作 -const handleExport = async () => { - await exportList('岗位数据.xls') -} - // ========== CRUD 相关 ========== const actionLoading = ref(false) // 遮罩层 const actionType = ref('') // 操作按钮的类型 @@ -74,11 +69,6 @@ const submitForm = async () => { } } -// 删除操作 -const handleDelete = (row: PostVO) => { - delList(row.id, false) -} - // ========== 详情相关 ========== const detailRef = ref() // 详情 Ref @@ -108,7 +98,7 @@ getList() type="warning" v-hasPermi="['system:post:export']" :loading="tableObject.exportLoading" - @click="handleExport" + @click="exportList('岗位数据.xls')" > {{ t('action.export') }} @@ -153,7 +143,7 @@ getList() link type="primary" v-hasPermi="['system:post:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/system/role/index.vue b/yudao-ui-admin-vue3/src/views/system/role/index.vue index 6ec151db0..8606d21ec 100644 --- a/yudao-ui-admin-vue3/src/views/system/role/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/role/index.vue @@ -83,11 +83,6 @@ const submitForm = async () => { } } -// 删除操作 -const handleDelete = (row: RoleVO) => { - delList(row.id, false) -} - // ========== 详情相关 ========== const detailRef = ref() // 详情 Ref @@ -221,7 +216,7 @@ getList() link type="primary" v-hasPermi="['system:role:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue b/yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue index 2f27478f8..69f9f97c5 100644 --- a/yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/sensitiveWord/index.vue @@ -19,10 +19,6 @@ const { register, tableObject, methods } = useTable({ }) const { getList, setSearchParams, delList, exportList } = methods -// 导出操作 -const handleExport = async () => { - await exportList('敏感词数据.xls') -} // 获取标签 const tagsOptions = ref() const getTags = async () => { @@ -79,11 +75,6 @@ const submitForm = async () => { } } -// 删除操作 -const handleDelete = (row: SensitiveWordVO) => { - delList(row.id, false) -} - // ========== 详情相关 ========== const detailRef = ref() // 详情 Ref @@ -116,7 +107,7 @@ onMounted(async () => { type="warning" v-hasPermi="['system:post:export']" :loading="tableObject.exportLoading" - @click="handleExport" + @click="exportList('敏感词数据.xls')" > {{ t('action.export') }} @@ -171,7 +162,7 @@ onMounted(async () => { link type="primary" v-hasPermi="['system:post:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue b/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue index c040a92de..083e1cc3d 100644 --- a/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/sms/smsChannel/index.vue @@ -68,11 +68,6 @@ const submitForm = async () => { } } -// 删除操作 -const handleDelete = (row: SmsChannelVO) => { - delList(row.id, false) -} - // ========== 详情相关 ========== const detailRef = ref() // 详情 Ref @@ -142,7 +137,7 @@ getList() link type="primary" v-hasPermi="['system:sms-channel:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue index 0c7438fcd..71d455ec5 100644 --- a/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/sms/smsTemplate/index.vue @@ -68,11 +68,6 @@ const submitForm = async () => { } } -// 删除操作 -const handleDelete = (row: SmsTemplateVO) => { - delList(row.id, false) -} - // ========== 详情相关 ========== const detailRef = ref() // 详情 Ref @@ -190,7 +185,7 @@ getList() link type="primary" v-hasPermi="['system:sms-template:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/system/tenant/index.vue b/yudao-ui-admin-vue3/src/views/system/tenant/index.vue index dc06064ca..76bdf9b9f 100644 --- a/yudao-ui-admin-vue3/src/views/system/tenant/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/tenant/index.vue @@ -21,10 +21,6 @@ const { register, tableObject, methods } = useTable({ }) const { getList, setSearchParams, delList, exportList } = methods -// 导出操作 -const handleExport = async () => { - await exportList('租户数据.xls') -} // ========== 套餐 ========== const tenantPackageId = ref() // 套餐 const tenantPackageOptions = ref([]) //套餐列表 @@ -97,11 +93,6 @@ const submitForm = async () => { } } -// 删除操作 -const handleDelete = (row: TenantVO) => { - delList(row.id, false) -} - // ========== 详情相关 ========== const detailRef = ref() // 详情 Ref @@ -134,7 +125,7 @@ onMounted(async () => { type="warning" v-hasPermi="['system:tenant:export']" :loading="tableObject.exportLoading" - @click="handleExport" + @click="exportList('租户数据.xls')" > {{ t('action.export') }} @@ -191,7 +182,7 @@ onMounted(async () => { link type="primary" v-hasPermi="['system:tenant:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/system/tenantPackage/index.vue b/yudao-ui-admin-vue3/src/views/system/tenantPackage/index.vue index 8ba75af98..8277327a7 100644 --- a/yudao-ui-admin-vue3/src/views/system/tenantPackage/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/tenantPackage/index.vue @@ -101,11 +101,6 @@ const submitForm = async () => { } } -// 删除操作 -const handleDelete = (row: TenantPackageVO) => { - delList(row.id, false) -} - // ========== 初始化 ========== onMounted(async () => { await getList() @@ -149,7 +144,7 @@ onMounted(async () => { {{ t('action.edit') }} - + {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/src/views/system/user/index.vue b/yudao-ui-admin-vue3/src/views/system/user/index.vue index 21e7022d5..5a9057a74 100644 --- a/yudao-ui-admin-vue3/src/views/system/user/index.vue +++ b/yudao-ui-admin-vue3/src/views/system/user/index.vue @@ -164,15 +164,6 @@ const handleResetPwd = (row: UserVO) => { }) }) } -// 删除操作 -const handleDelete = (row: UserVO) => { - delList(row.id, false) -} - -// 导出操作 -const handleExport = async () => { - await exportList('用户数据.xls') -} // ========== 详情相关 ========== const detailRef = ref() @@ -300,7 +291,11 @@ getList() > {{ t('action.import') }} - + {{ t('action.export') }} @@ -360,7 +355,7 @@ getList() link type="primary" v-hasPermi="['system:user:delete']" - @click="handleDelete(row)" + @click="delList(row.id, false)" > {{ t('action.del') }} diff --git a/yudao-ui-admin-vue3/vite.config.ts b/yudao-ui-admin-vue3/vite.config.ts index f849f8d09..d5f97167a 100644 --- a/yudao-ui-admin-vue3/vite.config.ts +++ b/yudao-ui-admin-vue3/vite.config.ts @@ -137,16 +137,19 @@ export default ({ command, mode }: ConfigEnv): UserConfig => { 'vue', 'vue-router', 'vue-types', + 'vue-i18n', 'element-plus/es/locale/lang/zh-cn', 'element-plus/es/locale/lang/en', '@iconify/iconify', '@vueuse/core', 'axios', 'qs', + 'dayjs', 'echarts', 'echarts-wordcloud', 'intro.js', 'qrcode', + 'pinia', '@wangeditor/editor', '@wangeditor/editor-for-vue' ] diff --git a/yudao-ui-admin/src/views/bpm/form/index.vue b/yudao-ui-admin/src/views/bpm/form/index.vue index d592a9ddf..d0be4153f 100644 --- a/yudao-ui-admin/src/views/bpm/form/index.vue +++ b/yudao-ui-admin/src/views/bpm/form/index.vue @@ -101,10 +101,8 @@ export default { /** 查询列表 */ getList() { this.loading = true; - // 处理查询参数 - let params = {...this.queryParams}; // 执行查询 - getFormPage(params).then(response => { + getFormPage(this.queryParams).then(response => { this.list = response.data.list; this.total = response.data.total; this.loading = false; diff --git a/yudao-ui-admin/src/views/bpm/model/index.vue b/yudao-ui-admin/src/views/bpm/model/index.vue index a9ddce419..8bc24eccf 100644 --- a/yudao-ui-admin/src/views/bpm/model/index.vue +++ b/yudao-ui-admin/src/views/bpm/model/index.vue @@ -121,7 +121,7 @@ - + @@ -130,7 +130,7 @@ - + diff --git a/yudao-ui-admin/src/views/infra/file/index.vue b/yudao-ui-admin/src/views/infra/file/index.vue index 9d38a7484..b09026e44 100644 --- a/yudao-ui-admin/src/views/infra/file/index.vue +++ b/yudao-ui-admin/src/views/infra/file/index.vue @@ -131,7 +131,7 @@ export default { getList() { this.loading = true; // 执行查询 - getFilePage(params).then(response => { + getFilePage(this.queryParams).then(response => { this.list = response.data.list; this.total = response.data.total; this.loading = false; diff --git a/yudao-ui-admin/src/views/mall/market/banner/index.vue b/yudao-ui-admin/src/views/mall/market/banner/index.vue index daa3c488e..ce5b1c750 100644 --- a/yudao-ui-admin/src/views/mall/market/banner/index.vue +++ b/yudao-ui-admin/src/views/mall/market/banner/index.vue @@ -165,7 +165,7 @@ export default { getList() { this.loading = true; // 执行查询 - getBannerPage(params).then(response => { + getBannerPage(this.queryParams).then(response => { this.list = response.data.list; this.total = response.data.total; this.loading = false; diff --git a/yudao-ui-admin/src/views/mall/product/spu/index.vue b/yudao-ui-admin/src/views/mall/product/spu/index.vue index a61431a5c..849bc7445 100644 --- a/yudao-ui-admin/src/views/mall/product/spu/index.vue +++ b/yudao-ui-admin/src/views/mall/product/spu/index.vue @@ -571,7 +571,7 @@ getList() { this.loading = true; // 执行查询 - getSpuPage(params).then(response => { + getSpuPage(this.queryParams).then(response => { this.list = response.data.list; this.total = response.data.total; this.loading = false; diff --git a/yudao-ui-admin/src/views/system/oauth2/client/index.vue b/yudao-ui-admin/src/views/system/oauth2/client/index.vue index 4f474ab2f..8abe53f9b 100755 --- a/yudao-ui-admin/src/views/system/oauth2/client/index.vue +++ b/yudao-ui-admin/src/views/system/oauth2/client/index.vue @@ -206,10 +206,8 @@ export default { /** 查询列表 */ getList() { this.loading = true; - // 处理查询参数 - let params = {...this.queryParams}; // 执行查询 - getOAuth2ClientPage(params).then(response => { + getOAuth2ClientPage(this.queryParams).then(response => { this.list = response.data.list; this.total = response.data.total; this.loading = false;