From bf5dd6ac5198818a0078b19c3497feba066161a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Mon, 30 Jan 2023 18:21:55 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=B2=97=E4=BD=8D=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/post.js | 17 +++++++++-------- src/views/system/post/index.vue | 26 ++++++++++++-------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/api/system/post.js b/src/api/system/post.js index 434cd35..8b9aff8 100644 --- a/src/api/system/post.js +++ b/src/api/system/post.js @@ -1,5 +1,5 @@ import request from '@/utils/request' - +import { downFile } from '@/utils/request' // 查询岗位列表 export function listPost(query) { return request({ @@ -44,10 +44,11 @@ export function delPost(postId) { } // 导出岗位 -export function exportPost(query) { - return request({ - url: '/system/post/export', - method: 'get', - params: query - }) -} \ No newline at end of file +export async function exportPost(query) { + // return request({ + // url: '/system/post/export', + // method: 'get', + // params: query + // }) + await downFile('/system/post/export', query) +} diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue index fb4ba19..8e106bf 100644 --- a/src/views/system/post/index.vue +++ b/src/views/system/post/index.vue @@ -123,7 +123,7 @@ let queryParams = reactive({ pageSize: 10, postCode: undefined, postName: undefined, - status: undefined, + status: undefined }) // 表单校验 @@ -132,8 +132,8 @@ const state = reactive({ rules: { postName: [{ required: true, message: '岗位名称不能为空', trigger: 'blur' }], postCode: [{ required: true, message: '岗位编码不能为空', trigger: 'blur' }], - postSort: [{ required: true, message: '岗位顺序不能为空', trigger: 'blur' }], - }, + postSort: [{ required: true, message: '岗位顺序不能为空', trigger: 'blur' }] + } }) const formRef = ref(null) const { form, rules } = toRefs(state) @@ -159,7 +159,7 @@ function reset() { postName: undefined, postSort: 0, status: '0', - remark: undefined, + remark: undefined } proxy.resetForm('formRef') } @@ -225,7 +225,7 @@ function handleDelete(row) { .$confirm('是否确认删除岗位编号为"' + postIds + '"的数据项?', '警告', { confirmButtonText: '确定', cancelButtonText: '取消', - type: 'warning', + type: 'warning' }) .then(function () { return delPost(postIds) @@ -237,16 +237,14 @@ function handleDelete(row) { } /** 导出按钮操作 */ function handleExport() { - this.$confirm('是否确认导出所有岗位数据项?', '警告', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning', - }) - .then(function () { - return exportPost(queryParams) + proxy + .$confirm('是否确认导出所有岗位数据项?', '警告', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' }) - .then((response) => { - proxy.download(response.data.path) + .then(async () => { + await exportPost(queryParams) }) } handleQuery()