Commit d54a0f11 authored by v_liuhuaizhi's avatar v_liuhuaizhi

Merge remote-tracking branch 'origin/master'

parents 1818068b 1082e93e
......@@ -31,7 +31,14 @@ color: #333333;"
</div>
</div>
</div>
<el-form ref="form" :model="detailInfo" :rules="formRules" class="registration-add-form" label-width="110px" size="small">
<el-form
ref="form"
:model="detailInfo"
:rules="formRules"
class="registration-add-form"
label-width="110px"
size="small"
>
<!--2--基本信息-->
<div style="display: flex;margin-bottom: 20px;">
<!-- 1-- 宠物基本信息的页面--标签头 -->
......@@ -81,8 +88,8 @@ color: #333333;"
<el-form-item label="宠物性别">
<el-select
v-model="detailInfo.petSex"
clearable
:disabled="!isEdit"
clearable
placeholder="请选择宠物性别"
style="width: 100%"
>
......@@ -136,8 +143,8 @@ color: #333333;"
<el-form-item label="绝育情况">
<el-select
v-model="detailInfo.sterilizationStatus"
clearable
:disabled="!isEdit"
clearable
placeholder="请选择宠物绝育情况"
style="width: 100%"
>
......@@ -155,8 +162,8 @@ color: #333333;"
<el-form-item label="疫苗情况">
<el-select
v-model="detailInfo.vaccineSituation"
clearable
:disabled="!isEdit"
clearable
placeholder="请选择宠物疫苗情况"
style="width: 100%"
>
......@@ -176,8 +183,8 @@ color: #333333;"
<el-form-item label="宠物保险">
<el-select
v-model="detailInfo.insure"
clearable
:disabled="!isEdit"
clearable
placeholder="请选择宠物保险情况"
style="width: 100%"
>
......@@ -407,12 +414,16 @@ color: #333333;"
</div>
<!-- 内部信息 -->
<div class="table-content">
<el-form ref="drugForm" :model="drugForm" label-width="0" :rules="drugRules" class="demo-ruleForm">
<el-form ref="drugForm" :model="drugForm" :rules="drugRules" class="demo-ruleForm" label-width="0">
<el-table :data="petProtect" :header-cell-style="{ background:'#E8E9E8'}" border>
<el-table-column align="center" label="药品名称" prop="protectName">
<template slot-scope="scope">
<el-form-item v-if="scope.row.inputShow" :prop="'tableData.'+scope.$index+'.protectName'" :rules="drugRules.protectName">
<el-select v-model="scope.row.protectName" placeholder="请选择" clearable>
<el-form-item
v-if="scope.row.inputShow"
:prop="'tableData.'+scope.$index+'.protectName'"
:rules="drugRules.protectName"
>
<el-select v-model="scope.row.protectName" clearable placeholder="请选择">
<el-option
v-for="(item, index) in drugList"
:key="index"
......@@ -421,7 +432,11 @@ color: #333333;"
/>
</el-select>
</el-form-item>
<span v-else>{{ scope.row.protectName === '' || scope.row.protectName === null ? '-' : scope.row.protectName }}</span>
<span
v-else
>{{
scope.row.protectName === '' || scope.row.protectName === null ? '-' : scope.row.protectName
}}</span>
</template>
</el-table-column>
......@@ -430,7 +445,13 @@ color: #333333;"
<el-table-column align="center" label="用法" prop="date" />
<el-table-column align="center" label="开药日期" prop="date" />
<el-table-column align="center" label="缴费状态" prop="date" />
<el-table-column align="center" show-overflow-tooltip class-name="small-padding fixed-width" label="操作" min-width="180">
<el-table-column
align="center"
class-name="small-padding fixed-width"
label="操作"
min-width="180"
show-overflow-tooltip
>
<template slot-scope="scope">
<el-button
v-if="!isEdit || (scope.row.payType !== '0' && !scope.row.isAdd)"
......@@ -501,12 +522,21 @@ color: #333333;"
</div>
<!-- 内部信息 -->
<div class="table-content">
<el-form ref="checkForm" :model="checkForm" label-width="0" :rules="checkRules" class="demo-ruleForm">
<el-form ref="checkForm" :model="checkForm" :rules="checkRules" class="demo-ruleForm" label-width="0">
<el-table :data="checkManageBos" :header-cell-style="{ background:'#E8E9E8'}" border>
<el-table-column align="center" label="检查类型" prop="checkType">
<template slot-scope="scope">
<el-form-item v-if="scope.row.inputShow" :prop="'checkManageBos.'+scope.$index+'.checkType'" :rules="checkRules.checkType">
<el-select v-model="scope.row.checkType" placeholder="请选择" clearable @change="getCheckItemOptions">
<el-form-item
v-if="scope.row.inputShow"
:prop="'checkManageBos.'+scope.$index+'.checkType'"
:rules="checkRules.checkType"
>
<el-select
v-model="scope.row.checkType"
clearable
placeholder="请选择"
@change="getCheckItemOptions"
>
<el-option
v-for="(item, index) in dict.type.check_type"
:key="index"
......@@ -526,8 +556,17 @@ color: #333333;"
</el-table-column>
<el-table-column align="center" label="检查项目" prop="checkItemsName">
<template slot-scope="scope">
<el-form-item v-if="scope.row.inputShow" :prop="'checkManageBos.'+scope.$index+'.checkItemsId'" :rules="drugRules.checkItemsName">
<el-select v-model="scope.row.checkItemsId" placeholder="请选择" clearable @change="setCheckItemsName(scope.row,checkItemOptions)">
<el-form-item
v-if="scope.row.inputShow"
:prop="'checkManageBos.'+scope.$index+'.checkItemsId'"
:rules="drugRules.checkItemsName"
>
<el-select
v-model="scope.row.checkItemsId"
clearable
placeholder="请选择"
@change="setCheckItemsName(scope.row,checkItemOptions)"
>
<el-option
v-for="(item, index) in checkItemOptions"
:key="index"
......@@ -536,7 +575,11 @@ color: #333333;"
/>
</el-select>
</el-form-item>
<span v-else>{{ scope.row.checkItemsName === '' || scope.row.checkItemsName === null ? '-' : scope.row.checkItemsName }}</span>
<span
v-else
>{{
scope.row.checkItemsName === '' || scope.row.checkItemsName === null ? '-' : scope.row.checkItemsName
}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="缴费状态" prop="payType">
......@@ -554,7 +597,7 @@ color: #333333;"
<template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span>
<span v-else>
{{ scope.row.checkSchedule? (scope.row.checkSchedule === 3 ? '已检查' : '未检查') : '-' }}
{{ scope.row.checkSchedule ? (scope.row.checkSchedule === 3 ? '已检查' : '未检查') : '-' }}
</span>
</template>
</el-table-column>
......@@ -562,7 +605,7 @@ color: #333333;"
<template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span>
<span v-else>
{{ scope.row.reportTime? scope.row.reportTime : '-' }}
{{ scope.row.reportTime ? scope.row.reportTime : '-' }}
</span>
</template>
</el-table-column>
......@@ -570,11 +613,17 @@ color: #333333;"
<template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span>
<span v-else>
{{ scope.row.shadowReport? scope.row.shadowReport : '-' }}
{{ scope.row.shadowReport ? scope.row.shadowReport : '-' }}
</span>
</template>
</el-table-column>
<el-table-column align="center" show-overflow-tooltip class-name="small-padding fixed-width" label="操作" min-width="180">
<el-table-column
align="center"
class-name="small-padding fixed-width"
label="操作"
min-width="180"
show-overflow-tooltip
>
<template slot-scope="scope">
<el-button
v-if="!isEdit || (scope.row.payType !== '0' && !scope.row.isAdd)"
......@@ -641,12 +690,21 @@ color: #333333;"
</div>
<!-- 内部信息 -->
<div class="table-content">
<el-form ref="treatForm" :model="treatForm" label-width="0" :rules="treatRules" class="demo-ruleForm">
<el-form ref="treatForm" :model="treatForm" :rules="treatRules" class="demo-ruleForm" label-width="0">
<el-table :data="treatManageBo" :header-cell-style="{ background:'#E8E9E8'}" border>
<el-table-column align="center" label="治疗项目" prop="treatItemsName">
<template slot-scope="scope">
<el-form-item v-if="scope.row.inputShow" :prop="'treatManageBo.'+scope.$index+'.treatItemsId'" :rules="treatRules.treatItemsId">
<el-select v-model="scope.row.treatItemsId" placeholder="请选择" clearable @change="setTreatItemsName(scope.row,treatItemOptions)">
<el-form-item
v-if="scope.row.inputShow"
:prop="'treatManageBo.'+scope.$index+'.treatItemsId'"
:rules="treatRules.treatItemsId"
>
<el-select
v-model="scope.row.treatItemsId"
clearable
placeholder="请选择"
@change="setTreatItemsName(scope.row,treatItemOptions)"
>
<el-option
v-for="(item, index) in treatItemOptions"
:key="index"
......@@ -655,13 +713,19 @@ color: #333333;"
/>
</el-select>
</el-form-item>
<span v-else>{{ scope.row.treatItemsName === '' || scope.row.treatItemsName === null ? '-' : scope.row.treatItemsName }}</span>
<span
v-else
>{{
scope.row.treatItemsName === '' || scope.row.treatItemsName === null ? '-' : scope.row.treatItemsName
}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="治疗负责人" prop="doctorName" />
<el-table-column align="center" label="治疗诊室" prop="consultRoomName">
<template slot-scope="scope">
<span>{{ scope.row.consultRoomName === '' || scope.row.consultRoomName === null ? '-' : scope.row.consultRoomName }}</span>
<span>{{
scope.row.consultRoomName === '' || scope.row.consultRoomName === null ? '-' : scope.row.consultRoomName
}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="缴费状态" prop="payType">
......@@ -679,7 +743,7 @@ color: #333333;"
<template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span>
<span v-else>
{{ scope.row.treatStatus? (scope.row.treatStatus === 3 ? '已检查' : '未检查') : '-' }}
{{ scope.row.treatStatus ? (scope.row.treatStatus === 3 ? '已检查' : '未检查') : '-' }}
</span>
</template>
</el-table-column>
......@@ -687,11 +751,17 @@ color: #333333;"
<template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span>
<span v-else>
{{ scope.row.treatStartTime? scope.row.treatStartTime : '-' }}
{{ scope.row.treatStartTime ? scope.row.treatStartTime : '-' }}
</span>
</template>
</el-table-column>
<el-table-column align="center" show-overflow-tooltip class-name="small-padding fixed-width" label="操作" min-width="180">
<el-table-column
align="center"
class-name="small-padding fixed-width"
label="操作"
min-width="180"
show-overflow-tooltip
>
<template slot-scope="scope">
<el-button
v-if="!isEdit || (scope.row.payType !== '0' && !scope.row.isAdd)"
......@@ -755,7 +825,13 @@ color: #333333;"
<el-table-column align="center" label="能否沐浴" prop="date" />
<el-table-column align="center" label="是否出院" prop="date" />
<el-table-column align="center" label="病房号" prop="date" />
<el-table-column align="center" show-overflow-tooltip class-name="small-padding fixed-width" label="操作" min-width="180">
<el-table-column
align="center"
class-name="small-padding fixed-width"
label="操作"
min-width="180"
show-overflow-tooltip
>
<template slot-scope="scope">
<el-button
v-if="!isEdit || (scope.row.payType !== '0' && !scope.row.isAdd)"
......@@ -824,13 +900,20 @@ color: #333333;"
</div>
</div>
</div>
<el-form ref="followForm" :model="detailInfo" :rules="formRules" class="registration-add-form" label-width="110px" size="small">
<el-form
ref="followForm"
:model="detailInfo"
:rules="formRules"
class="registration-add-form"
label-width="110px"
size="small"
>
<el-col :span="24">
<el-form-item label="回访情况">
<el-input
v-model="detailInfo.followContent"
maxlength="200"
:disabled="!isEdit || detailInfo.followTime"
maxlength="200"
placeholder="请输入回访情况"
type="textarea"
/>
......@@ -869,6 +952,7 @@ import {
updateCheck, editRecord
} from '@/api/business/mdeicalRecord'
import { mapGetters } from 'vuex'
export default {
name: 'MedicalEdit',
// 数据字典
......@@ -897,8 +981,7 @@ export default {
treatManageBo: 0
},
drugList: [], // 药品列表
map: {
},
map: {},
drugForm: {}, // 用药管理table编辑
drugRules: {},
checkForm: {}, // 检查table编辑
......@@ -1097,7 +1180,18 @@ export default {
/** 获取页面详情*/
getDetail(type = 'usual') {
getRecord(this.$route.params.id).then(response => {
console.log('KKKKKKKKKKKKKKKKKKKK', response)
console.log('这是病历管理的详情内容,我要调取!', response)
// 主键
this.scheduleKey.checkSchedule = response.data.checkSchedule
// 挂号时间
this.scheduleKey.registrationTime = response.data.registrationTime
// 录入时间
this.scheduleKey.diagnosisTime = response.data.diagnosisTime
// 病历时间
this.scheduleKey.reportTime = response.data.reportTime
// 开具处方时间
this.scheduleKey.recipelTime = response.data.recipelTime
console.log('这是我要传的checkSchedule的值:值 挂号时间 录入时间 病历时间 开具处方时间', response.data.registrationTime, response.data.diagnosisTime, response.data.reportTime, response.data.recipelTime)
response.data.checkManageBos.forEach(item => {
item['inputShow'] = false
item['isAdd'] = false
......@@ -1502,20 +1596,23 @@ export default {
//整个页面整体布局
.medical-edit {
// 项目标题
.title-content{
.title-content {
display: flex;
justify-content: space-between;
.title-left{
.title-left {
display: flex;
.tip-text{
.tip-text {
padding-left: 13px;
font-size: 16px;
font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;
font-family: Microsoft YaHei-Bold, Microsoft YaHei, serif;
font-weight: bold;
color: #333333;
}
}
}
//最外层嵌套卡片的样式
.box-card {
margin: 20px 20px 20px 20px;
......@@ -1625,10 +1722,22 @@ export default {
<style lang="scss">
.medical-edit {
// 表格中输入框样式
.el-table{
.el-form-item{
.el-table {
.el-form-item {
margin-bottom: 0;
}
}
}
//文本框样式
::v-deep .el-textarea {
width: 90% !important;
}
.bottom-input-style {
//输入框样式
::v-deep .el-input__inner {
width: 400% !important;
}
}
</style>
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