Commit f4718295 authored by 高滢's avatar 高滢

Merge remote-tracking branch 'origin/master'

parents da613439 5bb0e3dd
...@@ -18,7 +18,7 @@ color: #333333;" ...@@ -18,7 +18,7 @@ color: #333333;"
<!--1--宠物头像--> <!--1--宠物头像-->
<div style="display: flex"> <div style="display: flex">
<!-- 1-- 宠物基本信息的页面--标签头 --> <!-- 1-- 宠物基本信息的页面--标签头 -->
<div class="tip-green"/> <div class="tip-green" />
<div <div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;" 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;" ...@@ -29,7 +29,7 @@ color: #333333;"
<div> <div>
<!--宠物图片--> <!--宠物图片-->
<div class="petPicture" style="padding-bottom: 40px;"> <div class="petPicture" style="padding-bottom: 40px;">
<ImagePreview :height="150" :src="showLogo" :width="150"/> <ImagePreview :height="150" :src="showLogo" :width="150" />
</div> </div>
</div> </div>
</div> </div>
...@@ -45,7 +45,7 @@ color: #333333;" ...@@ -45,7 +45,7 @@ color: #333333;"
<!--2--基本信息--> <!--2--基本信息-->
<div style="display: flex;margin-bottom: 20px;"> <div style="display: flex;margin-bottom: 20px;">
<!-- 1-- 宠物基本信息的页面--标签头 --> <!-- 1-- 宠物基本信息的页面--标签头 -->
<div class="tip-green"/> <div class="tip-green" />
<div <div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;" 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;" ...@@ -56,13 +56,13 @@ color: #333333;"
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物昵称" prop="petNickname"> <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-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<!--宠物ID--> <!--宠物ID-->
<el-form-item label="宠物ID" prop="petsId"> <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-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -106,7 +106,7 @@ color: #333333;" ...@@ -106,7 +106,7 @@ color: #333333;"
</el-form-item> </el-form-item>
</div> </div>
<el-form-item v-else class="petBreed" label="宠物品种" prop="petBreed"> <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 <el-input
v-model="detailInfo.petChildBreed" v-model="detailInfo.petChildBreed"
:placeholder="isEdit? '请选择分品种' : '-'" :placeholder="isEdit? '请选择分品种' : '-'"
...@@ -142,7 +142,7 @@ color: #333333;" ...@@ -142,7 +142,7 @@ color: #333333;"
<el-col :span="8"> <el-col :span="8">
<!--宠物年龄--> <!--宠物年龄-->
<el-form-item v-if="!isEdit" label="宠物年龄" prop="petAge"> <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>
<el-form-item v-else label="宠物生日" prop="petBirthday"> <el-form-item v-else label="宠物生日" prop="petBirthday">
<el-date-picker <el-date-picker
...@@ -245,7 +245,7 @@ color: #333333;" ...@@ -245,7 +245,7 @@ color: #333333;"
</el-row> </el-row>
<!--3--宠主信息--> <!--3--宠主信息-->
<div style="display: flex;margin-bottom: 20px;"> <div style="display: flex;margin-bottom: 20px;">
<div class="tip-green"/> <div class="tip-green" />
<div <div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;" 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;" ...@@ -256,17 +256,17 @@ color: #333333;"
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠主姓名"> <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-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="手机号"> <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-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="用户ID"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -307,7 +307,7 @@ color: #333333;" ...@@ -307,7 +307,7 @@ color: #333333;"
<el-col v-if="deptLevel !== '1'" :span="8"> <el-col v-if="deptLevel !== '1'" :span="8">
<el-form-item label="会员卡余额"> <el-form-item label="会员卡余额">
<div style="display: flex;align-items: center;"> <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> <span class="unit-text"></span>
</div> </div>
</el-form-item> </el-form-item>
...@@ -328,13 +328,13 @@ color: #333333;" ...@@ -328,13 +328,13 @@ color: #333333;"
</el-col> </el-col>
<el-col v-if="deptLevel !== '1'" :span="8"> <el-col v-if="deptLevel !== '1'" :span="8">
<el-form-item label="绑定宠物数量" :label-width="'100'"> <el-form-item label="绑定宠物数量" :label-width="'100'">
<el-input v-model="detailInfo.petOwnerBo.petCount" :placeholder="'-'" disabled/> <el-input v-model="detailInfo.petOwnerBo.petCount" :placeholder="'-'" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!--4--兽医信息--> <!--4--兽医信息-->
<div style="display: flex;margin-bottom: 20px;"> <div style="display: flex;margin-bottom: 20px;">
<div class="tip-green"/> <div class="tip-green" />
<div <div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;" style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
>兽医信息 >兽医信息
...@@ -345,40 +345,40 @@ color: #333333;" ...@@ -345,40 +345,40 @@ color: #333333;"
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="医生姓名" prop="doctorName"> <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-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="医生ID" prop="doctorId"> <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-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="手机号" prop="doctorPhone"> <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-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="所属医院" prop="hospitalName"> <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-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="所属科室" prop="hospitalDepartmentName"> <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-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="医生职称" prop="doctorTitleLabel"> <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-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!--5--进度信息--> <!--5--进度信息-->
<schedule-info :schedule-key="scheduleKey"/> <schedule-info :schedule-key="scheduleKey" />
<!--6--就诊信息--> <!--6--就诊信息-->
<div style="display: flex;margin-bottom: 20px;"> <div style="display: flex;margin-bottom: 20px;">
<div class="tip-green"/> <div class="tip-green" />
<div <div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;" style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
>就诊信息 >就诊信息
...@@ -412,7 +412,7 @@ color: #333333;" ...@@ -412,7 +412,7 @@ color: #333333;"
<el-col :span="8"> <el-col :span="8">
<!--是否首诊--> <!--是否首诊-->
<el-form-item label="就诊诊位"> <el-form-item label="就诊诊位">
<el-input v-model="detailInfo.visitLocation" placeholder="-" disabled/> <el-input v-model="detailInfo.visitLocation" placeholder="-" disabled />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
...@@ -457,7 +457,7 @@ color: #333333;" ...@@ -457,7 +457,7 @@ color: #333333;"
<!--7--药物处理--> <!--7--药物处理-->
<div class="title-content"> <div class="title-content">
<div class="title-left"> <div class="title-left">
<div class="tip-green"/> <div class="tip-green" />
<div <div
class="tip-text" class="tip-text"
>药物处理 >药物处理
...@@ -476,19 +476,20 @@ color: #333333;" ...@@ -476,19 +476,20 @@ color: #333333;"
<div class="table-content"> <div class="table-content">
<el-form <el-form
ref="drugForm" ref="drugForm"
:model="drugForm" :model="stockDispenseOutboundList"
hide-required-asterisk hide-required-asterisk
:rules="drugRules" :rules="drugRules"
class="demo-ruleForm" class="demo-ruleForm"
:inline-message="true"
label-width="0" label-width="0"
> >
<el-table :data="stockDispenseOutboundList" :header-cell-style="{ background:'#F4F4F4'}" border> <el-table :data="stockDispenseOutboundList" :header-cell-style="{ background:'#F4F4F4'}" border>
<el-table-column align="center" label="药品名称" prop="drugName"> <el-table-column align="left" label="药品名称" prop="drugId">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
v-if="scope.row.inputShow" v-if="scope.row.inputShow"
:prop="'tableData.'+scope.$index+'.drugName'" :prop="scope.$index+'.drugId'"
:rules="drugRules.drugName" :rules="drugRules.drugId"
> >
<el-select <el-select
v-model="scope.row.drugId" v-model="scope.row.drugId"
...@@ -499,53 +500,57 @@ color: #333333;" ...@@ -499,53 +500,57 @@ color: #333333;"
@change="setDrugOthers(scope.row,drugOptions)" @change="setDrugOthers(scope.row,drugOptions)"
> >
<el-option <el-option
v-for="item in drugOptions" v-for="item in drugOptionsShow"
:key="item.drugId" :key="item.drugId"
:label="item.drugName" :label="item.drugName"
:value="item.drugId" :value="item.drugId"
:disabled="item.disabled"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<span <span
v-else v-else
>{{ >{{
scope.row.drugName === '' || scope.row.drugName === null ? '-' : scope.row.drugName scope.row.drugName === '' || scope.row.drugName === null ? '-' : scope.row.drugName
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="开药日期" prop="createTime"> <el-table-column align="left" label="开药日期" prop="createTime">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span> <span v-if="scope.row.inputShow">-</span>
<span v-else> <span v-else>
{{ scope.row.createTime ? moment(scope.row.createTime).format('YYYY/MM/DD') : '-' }} {{ scope.row.updateTime ? moment(scope.row.updateTime).format('YYYY/MM/DD') : '-' }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="处方数量" prop="recipelNum"> <el-table-column align="left" label="处方数量" prop="recipelNum">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
v-if="scope.row.inputShow" v-if="scope.row.inputShow"
:prop="'tableData.'+scope.$index+'.recipelNum'" :prop="scope.$index+'.recipelNum'"
:rules="drugRules.recipelNum" :rules="drugRules.recipelNum"
> >
<el-input <div style="display: flex;align-items: center;">
v-model="scope.row.recipelNum" <el-input-number v-model.trim="scope.row.recipelNum" controls-position="right" :min="0" :max="10" placeholder="-" />
/> <span class="unit-text">{{ scope.row.normsUnit }}</span>
</div>
</el-form-item> </el-form-item>
<span v-else> <span v-else>
{{ scope.row.recipelNum ? scope.row.recipelNum : '-' }} {{ scope.row.recipelNumStr ? scope.row.recipelNumStr : '-' }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="用法" prop="remark"> <el-table-column align="left" label="用法" prop="remark">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
v-if="scope.row.inputShow" v-if="scope.row.inputShow"
:prop="'tableData.'+scope.$index+'.remark'" :prop="scope.$index+'.remark'"
:rules="drugRules.remark" :rules="drugRules.remark"
> >
<el-input <el-input
v-model="scope.row.remark" v-model.trim="scope.row.remark"
:placeholder="isEdit? '请输入用法' : '-'"
maxlength="30"
/> />
</el-form-item> </el-form-item>
<span v-else> <span v-else>
...@@ -554,7 +559,7 @@ color: #333333;" ...@@ -554,7 +559,7 @@ color: #333333;"
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="销售数量" prop="sallNum"> <el-table-column align="left" label="销售数量" prop="sallNum">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span> <span v-if="scope.row.inputShow">-</span>
<span v-else> <span v-else>
...@@ -562,7 +567,7 @@ color: #333333;" ...@@ -562,7 +567,7 @@ color: #333333;"
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="取药状态" prop="status"> <el-table-column align="left" label="取药状态" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span> <span v-if="scope.row.inputShow">-</span>
<span v-else> <span v-else>
...@@ -572,7 +577,7 @@ color: #333333;" ...@@ -572,7 +577,7 @@ color: #333333;"
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="缴费状态" prop="payType"> <el-table-column align="left" label="缴费状态" prop="payType">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span> <span v-if="scope.row.inputShow">-</span>
<dict-tag <dict-tag
...@@ -585,7 +590,7 @@ color: #333333;" ...@@ -585,7 +590,7 @@ color: #333333;"
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="isEdit" v-if="isEdit"
align="center" align="left"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
label="操作" label="操作"
min-width="180" min-width="180"
...@@ -619,7 +624,7 @@ color: #333333;" ...@@ -619,7 +624,7 @@ color: #333333;"
size="mini" size="mini"
style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(52,144,206);" style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(52,144,206);"
type="primary" type="primary"
@click="handleSave('checkForm','stockDispenseOutboundList', scope.$index)" @click="handleSave('drugForm','stockDispenseOutboundList', scope.$index)"
>保存 >保存
</el-button> </el-button>
<el-button <el-button
...@@ -641,7 +646,7 @@ color: #333333;" ...@@ -641,7 +646,7 @@ color: #333333;"
<!--8--辅助检查--> <!--8--辅助检查-->
<div class="title-content"> <div class="title-content">
<div class="title-left"> <div class="title-left">
<div class="tip-green"/> <div class="tip-green" />
<div <div
class="tip-text" class="tip-text"
>辅助检查 >辅助检查
...@@ -658,13 +663,19 @@ color: #333333;" ...@@ -658,13 +663,19 @@ color: #333333;"
</div> </div>
<!-- 内部信息 --> <!-- 内部信息 -->
<div class="table-content"> <div class="table-content">
<el-form ref="checkForm" :model="checkManageBos" class="demo-ruleForm" label-width="0"> <el-form
ref="checkForm"
:model="checkManageBos"
class="demo-ruleForm"
:inline-message="true"
label-width="0"
>
<el-table <el-table
:data="checkManageBos" :data="checkManageBos"
:header-cell-style="{ background:'#F4F4F4'}" :header-cell-style="{ background:'#F4F4F4'}"
border border
> >
<el-table-column align="center" label="检查类型" prop="checkType"> <el-table-column align="left" label="检查类型" prop="checkType">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
v-if="scope.row.inputShow" v-if="scope.row.inputShow"
...@@ -694,7 +705,7 @@ color: #333333;" ...@@ -694,7 +705,7 @@ color: #333333;"
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="检查项目" prop="checkItemsName"> <el-table-column align="left" label="检查项目" prop="checkItemsName">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
v-if="scope.row.inputShow" v-if="scope.row.inputShow"
...@@ -718,17 +729,18 @@ color: #333333;" ...@@ -718,17 +729,18 @@ color: #333333;"
:key="index" :key="index"
:label="item.label" :label="item.label"
:value="`${item.value}`" :value="`${item.value}`"
:disabled="item.disabled"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<span <span
v-else v-else
>{{ >{{
scope.row.checkItemsName === '' || scope.row.checkItemsName === null ? '-' : scope.row.checkItemsName scope.row.checkItemsName === '' || scope.row.checkItemsName === null ? '-' : scope.row.checkItemsName
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="检查设备" prop="checkSchedule"> <el-table-column align="left" label="检查设备" prop="checkSchedule">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span> <span v-if="scope.row.inputShow">-</span>
<span v-else> <span v-else>
...@@ -736,7 +748,7 @@ color: #333333;" ...@@ -736,7 +748,7 @@ color: #333333;"
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="检查状态" prop="checkSchedule"> <el-table-column align="left" label="检查状态" prop="checkSchedule">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span> <span v-if="scope.row.inputShow">-</span>
<span v-else> <span v-else>
...@@ -744,7 +756,7 @@ color: #333333;" ...@@ -744,7 +756,7 @@ color: #333333;"
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="检查日期" prop="reportTime"> <el-table-column align="left" label="检查日期" prop="reportTime">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span> <span v-if="scope.row.inputShow">-</span>
<span v-else> <span v-else>
...@@ -752,7 +764,7 @@ color: #333333;" ...@@ -752,7 +764,7 @@ color: #333333;"
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="检查报告" prop="shadowReport" show-overflow-tooltip> <el-table-column align="left" label="检查报告" prop="shadowReport" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.inputShow || !scope.row.shadowReport">-</span> <span v-if="scope.row.inputShow || !scope.row.shadowReport">-</span>
<span v-else> <span v-else>
...@@ -760,12 +772,12 @@ color: #333333;" ...@@ -760,12 +772,12 @@ color: #333333;"
type="primary" type="primary"
@click="showShadowReport(scope.row.shadowReport)" @click="showShadowReport(scope.row.shadowReport)"
>{{ >{{
scope.row.shadowReport ? scope.row.shadowReport.split('/')[scope.row.shadowReport.split('/').length - 1] : '-' scope.row.shadowReport ? scope.row.shadowReport.split('/')[scope.row.shadowReport.split('/').length - 1] : '-'
}}</el-link> }}</el-link>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="缴费状态" prop="payType"> <el-table-column align="left" label="缴费状态" prop="payType">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span> <span v-if="scope.row.inputShow">-</span>
<dict-tag <dict-tag
...@@ -778,7 +790,7 @@ color: #333333;" ...@@ -778,7 +790,7 @@ color: #333333;"
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="isEdit" v-if="isEdit"
align="center" align="left"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
label="操作" label="操作"
min-width="180" min-width="180"
...@@ -834,7 +846,7 @@ color: #333333;" ...@@ -834,7 +846,7 @@ color: #333333;"
<!--9--治疗信息--> <!--9--治疗信息-->
<div class="title-content"> <div class="title-content">
<div class="title-left"> <div class="title-left">
<div class="tip-green"/> <div class="tip-green" />
<div <div
class="tip-text" class="tip-text"
>辅助治疗 >辅助治疗
...@@ -851,13 +863,48 @@ color: #333333;" ...@@ -851,13 +863,48 @@ color: #333333;"
</div> </div>
<!-- 内部信息 --> <!-- 内部信息 -->
<div class="table-content"> <div class="table-content">
<el-form ref="treatForm" :model="treatManageBo" class="demo-ruleForm" label-width="0"> <el-form
ref="treatForm"
:model="treatManageBo"
class="demo-ruleForm"
:inline-message="true"
label-width="0"
>
<el-table <el-table
:data="treatManageBo" :data="treatManageBo"
:header-cell-style="{ background:'#F4F4F4'}" :header-cell-style="{ background:'#F4F4F4'}"
border border
> >
<el-table-column align="center" label="治疗项目" prop="treatItemsName"> <el-table-column align="left" label="治疗类型" prop="treatItemsType">
<template slot-scope="scope">
<el-form-item
v-if="scope.row.inputShow"
:prop="scope.$index+'.treatItemsType'"
:rules="[{ required: true, message: '请选择治疗类型', trigger: 'change' }]"
>
<el-select
v-model="scope.row.treatItemsType"
clearable
:placeholder="isEdit? '请选择治疗类型' : '-'"
@change="changeTreatItemOptionsShow(scope.row.treatItemsType,scope.row)"
>
<el-option
v-for="(item, index) in dict.type.treat_type"
:key="index"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<dict-tag
v-else
:options="dict.type.treat_type"
:value="scope.row.treatItemsType"
class="content-style"
/>
</template>
</el-table-column>
<el-table-column align="left" label="治疗项目" prop="treatItemsName">
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item <el-form-item
v-if="scope.row.inputShow" v-if="scope.row.inputShow"
...@@ -868,36 +915,37 @@ color: #333333;" ...@@ -868,36 +915,37 @@ color: #333333;"
v-model="scope.row.treatItemsId" v-model="scope.row.treatItemsId"
clearable clearable
:placeholder="isEdit? '请选择治疗项目' : '-'" :placeholder="isEdit? '请选择治疗项目' : '-'"
@change="setTreatItemsName(scope.row,treatItemOptions)" @change="setTreatItemsName(scope.row,treatItemOptionsShow,scope.$index)"
> >
<el-option <el-option
v-for="(item, index) in treatItemOptions" v-for="(item, index) in treatItemOptionsShow"
:key="index" :key="index"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
:disabled="item.disabled"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<span <span
v-else v-else
>{{ >{{
scope.row.treatItemsName === '' || scope.row.treatItemsName === null ? '-' : scope.row.treatItemsName scope.row.treatItemsName === '' || scope.row.treatItemsName === null ? '-' : scope.row.treatItemsName
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="治疗负责人" prop="doctorName"> <el-table-column align="left" label="治疗负责人" prop="doctorName">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.docName || '-' }}</span> <span>{{ scope.row.docName || '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="治疗诊室" prop="consultRoomName"> <el-table-column align="left" label="治疗诊室" prop="consultRoomName">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ <span>{{
scope.row.consultRoomName === '' || scope.row.consultRoomName === null ? '-' : scope.row.consultRoomName scope.row.consultRoomName === '' || scope.row.consultRoomName === null ? '-' : scope.row.consultRoomName
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="缴费状态" prop="payType"> <el-table-column align="left" label="缴费状态" prop="payType">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span> <span v-if="scope.row.inputShow">-</span>
<dict-tag <dict-tag
...@@ -908,7 +956,7 @@ color: #333333;" ...@@ -908,7 +956,7 @@ color: #333333;"
/> />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="治疗状态" prop="treatStatus"> <el-table-column align="left" label="治疗状态" prop="treatStatus">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span> <span v-if="scope.row.inputShow">-</span>
<span v-else> <span v-else>
...@@ -916,7 +964,7 @@ color: #333333;" ...@@ -916,7 +964,7 @@ color: #333333;"
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="治疗日期" prop="treatStartTime"> <el-table-column align="left" label="治疗日期" prop="treatStartTime">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.inputShow">-</span> <span v-if="scope.row.inputShow">-</span>
<span v-else> <span v-else>
...@@ -926,7 +974,7 @@ color: #333333;" ...@@ -926,7 +974,7 @@ color: #333333;"
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="isEdit" v-if="isEdit"
align="center" align="left"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
label="操作" label="操作"
min-width="180" min-width="180"
...@@ -982,7 +1030,7 @@ color: #333333;" ...@@ -982,7 +1030,7 @@ color: #333333;"
<!--10--住院信息--> <!--10--住院信息-->
<div class="title-content"> <div class="title-content">
<div class="title-left"> <div class="title-left">
<div class="tip-green"/> <div class="tip-green" />
<div <div
class="tip-text" class="tip-text"
>住院治疗 >住院治疗
...@@ -1015,7 +1063,7 @@ color: #333333;" ...@@ -1015,7 +1063,7 @@ color: #333333;"
:header-cell-style="{ background:'#F4F4F4'}" :header-cell-style="{ background:'#F4F4F4'}"
border border
> >
<el-table-column align="center" label="病情等级" prop="diseaseLevel"> <el-table-column align="left" label="病情等级" prop="diseaseLevel">
<template slot-scope="scope"> <template slot-scope="scope">
<sapn v-if="!scope.row.diseaseLevel && !petInHospitalUpdateShow">-</sapn> <sapn v-if="!scope.row.diseaseLevel && !petInHospitalUpdateShow">-</sapn>
<dict-tag <dict-tag
...@@ -1035,12 +1083,12 @@ color: #333333;" ...@@ -1035,12 +1083,12 @@ color: #333333;"
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="病房类型" prop="wardType"> <el-table-column align="left" label="病房类型" prop="wardType">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.diseaseLevel ? (scope.row.diseaseLevel === '1' ? 'ICU病房' : '普通病房') : '-' }} {{ scope.row.diseaseLevel ? (scope.row.diseaseLevel === '1' ? 'ICU病房' : '普通病房') : '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="能否沐浴" prop="bathe"> <el-table-column align="left" label="能否沐浴" prop="bathe">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="!petInHospitalUpdateShow" v-if="!petInHospitalUpdateShow"
...@@ -1059,30 +1107,30 @@ color: #333333;" ...@@ -1059,30 +1107,30 @@ color: #333333;"
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="病房号" prop="wardRuleId"> <el-table-column align="left" label="病房号" prop="wardRuleId">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.wardRuleId || '-' }} {{ scope.row.wardRuleId || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="入院日期" prop="admissionDate"> <el-table-column align="left" label="入院日期" prop="admissionDate">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.admissionDate || '-' }} {{ scope.row.admissionDate || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="天数" prop="actualDays"> <el-table-column align="left" label="天数" prop="actualDays">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.actualDays || '-' }} {{ scope.row.actualDays || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="状态" prop="status"> <el-table-column align="left" label="状态" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="!scope.row.status">{{ '-' }}</span> <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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="isEdit && !petInHospitalStatus" v-if="isEdit && !petInHospitalStatus"
align="center" align="left"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
label="操作" label="操作"
min-width="180" min-width="180"
...@@ -1125,37 +1173,37 @@ color: #333333;" ...@@ -1125,37 +1173,37 @@ color: #333333;"
</el-table> </el-table>
</el-form> </el-form>
<el-table v-else :data="petInHospitalList" :header-cell-style="{ background:'#F4F4F4'}" border> <el-table v-else :data="petInHospitalList" :header-cell-style="{ background:'#F4F4F4'}" border>
<el-table-column align="center" label="病房类型" prop="wardType"> <el-table-column align="left" label="病房类型" prop="wardType">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.diseaseLevel }} {{ scope.row.diseaseLevel }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="病房号" prop="wardRuleId"> <el-table-column align="left" label="病房号" prop="wardRuleId">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.wardRuleId || '-' }} {{ scope.row.wardRuleId || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="入院日期" prop="admissionDate"> <el-table-column align="left" label="入院日期" prop="admissionDate">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.admissionDate || '-' }} {{ scope.row.admissionDate || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="天数" prop="actualDays"> <el-table-column align="left" label="天数" prop="actualDays">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.actualDays || '-' }} {{ scope.row.actualDays || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="状态" prop="status"> <el-table-column align="left" label="状态" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="!scope.row.status">{{ '-' }}</span> <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> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<!--10--费用明细--> <!--10--费用明细-->
<div style="display: flex"> <div style="display: flex">
<div class="tip-green"/> <div class="tip-green" />
<div <div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;" style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
>费用明细 >费用明细
...@@ -1164,37 +1212,37 @@ color: #333333;" ...@@ -1164,37 +1212,37 @@ color: #333333;"
<!-- 内部信息 --> <!-- 内部信息 -->
<div class="table-content"> <div class="table-content">
<el-table :data="paymentList" :header-cell-style="{ background:'#F4F4F4'}" border> <el-table :data="paymentList" :header-cell-style="{ background:'#F4F4F4'}" border>
<el-table-column align="center" label="收费项" prop="feeItems"> <el-table-column align="left" label="收费项" prop="feeItems">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.feeItems || '-' }} {{ scope.row.feeItems || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="明细" prop="detail"> <el-table-column align="left" label="明细" prop="detail">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.detail || '-' }} {{ scope.row.detail || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="数目" prop="qty"> <el-table-column align="left" label="数目" prop="qty">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.qty || '-' }} {{ scope.row.qty || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="金额" prop="standardAmount"> <el-table-column align="left" label="金额" prop="standardAmount">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.standardAmount| formatAmount }} {{ scope.row.standardAmount| formatAmount }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="缴费状态" prop="payStatus"> <el-table-column align="left" label="缴费状态" prop="payStatus">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="缴费时间" prop="payTime"> <el-table-column align="left" label="缴费时间" prop="payTime">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.payTime || '-' }} {{ scope.row.payTime || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="付款账号" prop="ownerId"> <el-table-column align="left" label="付款账号" prop="ownerId">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.ownerId || '-' }} {{ scope.row.ownerId || '-' }}
</template> </template>
...@@ -1207,7 +1255,7 @@ color: #333333;" ...@@ -1207,7 +1255,7 @@ color: #333333;"
<!--8--检查信息--> <!--8--检查信息-->
<div class="title-content"> <div class="title-content">
<div class="title-left"> <div class="title-left">
<div class="tip-green"/> <div class="tip-green" />
<div <div
class="tip-text" class="tip-text"
>回访信息 >回访信息
...@@ -1296,7 +1344,7 @@ import a from '@/assets/images/bg.png' ...@@ -1296,7 +1344,7 @@ import a from '@/assets/images/bg.png'
export default { export default {
name: 'MedicalEdit', name: 'MedicalEdit',
// 数据字典 // 数据字典
dicts: ['pet_sex', 'ward_type', 'payment_status', 'hospital_status_in', 'vaccine_situation', 'exist_state', 'sterilization_status', 'pet_insure', 'cat_breed', 'dog_breed', 'pet_breed', 'other_breed', 'check_type', 'payment_status', 'disease_level'], dicts: ['pet_sex', 'ward_type', 'payment_status', 'hospital_status_in', 'vaccine_situation', 'exist_state', 'sterilization_status', 'pet_insure', 'cat_breed', 'dog_breed', 'pet_breed', 'other_breed', 'check_type', 'payment_status', 'disease_level', 'treat_type'],
components: { components: {
// 引入进度信息模组件 // 引入进度信息模组件
scheduleInfo scheduleInfo
...@@ -1389,11 +1437,15 @@ export default { ...@@ -1389,11 +1437,15 @@ export default {
}, },
// 检查信息表单校验 // 检查信息表单校验
drugRules: { drugRules: {
drugName: [ drugId: [
{ required: true, message: '请选择药品', trigger: 'change' } { required: true, message: '请选择药品', trigger: 'change' }
], ],
recipelNum: [ recipelNum: [
{ required: true, message: '请输入药品数量', trigger: 'blur' } { required: true, message: '请输入药品数量', trigger: 'blur' },
{ pattern: /^[1-9]\d*$/, message: '仅支持数字', trigger: 'blur' }
],
remark: [
{ required: true, message: '请输入用法', trigger: 'blur' }
] ]
}, },
// 住院表单校验 // 住院表单校验
...@@ -1415,6 +1467,7 @@ export default { ...@@ -1415,6 +1467,7 @@ export default {
}, },
checkItemOptions: [], // 项目选项列表 根据检查类型变化 checkItemOptions: [], // 项目选项列表 根据检查类型变化
treatItemOptions: [], // 治疗项目选项列表 treatItemOptions: [], // 治疗项目选项列表
treatItemOptionsShow: [], // 治疗项目选项列表 --展示
checkManageBos: [], // 检查列表数据 checkManageBos: [], // 检查列表数据
treatManageBo: [], // 治疗列表数据 treatManageBo: [], // 治疗列表数据
stockDispenseOutboundList: [], // 药品列表数据 stockDispenseOutboundList: [], // 药品列表数据
...@@ -1562,6 +1615,13 @@ export default { ...@@ -1562,6 +1615,13 @@ export default {
} else { } else {
return this.defaultImage return this.defaultImage
} }
},
drugOptionsShow() {
console.log('drugListShow', this.stockDispenseOutboundList, this.drugOptions)
return this.drugOptions.map(item => {
return { ...item, disabled: !this.stockDispenseOutboundList.every(drug => drug.drugId !== item.drugId) }
}
)
} }
}, },
mounted() { mounted() {
...@@ -1759,13 +1819,28 @@ export default { ...@@ -1759,13 +1819,28 @@ export default {
}) })
console.log('finishSetDrugOthers', rowData) console.log('finishSetDrugOthers', rowData)
}, },
changeTreatItemOptionsShow(type, row) {
this.treatItemOptionsShow = this.treatItemOptions.filter(item => item.type === type).map(item => {
return {
...item,
disabled: !this.treatManageBo.every(treat => {
return treat.treatItemsId !== item.value
})
}
})
console.log('this.treatItemOptionsQQQQQQQQQQQQQQQ', this.treatItemOptionsShow, this.treatManageBo)
if (row && row.treatItemsId) {
row.treatItemsId = ''
row.treatItemsName = ''
}
},
// 设置当前行治疗名称 // 设置当前行治疗名称
setTreatItemsName(rowData, options) { setTreatItemsName(rowData, options, num) {
console.log('setTreatItemsName', rowData, options) console.log('setTreatItemsName', rowData, options, this.treatManageBo[num])
options.forEach(item => { options.forEach(item => {
console.log('item.value === rowData.treatItemsId', item.value === rowData.treatItemsId)
if (item.value === rowData.treatItemsId) { if (item.value === rowData.treatItemsId) {
rowData.treatItemsName = item.label rowData.treatItemsName = item.label
rowData.treatItemsType = item.type
rowData.payAmount = item.payAmount rowData.payAmount = item.payAmount
} }
}) })
...@@ -1779,10 +1854,14 @@ export default { ...@@ -1779,10 +1854,14 @@ export default {
return { return {
label: item.name, label: item.name,
value: item.id.toString(), value: item.id.toString(),
payAmount: item.price payAmount: item.price,
disabled: !this.checkManageBos.every(check => {
return check.checkItemsId !== item.id.toString()
})
} }
}) })
console.log('checkItemOptions!!!!!!!!!!!!!', this.checkItemOptions) console.log('checkItemOptions!!!!!!!!!!!!!', this.checkItemOptions)
console.log('checkManageBos!!!!!!!!!!!!!', this.checkManageBos)
resolve() resolve()
}) })
if (row) { if (row) {
...@@ -1846,12 +1925,11 @@ export default { ...@@ -1846,12 +1925,11 @@ export default {
if (response.data.stockDispenseOutboundList) { if (response.data.stockDispenseOutboundList) {
this.stockDispenseOutboundList.push(...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') { if (type !== 'update') {
this.petInfo = { ...response.data } this.petInfo = { ...response.data }
this.detailInfo = { ...response.data } this.detailInfo = { ...response.data }
} }
console.log(this.checkManageBos, 'kkkkkkkkkkkkkkkkkkkkkkk') console.log(this.stockDispenseOutboundList, 'kkkkkkkkkkkkkkkkkkkkkkk')
}) })
this.getInHospitalList(this.$route.params.id) this.getInHospitalList(this.$route.params.id)
}, },
...@@ -1867,6 +1945,9 @@ export default { ...@@ -1867,6 +1945,9 @@ export default {
console.log('KKKKKKKKKKKKKKKKKKKKKKKK') console.log('KKKKKKKKKKKKKKKKKKKKKKKK')
this[tableData][index]['inputShow'] = true this[tableData][index]['inputShow'] = true
}) })
} else if (tableData === 'treatManageBo') {
this.changeTreatItemOptionsShow(this.treatManageBo[index].treatItemsType)
this[tableData][index]['inputShow'] = true
} else { } else {
this[tableData][index]['inputShow'] = true this[tableData][index]['inputShow'] = true
} }
...@@ -1936,6 +2017,7 @@ export default { ...@@ -1936,6 +2017,7 @@ export default {
inputShow: true, inputShow: true,
isAdd: true isAdd: true
}) })
this.checkItemOptions = []
} else if (tableName === 'treatManageBo') { } else if (tableName === 'treatManageBo') {
// 新增z治疗信息初始值 // 新增z治疗信息初始值
this[tableName].push({ this[tableName].push({
...@@ -1948,6 +2030,7 @@ export default { ...@@ -1948,6 +2030,7 @@ export default {
inputShow: true, inputShow: true,
isAdd: true isAdd: true
}) })
this.treatItemOptionsShow = []
} else if (tableName === 'stockDispenseOutboundList') { } else if (tableName === 'stockDispenseOutboundList') {
this[tableName].push({ this[tableName].push({
drugName: '', drugName: '',
...@@ -1958,7 +2041,7 @@ export default { ...@@ -1958,7 +2041,7 @@ export default {
sallNum: '', sallNum: '',
standardAmount: '', standardAmount: '',
paymentStatus: '', paymentStatus: '',
recipelNum: '', recipelNum: 0,
remark: '', remark: '',
inputShow: true, inputShow: true,
isAdd: true isAdd: true
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="诊断日期" prop="visitDate"> <el-form-item label="诊断日期" prop="visitDate">
<el-input v-model="formattedDiagnosisTime" placeholder="-" :disabled="true" maxlength="20" /> <el-input v-model="formattedDiagnosisTime" placeholder="-" :disabled="true" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -144,7 +144,10 @@ ...@@ -144,7 +144,10 @@
<el-form-item label="药物处理" prop="medication"> <el-form-item label="药物处理" prop="medication">
<div v-for="(singleItem, index) in prescribingForm.medication" :key="index" class="single-medication"> <div v-for="(singleItem, index) in prescribingForm.medication" :key="index" class="single-medication">
<div class="single-file"> <div class="single-file">
<el-form-item prop="drug"> <el-form-item
:rules="{validator: validatePharmDrug(singleItem, 'drugId', '请选择药品'), trigger: 'blur'}"
prop="drug"
>
<el-select <el-select
v-model="singleItem.drugId" v-model="singleItem.drugId"
clearable clearable
...@@ -162,18 +165,31 @@ ...@@ -162,18 +165,31 @@
</el-form-item> </el-form-item>
</div> </div>
<div class="single-file"> <div class="single-file">
<el-form-item label="数量" prop="recipelNum"> <el-form-item
<el-input-number :rules="{validator: validatePharmDrugOther(singleItem, 'recipelNum', '请输入剂量'), trigger: 'blur'}"
v-model.trim="singleItem.recipelNum" label="剂量"
:max="100" prop="recipelNum"
:min="0" >
controls-position="right" <div style="display: flex;align-items: center;">
/>&nbsp;{{ singleItem.smallSallNormsUnit || '盒' }} <el-input-number
:disabled="!singleItem.drugId"
v-model.trim="singleItem.recipelNum"
:max="9999"
:min="0"
controls-position="right"
/>
<span class="unit-text">{{ singleItem.normsUnit || '' }}</span>
</div>
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
<el-form-item label="sig" prop="remark"> <el-form-item
:rules="{validator: validatePharmDrugOther(singleItem, 'remark', '请输入具体用法'), trigger: 'blur'}"
label="sig"
prop="remark"
>
<el-input <el-input
:disabled="!singleItem.drugId"
v-model.trim="singleItem.remark" v-model.trim="singleItem.remark"
placeholder="请输入具体用法" placeholder="请输入具体用法"
maxlength="30" maxlength="30"
...@@ -292,7 +308,7 @@ ...@@ -292,7 +308,7 @@
clearable clearable
placeholder="请选择病房类型" placeholder="请选择病房类型"
style="width: 100%" style="width: 100%"
disabled="true" :disabled="true"
> >
<el-option <el-option
v-for="(item, index) in dict.type.ward_type" v-for="(item, index) in dict.type.ward_type"
...@@ -471,6 +487,7 @@ export default { ...@@ -471,6 +487,7 @@ export default {
this.prescribingForm.treatment = [...val.treatManageBo] this.prescribingForm.treatment = [...val.treatManageBo]
} }
if (val && val.stockDispenseOutboundList.length > 0) { if (val && val.stockDispenseOutboundList.length > 0) {
console.log('val.stockDispenseOutboundList', val.stockDispenseOutboundList)
this.prescribingForm.medication = [...val.stockDispenseOutboundList] this.prescribingForm.medication = [...val.stockDispenseOutboundList]
} }
if (val && val.inHospitalBo) { if (val && val.inHospitalBo) {
...@@ -549,7 +566,8 @@ export default { ...@@ -549,7 +566,8 @@ export default {
sallUnit: item.smallSallNormsUnit, sallUnit: item.smallSallNormsUnit,
sallNum: item.smallSallNormsNum, sallNum: item.smallSallNormsNum,
standardAmount: item.sellingPrice, standardAmount: item.sellingPrice,
paymentStatus: '0' paymentStatus: '0',
normsUnit: item.normsUnit
} }
}) })
console.log('drugOptions!!!!!!!!!!!!!', this.drugOptions) console.log('drugOptions!!!!!!!!!!!!!', this.drugOptions)
...@@ -572,6 +590,39 @@ export default { ...@@ -572,6 +590,39 @@ export default {
} }
} }
}, },
// 校验触发--药物相关
validatePharmDrug(singleItem) {
return (rule, value, callback) => {
if (singleItem.drugId) {
callback()
return true
} else if (singleItem.recipelNum || singleItem.remark) {
callback('请选择药品')
return false
} else {
callback()
return true
}
}
},
// 校验触发--药物相关
validatePharmDrugOther(singleItem, key, message) {
return (rule, value, callback) => {
if (!singleItem.drugId) {
callback()
return true
} else if (!singleItem[key]) {
callback(message)
return false
} else if (key === 'recipelNum' && !/^[1-9]\d*$/.test(singleItem[key])) {
callback('仅支持数字')
return false
} else {
callback()
return true
}
}
},
// 设置当前行治疗名称 // 设置当前行治疗名称
setTreatItemsName(rowData, options) { setTreatItemsName(rowData, options) {
console.log('setTreatItemsName', rowData, options) console.log('setTreatItemsName', rowData, options)
...@@ -606,6 +657,7 @@ export default { ...@@ -606,6 +657,7 @@ export default {
rowData['sallNum'] = item.sallNum rowData['sallNum'] = item.sallNum
rowData['standardAmount'] = item.standardAmount rowData['standardAmount'] = item.standardAmount
rowData['paymentStatus'] = item.paymentStatus rowData['paymentStatus'] = item.paymentStatus
rowData['normsUnit'] = item.normsUnit
} }
}) })
console.log('finishSetDrugOthers', rowData) console.log('finishSetDrugOthers', rowData)
...@@ -864,7 +916,9 @@ export default { ...@@ -864,7 +916,9 @@ export default {
.el-input--small { .el-input--small {
width: 188px !important; width: 188px !important;
} }
.unit-text{
margin-left: unset;
}
.el-input-number--small { .el-input-number--small {
width: 188px !important; width: 188px !important;
} }
......
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