diff --git a/src/views/health/doctorRecord/index.vue b/src/views/health/doctorRecord/index.vue index f17f9be..1c8c5ff 100644 --- a/src/views/health/doctorRecord/index.vue +++ b/src/views/health/doctorRecord/index.vue @@ -168,9 +168,7 @@ const data = reactive({ doctor: [{ required: true, message: '大夫不能为空', trigger: 'blur' }], partner: [{ required: true, message: '陪同人不能为空', trigger: 'blur' }], totalCost: [{ required: true, message: '总费用不能为空', trigger: 'blur' }], - // healthRecordId: [ - // { required: true, message: '健康档案不能为空', trigger: 'blur' } - // ], + healthRecordId: [{ required: true, message: '健康档案不能为空', trigger: 'blur' }], visitingTime: [{ required: true, message: '就诊时间不能为空', trigger: 'blur' }], prescribe: [{ required: true, message: '诊断及开药不能为空', trigger: 'blur' }] } @@ -198,6 +196,9 @@ const handlePersonChange = (personId) => { queryHealthRecordParams.personId = personId listHealthRecord(queryHealthRecordParams).then((response) => { healthRecordList.value = response.rows + if (response.rows.length > 0) { + form.value.healthRecordId = healthRecordList.value[0].id + } }) } @@ -291,6 +292,16 @@ const handleView = (row) => { /** 新增按钮操作 */ function handleAdd() { reset() + if (personList.value.length > 0) { + form.value.personId = personList.value[0].id + queryHealthRecordParams.personId = personList.value[0].id + listHealthRecord(queryHealthRecordParams).then((response) => { + healthRecordList.value = response.rows + if (response.rows.length > 0) { + form.value.healthRecordId = healthRecordList.value[0].id + } + }) + } open.value = true title.value = '添加就医记录' } diff --git a/src/views/health/marRecord/index.vue b/src/views/health/marRecord/index.vue index a83c400..dc1c9cf 100644 --- a/src/views/health/marRecord/index.vue +++ b/src/views/health/marRecord/index.vue @@ -8,8 +8,10 @@ - - + + + + @@ -89,7 +91,7 @@ - + @@ -98,14 +100,19 @@ - - - - + + + + + + + + + @@ -119,15 +126,17 @@ - - + + + - - - + + + @@ -149,6 +158,7 @@ import { listMarRecord, getMarRecord, delMarRecord, addMarRecord, updateMarRecord } from '@/api/health/marRecord' import { listPerson, getPerson } from '@/api/health/person' import { listHealthRecord } from '@/api/health/healthRecord' +import { listMedicineBasic, getMedicineBasic } from '@/api/health/medicineBasic' import dayjs from 'dayjs' // eslint-disable-next-line no-unused-vars import { require } from '@/utils/require' @@ -166,6 +176,7 @@ const total = ref(0) const title = ref('') const personList = ref([]) const healthRecordList = ref([]) +const medicineList = ref([]) const operateList = ref([ { id: 'view', icon: 'View', title: '查看', hasPermi: ['health:marRecord:query'] }, { id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:marRecord:edit'] }, @@ -196,9 +207,15 @@ const data = reactive({ state: '1', pageSize: 1000 }, + queryMedicineParams: { + pageNum: 1, + treatmentType: null, + pageSize: 1000 + }, rules: { - name: [{ required: true, message: '用药名称不能为空', trigger: 'blur' }], - type: [{ required: true, message: '用药类型，1退烧，2消炎，3止咳，4止泻，5抗病毒不能为空', trigger: 'change' }], + medicineId: [{ required: true, message: '药品名称不能为空', trigger: 'blur' }], + type: [{ required: true, message: '用药类型不能为空', trigger: 'change' }], + healthRecordId: [{ required: true, message: '健康档案不能为空', trigger: 'change' }], dosingTime: [{ required: true, message: '用药时间不能为空', trigger: 'blur' }], dosage: [{ required: true, message: '用药剂量不能为空', trigger: 'blur' }], resource: [{ required: true, message: '药品来源不能为空', trigger: 'blur' }], @@ -226,12 +243,32 @@ const handleOperate = (operate, row) => { } } -const { queryParams, form, rules, queryPersonParams, queryHealthRecordParams } = toRefs(data) +const { queryParams, form, rules, queryPersonParams, queryHealthRecordParams, queryMedicineParams } = toRefs(data) + +const handleDosageChange = (val) => {} const handlePersonChange = (personId) => { queryHealthRecordParams.personId = personId listHealthRecord(queryHealthRecordParams).then((response) => { healthRecordList.value = response.rows + if (response.rows.length > 0) { + form.value.healthRecordId = healthRecordList.value[0].id + } + }) +} + +const handleTypeChange = (type) => { + queryMedicineParams.value.treatmentType = type + + listMedicineBasic(queryMedicineParams.value).then((response) => { + medicineList.value = response.rows + }) +} +const handleMedicineChange = (medicineId) => { + getMedicineBasic(medicineId).then((response) => { + form.value.name = response.data.name + form.value.unit = response.data.unit + form.value.contentUnit = response.data.contentUnit }) } @@ -242,6 +279,13 @@ function getPersonList() { }) } +/** 查询药品管理列表 */ +function getMedicineList() { + listMedicineBasic(queryMedicineParams.value).then((response) => { + medicineList.value = response.rows + }) +} + /** 查询用药记录列表 */ function getList() { loading.value = true @@ -284,7 +328,11 @@ function reset() { dosage: null, personId: null, resource: '1', - place: '1' + place: '1', + medicineId: null, + unit: null, + content: '1', + contentUnit: null } proxy.resetForm('marRecordRef') } @@ -324,6 +372,16 @@ const handleView = (row) => { /** 新增按钮操作 */ function handleAdd() { reset() + if (personList.value.length > 0) { + form.value.personId = personList.value[0].id + queryHealthRecordParams.personId = personList.value[0].id + listHealthRecord(queryHealthRecordParams).then((response) => { + healthRecordList.value = response.rows + if (response.rows.length > 0) { + form.value.healthRecordId = healthRecordList.value[0].id + } + }) + } open.value = true title.value = '添加用药记录' } @@ -400,4 +458,5 @@ function handleExport() { getList() getPersonList() +getMedicineList() diff --git a/src/views/health/medicineBasic/index.vue b/src/views/health/medicineBasic/index.vue index af96086..b98b2df 100644 --- a/src/views/health/medicineBasic/index.vue +++ b/src/views/health/medicineBasic/index.vue @@ -94,8 +94,11 @@ - - + + + + + @@ -126,6 +129,11 @@ + + + + + @@ -136,28 +144,28 @@ - - + + - - + + - - + + + + + - - - @@ -192,14 +200,15 @@ import { listMedicineBasic, getMedicineBasic, delMedicineBasic, addMedicineBasic // eslint-disable-next-line no-unused-vars import { require } from '@/utils/require' const { proxy } = getCurrentInstance() -const { medicine_category, mar_type, medicine_classification, dosage_form, is_import, medical_unit, content_unit } = proxy.useDict( +const { medicine_category, mar_type, medicine_classification, dosage_form, is_import, medical_unit, content_unit, package_unit } = proxy.useDict( 'medicine_category', 'mar_type', 'medicine_classification', 'dosage_form', 'is_import', 'medical_unit', - 'content_unit' + 'content_unit', + 'package_unit' ) const medicineBasicList = ref([]) @@ -233,16 +242,18 @@ const data = reactive({ ingredients: null, usage: null, dosageForm: null, - code: null + code: null, + shortName: null }, rules: { - name: [{ required: true, message: '药品名称不能为空', trigger: 'blur' }], + name: [{ required: true, message: '药品全称不能为空', trigger: 'blur' }], + shortName: [{ required: true, message: '药品简称不能为空', trigger: 'blur' }], classification: [{ required: true, message: '药品分类不能为空', trigger: 'change' }], category: [{ required: true, message: '类别不能为空', trigger: 'change' }], brand: [{ required: true, message: '品牌不能为空', trigger: 'blur' }], packaging: [{ required: true, message: '药品包装不能为空', trigger: 'blur' }], manufacturers: [{ required: true, message: '生产厂家不能为空', trigger: 'blur' }], - treatmentType: [{ required: true, message: '治疗类型不能为空', trigger: 'change' }], + //treatmentType: [{ required: true, message: '治疗类型不能为空', trigger: 'change' }], dosageForm: [{ required: true, message: '药品剂型不能为空', trigger: 'change' }], code: [{ required: true, message: '药品编码不能为空', trigger: 'blur' }] } diff --git a/src/views/health/medicineStockIn/index.vue b/src/views/health/medicineStockIn/index.vue index 24a876f..99085f9 100644 --- a/src/views/health/medicineStockIn/index.vue +++ b/src/views/health/medicineStockIn/index.vue @@ -55,8 +55,9 @@ {{ parseTime(scope.row.expiringDate, '{y}-{m}-{d}') }} - + +