diff --git a/src/api/platform/system/controller/boxcard.ts b/src/api/platform/common/controller/boxcard.ts similarity index 95% rename from src/api/platform/system/controller/boxcard.ts rename to src/api/platform/common/controller/boxcard.ts index ee2b11e..a3729da 100644 --- a/src/api/platform/system/controller/boxcard.ts +++ b/src/api/platform/common/controller/boxcard.ts @@ -1,4 +1,4 @@ -import {BoxCardParams, BoxCardListItem, BoxCardListGetListResult} from '/@/api/platform/system/entity/boxCardModel'; +import {BoxCardParams, BoxCardListItem, BoxCardListGetListResult} from '/@/api/platform/common/entity/boxCard'; import { defHttp } from '/@/utils/http/axios'; import {isDef} from '/@/utils/is'; @@ -48,4 +48,4 @@ export const set = (params: BoxCardListItem) =>{ export const remove = (params: {ids: String}) => - defHttp.delete({url: prefix + Api.Remove + `/${params.ids}`}); \ No newline at end of file + defHttp.delete({url: prefix + Api.Remove + `/${params.ids}`}); diff --git a/src/api/platform/system/controller/doctor.ts b/src/api/platform/common/controller/doctor.ts similarity index 95% rename from src/api/platform/system/controller/doctor.ts rename to src/api/platform/common/controller/doctor.ts index 3ce25bf..9e6a566 100644 --- a/src/api/platform/system/controller/doctor.ts +++ b/src/api/platform/common/controller/doctor.ts @@ -1,4 +1,4 @@ -import {DoctorParams,DoctorItem,DoctorItemListResult} from '/@/api/platform/system/entity/doctorModel'; +import {DoctorParams,DoctorItem,DoctorItemListResult} from '/@/api/platform/common/entity/doctor'; import { defHttp } from '/@/utils/http/axios'; import {isDef} from '/@/utils/is'; @@ -30,4 +30,4 @@ export const editDoctor = (params: Partial) => defHttp.put({ url: export const getDoctor = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); /** 删除医生 */ -export const delDoctor = (id: string) => defHttp.delete({ url: `${Api.del}/${id}` }); \ No newline at end of file +export const delDoctor = (id: string) => defHttp.delete({ url: `${Api.del}/${id}` }); diff --git a/src/api/platform/system/controller/hospital.ts b/src/api/platform/common/controller/hospital.ts similarity index 96% rename from src/api/platform/system/controller/hospital.ts rename to src/api/platform/common/controller/hospital.ts index 5990ffd..16bd62a 100644 --- a/src/api/platform/system/controller/hospital.ts +++ b/src/api/platform/common/controller/hospital.ts @@ -1,4 +1,4 @@ -import {HospitalParams,HospitalItem,HospitalItemListResult} from '/@/api/platform/system/entity/hospitalModel'; +import {HospitalParams,HospitalItem,HospitalItemListResult} from '/@/api/platform/common/entity/hospital'; import { defHttp } from '/@/utils/http/axios'; import {isDef} from '/@/utils/is'; @@ -43,4 +43,4 @@ export const editHospital = (params: Partial) => defHttp.put({ur /** 查询医院详细*/ export const getHospital = (id: string) => defHttp.get({url: `${Api.get}/${id}` }); /** 删除项目 */ -export const delHospital = (id: string) => defHttp.delete({ url: `${Api.del}/${id}` }); \ No newline at end of file +export const delHospital = (id: string) => defHttp.delete({ url: `${Api.del}/${id}` }); diff --git a/src/api/platform/system/controller/institution.ts b/src/api/platform/common/controller/institution.ts similarity index 96% rename from src/api/platform/system/controller/institution.ts rename to src/api/platform/common/controller/institution.ts index e15b384..3e0441c 100644 --- a/src/api/platform/system/controller/institution.ts +++ b/src/api/platform/common/controller/institution.ts @@ -1,5 +1,5 @@ -import {InstitutionParams,InstitutionItem,InstitutionItemListResult} from '/@/api/platform/system/entity/institutionModel'; +import {InstitutionParams,InstitutionItem,InstitutionItemListResult} from '/@/api/platform/common/entity/institution'; import { defHttp } from '/@/utils/http/axios'; import {isDef} from '/@/utils/is'; @@ -49,4 +49,4 @@ export const editInstitution = (params: Partial) => defHttp.p export const getInstitution = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); /** 删除机构 */ -export const delInstitution= (id: string) => defHttp.delete({ url: `${Api.del}/${id}` }); \ No newline at end of file +export const delInstitution= (id: string) => defHttp.delete({ url: `${Api.del}/${id}` }); diff --git a/src/api/platform/system/controller/office.ts b/src/api/platform/common/controller/office.ts similarity index 95% rename from src/api/platform/system/controller/office.ts rename to src/api/platform/common/controller/office.ts index 1f83613..b69fa1f 100644 --- a/src/api/platform/system/controller/office.ts +++ b/src/api/platform/common/controller/office.ts @@ -1,7 +1,7 @@ -import {OfficeParams,OfficeItem,OfficeItemListResult} from '/@/api/platform/system/entity/officeModel'; +import {OfficeParams,OfficeItem,OfficeItemListResult} from '/@/api/platform/common/entity/office'; import { defHttp } from '/@/utils/http/axios'; import {isDef} from '/@/utils/is'; -import {HospitalItemListResult, HospitalParams} from "/@/api/platform/system/entity/hospitalModel"; +import {HospitalItemListResult, HospitalParams} from "/@/api/platform/common/entity/hospital"; @@ -47,4 +47,4 @@ export const editOffice = (params: Partial) => defHttp.put({ url: export const getOffice = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); /** 删除科室 */ -export const delOffice = (id: string) => defHttp.delete({ url: `${Api.del}/${id}` }); \ No newline at end of file +export const delOffice = (id: string) => defHttp.delete({ url: `${Api.del}/${id}` }); diff --git a/src/api/platform/system/controller/report.ts b/src/api/platform/common/controller/report.ts similarity index 95% rename from src/api/platform/system/controller/report.ts rename to src/api/platform/common/controller/report.ts index 7129399..b7b37b0 100644 --- a/src/api/platform/system/controller/report.ts +++ b/src/api/platform/common/controller/report.ts @@ -1,4 +1,4 @@ -import {DoctorParams,DoctorItem,DoctorItemListResult} from '/@/api/platform/system/entity/doctorModel'; +import {DoctorParams,DoctorItem,DoctorItemListResult} from '/@/api/platform/common/entity/doctor'; import { defHttp } from '/@/utils/http/axios'; import {isDef} from '/@/utils/is'; @@ -30,4 +30,4 @@ export const editReport = (params: Partial) => defHttp.put({ url: export const getReport = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); /** 删除医生 */ -export const delReport = (id: string) => defHttp.delete({ url: `${Api.del}/${id}` }); \ No newline at end of file +export const delReport = (id: string) => defHttp.delete({ url: `${Api.del}/${id}` }); diff --git a/src/api/platform/system/entity/boxCardModel.ts b/src/api/platform/common/entity/boxCard.ts similarity index 100% rename from src/api/platform/system/entity/boxCardModel.ts rename to src/api/platform/common/entity/boxCard.ts diff --git a/src/api/platform/system/entity/doctorModel.ts b/src/api/platform/common/entity/doctor.ts similarity index 100% rename from src/api/platform/system/entity/doctorModel.ts rename to src/api/platform/common/entity/doctor.ts diff --git a/src/api/platform/system/entity/hospitalModel.ts b/src/api/platform/common/entity/hospital.ts similarity index 100% rename from src/api/platform/system/entity/hospitalModel.ts rename to src/api/platform/common/entity/hospital.ts diff --git a/src/api/platform/system/entity/institutionModel.ts b/src/api/platform/common/entity/institution.ts similarity index 100% rename from src/api/platform/system/entity/institutionModel.ts rename to src/api/platform/common/entity/institution.ts diff --git a/src/api/platform/system/entity/officeModel.ts b/src/api/platform/common/entity/office.ts similarity index 100% rename from src/api/platform/system/entity/officeModel.ts rename to src/api/platform/common/entity/office.ts diff --git a/src/api/platform/system/entity/report.ts b/src/api/platform/common/entity/report.ts similarity index 100% rename from src/api/platform/system/entity/report.ts rename to src/api/platform/common/entity/report.ts diff --git a/src/api/platform/system/controller/area.ts b/src/api/platform/system/controller/area.ts deleted file mode 100644 index a8d4536..0000000 --- a/src/api/platform/system/controller/area.ts +++ /dev/null @@ -1,30 +0,0 @@ -/** - * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 - * Copyright © 2020-2022 entfrm All rights reserved. - * author entfrm开发团队-王翔 - */ -import type { AreaParams, Area } from '/@/api/platform/system/entity/area'; -import { defHttp } from '/@/utils/http/axios'; - -enum Api { - list = '/system_proxy/system/address/queryByParentId', - add = '/system_proxy/system/address/save', - get = '/system_proxy/system/address/query', - edit = '/system_proxy/system/address/update', - del = '/system_proxy/system/address/remove', -} - -/** 查询区域列表 */ -export const listArea = (params?: Partial) => defHttp.get({ url: Api.list, params }); - -/** 新增区域 */ -export const addArea = (params: Partial) => defHttp.post({ url: Api.add, data: params }); - -/** 修改区域 */ -export const editArea = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); - -/** 查询区域详细 */ -export const getArea = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); - -/** 删除区域 */ -export const delArea = (id: string) => defHttp.delete({ url: `${Api.del}/${id}` }); diff --git a/src/api/platform/system/controller/address.ts b/src/api/platform/system/controller/region.ts similarity index 96% rename from src/api/platform/system/controller/address.ts rename to src/api/platform/system/controller/region.ts index 036bffd..a71d882 100644 --- a/src/api/platform/system/controller/address.ts +++ b/src/api/platform/system/controller/region.ts @@ -3,7 +3,7 @@ * Copyright © 2020-2022 entfrm All rights reserved. * author entfrm开发团队-王翔 */ -import {AddressParams, AddressItem, AddressItemListResult} from '/@/api/platform/system/entity/addressModel'; +import {AddressParams, AddressItem, AddressItemListResult} from '/@/api/platform/system/entity/region'; import { defHttp } from '/@/utils/http/axios'; import { isEmpty } from '/@/utils/is'; diff --git a/src/api/platform/system/entity/area.ts b/src/api/platform/system/entity/area.ts deleted file mode 100644 index 773a276..0000000 --- a/src/api/platform/system/entity/area.ts +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @program: kicc-ui - * @description: 区域实体类 - * 类型定义 - * @author: entfrm开发团队-王翔 - * @create: 2022/4/8 - */ -import type { R } from '/#/axios'; -import type { CommonEntity, Page } from '/@/api/common/data/entity'; - -/** 区域查询参数 */ -export type AreaParams = Page & Area; - -/** 区域对象 */ -export interface Area extends CommonEntity { - areaId: string; - code: string; - name: string; - parentId: string; - sort: number; - contacts: string; - phone: string; - address: string; - email: string; - status: string; - [key: string]: any; -} - -/** 区域响应对象 */ -export type AreaResult = R; diff --git a/src/api/platform/system/entity/addressModel.ts b/src/api/platform/system/entity/region.ts similarity index 100% rename from src/api/platform/system/entity/addressModel.ts rename to src/api/platform/system/entity/region.ts diff --git a/src/views/common/boxcard/BoxCardModal.vue b/src/views/common/boxcard/BoxCardModal.vue index 00953c9..73dfbe6 100644 --- a/src/views/common/boxcard/BoxCardModal.vue +++ b/src/views/common/boxcard/BoxCardModal.vue @@ -13,7 +13,7 @@ import {ref, computed, unref} from 'vue'; import {BasicModal, useModalInner} from '/@/components/Modal'; import {cardFormSchema} from './boxcard.data'; import {BasicForm, useForm} from '/@/components/Form'; -import {set} from '/@/api/platform/system/controller/boxcard'; +import {set} from '/@/api/platform/common/controller/boxcard'; const isUpdate = ref(true); // 定义emit const emit = defineEmits(['success', 'register']); diff --git a/src/views/common/boxcard/index.vue b/src/views/common/boxcard/index.vue index 5c26b1b..656d72e 100644 --- a/src/views/common/boxcard/index.vue +++ b/src/views/common/boxcard/index.vue @@ -34,7 +34,7 @@ import {useModal} from '/@/components/Modal'; import BoxCardModal from './BoxCardModal.vue'; import {columns, searchFormSchema} from './boxcard.data'; import {useMessage} from '/@/hooks/web/useMessage'; -import {cardList, remove} from '/@/api/platform/system/controller/boxcard'; +import {cardList, remove} from '/@/api/platform/common/controller/boxcard'; const {createMessage} = useMessage(); const [registerModal, {openModal}] = useModal(); const [registerTable, {reload}] = useTable({ @@ -91,4 +91,4 @@ async function handleDelete(record: Recordable) { function handleSuccess() { reload(); } - \ No newline at end of file + diff --git a/src/views/common/doctor/DoctorModal.vue b/src/views/common/doctor/DoctorModal.vue index c1989d5..12a0e55 100644 --- a/src/views/common/doctor/DoctorModal.vue +++ b/src/views/common/doctor/DoctorModal.vue @@ -17,7 +17,7 @@ import { ref, unref } from 'vue'; import { BasicForm, useForm } from '/@/components/Form'; import { doctorFormSchema } from './doctor.data'; - import {addDoctor, delDoctor,getDoctor,editDoctor} from '/@/api/platform/system/controller/doctor'; + import {addDoctor, delDoctor,getDoctor,editDoctor} from '/@/api/platform/common/controller/doctor'; import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; import { isEmpty } from '/@/utils/is'; diff --git a/src/views/common/doctor/doctor.data.ts b/src/views/common/doctor/doctor.data.ts index dd35da0..8cf7519 100644 --- a/src/views/common/doctor/doctor.data.ts +++ b/src/views/common/doctor/doctor.data.ts @@ -2,9 +2,9 @@ import { BasicColumn } from '/@/components/Table'; import { FormSchema } from '/@/components/Table'; import {h, watch, watchEffect, watchSyncEffect} from 'vue'; import {Tag} from 'ant-design-vue'; -import { list as hospitalList } from '/@/api/platform/system/controller/hospital'; -import {list as institutionList} from '/@/api/platform/system/controller/institution'; -import { listOffice as officeList } from '/@/api/platform/system/controller/office'; +import { list as hospitalList } from '/@/api/platform/common/controller/hospital'; +import {list as institutionList} from '/@/api/platform/common/controller/institution'; +import { listOffice as officeList } from '/@/api/platform/common/controller/office'; import {deepMerge} from '/@/utils'; @@ -271,4 +271,4 @@ export const doctorFormSchema: FormSchema[] = [ field: 'remarks', component: 'InputTextArea', } -]; \ No newline at end of file +]; diff --git a/src/views/common/doctor/index.vue b/src/views/common/doctor/index.vue index dc060a2..4be402c 100644 --- a/src/views/common/doctor/index.vue +++ b/src/views/common/doctor/index.vue @@ -47,7 +47,7 @@ */ import { reactive, toRaw } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; - import {listDoctor, delDoctor} from '/@/api/platform/system/controller/doctor'; + import {listDoctor, delDoctor} from '/@/api/platform/common/controller/doctor'; import { useModal } from '/@/components/Modal'; import { columns, searchFormSchema } from './doctor.data'; import { useMessage } from '/@/hooks/web/useMessage'; diff --git a/src/views/common/hospital/HospitalModal.vue b/src/views/common/hospital/HospitalModal.vue index d8794b3..5e0120b 100644 --- a/src/views/common/hospital/HospitalModal.vue +++ b/src/views/common/hospital/HospitalModal.vue @@ -17,7 +17,7 @@ import { ref, unref } from 'vue'; import { BasicForm, useForm } from '/@/components/Form'; import { hospitalFormSchema } from './hospital.data'; -import {addHospital, delHospital,getHospital,editHospital} from '/@/api/platform/system/controller/hospital'; +import {addHospital, delHospital,getHospital,editHospital} from '/@/api/platform/common/controller/hospital'; import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; import { isEmpty } from '/@/utils/is'; diff --git a/src/views/common/hospital/hospital.data.ts b/src/views/common/hospital/hospital.data.ts index c1abb1c..35cd418 100644 --- a/src/views/common/hospital/hospital.data.ts +++ b/src/views/common/hospital/hospital.data.ts @@ -2,7 +2,7 @@ import { BasicColumn } from '/@/components/Table'; import { FormSchema } from '/@/components/Table'; import {h} from 'vue'; import {Tag} from 'ant-design-vue'; -import {list as institutionList} from '/@/api/platform/system/controller/institution'; +import {list as institutionList} from '/@/api/platform/common/controller/institution'; export const columns: BasicColumn[] = [ @@ -259,4 +259,4 @@ export const hospitalFormSchema: FormSchema[] = [ field: 'remarks', component: 'InputTextArea', } -]; \ No newline at end of file +]; diff --git a/src/views/common/hospital/index.vue b/src/views/common/hospital/index.vue index 665010c..17afdc9 100644 --- a/src/views/common/hospital/index.vue +++ b/src/views/common/hospital/index.vue @@ -47,7 +47,7 @@ */ import { reactive, toRaw } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; -import {list, delHospital} from '/@/api/platform/system/controller/hospital'; +import {list, delHospital} from '/@/api/platform/common/controller/hospital'; import { useModal } from '/@/components/Modal'; import { columns, searchFormSchema } from './hospital.data'; import { useMessage } from '/@/hooks/web/useMessage'; diff --git a/src/views/common/institution/InstitutionModal.vue b/src/views/common/institution/InstitutionModal.vue index 6f2c08f..af6f79e 100644 --- a/src/views/common/institution/InstitutionModal.vue +++ b/src/views/common/institution/InstitutionModal.vue @@ -17,7 +17,7 @@ import { ref, unref } from 'vue'; import { BasicForm, useForm } from '/@/components/Form'; import { institutionFormSchema } from './institution.data'; -import {addInstitution, delInstitution,getInstitution,editInstitution} from '/@/api/platform/system/controller/institution'; +import {addInstitution, delInstitution,getInstitution,editInstitution} from '/@/api/platform/common/controller/institution'; import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; import { isEmpty } from '/@/utils/is'; diff --git a/src/views/common/institution/index.vue b/src/views/common/institution/index.vue index b0d724a..ea18f5d 100644 --- a/src/views/common/institution/index.vue +++ b/src/views/common/institution/index.vue @@ -47,7 +47,7 @@ */ import { reactive, toRaw } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; -import {list, delInstitution} from '/@/api/platform/system/controller/institution'; +import {list, delInstitution} from '/@/api/platform/common/controller/institution'; import { useModal } from '/@/components/Modal'; import { columns, searchFormSchema } from './institution.data'; import { useMessage } from '/@/hooks/web/useMessage'; diff --git a/src/views/common/office/OfficeModal.vue b/src/views/common/office/OfficeModal.vue index 2f136d0..7699942 100644 --- a/src/views/common/office/OfficeModal.vue +++ b/src/views/common/office/OfficeModal.vue @@ -17,7 +17,7 @@ import { ref, unref } from 'vue'; import { BasicForm, useForm } from '/@/components/Form'; import { officeFormSchema } from './office.data'; -import {addOffice, delOffice,getOffice,editOffice} from '/@/api/platform/system/controller/office'; +import {addOffice, delOffice,getOffice,editOffice} from '/@/api/platform/common/controller/office'; import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; import { isEmpty } from '/@/utils/is'; diff --git a/src/views/common/office/index.vue b/src/views/common/office/index.vue index ea69dcd..3f8509d 100644 --- a/src/views/common/office/index.vue +++ b/src/views/common/office/index.vue @@ -47,7 +47,7 @@ */ import { reactive, toRaw } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; -import {listOffice, delOffice} from '/@/api/platform/system/controller/office'; +import {listOffice, delOffice} from '/@/api/platform/common/controller/office'; import { useModal } from '/@/components/Modal'; import { columns, searchFormSchema } from './office.data'; import { useMessage } from '/@/hooks/web/useMessage'; diff --git a/src/views/common/office/office.data.ts b/src/views/common/office/office.data.ts index da596c1..57a6c83 100644 --- a/src/views/common/office/office.data.ts +++ b/src/views/common/office/office.data.ts @@ -2,8 +2,8 @@ import { BasicColumn } from '/@/components/Table'; import { FormSchema } from '/@/components/Table'; import {h, watch} from 'vue'; import {Tag} from 'ant-design-vue'; -import { list as hospitalList } from '/@/api/platform/system/controller/hospital'; -import { list as institutionList } from '/@/api/platform/system/controller/institution'; +import { list as hospitalList } from '/@/api/platform/common/controller/hospital'; +import { list as institutionList } from '/@/api/platform/common/controller/institution'; import {deepMerge} from '/@/utils'; diff --git a/src/views/common/report/ReportModal.vue b/src/views/common/report/ReportModal.vue index 7a6882b..158666f 100644 --- a/src/views/common/report/ReportModal.vue +++ b/src/views/common/report/ReportModal.vue @@ -17,7 +17,7 @@ import { ref, unref } from 'vue'; import { BasicForm, useForm } from '/@/components/Form'; import { doctorFormSchema } from './report.data'; -import {addReport, delReport,getReport,editReport} from '/@/api/platform/system/controller/report'; +import {addReport, delReport,getReport,editReport} from '/@/api/platform/common/controller/report'; import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; import { isEmpty } from '/@/utils/is'; diff --git a/src/views/common/report/index.vue b/src/views/common/report/index.vue index a36cbd8..6a88651 100644 --- a/src/views/common/report/index.vue +++ b/src/views/common/report/index.vue @@ -61,7 +61,7 @@ */ import { reactive, ref, toRaw } from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; -import {listReport, delReport} from '/@/api/platform/system/controller/report'; +import {listReport, delReport} from '/@/api/platform/common/controller/report'; import { useModal } from '/@/components/Modal'; import { columns, searchFormSchema } from './report.data'; import { useMessage } from '/@/hooks/web/useMessage'; @@ -178,7 +178,7 @@ function handleClickLinkDoctor(record) { } /**合并上传*/ function handleClickMergeUpload() { - + } /**设置收样员*/ function handleClickBatchCollect() { @@ -194,11 +194,11 @@ function handleClickBatchDownload() { } /**导出*/ function handleClickExport() { - + } /**导出预制码*/ function handleClickExportPreCode() { - + } function getDropDownAction(record) { return [ diff --git a/src/views/system/equip/boxcard/BoxCardModal.vue b/src/views/system/equip/boxcard/BoxCardModal.vue deleted file mode 100644 index 5692968..0000000 --- a/src/views/system/equip/boxcard/BoxCardModal.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/system/equip/boxcard/boxcard.data.ts b/src/views/system/equip/boxcard/boxcard.data.ts deleted file mode 100644 index e75e69c..0000000 --- a/src/views/system/equip/boxcard/boxcard.data.ts +++ /dev/null @@ -1,160 +0,0 @@ -import { BasicColumn } from '/@/components/Table'; -import { FormSchema } from '/@/components/Table'; -import {h} from 'vue'; -import {Tag} from 'ant-design-vue'; - - -export const columns: BasicColumn[] = [ - { - title: 'ID', - dataIndex: 'id', - width: 120, - }, - { - title: 'iccid', - dataIndex: 'iccid', - width: 120, - }, - { - title: '卡号', - dataIndex: 'card', - width: 120, - }, - { - title: '网卡厂商', - dataIndex: 'company', - width: 120, - customRender: ({ record }) => { - const com = record.company; - switch (com) { - case '1': return '中国移动'; - case '2': return '中国联通'; - case '3': return '中国电信'; - default: return '未知厂商'; - } - } - }, - { - title: '卡是否已使用', - dataIndex: 'isUsed', - width: 120, - }, - { - title: '状态', - dataIndex: 'status', - width: 100, - customRender: ({ record }) => { - const status = record.status; - const enable = status === '0'; - const color = enable ? 'green' : 'red'; - const text = enable ? '启用' : '禁用'; - return h(Tag, { color: color }, () => text); - }, - }, - { - title: '创建人', - dataIndex: 'createByName', - width: 180, - }, - { - title: '创建时间', - dataIndex: 'createTime', - width: 180, - } -]; - -export const searchFormSchema: FormSchema[] = [ - { - field: 'iccid', - label: 'iccid', - component: 'Input', - componentProps: { - placeholder: '请输入唯一标识iccid', - }, - colProps: { span: 5 }, - }, - { - field: 'card', - label: '卡号', - component: 'Input', - componentProps: { - placeholder: '请输入卡号', - }, - colProps: { span: 5 }, - }, - { - field: 'company', - label: '网卡厂商', - component: 'Input', - componentProps: { - placeholder: '请输入网卡厂商', - }, - colProps: { span: 4 }, - }, - { - field: 'beginTime', - label: '起始时间', - component: 'DatePicker', - colProps: { span: 5 }, - }, - { - field: 'endTime', - label: '截止时间', - component: 'DatePicker', - colProps: { span: 5 }, - }, -]; - -export const cardFormSchema: FormSchema[] = [ - { - field: 'id', - label: 'ID', - component: 'Input', - show: false, - }, - { - field: 'iccid', - label: 'iccid', - component: 'Input', - helpMessage: ['唯一识别号'], - required: true - }, - { - field: 'card', - label: '卡号', - component: 'Input', - required: false, - }, - { - field: 'company', - label: '网卡厂商', - component: 'Select', - required: true, - componentProps: { - options: [ - { label: '中国移动', value: '1' }, - { label: '中国联通', value: '2' }, - { label: '中国电信', value: '3' }, - { label: '未知厂商', value: ''||undefined||null } - ], - - } - }, - { - field: 'status', - label: '状态', - component: 'RadioButtonGroup', - defaultValue: '0', - componentProps: { - options: [ - { label: '启用', value: '0' }, - { label: '禁用', value: '1' }, - ], - }, - }, - { - label: '备注', - field: 'remarks', - component: 'InputTextArea', - } -]; \ No newline at end of file diff --git a/src/views/system/equip/boxcard/index.vue b/src/views/system/equip/boxcard/index.vue deleted file mode 100644 index b62acdb..0000000 --- a/src/views/system/equip/boxcard/index.vue +++ /dev/null @@ -1,100 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/common/address/AddressModal.vue b/src/views/system/region/RegionModal.vue similarity index 94% rename from src/views/common/address/AddressModal.vue rename to src/views/system/region/RegionModal.vue index 482fffd..bed820e 100644 --- a/src/views/common/address/AddressModal.vue +++ b/src/views/system/region/RegionModal.vue @@ -16,11 +16,11 @@ */ import { ref, unref } from 'vue'; import { BasicForm, useForm } from '/@/components/Form'; - import { addressFormSchema } from './address.data'; + import { addressFormSchema } from './region.data'; import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal'; - import { listAddr, addAddr, editAddr, getAddr} from '/@/api/platform/system/controller/address'; + import { listAddr, addAddr, editAddr, getAddr} from '/@/api/platform/system/controller/region'; import { listToTree } from '/@/utils/helper/treeHelper'; - import {AddressItem} from '/@/api/platform/system/entity/addressModel'; + import {AddressItem} from '/@/api/platform/system/entity/region'; /** 通用变量统一声明区域 */ const tag = ref>(''); diff --git a/src/views/common/address/index.vue b/src/views/system/region/index.vue similarity index 96% rename from src/views/common/address/index.vue rename to src/views/system/region/index.vue index 91fbe28..68f0c2d 100644 --- a/src/views/common/address/index.vue +++ b/src/views/system/region/index.vue @@ -55,9 +55,9 @@ */ import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { useModal } from '/@/components/Modal'; -import DeptModal from './AddressModal.vue'; -import { columns, searchFormSchema } from './address.data'; -import {delAddr, getAddr, listAddr} from '/@/api/platform/system/controller/address'; +import DeptModal from './RegionModal.vue'; +import { columns, searchFormSchema } from './region.data'; +import {delAddr, getAddr, listAddr} from '/@/api/platform/system/controller/region'; import { useMessage } from '/@/hooks/web/useMessage'; import { listToTree } from '/@/utils/helper/treeHelper'; @@ -131,4 +131,4 @@ function handleRefreshTable() { reload(); } - \ No newline at end of file + diff --git a/src/views/common/address/address.data.ts b/src/views/system/region/region.data.ts similarity index 100% rename from src/views/common/address/address.data.ts rename to src/views/system/region/region.data.ts