Commit f554c7c1 authored by v_liuhuaizhi's avatar v_liuhuaizhi

控制台报错修改2

parent 14e0a5ab
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<!-- 宠物基本信息--> <!-- 宠物基本信息-->
<el-row class="pet-base"> <el-row class="pet-base">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物名称" prop="nickName"> <el-form-item label="宠物名称" prop="petNickname">
<el-input <el-input
v-model="registerForm.petNickname" v-model="registerForm.petNickname"
disabled disabled
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠物年龄" prop="age"> <el-form-item label="宠物年龄" prop="petAge">
<el-input v-model="registerForm.petAge" :disabled="true" maxlength="20"/> <el-input v-model="registerForm.petAge" :disabled="true" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="体重" prop="petWeight"> <el-form-item label="体重" prop="petWeight">
<el-input v-model="registerForm.petWeight" :disabled="true" maxlength="20"/> <el-input v-model="registerForm.petWeight" :disabled="true" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -73,13 +73,13 @@ ...@@ -73,13 +73,13 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="宠主姓名" prop="age"> <el-form-item label="宠主姓名" prop="nickName">
<el-input v-model="registerForm.petOwnerBo.nickName" :disabled="true" maxlength="20"/> <el-input v-model="registerForm.petOwnerBo.nickName" :disabled="true" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="联系电话" prop="age"> <el-form-item label="联系电话" prop="phoneNumber">
<el-input v-model="registerForm.petOwnerBo.phoneNumber" :disabled="true" maxlength="20"/> <el-input v-model="registerForm.petOwnerBo.phoneNumber" :disabled="true" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -105,19 +105,19 @@ ...@@ -105,19 +105,19 @@
<!-- 处方模块--> <!-- 处方模块-->
<el-row class="prescribing-content"> <el-row class="prescribing-content">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="主治兽医" prop="nickName"> <el-form-item label="主治兽医" prop="doctorName">
<el-input v-model="registerForm.doctorName" :disabled="true" maxlength="20" placeholder="请输入宠物昵称"/> <el-input v-model="registerForm.doctorName" :disabled="true" maxlength="20" placeholder="请输入宠物昵称" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="科室" prop="petSex"> <el-form-item label="科室" prop="hospitalDepartmentName">
<el-input v-model="registerForm.hospitalDepartmentName" :disabled="true" maxlength="20"/> <el-input v-model="registerForm.hospitalDepartmentName" :disabled="true" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="诊位" prop="age"> <el-form-item label="诊位" prop="visitLocation">
<el-input v-model="registerForm.visitLocation" :disabled="true" maxlength="20"/> <el-input v-model="registerForm.visitLocation" :disabled="true" maxlength="20" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
...@@ -133,14 +133,18 @@ ...@@ -133,14 +133,18 @@
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="医嘱"> <el-form-item label="医嘱">
<el-input v-model="visitForm.doctorAdvice" disabled maxlength="200" placeholder="请输入医嘱" <el-input
type="textarea" v-model="visitForm.doctorAdvice"
disabled
maxlength="200"
placeholder="请输入医嘱"
type="textarea"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="诊断结果"> <el-form-item label="诊断结果">
<el-input v-model="visitForm.diagnosisResult" disabled maxlength="30" placeholder="请输入诊断结果"/> <el-input v-model="visitForm.diagnosisResult" disabled maxlength="30" placeholder="请输入诊断结果" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- 开药模块--后续开发 --> <!-- 开药模块--后续开发 -->
...@@ -165,21 +169,26 @@ ...@@ -165,21 +169,26 @@
</el-form-item> </el-form-item>
</div> </div>
<div class="single-file"> <div class="single-file">
<el-form-item label="数量" prop="num" > <el-form-item label="数量" prop="num">
<el-input-number v-model="item.num" <el-input-number
:max="10" :min="1" v-model="item.num"
controls-position="right"/> :max="10"
:min="1"
controls-position="right"
/>
</el-form-item> </el-form-item>
</div> </div>
<div> <div>
<el-form-item label="sig" prop="sig"> <el-form-item label="sig" prop="sig">
<el-input v-model="item.sig" <el-input
placeholder="请输入具体用法"/> v-model="item.sig"
placeholder="请输入具体用法"
/>
</el-form-item> </el-form-item>
</div> </div>
<div class="content-option"> <div class="content-option">
<i class="el-icon-plus" @click="addRow('medication')"/> <i class="el-icon-plus" @click="addRow('medication')" />
<i class="el-icon-minus" @click="minusRow(index,'medication')"/> <i class="el-icon-minus" @click="minusRow(index,'medication')" />
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
...@@ -190,8 +199,11 @@ ...@@ -190,8 +199,11 @@
<div v-for="(singleItem, index) in prescribingForm.inspect" :key="index" class="single-medication"> <div v-for="(singleItem, index) in prescribingForm.inspect" :key="index" class="single-medication">
<div class="single-file"> <div class="single-file">
<el-form-item label="检查类型" prop="checktype"> <el-form-item label="检查类型" prop="checktype">
<el-select v-model="singleItem.checkType" clearable placeholder="检查类型" <el-select
@change="getCheckItemOptions" v-model="singleItem.checkType"
clearable
placeholder="检查类型"
@change="getCheckItemOptions"
> >
<el-option <el-option
v-for="(item, index) in dict.type.check_type" v-for="(item, index) in dict.type.check_type"
...@@ -203,10 +215,13 @@ ...@@ -203,10 +215,13 @@
</el-form-item> </el-form-item>
</div> </div>
<div class="single-file"> <div class="single-file">
<el-form-item label="项目" prop="checkItemsid" :rules="{validator: validatePharmaceuticalsOther(singleItem, 'checkItemsId', '项目'), trigger: 'blur'}"> <el-form-item label="项目" prop="checkItemsid" :rules="{validator: validatePharmaceuticalsOther(singleItem, 'checkItemsId', '项目'), trigger: 'blur'}">
<el-select v-model="singleItem.checkItemsId" clearable placeholder="请选择" <el-select
@change="setCheckItemsName(singleItem,checkItemOptions)" v-model="singleItem.checkItemsId"
:disabled="validatePharmaceuticalsOther(singleItem, 'checkItemsId', '项目')(null, null, msg => {})" clearable
placeholder="请选择"
:disabled="validatePharmaceuticalsOther(singleItem, 'checkItemsId', '项目')(null, null, msg => {})"
@change="setCheckItemsName(singleItem,checkItemOptions)"
> >
<el-option <el-option
v-for="(item, index) in checkItemOptions" v-for="(item, index) in checkItemOptions"
...@@ -218,8 +233,8 @@ ...@@ -218,8 +233,8 @@
</el-form-item> </el-form-item>
</div> </div>
<div class="content-option"> <div class="content-option">
<i class="el-icon-plus" @click="addRow('inspect')"/> <i class="el-icon-plus" @click="addRow('inspect')" />
<i class="el-icon-minus" @click="minusRow(index,'inspect')"/> <i class="el-icon-minus" @click="minusRow(index,'inspect')" />
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
...@@ -230,8 +245,11 @@ ...@@ -230,8 +245,11 @@
<div v-for="(singleItem, index) in prescribingForm.treatment" :key="index" class="single-medication"> <div v-for="(singleItem, index) in prescribingForm.treatment" :key="index" class="single-medication">
<div class="single-file"> <div class="single-file">
<el-form-item label="治疗名称:"> <el-form-item label="治疗名称:">
<el-select v-model="singleItem.treatItemsId" clearable placeholder="请选择" <el-select
@change="setTreatItemsName(singleItem,treatItemOptions)" v-model="singleItem.treatItemsId"
clearable
placeholder="请选择"
@change="setTreatItemsName(singleItem,treatItemOptions)"
> >
<el-option <el-option
v-for="(item, index) in treatItemOptions" v-for="(item, index) in treatItemOptions"
...@@ -243,8 +261,8 @@ ...@@ -243,8 +261,8 @@
</el-form-item> </el-form-item>
</div> </div>
<div class="content-option"> <div class="content-option">
<i class="el-icon-plus" @click="addRow('treatment')"/> <i class="el-icon-plus" @click="addRow('treatment')" />
<i class="el-icon-minus" @click="minusRow(index,'treatment')"/> <i class="el-icon-minus" @click="minusRow(index,'treatment')" />
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
...@@ -253,7 +271,7 @@ ...@@ -253,7 +271,7 @@
<el-row class="hospital-content"> <el-row class="hospital-content">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="住院治疗"> <el-form-item label="住院治疗">
<el-input-number v-model="registerForm.petSex" :max="10" :min="1" controls-position="right"/> <el-input-number v-model="registerForm.petSex" :max="10" :min="1" controls-position="right" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -317,7 +335,12 @@ export default { ...@@ -317,7 +335,12 @@ export default {
}, },
// 新增挂号宠物的所有信息 // 新增挂号宠物的所有信息
registerForm: { registerForm: {
type: Object type: Object,
default() {
return {
petOwnerBo: {}
}
}
}, },
// 新增挂号--填写传的信息(医嘱。。。) // 新增挂号--填写传的信息(医嘱。。。)
visitForm: { visitForm: {
......
...@@ -74,7 +74,6 @@ ...@@ -74,7 +74,6 @@
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:total="total" :total="total"
@current-change="handleCurrentChange"
@pagination="getRegisterMsg" @pagination="getRegisterMsg"
/> />
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
......
...@@ -454,6 +454,7 @@ color: #333333;" ...@@ -454,6 +454,7 @@ color: #333333;"
</div> </div>
<!-- 开具处方弹出框--> <!-- 开具处方弹出框-->
<prescribing-modle <prescribing-modle
v-if="showPrescribing"
:is-show="showPrescribing" :is-show="showPrescribing"
:register-form="openForm" :register-form="openForm"
:visit-form="visitForm" :visit-form="visitForm"
...@@ -493,7 +494,9 @@ export default { ...@@ -493,7 +494,9 @@ export default {
// 进度 // 进度
scheduleKey: { checkSchedule: '', diagnosisTime: '', registrationTime: '', reportTime: '', recipelTime: '' }, scheduleKey: { checkSchedule: '', diagnosisTime: '', registrationTime: '', reportTime: '', recipelTime: '' },
// 挂号处方信息传值 // 挂号处方信息传值
openForm: {}, openForm: {
petOwnerBo: {}
},
regiterForm: {}, regiterForm: {},
// 就诊信息模块 // 就诊信息模块
visitForm: {}, visitForm: {},
......
...@@ -117,18 +117,18 @@ ...@@ -117,18 +117,18 @@
</el-row> </el-row>
<el-table <el-table
ref="table"
v-loading="loading" v-loading="loading"
:data="registerList" :data="registerList"
ref="table"
row-key="id" row-key="id"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
@select-all="selectAll" @select-all="selectAll"
> >
<el-table-column align="center" reserve-selection type="selection" width="55" /> <el-table-column align="center" reserve-selection type="selection" width="55" />
<el-table-column align="center" label="序号" min-width="55" prop="index" show-overflow-tooltip type="index" /> <el-table-column align="center" label="序号" min-width="55" prop="index" show-overflow-tooltip type="index" />
<el-table-column align="center" label="挂号方式" min-width="70" prop="type" show-overflow-tooltip > <el-table-column align="center" label="挂号方式" min-width="70" prop="type" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.type === '1'? '现场' : '预约' }}</span> <span>{{ scope.row.type === '1'? '现场' : '预约' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="宠物昵称" min-width="70" prop="petNickname" show-overflow-tooltip /> <el-table-column align="center" label="宠物昵称" min-width="70" prop="petNickname" show-overflow-tooltip />
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
</template> </template>
<script> <script>
import { listRegister, getRegister, delRegister, addRegister, updateRegister, checkPet } from '@/api/business/register' import { listRegister, checkPet } from '@/api/business/register'
export default { export default {
name: 'Register', name: 'Register',
......
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