From 19addc62e0a4d8b6203a2e4342383246e7e95cd7 Mon Sep 17 00:00:00 2001 From: lizhi <1370025557@qq.com> Date: Wed, 29 Jun 2022 16:59:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/common/data/entity/index.ts | 1 + src/api/platform/system/controller/address.ts | 62 +++++++++---------- .../platform/system/entity/addressModel.ts | 28 ++++----- src/utils/dateUtil.ts | 2 +- .../institution/hospital/HospitalModal.vue | 11 ++-- src/views/system/project/index.vue | 4 +- 6 files changed, 55 insertions(+), 53 deletions(-) diff --git a/src/api/common/data/entity/index.ts b/src/api/common/data/entity/index.ts index 3a29f4d..d5d5f49 100644 --- a/src/api/common/data/entity/index.ts +++ b/src/api/common/data/entity/index.ts @@ -27,6 +27,7 @@ export interface CommonEntity { /** 树结构模型 */ export interface TreeEntity { + id:string; parentId: string; name: string; sort: number; diff --git a/src/api/platform/system/controller/address.ts b/src/api/platform/system/controller/address.ts index 12be90f..26c7cbc 100644 --- a/src/api/platform/system/controller/address.ts +++ b/src/api/platform/system/controller/address.ts @@ -1,46 +1,44 @@ -import {AddressParams,AddressItem,AddressItemListResult} from '/@/api/platform/system/entity/addressModel'; +/** + * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 + * Copyright © 2020-2022 entfrm All rights reserved. + * author entfrm开发团队-王翔 + */ +import {AddressParams,AddressItem} from '/@/api/platform/system/entity/addressModel'; import { defHttp } from '/@/utils/http/axios'; -import {isDef} from '/@/utils/is'; -import {listToTree} from '/@/utils/helper/treeHelper'; - -const prefix = '/system_proxy/system'; enum Api { - QueryById = '/address/query', - List = '/address/list', - QueryByParentIds = '/address/queryByParentIds', - Add = '/address/add', - Update = '/address/update', - Remove = '/address/remove' + get = '/system_proxy/system/address', + QueryById = '/system_proxy/system/address/query', + list = '/system_proxy/system/address/list', + QueryByParentIds = '/system_proxy/system/address/queryByParentIds', + 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: prefix + Api.QueryById + `/${params.id}`}); + defHttp.get({url: Api.QueryById + `/${params.id}`}); -export const treeList = (params: AddressParams) => { - return defHttp.get({url: prefix + Api.List, params}).then(data =>{ - return listToTree(data, { - id: 'code', - parentId: 'parentId' - }); - }); -}; +export const treeList = (params: AddressParams) => defHttp.get({url: Api.list, params}); -export const list = (params: AddressParams) => - defHttp.get({url: prefix + Api.List, params}); +export const listAddr = (params?: Partial) => + defHttp.get({url: Api.list, params}); export const queryByParentIds = (params) => - defHttp.get({url: prefix + Api.QueryByParentIds + `/${params}`}); + defHttp.get({url: Api.QueryByParentIds + `/${params}`}); + -export const set = (params: AddressItem) => { - if (isDef(params.code)){ - defHttp.put({url: prefix + Api.Update, params}); - }else { - defHttp.post({url: prefix + Api.Add, params}); - } -}; +/**新增地址 */ +export const addAddr = (params: Partial) => + defHttp.post({url:Api.add, data: params}); -export const remove = (params: {ids: String}) => - defHttp.delete({url: prefix + Api.Remove + `/${params.ids}`}); \ No newline at end of file +/**修改地址 */ +export const editAddr=(params: Partial)=> + defHttp.put({url: Api.edit,data:params}); +/**查询详细 */ +export const getAddr = (id: string) =>defHttp.get({url:`${Api.get}/${id}`}); +/**删除 */ +export const delAddr =(id: string)=> + defHttp.delete({url:`${Api.del}/${id}`}); \ No newline at end of file diff --git a/src/api/platform/system/entity/addressModel.ts b/src/api/platform/system/entity/addressModel.ts index 383cda0..e92ae50 100644 --- a/src/api/platform/system/entity/addressModel.ts +++ b/src/api/platform/system/entity/addressModel.ts @@ -1,26 +1,26 @@ // 引入基础包 import type { R } from '/#/axios'; -import type { TreeEntity,Page } from '/@/api/common/data/entity'; +import type { CommonEntity,Page } from '/@/api/common/data/entity'; -export type AddressParams = { - parentId?: string; - code?: string; - level?:string; - name?: string; - beginTime?: string; - endTime?: string; -} & Page; +export type AddressParams =AddressItem & Page; -export interface AddressItem extends TreeEntity{ - +export interface AddressItem extends CommonEntity{ + id: string; + parentId: string; + //level?:string; + sort: number; + name: string; + // beginTime?: string; + // endTime?: string; code: string; - level: number; + // level: number; - lastLevel: boolean; + // lastLevel: boolean; + [key: string]: any } -export type AddressItemListResult = R; \ No newline at end of file +export type AddressItemListResult = R; \ No newline at end of file diff --git a/src/utils/dateUtil.ts b/src/utils/dateUtil.ts index c45b5b6..4921bee 100644 --- a/src/utils/dateUtil.ts +++ b/src/utils/dateUtil.ts @@ -22,7 +22,7 @@ export function formatToDate(date: moment.MomentInput = undefined, format = DATE } /** 添加日期范围 */ -export function convertDateRange(params: Recordable, dateRange: string[]): Recordable { +export function convertDateRange(params: Recordable, dateRange: string): Recordable { const search = params; search.beginTime = ''; search.endTime = ''; diff --git a/src/views/institution/hospital/HospitalModal.vue b/src/views/institution/hospital/HospitalModal.vue index 81b96bb..5cdb5bc 100644 --- a/src/views/institution/hospital/HospitalModal.vue +++ b/src/views/institution/hospital/HospitalModal.vue @@ -1,5 +1,8 @@ @@ -10,7 +13,7 @@ import {BasicModal, useModalInner} from '/@/components/Modal'; import {hospitalFormSchema} from './hospital.data'; import {BasicForm, useForm} from '/@/components/Form'; import {set} from '/@/api/platform/system/controller/hospital'; -import {HospitalItem} from "/@/api/platform/system/entity/hospitalModel"; +import {HospitalItem} from '/@/api/platform/system/entity/hospitalModel'; const isUpdate = ref(true); // 定义emit const emit = defineEmits(['success', 'register']); @@ -33,9 +36,9 @@ const [registerModal, {setModalProps, closeModal}] = useModalInner( (data) => { setModalProps({confirmLoading: false}); isUpdate.value = !!data?.isUpdate; if (unref(isUpdate)) { - if(typeof data.record.addressIds == "string"){ + if(typeof data.record.addressIds == 'string'){ let addressIdsStr: string = data.record.addressIds; - const addressIds:String[] = addressIdsStr.split(","); + const addressIds:String[] = addressIdsStr.split(','); data.record.addressIds = addressIds; } setFieldsValue({ diff --git a/src/views/system/project/index.vue b/src/views/system/project/index.vue index a7122ce..fa7a82e 100644 --- a/src/views/system/project/index.vue +++ b/src/views/system/project/index.vue @@ -4,8 +4,8 @@