diff --git a/src/api/platform/system/entity/doctorModel.ts b/src/api/platform/system/entity/doctorModel.ts index d1e36b0..ecf7b95 100644 --- a/src/api/platform/system/entity/doctorModel.ts +++ b/src/api/platform/system/entity/doctorModel.ts @@ -26,7 +26,7 @@ export interface DoctorItem { /**地址(门牌号)*/ detailAddress: string; /**组织类型*/ - organType: number; + organType: string; /**组织id*/ organId: string; /**组织名称*/ diff --git a/src/api/platform/system/entity/officeModel.ts b/src/api/platform/system/entity/officeModel.ts index 10c883f..d41c85e 100644 --- a/src/api/platform/system/entity/officeModel.ts +++ b/src/api/platform/system/entity/officeModel.ts @@ -15,7 +15,7 @@ export interface OfficeItem extends CommonEntity{ name: string; - organType: number; + organType: string; organId: string; diff --git a/src/views/institution/doctor/DoctorModal.vue b/src/views/institution/doctor/DoctorModal.vue index 61b195d..5efd0c3 100644 --- a/src/views/institution/doctor/DoctorModal.vue +++ b/src/views/institution/doctor/DoctorModal.vue @@ -31,10 +31,9 @@ const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) resetFields(); setModalProps({confirmLoading: false}); isUpdate.value = !!data?.isUpdate; + console.log(data.record); if (unref(isUpdate)) { - setFieldsValue({ - ...data.record, - }); + setFieldsValue(data.record); } }) //表单标题 diff --git a/src/views/institution/doctor/doctor.data.ts b/src/views/institution/doctor/doctor.data.ts index 1697126..5ecc1ad 100644 --- a/src/views/institution/doctor/doctor.data.ts +++ b/src/views/institution/doctor/doctor.data.ts @@ -1,10 +1,10 @@ import { BasicColumn } from '/@/components/Table'; import { FormSchema } from '/@/components/Table'; -import {h} from "vue"; -import {Tag} from "ant-design-vue"; -import { list as hospitalList } from "/@/api/platform/system/controller/hospital"; -import {list as institutionList, list as institutalList} from "/@/api/platform/system/controller/institution"; -import { list as officeList } from "/@/api/platform/system/controller/office"; +import {h} from 'vue'; +import {Tag} from 'ant-design-vue'; +import { list as hospitalList } from '/@/api/platform/system/controller/hospital'; +import {list as institutionList, list as institutalList} from '/@/api/platform/system/controller/institution'; +import { list as officeList } from '/@/api/platform/system/controller/office'; export const columns: BasicColumn[] = [ @@ -71,20 +71,17 @@ export const columns: BasicColumn[] = [ text = '未知'; color = 'gray'; break; + } + return h(Tag, { color: color }, () => text); } }, - { - title: '组织名称', - dataIndex: 'organName', - width: 120, - }, - { - title: '科室名称', - dataIndex: 'officeName', - width: 120, - }, + // { + // title: '科室名称', + // dataIndex: 'officeName', + // width: 120, + // }, { title: '状态', dataIndex: 'status', @@ -189,8 +186,8 @@ export const doctorFormSchema: FormSchema[] = [ component: 'Select', componentProps: { options: [ - { label: '医院', value: 1 }, - { label: '医检', value: 2 } + { label: '医院', value: '1' }, + { label: '医检', value: '2' } ] }, required: true, @@ -202,16 +199,22 @@ export const doctorFormSchema: FormSchema[] = [ required: true, renderComponentContent: renderCallbackParams => { const organType = renderCallbackParams.model.organType; - const dataApi = organType==1 ? hospitalList : institutionList; + const dataApi = organType=='1' ? hospitalList : institutionList; renderCallbackParams.schema.componentProps = { resultField: 'list', labelField: 'name', valueField: 'id', api: dataApi - } + }; }, }, + // { + // field: 'officeId', + // label: '所属科室', + // component: 'ApiSelect', + // required: true, + // }, { field: 'status', label: '状态', diff --git a/src/views/institution/hospital/HospitalModal.vue b/src/views/institution/hospital/HospitalModal.vue index 6aa6917..81b96bb 100644 --- a/src/views/institution/hospital/HospitalModal.vue +++ b/src/views/institution/hospital/HospitalModal.vue @@ -50,7 +50,7 @@ async function handleSubmit() { const values = await validate(); setModalProps({confirmLoading: true}); let val = toRaw(values); - values.addressIds = toRaw(val.addressIds).toString(); + values.addressIds = toRaw(val.addressIds); await set(values); closeModal(); emit('success'); diff --git a/src/views/institution/institution/institution.data.ts b/src/views/institution/institution/institution.data.ts index 549e9e8..6e423bd 100644 --- a/src/views/institution/institution/institution.data.ts +++ b/src/views/institution/institution/institution.data.ts @@ -12,15 +12,16 @@ export const columns: BasicColumn[] = [ width: 120, }, { - title: '医检名', + title: '机构名称', dataIndex: 'name', width: 120, }, { - title: '医检类型', - dataIndex: 'card', + title: '机构类型', + dataIndex: 'type', width: 120, customRender: ({ record }) =>{ + console.log(record); const type = record.type; let text = ''; let color = ''; diff --git a/src/views/institution/office/OfficeModal.vue b/src/views/institution/office/OfficeModal.vue index e0859ec..6fdbede 100644 --- a/src/views/institution/office/OfficeModal.vue +++ b/src/views/institution/office/OfficeModal.vue @@ -42,6 +42,7 @@ const getTitle = computed(() => (!unref(isUpdate) ? '新增科室' : '编辑科 async function handleSubmit() { try { const values = await validate(); + setModalProps({confirmLoading: true}); await set(values); closeModal(); diff --git a/src/views/institution/office/office.data.ts b/src/views/institution/office/office.data.ts index 4e85a12..ae12b50 100644 --- a/src/views/institution/office/office.data.ts +++ b/src/views/institution/office/office.data.ts @@ -42,11 +42,11 @@ export const columns: BasicColumn[] = [ return h(Tag, { color: color }, () => text); } }, - { - title: '组织名称', - dataIndex: 'organName', - width: 120, - }, + // { + // title: '组织名称', + // dataIndex: 'organName', + // width: 120, + // }, { title: '主任名称', dataIndex: 'directorName', @@ -129,8 +129,8 @@ export const officeFormSchema: FormSchema[] = [ component: 'Select', componentProps: { options: [ - { label: '医院', value: 1 }, - { label: '医检', value: 2 } + { label: '医院', value: '1' }, + { label: '医检', value: '2' } ] }, required: true,