From 9eca03d0e7ba487df6cd3c7597af27b1912426f3 Mon Sep 17 00:00:00 2001 From: lizhi <1370025557@qq.com> Date: Thu, 14 Jul 2022 18:07:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=AE=A1=E7=90=86=E6=87=92?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/api/platform/system/controller/address.ts | 25 ++++++++--------- .../platform/system/entity/addressModel.ts | 11 +++++--- .../institution/address/AddressModal.vue | 17 ++++++++++- src/views/institution/address/address.data.ts | 28 +++++++++---------- src/views/institution/address/index.vue | 26 ++++++++++++++--- 6 files changed, 72 insertions(+), 37 deletions(-) diff --git a/.env.development b/.env.development index 09279ca..5be9756 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,7 @@ VITE_PUBLIC_PATH = / # 本地开发代理，可以解决跨域及多地址代理 # 如果接口地址匹配到，则会转发到http://localhost:3000，防止本地出现跨域问题 # 可以有多个，注意多个不能换行，否则代理将会失效 -VITE_PROXY = [["/api","http://192.168.3.10:9999"],["/upload","http://192.168.3.10:9999/system_proxy/system/file/upload"]] +VITE_PROXY = [["/api","http://localhost:9999"],["/upload","http://localhost:9999/system_proxy/system/file/upload"]] # 是否删除console.log VITE_DROP_CONSOLE = false diff --git a/src/api/platform/system/controller/address.ts b/src/api/platform/system/controller/address.ts index 54754b4..036bffd 100644 --- a/src/api/platform/system/controller/address.ts +++ b/src/api/platform/system/controller/address.ts @@ -3,36 +3,35 @@ * Copyright © 2020-2022 entfrm All rights reserved. * author entfrm开发团队-王翔 */ -import {AddressParams,AddressItem} from '/@/api/platform/system/entity/addressModel'; +import {AddressParams, AddressItem, AddressItemListResult} from '/@/api/platform/system/entity/addressModel'; import { defHttp } from '/@/utils/http/axios'; - +import { isEmpty } from '/@/utils/is'; enum Api { - get = '/system_proxy/system/address', - QueryById = '/system_proxy/system/address/query', + list = '/system_proxy/system/address/list', - QueryByParentIds = '/system_proxy/system/address/queryByParentIds', + lazyList= '/system_proxy/system/address/lazyList', + get = '/system_proxy/system/address', add = '/system_proxy/system/address/add', edit = '/system_proxy/system/address/update', del = '/system_proxy/system/address/remove' } -export const queryById = (params: { id: String }) => - defHttp.get({url: Api.QueryById + `/${params.id}`}); -export const treeList = (params: AddressParams) => defHttp.get({url: Api.list, params}); -export const listAddr = (params?: Partial) => - defHttp.get({url: Api.list, params}); +export const listAddr = (params?: Partial) => { + if (params?.name || params?.id || !isEmpty(params?.dateRange)) { + defHttp.get({url: Api.list, params}); + } else + defHttp.get({url: Api.lazyList, params}); +}; + /**新增 */ export const addAddr =(params:Partial) =>defHttp.post({url:Api.add,data:params}); /**修改 */ export const editAddr =(params:Partial) =>defHttp.put({url:Api.edit,data:params}); -export const queryByParentIds = (params) => - defHttp.get({url: Api.QueryByParentIds + `/${params}`}); - /**查询详细 */ export const getAddr = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); diff --git a/src/api/platform/system/entity/addressModel.ts b/src/api/platform/system/entity/addressModel.ts index e92ae50..b0f1b77 100644 --- a/src/api/platform/system/entity/addressModel.ts +++ b/src/api/platform/system/entity/addressModel.ts @@ -8,16 +8,19 @@ export type AddressParams =AddressItem & Page; export interface AddressItem extends CommonEntity{ id: string; parentId: string; - //level?:string; + code: string; sort: number; name: string; + + + + // level: number; + // lastLevel: boolean; + //level?:string; // beginTime?: string; // endTime?: string; - code: string; - // level: number; - // lastLevel: boolean; [key: string]: any diff --git a/src/views/institution/address/AddressModal.vue b/src/views/institution/address/AddressModal.vue index b6d3cf0..953a530 100644 --- a/src/views/institution/address/AddressModal.vue +++ b/src/views/institution/address/AddressModal.vue @@ -1,8 +1,10 @@