fix: 功能优化。
This commit is contained in:
@@ -42,10 +42,11 @@
|
|||||||
<el-table-column label="健康档案" align="center" prop="healthRecordName" />
|
<el-table-column label="健康档案" align="center" prop="healthRecordName" />
|
||||||
<el-table-column label="医院名称" align="center" prop="hospitalName" />
|
<el-table-column label="医院名称" align="center" prop="hospitalName" />
|
||||||
<el-table-column label="科室" align="center" prop="departments" />
|
<el-table-column label="科室" align="center" prop="departments" />
|
||||||
<el-table-column label="大夫" align="center" prop="doctor" />
|
<el-table-column label="大夫" align="center" width="100" prop="doctor" />
|
||||||
<el-table-column label="就诊时间" align="center" prop="visitingTime" width="180"> </el-table-column>
|
<el-table-column label="就诊时间" align="center" prop="visitingTime" width="180"> </el-table-column>
|
||||||
<el-table-column label="诊断及开药" align="center" prop="prescribe" />
|
<el-table-column label="诊断及开药" align="center" prop="prescribe" />
|
||||||
|
<el-table-column label="陪同人" align="center" prop="partner" />
|
||||||
|
<el-table-column label="总费用(元)" align="center" prop="totalCost" />
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<div class="ctrl-btn d-flex">
|
<div class="ctrl-btn d-flex">
|
||||||
@@ -85,9 +86,20 @@
|
|||||||
<el-date-picker clearable v-model="form.visitingTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择就诊时间">
|
<el-date-picker clearable v-model="form.visitingTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择就诊时间">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="陪同人" prop="partner">
|
||||||
|
<el-input v-model="form.partner" placeholder="请输入陪同人" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="总费用" prop="totalCost">
|
||||||
|
<el-input v-model="form.totalCost" type="number" placeholder="请输入总费用">
|
||||||
|
<template #suffix>元</template>
|
||||||
|
</el-input>
|
||||||
|
</el-form-item>
|
||||||
<el-form-item label="诊断及开药" style="width: 792px" prop="prescribe">
|
<el-form-item label="诊断及开药" style="width: 792px" prop="prescribe">
|
||||||
<el-input v-model="form.prescribe" type="textarea" placeholder="请输入诊断及开药" />
|
<el-input v-model="form.prescribe" type="textarea" placeholder="请输入诊断及开药" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-form-item label="费用明细" style="width: 792px" prop="costDetail">
|
||||||
|
<el-input v-model="form.costDetail" type="textarea" placeholder="请输入费用明细" />
|
||||||
|
</el-form-item>
|
||||||
<el-form-item label="备注" style="width: 792px" prop="remark">
|
<el-form-item label="备注" style="width: 792px" prop="remark">
|
||||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -154,6 +166,8 @@ const data = reactive({
|
|||||||
hospitalName: [{ required: true, message: '医院名称不能为空', trigger: 'blur' }],
|
hospitalName: [{ required: true, message: '医院名称不能为空', trigger: 'blur' }],
|
||||||
departments: [{ required: true, message: '科室不能为空', trigger: 'blur' }],
|
departments: [{ required: true, message: '科室不能为空', trigger: 'blur' }],
|
||||||
doctor: [{ required: true, message: '大夫不能为空', trigger: 'blur' }],
|
doctor: [{ required: true, message: '大夫不能为空', trigger: 'blur' }],
|
||||||
|
partner: [{ required: true, message: '陪同人不能为空', trigger: 'blur' }],
|
||||||
|
totalCost: [{ required: true, message: '总费用不能为空', trigger: 'blur' }],
|
||||||
// healthRecordId: [
|
// healthRecordId: [
|
||||||
// { required: true, message: '健康档案不能为空', trigger: 'blur' }
|
// { required: true, message: '健康档案不能为空', trigger: 'blur' }
|
||||||
// ],
|
// ],
|
||||||
@@ -234,7 +248,10 @@ function reset() {
|
|||||||
healthRecordId: null,
|
healthRecordId: null,
|
||||||
visitingTime: null,
|
visitingTime: null,
|
||||||
prescribe: null,
|
prescribe: null,
|
||||||
personId: null
|
personId: null,
|
||||||
|
totalCost: null,
|
||||||
|
partner: null,
|
||||||
|
costDetail: null
|
||||||
}
|
}
|
||||||
proxy.resetForm('doctorRecordRef')
|
proxy.resetForm('doctorRecordRef')
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,28 +35,28 @@
|
|||||||
<el-table v-loading="loading" :data="medicineStockInList" @selection-change="handleSelectionChange" height="calc(100% - 0.65rem)">
|
<el-table v-loading="loading" :data="medicineStockInList" @selection-change="handleSelectionChange" height="calc(100% - 0.65rem)">
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
<el-table-column label="药品名称" align="center" prop="medicineName" />
|
<el-table-column label="药品名称" align="center" prop="medicineName" />
|
||||||
<el-table-column label="购买时间" align="center" prop="purchaseDate" width="180"> </el-table-column>
|
<el-table-column label="购买时间" align="center" prop="purchaseDate" width="155"> </el-table-column>
|
||||||
<el-table-column label="入库数量" align="center" prop="quantity" />
|
<el-table-column label="入库数量" align="center" width="100" prop="quantity" />
|
||||||
<el-table-column label="单价" align="center" prop="purchasePrice" />
|
<el-table-column label="单价(元)" align="center" width="100" prop="purchasePrice" />
|
||||||
<el-table-column label="总价" align="center" prop="totalPrice" />
|
<el-table-column label="总价(元)" align="center" width="100" prop="totalPrice" />
|
||||||
<el-table-column label="入库编号" align="center" prop="code" />
|
<el-table-column label="入库编号" align="center" prop="code" />
|
||||||
<el-table-column label="使用状态" align="center" prop="state">
|
<el-table-column label="使用状态" align="center" width="100" prop="state">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<dict-tag :options="used_state" :value="scope.row.state" />
|
<dict-tag :options="used_state" :value="scope.row.state" />
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="生产日期" align="center" prop="productionDate" width="180">
|
<el-table-column label="生产日期" align="center" prop="productionDate" width="100">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d}') }}</span>
|
<span>{{ parseTime(scope.row.productionDate, '{y}-{m}-{d}') }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="过期日期" align="center" prop="expiringDate" width="180">
|
<el-table-column label="过期日期" align="center" prop="expiringDate" width="120">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<span>{{ parseTime(scope.row.expiringDate, '{y}-{m}-{d}') }}</span>
|
<span>{{ parseTime(scope.row.expiringDate, '{y}-{m}-{d}') }}</span>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="剩余数量" align="center" prop="leftCount" />
|
<el-table-column label="剩余数量" align="center" width="100" prop="leftCount" />
|
||||||
<el-table-column label="使用数量" align="center" prop="usedCount" />
|
<el-table-column label="使用数量" align="center" width="100" prop="usedCount" />
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template v-slot="scope">
|
<template v-slot="scope">
|
||||||
<div class="ctrl-btn d-flex">
|
<div class="ctrl-btn d-flex">
|
||||||
@@ -89,7 +89,6 @@
|
|||||||
<el-form-item label="入库数量" prop="quantity">
|
<el-form-item label="入库数量" prop="quantity">
|
||||||
<el-input v-model="form.quantity" type="number" placeholder="请输入入库数量"> </el-input>
|
<el-input v-model="form.quantity" type="number" placeholder="请输入入库数量"> </el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
<el-form-item label="使用状态" prop="state">
|
<el-form-item label="使用状态" prop="state">
|
||||||
<el-select v-model="form.state" placeholder="请选择使用状态">
|
<el-select v-model="form.state" placeholder="请选择使用状态">
|
||||||
<el-option v-for="dict in used_state" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
|
<el-option v-for="dict in used_state" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
|
||||||
@@ -101,14 +100,24 @@
|
|||||||
<el-form-item label="过期日期" prop="expiringDate">
|
<el-form-item label="过期日期" prop="expiringDate">
|
||||||
<el-date-picker clearable v-model="form.expiringDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择过期日期"> </el-date-picker>
|
<el-date-picker clearable v-model="form.expiringDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择过期日期"> </el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="购买地址" prop="purchaseAddress">
|
<el-form-item label="年龄体重" prop="ageWeight">
|
||||||
|
<el-input v-model="form.ageWeight" placeholder="请输入年龄体重" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="医嘱" style="width: 792px" prop="usage">
|
||||||
|
<el-input v-model="form.usage" placeholder="请输入医嘱" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="购买地址" style="width: 792px" prop="purchaseAddress">
|
||||||
<el-input v-model="form.purchaseAddress" placeholder="请输入购买地址" />
|
<el-input v-model="form.purchaseAddress" placeholder="请输入购买地址" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="药品单价" prop="purchasePrice">
|
<el-form-item label="药品单价" prop="purchasePrice">
|
||||||
<el-input v-model="form.purchasePrice" type="number" placeholder="请输入药品单价"> </el-input>
|
<el-input v-model="form.purchasePrice" type="number" placeholder="请输入药品单价">
|
||||||
|
<template #suffix>元</template>
|
||||||
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="药品总价" prop="totalPrice">
|
<el-form-item label="药品总价" prop="totalPrice">
|
||||||
<el-input v-model="form.totalPrice" type="number" placeholder="请输入药品总价"> </el-input>
|
<el-input v-model="form.totalPrice" type="number" placeholder="请输入药品总价">
|
||||||
|
<template #suffix>元</template>
|
||||||
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="备注" style="width: 792px" prop="remark">
|
<el-form-item label="备注" style="width: 792px" prop="remark">
|
||||||
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
||||||
@@ -241,7 +250,9 @@ function reset() {
|
|||||||
leftCount: null,
|
leftCount: null,
|
||||||
usedCount: null,
|
usedCount: null,
|
||||||
purchaseAddress: null,
|
purchaseAddress: null,
|
||||||
totalPrice: null
|
totalPrice: null,
|
||||||
|
usage: null,
|
||||||
|
ageWeight: null
|
||||||
}
|
}
|
||||||
proxy.resetForm('medicineStockInRef')
|
proxy.resetForm('medicineStockInRef')
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -119,6 +119,7 @@ const healthRecordList = ref([])
|
|||||||
const operateList = ref([
|
const operateList = ref([
|
||||||
{ id: 'view', icon: 'View', title: '查看', hasPermi: ['health:temperatureRecord:query'] },
|
{ id: 'view', icon: 'View', title: '查看', hasPermi: ['health:temperatureRecord:query'] },
|
||||||
{ id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:temperatureRecord:edit'] },
|
{ id: 'edit', icon: 'Edit', title: '修改', hasPermi: ['health:temperatureRecord:edit'] },
|
||||||
|
{ id: 'copy', icon: 'Link', title: '复制', hasPermi: ['health:marRecord:edit'] },
|
||||||
{ id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['health:temperatureRecord:remove'] }
|
{ id: 'delete', icon: 'Delete', title: '删除', hasPermi: ['health:temperatureRecord:remove'] }
|
||||||
])
|
])
|
||||||
const data = reactive({
|
const data = reactive({
|
||||||
@@ -159,6 +160,9 @@ const handleOperate = (operate, row) => {
|
|||||||
case 'delete':
|
case 'delete':
|
||||||
handleDelete(row)
|
handleDelete(row)
|
||||||
break
|
break
|
||||||
|
case 'copy':
|
||||||
|
handleCopy(row)
|
||||||
|
break
|
||||||
default:
|
default:
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
@@ -180,6 +184,18 @@ function getPersonList() {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 复制按钮操作 */
|
||||||
|
function handleCopy(row) {
|
||||||
|
reset()
|
||||||
|
const _id = row.id || ids.value
|
||||||
|
getTemperatureRecord(_id).then((response) => {
|
||||||
|
form.value = response.data
|
||||||
|
form.value.id = null
|
||||||
|
open.value = true
|
||||||
|
title.value = '复制体温记录'
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/** 查询体温记录列表 */
|
/** 查询体温记录列表 */
|
||||||
function getList() {
|
function getList() {
|
||||||
loading.value = true
|
loading.value = true
|
||||||
|
|||||||
Reference in New Issue
Block a user