Skip to content

P
pet-business-web
Commit c0e02ef0 authored by 盖献康's avatar 盖献康
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents cbb0d358 7ddd8efc
Show whitespace changes
Inline Side-by-side
Showing with 65 additions and 59 deletions
src/views/medical-record-management/medical-edit.vue
View file @ c0e02ef0
......@@ -18,7 +18,7 @@ color: #333333;"
<!--1--宠物头像-->
<div style="display: flex">
<!-- 1-- 宠物基本信息的页面--标签头 -->
<div class="tip-green" />
<div class="tip-green"/>
<div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
>宠物头像
......@@ -29,7 +29,7 @@ color: #333333;"
<div>
<!--宠物图片-->
<div class="petPicture" style="padding-bottom: 40px;">
<ImagePreview :height="150" :src="showLogo" :width="150" />
<ImagePreview :height="150" :src="showLogo" :width="150"/>
</div>
</div>
</div>
......@@ -45,7 +45,7 @@ color: #333333;"
<!--2--基本信息-->
<div style="display: flex;margin-bottom: 20px;">
<!-- 1-- 宠物基本信息的页面--标签头 -->
<div class="tip-green" />
<div class="tip-green"/>
<div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
>宠物信息
......@@ -56,13 +56,13 @@ color: #333333;"
<el-row>
<el-col :span="8">
<el-form-item label="宠物昵称" prop="petNickname">
<el-input v-model="detailInfo.petNickname" :placeholder="'-'" disabled />
<el-input v-model="detailInfo.petNickname" :placeholder="'-'" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<!--宠物ID-->
<el-form-item label="宠物ID" prop="petsId">
<el-input v-model="detailInfo.petsId" :placeholder="'-'" disabled />
<el-input v-model="detailInfo.petsId" :placeholder="'-'" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -106,7 +106,7 @@ color: #333333;"
</el-form-item>
</div>
<el-form-item v-else class="petBreed" label="宠物品种" prop="petBreed">
<el-input v-model="detailInfo.petBreed" :placeholder="isEdit? '请选择主品种' : '-'" disabled />
<el-input v-model="detailInfo.petBreed" :placeholder="isEdit? '请选择主品种' : '-'" disabled/>
<el-input
v-model="detailInfo.petChildBreed"
:placeholder="isEdit? '请选择分品种' : '-'"
......@@ -142,7 +142,7 @@ color: #333333;"
<el-col :span="8">
<!--宠物年龄-->
<el-form-item v-if="!isEdit" label="宠物年龄" prop="petAge">
<el-input v-model="detailInfo.petAge" :placeholder="isEdit? '请输入宠物年龄' : '-'" disabled />
<el-input v-model="detailInfo.petAge" :placeholder="isEdit? '请输入宠物年龄' : '-'" disabled/>
</el-form-item>
<el-form-item v-else label="宠物生日:" prop="petBirthday">
<el-date-picker
......@@ -245,7 +245,7 @@ color: #333333;"
</el-row>
<!--3--宠主信息-->
<div style="display: flex;margin-bottom: 20px;">
<div class="tip-green" />
<div class="tip-green"/>
<div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
>宠主信息
......@@ -256,17 +256,17 @@ color: #333333;"
<el-row>
<el-col :span="8">
<el-form-item label="宠主姓名">
<el-input v-model="detailInfo.petOwnerBo.nickName" :placeholder="'-'" disabled />
<el-input v-model="detailInfo.petOwnerBo.nickName" :placeholder="'-'" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机号">
<el-input v-model="detailInfo.petOwnerBo.phoneNumber" :placeholder="'-'" disabled />
<el-input v-model="detailInfo.petOwnerBo.phoneNumber" :placeholder="'-'" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="用户ID">
<el-input v-model="detailInfo.petOwnerBo.ownersId" :placeholder="'-'" disabled />
<el-input v-model="detailInfo.petOwnerBo.ownersId" :placeholder="'-'" disabled/>
</el-form-item>
</el-col>
</el-row>
......@@ -303,10 +303,11 @@ color: #333333;"
/>
</el-select>
</el-form-item>
</el-col>
<el-col v-if="deptLevel !== '1'" :span="8">
<el-form-item label="会员卡余额">
<div style="display: flex;align-items: center;">
<el-input v-model="detailInfo.petOwnerBo.cardBalance" :placeholder="'-'" disabled />
<el-input v-model="detailInfo.petOwnerBo.cardBalance" :placeholder="'-'" disabled/>
<span class="unit-text">元</span>
</div>
</el-form-item>
......@@ -326,14 +327,14 @@ color: #333333;"
</el-form-item>
</el-col>
<el-col v-if="deptLevel !== '1'" :span="8">
<el-form-item label="绑定宠物数量" :label-width="100">
<el-input v-model="detailInfo.petOwnerBo.petCount" :placeholder="'-'" disabled />
<el-form-item label="绑定宠物数量" :label-width="'100'">
<el-input v-model="detailInfo.petOwnerBo.petCount" :placeholder="'-'" disabled/>
</el-form-item>
</el-col>
</el-row>
<!--4--兽医信息-->
<div style="display: flex;margin-bottom: 20px;">
<div class="tip-green" />
<div class="tip-green"/>
<div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
>兽医信息
......@@ -341,43 +342,43 @@ color: #333333;"
</div>
<!-- 内部信息 -->
<!-- 宠主基本信息-->
<el-row :gutter="41">
<el-row>
<el-col :span="8">
<el-form-item label="医生姓名" prop="doctorName">
<el-input v-model="detailInfo.doctorName" :placeholder="'-'" disabled />
<el-input v-model="detailInfo.doctorName" :placeholder="'-'" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="医生ID" prop="doctorId">
<el-input v-model="detailInfo.doctorId" :placeholder="'-'" disabled />
<el-input v-model="detailInfo.doctorId" :placeholder="'-'" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机号" prop="doctorPhone">
<el-input v-model="detailInfo.doctorPhone" :placeholder="'-'" disabled />
<el-input v-model="detailInfo.doctorPhone" :placeholder="'-'" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所属医院" prop="hospitalName">
<el-input v-model="detailInfo.hospitalName" :placeholder="'-'" disabled />
<el-input v-model="detailInfo.hospitalName" :placeholder="'-'" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="所属科室" prop="hospitalDepartmentName">
<el-input v-model="detailInfo.hospitalDepartmentName" :placeholder="'-'" disabled />
<el-input v-model="detailInfo.hospitalDepartmentName" :placeholder="'-'" disabled/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="医生职称" prop="doctorTitleLabel">
<el-input v-model="detailInfo.doctorTitleLabel" :placeholder="'-'" disabled />
<el-input v-model="detailInfo.doctorTitleLabel" :placeholder="'-'" disabled/>
</el-form-item>
</el-col>
</el-row>
<!--5--进度信息-->
<schedule-info :schedule-key="scheduleKey" />
<schedule-info :schedule-key="scheduleKey"/>
<!--6--就诊信息-->
<div style="display: flex;margin-bottom: 20px;">
<div class="tip-green" />
<div class="tip-green"/>
<div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
>就诊信息
......@@ -411,7 +412,7 @@ color: #333333;"
<el-col :span="8">
<!--是否首诊-->
<el-form-item label="就诊诊位">
<el-input v-model="detailInfo.visitLocation" placeholder="-" disabled />
<el-input v-model="detailInfo.visitLocation" placeholder="-" disabled/>
</el-form-item>
</el-col>
<el-col :span="24">
......@@ -456,7 +457,7 @@ color: #333333;"
<!--7--药物处理-->
<div class="title-content">
<div class="title-left">
<div class="tip-green" />
<div class="tip-green"/>
<div
class="tip-text"
>药物处理
......@@ -639,7 +640,7 @@ color: #333333;"
<!--8--辅助检查-->
<div class="title-content">
<div class="title-left">
<div class="tip-green" />
<div class="tip-green"/>
<div
class="tip-text"
>辅助检查
......@@ -831,7 +832,7 @@ color: #333333;"
<!--9--治疗信息-->
<div class="title-content">
<div class="title-left">
<div class="tip-green" />
<div class="tip-green"/>
<div
class="tip-text"
>辅助治疗
......@@ -978,7 +979,7 @@ color: #333333;"
<!--10--住院信息-->
<div class="title-content">
<div class="title-left">
<div class="tip-green" />
<div class="tip-green"/>
<div
class="tip-text"
>住院治疗
......@@ -1073,7 +1074,7 @@ color: #333333;"
<el-table-column align="center" label="状态" prop="status">
<template slot-scope="scope">
<span v-if="!scope.row.status">{{ '-' }}</span>
<dict-tag :options="dict.type.hospital_status_in" :value="scope.row.status" />
<dict-tag :options="dict.type.hospital_status_in" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column
......@@ -1143,14 +1144,14 @@ color: #333333;"
<el-table-column align="center" label="状态" prop="status">
<template slot-scope="scope">
<span v-if="!scope.row.status">{{ '-' }}</span>
<dict-tag :options="dict.type.hospital_status_in" :value="scope.row.status" />
<dict-tag :options="dict.type.hospital_status_in" :value="scope.row.status"/>
</template>
</el-table-column>
</el-table>
</div>
<!--10--费用明细-->
<div style="display: flex">
<div class="tip-green" />
<div class="tip-green"/>
<div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
>费用明细
......@@ -1181,7 +1182,7 @@ color: #333333;"
</el-table-column>
<el-table-column align="center" label="缴费状态" prop="payStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.payment_status" :value="scope.row.payStatus" />
<dict-tag :options="dict.type.payment_status" :value="scope.row.payStatus"/>
</template>
</el-table-column>
<el-table-column align="center" label="缴费时间" prop="payTime">
......@@ -1202,7 +1203,7 @@ color: #333333;"
<!--8--检查信息-->
<div class="title-content">
<div class="title-left">
<div class="tip-green" />
<div class="tip-green"/>
<div
class="tip-text"
>回访信息
......@@ -1837,7 +1838,10 @@ export default {
this.stockDispenseOutboundList = []
this.checkManageBos.push(...response.data.checkManageBos)
this.treatManageBo.push(...response.data.treatManageBo)
/* 加个判空就好了 */
if (response.data.stockDispenseOutboundList) {
this.stockDispenseOutboundList.push(...response.data.stockDispenseOutboundList)
}
// this.stockDispenseOutboundList = [{ 'inputShow': false, 'isAdd': false, 'drugName': '红霉素3', 'brand': '康恩贝', 'drugId': 11, 'giveWay': '1', 'sallUnit': null, 'sallNum': null, 'standardAmount': 19, 'paymentStatus': '0', 'recipelNum': 1, 'remarks': '2' }, { 'inputShow': false, 'isAdd': false, 'drugName': '红霉素2', 'brand': '康恩贝', 'drugId': 10, 'giveWay': '1', 'sallUnit': null, 'sallNum': null, 'standardAmount': 19, 'paymentStatus': '0', 'recipelNum': 2, 'remarks': '3' }]
if (type !== 'update') {
this.petInfo = { ...response.data }
......@@ -2131,11 +2135,13 @@ export default {
this.petInHospitalList = res.rows.rows
// console.log('住院情况2', this.petInHospitalList)
this.editCunt.inHospitalBos = res.total
if (this.petInHospitalList !== undefined && this.petInHospitalList !== null) {
this.petInHospitalList.forEach(item => {
if (item.status === '1' || item.status === '2') {
this.petInHospitalStatus = false
}
})
}
console.log('是否在住院中', this.petInHospitalStatus)
}
})
......
src/views/service-management/registration-queue/registration-detail.vue
View file @ c0e02ef0
......@@ -453,7 +453,7 @@
<el-input v-model="detailInfo.visitLocation" placeholder="-" disabled />
</el-form-item>
</el-col>
<el-row :span="24">
<el-col :span="24">
<!-- 新学的第二种方法-->
<el-form-item
label="主诉"
......@@ -476,8 +476,8 @@
show-word-limit
/>
</el-form-item>
</el-row>
<el-row :span="24">
</el-col>
<el-col :span="24">
<el-form-item
label="医嘱"
prop="doctorAdvice"
......@@ -499,8 +499,8 @@
type="textarea"
/>
</el-form-item>
</el-row>
<el-row :span="24">
</el-col>
<el-col :span="24">
<el-form-item
label="诊断结果"
prop="diagnosisResult"
......@@ -521,8 +521,8 @@
placeholder="请输入诊断结果"
/>
</el-form-item>
</el-row>
<el-row :span="24">
</el-col>
<el-col :span="24">
<el-form-item label="处方单">
<el-button
class="fourWordsBtn"
......@@ -533,7 +533,7 @@
开具处方
</el-button>
</el-form-item>
</el-row>
</el-col>
</el-row>
</el-form>
</el-row>
......
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