Skip to content

P
pet-business-web
Commit 3c6adf5e authored by 王飞龙's avatar 王飞龙
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents cac02cfe bc86ea23
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 55 deletions
src/views/service-management/hospitalization-management/components/assign-wards.vue
View file @ 3c6adf5e
......@@ -30,7 +30,7 @@
</el-select>
</el-form-item>
<el-form-item label="当前状态" prop="petSex">
<el-select v-model="queryParams.chooseStatus" clearable collapse-tags placeholder="请选择当前状态" @change="searchWard">
<el-select v-model="queryParams.chooseStatus" clearable collapse-tags placeholder="请选择病房当前状态" @change="searchWard">
<el-option
v-for="item in wardStatusList"
:key="item.value"
......@@ -52,11 +52,16 @@
:row-class-name="highlightRow"
:height="'50vh'"
>
<el-table-column label="病房类型" min-width="80" prop="wardType" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ scope.row.wardType === '1'?'普通病房':'ICU病房' || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="病房号" min-width="80" prop="wardRuleId" align="center" show-overflow-tooltip />
<el-table-column label="当前状态" min-width="80" prop="chooseStatus" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.chooseStatus==='0'" style="color:rgb(95,181,75) ">{{ wardStatusLabel(scope.row.chooseStatus) }}</span>
<span v-else style="color:red ">{{ wardStatusLabel(scope.row.chooseStatus) }}</span>
<span v-else style="color:#dfe6ec ">{{ wardStatusLabel(scope.row.chooseStatus) }}</span>
</template>
</el-table-column>
<el-table-column label="宠物昵称" min-width="80" prop="petNickname" align="center" show-overflow-tooltip>
......@@ -70,25 +75,27 @@
</template>
</el-table-column>
<el-table-column label="所在位置" min-width="80" prop="position" align="center" show-overflow-tooltip />
<el-table-column label="病房每日单价" min-width="80" align="center" show-overflow-tooltip>
<el-table-column label="标准价格" min-width="80" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<span v-show="scope.row.wardType==='1'">{{ scope.row.ordinaryPrice || '-' }}</span>
<span v-show="scope.row.wardType==='2'">{{ scope.row.icuPrice || '-' }}</span>
<span v-if="scope.row.wardType==='1'">{{ moneyFormat(scope.row.ordinaryPrice) + '元/天' }}</span>
<span v-else-if="scope.row.wardType==='2'">{{ moneyFormat(scope.row.icuPrice )+ '元/天' }}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column class-name="small-padding fixed-width" align="center" label="操作" min-width="150">
<template #default="{row}">
<el-button
v-if="row.chooseStatus==='0'"
icon="el-icon-document"
plain
size="mini"
style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(95,181,75);"
type="success"
:disabled="row.chooseStatus !== '0'"
@click="selectComlum(row)"
>选择
</el-button>
<el-button
v-else
icon="el-icon-document"
plain
size="mini"
......@@ -108,18 +115,20 @@
:limit.sync="queryParams.pageSize"
:page.sync="queryParams.pageNum"
:total="total"
:page-sizes="[10]"
@pagination="getWardList()"
/>
<div style="padding: 20px">
<el-button class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
<el-button class="backBth" icon="el-icon-back" @click="goBack">返 回</el-button>
<el-button class="fourWordswhiteBtn" @click="goBack">取 消</el-button>
<el-button class="fourWordsBtn" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</template>
<script>
import { inHospitalWard, listWardUse } from '@/api/business/inHospital'
import { moneyFormat } from '../../../../utils'
export default {
name: 'HandlingAdmissions',
......@@ -145,7 +154,7 @@ export default {
// 病房类型信息
wardTypeList: [
{
value: 'null',
value: '',
label: '全部'
},
{
......@@ -187,6 +196,7 @@ export default {
this.getWardList()
},
methods: {
moneyFormat,
wardStatusLabel(value) {
if (value === '0') {
return '空闲'
......@@ -240,15 +250,19 @@ export default {
this.chooseWard.wardRuleId = row.wardRuleId
this.chooseWard.wardLeaderName = row.wardLeaderName
this.chooseWard.wardLeaderPhone = row.wardLeaderPhone
this.highlightedRowId = row.id
this.highlightedRowId = row.wardId
if (row.wardType === '2') {
this.chooseWard.standardAmount = row.icuPrice
} else if (row.wardType === '1') {
this.chooseWard.standardAmount = row.ordinaryPrice
}
},
highlightRow(row) {
return row.id === this.highlightedRowId ? 'highlight' : '' // 根据 ID 判断是否为高亮行
highlightRow(scope) {
if (scope.row.chooseStatus !== '0') {
return 'grey-row'
} else if (scope.row.wardId === this.highlightedRowId) {
return 'height-line'
}
},
// 去病历页面
goMedical(row) {
......@@ -271,10 +285,15 @@ export default {
}
</script>
<style scoped lang="scss">
.highlight {
background-color: #5FB54B; // 自定义高亮样式
<style>
.grey-row {
color:#dfe6ec !important;
}
.height-line{
background-color: rgba(85, 163, 67, 0.2) !important;
}
</style>
<style scoped lang="scss">
//模块tip样式--绿色
.tip-green {
width: 3px;
......@@ -283,3 +302,4 @@ export default {
border-radius: 10px 10px 10px 10px;
}
</style>
src/views/service-management/hospitalization-management/components/handle-discharge.vue
View file @ 3c6adf5e
<template>
<el-dialog
title="办理出院"
:before-close="closeModle"
:close-on-click-modal="false"
:visible.sync="isShow"
......@@ -17,31 +18,31 @@
</div>
<div style="padding: 20px">
<el-form ref="queryForm" :model="inHospitalInfo" label-width="auto" size="small">
<el-form ref="queryForm" :rules="rules" :model="inHospitalInfo" label-width="auto" size="small">
<el-form-item label="出院情况" prop="dischargeStatus">
<el-input
v-model="inHospitalInfo.dischargeStatus"
v-model.trim="inHospitalInfo.dischargeStatus"
type="textarea"
placeholder="请输入出院遗嘱"
maxlength="30"
placeholder="请输入出院情况"
maxlength="400"
show-word-limit
width="100%"
:autosize="{ minRows: 4, maxRows: 7 }"
/>
</el-form-item>
<el-form-item label="出院遗嘱" prop="doctorAdvice">
<el-form-item label="出院医嘱" prop="doctorAdvice">
<el-input
v-model="inHospitalInfo.doctorAdvice"
v-model.trim="inHospitalInfo.doctorAdvice"
type="textarea"
placeholder="请输入出院遗嘱"
maxlength="30"
placeholder="请输入出院医嘱"
maxlength="400"
show-word-limit
width="100%"
:autosize="{ minRows: 4, maxRows: 7 }"
/>
</el-form-item>
<el-form-item label="出院结果" prop="result">
<el-select v-model="inHospitalInfo.result" clearable collapse-tags placeholder="请输入出院结果" width="80%">
<el-select v-model="inHospitalInfo.result" clearable collapse-tags placeholder="请选择出院结果" width="80%">
<el-option
v-for="item in resaultList"
:key="item.value"
......@@ -54,8 +55,8 @@
</div>
<div style="padding: 20px">
<el-button class="queryBtn" icon="el-icon-check" @click="submitForm">提交</el-button>
<el-button class="backBth" icon="el-icon-back" @click="goBack">返 回</el-button>
<el-button class="fourWordswhiteBtn" @click="goBack">取 消</el-button>
<el-button class="fourWordsBtn" @click="submitForm">确 定</el-button>
</div>
</el-dialog>
</template>
......@@ -81,6 +82,11 @@ export default {
},
data() {
return {
rules: {
dischargeStatus: [{ required: true, message: '请输入出院情况', trigger: 'blur' }],
doctorAdvice: [{ required: true, message: '请输入出院医嘱', trigger: 'blur' }],
result: [{ required: true, message: '请选择出院结果', trigger: 'change' }]
},
resaultList: [
{
value: '1',
......@@ -92,8 +98,17 @@ export default {
methods: {
// 返回按钮
goBack() {
// this.isShow = false
this.$emit('disChargModleClose', false)
this.$confirm('是否确认立即返回，返回后系统不再保存已填写内容！', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
customClass: 'box-logout',
cancelButtonClass: 'resetBtn',
confirmButtonClass: 'queryBtn'
}).then(() => {
// this.isShow = false
this.$emit('disChargModleClose', false)
})
},
closeModle() {
this.inHospitalInfo = {
......@@ -108,13 +123,19 @@ export default {
if (this.flag === '1') {
this.inHospitalInfo.hospitalDetails = this.inHospitalInfo.hosDetailBos
}
updateHospital(this.inHospitalInfo).then(res => {
this.$message({
showClose: true,
message: '已办理出院',
type: 'success'
})
this.$emit('disChargModleClose', false)
this.$refs['queryForm'].validate(valid => {
if (valid) {
updateHospital(this.inHospitalInfo).then(res => {
this.$message({
showClose: true,
message: '已办理出院',
type: 'success'
})
this.$emit('disChargModleClose', false)
})
} else {
return false
}
})
}
}
......@@ -126,4 +147,10 @@ export default {
::v-deep .el-textarea {
width: 100% !important;
}
.tip-green {
width: 3px;
height: 24px;
background: #5FB54B;
border-radius: 10px 10px 10px 10px;
}
</style>
src/views/service-management/hospitalization-management/components/handling-admissions.vue
View file @ 3c6adf5e
......@@ -127,6 +127,7 @@
:limit.sync="queryParams.pageSize"
:page.sync="queryParams.pageNum"
:total="total"
:pageSizes="[10]"
@pagination="getWardList()"
/>
......@@ -163,7 +164,7 @@ export default {
},
// 病房状态信息
wardStatusList: [{
value: 'null',
value: '',
label: '全部'
},
{
......
src/views/service-management/hospitalization-management/hospitalization-details.vue
View file @ 3c6adf5e
......@@ -352,7 +352,8 @@
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<div v-if="detailInfo.status<4">
<dict-tag v-if="scope.row.status" :options="dict.type.in_hospital_detail" :value="scope.row.status" />
<span v-if="scope.row.status === '3'" style="color:#ff9d4e ">已转出</span>
<span v-else-if="scope.row.status === '2'" style="color: #5bb647">住院中</span>
<span v-else>-</span>
</div>
<div v-else>
......@@ -389,7 +390,7 @@
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="当前余额" align="center" prop="moneyFormat">
<el-table-column label="当前金额" align="center" prop="moneyFormat">
<template slot-scope="scope">
<span>{{ moneyFormat(scope.row.amountAfterTrade)+'元' || '-' }}</span>
</template>
......@@ -401,7 +402,8 @@
<el-button v-show="detailInfo.status==='2'||detailInfo.status==='0'" v-hasPermi="['business:hospital:edit']" class="fourWordsBtn" icon="el-icon-check" @click="handAdmission">办理入院</el-button>
<el-button v-show="detailInfo.status==='3'" v-hasPermi="['business:hospital:edit']" class="fourWordsBtn" icon="el-icon-check" @click="handDisCharge">办理出院</el-button>
<el-button v-show="detailInfo.status==='3'" v-hasPermi="['business:hospital:edit']" class="fourWordsBtn" icon="el-icon-check" @click="changeWard">变更病房</el-button>
<el-button class="backBth" icon="el-icon-back" @click="goBack">返 回</el-button>
<el-button v-show="detailInfo.status==='3'" class="fourWordswhiteBtn" icon="el-icon-document-remove">查看入院单</el-button>
<el-button class="fourWordswhiteBtn" icon="el-icon-back" @click="goBack">返 回</el-button>
</div>
<div v-else style="padding: 20px;">
......
src/views/service-management/hospitalization-management/hospitalization-management.vue
View file @ 3c6adf5e
......@@ -113,81 +113,81 @@
>
<el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
<el-table-column label="序号" type="index" align="left" />
<el-table-column label="病情等级" align="center" prop="diseaseLevel">
<el-table-column label="病情等级" align="left" prop="diseaseLevel">
<template slot-scope="scope">
<dict-tag v-if="scope.row.diseaseLevel" :options="dict.type.disease_level" :value="scope.row.diseaseLevel" />
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="宠物昵称" align="center" prop="petNickname" :show-overflow-tooltip="true">
<el-table-column label="宠物昵称" align="left" prop="petNickname" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.petNickname || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="宠物保险" align="center" prop="insure" :show-overflow-tooltip="true">
<el-table-column label="宠物保险" align="left" prop="insure" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag v-if="scope.row.insure" :options="dict.type.pet_insure" :value="scope.row.insure" />
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="宠主姓名" align="center" prop="petOwnersName" :show-overflow-tooltip="true">
<el-table-column label="宠主姓名" align="left" prop="petOwnersName" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.petOwnersName || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="联系方式" align="center" prop="petOwnersPhone" min-width="80px" :show-overflow-tooltip="true">
<el-table-column label="联系方式" align="left" prop="petOwnersPhone" min-width="80px" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.petOwnersPhone || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="主治兽医" align="center" prop="doctorName" :show-overflow-tooltip="true">
<el-table-column label="主治兽医" align="left" prop="doctorName" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.doctorName || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="所属科室" align="center" prop="departmentName" :show-overflow-tooltip="true">
<el-table-column label="所属科室" align="left" prop="departmentName" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.departmentName || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="病房负责人" align="center" prop="wardLeaderName" :show-overflow-tooltip="true">
<el-table-column label="病房负责人" align="left" prop="wardLeaderName" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.wardLeaderName || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="入院日期" align="center" prop="admissionDate" :show-overflow-tooltip="true">
<el-table-column label="入院日期" align="left" prop="admissionDate" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.admissionDate, '{y}/{m}/{d}') || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="入院天数" align="center" prop="actualDays" :show-overflow-tooltip="true">
<el-table-column label="入院天数" align="left" prop="actualDays" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.actualDays || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="病房类型" align="center" prop="wardType" :show-overflow-tooltip="true">
<el-table-column label="病房类型" align="left" prop="wardType" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag v-if="scope.row.wardType" :options="dict.type.ward_type" :value="scope.row.wardType" />
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="病房号" align="center" prop="wardRuleId" :show-overflow-tooltip="true">
<el-table-column label="病房号" align="left" prop="wardRuleId" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.wardRuleId || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="押金余额" align="center" prop="deposit" :show-overflow-tooltip="true">
<el-table-column label="押金余额" align="left" prop="deposit" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ scope.row.deposit || '0.00' }}元</span>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true">
<el-table-column label="状态" align="left" prop="status" :show-overflow-tooltip="true">
<template slot-scope="scope">
<dict-tag v-if="scope.row.status" :options="dict.type.hospital_status_in" :value="scope.row.status" />
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="出院日期" align="center" prop="dischargeDate" :show-overflow-tooltip="true">
<el-table-column label="出院日期" align="left" prop="dischargeDate" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.dischargeDate, '{y}/{m}/{d}') || '-' }}</span>
</template>
......
src/views/service-management/treatment-management/treatment-management.vue
View file @ 3c6adf5e
......@@ -205,7 +205,6 @@
size="mini"
icon="el-icon-orange"
:disabled="true"
@click="handleSubscribe(scope.row)"
>分配诊室</el-button>
</template>
</el-table-column>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment