fix: 新功能开发,原有功能优化。

This commit is contained in:
tianyongbao
2024-10-07 15:23:45 +08:00
parent 2f2f40a437
commit fe7b5b36a4
19 changed files with 1669 additions and 96 deletions

View File

@@ -44,10 +44,10 @@
<el-button @click="handleExport" icon="Download" v-hasPermi="['health:marRecord:export']">导出</el-button>
</div>
</div>
<div class="content-con" v-loading="loading">
<el-table v-loading="loading" :data="marRecordList" @selection-change="handleSelectionChange">
<div class="content-con" v-loading="loading" height="calc(100% - 0.65rem)">
<el-table v-loading="loading" :data="marRecordList" @selection-change="handleSelectionChange" height="calc(100% - 0.65rem)">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="人员姓名" align="center" prop="personName" />
<el-table-column label="人员姓名" align="center" width="120" prop="personName" />
<el-table-column label="健康档案" align="center" prop="healthRecordName" />
<el-table-column label="用药名称" align="center" prop="name" />
<el-table-column label="用药类型" align="center" prop="type">
@@ -55,18 +55,23 @@
<dict-tag :options="mar_type" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column label="药品来源" align="center" prop="resource">
<el-table-column label="药品来源" width="120" align="center" prop="resource">
<template #default="scope">
<dict-tag :options="mar_resource" :value="scope.row.resource" />
</template>
</el-table-column>
<el-table-column label="用药地点" align="center" prop="place">
<el-table-column label="用药地点" align="center" width="120" prop="place">
<template #default="scope">
<dict-tag :options="mar_place" :value="scope.row.place" />
</template>
</el-table-column>
<el-table-column label="用药时间" align="center" prop="dosingTime" width="180"> </el-table-column>
<el-table-column label="用药剂量" align="center" prop="dosage" />
<el-table-column label="用药剂量" align="center" width="120" prop="dosage" />
<el-table-column label="用药单位" align="center" prop="unit">
<template #default="scope">
<dict-tag :options="medical_unit" :value="scope.row.unit" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template v-slot="scope">
<div class="ctrl-btn d-flex">
@@ -114,8 +119,17 @@
<el-form-item label="用药时间" prop="dosingTime">
<el-date-picker clearable v-model="form.dosingTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择用药时间"> </el-date-picker>
</el-form-item>
<el-form-item label="用药剂量" prop="dosage">
<el-input v-model="form.dosage" placeholder="请输入用药剂量" />
<el-form-item label="用药剂量" prop="dosage"> <el-input v-model="form.dosage" placeholder="请输入用药剂量" /></el-form-item>
<el-form-item label="用药单位" prop="unit">
<el-select v-model="form.unit" placeholder="请选择用药单位">
<el-option v-for="dict in medical_unit" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="含量" prop="content"> <el-input v-model="form.content" placeholder="请输入含量" /></el-form-item>
<el-form-item label="含量单位" prop="contentUnit">
<el-select v-model="form.contentUnit" placeholder="请选择含量单位">
<el-option v-for="dict in content_unit" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="备注" style="width: 792px" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
@@ -139,7 +153,7 @@ import dayjs from 'dayjs'
// eslint-disable-next-line no-unused-vars
import { require } from '@/utils/require'
const { proxy } = getCurrentInstance()
const { mar_type, mar_place, mar_resource } = proxy.useDict('mar_type', 'mar_place', 'mar_resource')
const { mar_type, mar_place, mar_resource, medical_unit, content_unit } = proxy.useDict('mar_type', 'mar_place', 'mar_resource', 'medical_unit', 'content_unit')
const marRecordList = ref([])
const open = ref(false)
@@ -155,6 +169,7 @@ const healthRecordList = ref([])
const operateList = ref([
{ id: 'view', icon: 'View', title: '查看', hasPermi: ['health:marRecord:query'] },
{ id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:marRecord:edit'] },
{ id: 'copy', icon: 'Link', title: '复制', hasPermi: ['health:marRecord:edit'] },
{ id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['health:marRecord:remove'] }
])
const data = reactive({
@@ -203,6 +218,9 @@ const handleOperate = (operate, row) => {
case 'delete':
handleDelete(row)
break
case 'copy':
handleCopy(row)
break
default:
break
}
@@ -321,6 +339,18 @@ function handleUpdate(row) {
})
}
/** 复制按钮操作 */
function handleCopy(row) {
reset()
const _id = row.id || ids.value
getMarRecord(_id).then((response) => {
form.value = response.data
form.value.id = null
open.value = true
title.value = '复制用药记录'
})
}
/** 提交按钮 */
function submitForm() {
proxy.$refs.marRecordRef.validate((valid) => {