Commit 53b1910f authored by 小费同学阿's avatar 小费同学阿 💬

Merge remote-tracking branch 'origin/master'

parents 8c7261f6 db2d1cb1
......@@ -119,7 +119,7 @@ color: #333333;"
clearable
placeholder="请选择宠物生日"
type="date"
value-format="yyyy-MM-dd"
value-format="yyyy/MM/dd"
/>
</el-form-item>
</el-col>
......
......@@ -252,7 +252,7 @@ export default {
petOwnersName: this.doctorForm.nickName,
petOwnersPhone: this.doctorForm.phoneNumber,
petNickname: this.doctorForm.petNickname,
petBreed: this.doctorForm.petBreed.join(),
petBreed: this.doctorForm.petBreed,
petSex: this.doctorForm.petSex,
petBirthday: this.doctorForm.petBirthday.replaceAll('-', '/'),
petWeight: this.doctorForm.petWeight,
......
......@@ -46,15 +46,6 @@
clearable
collapse-tags
/>
<el-cascader
v-model.trim="form.petBreed"
placeholder="请选择宠物品种"
:options="options"
:disabled="!isEdit"
:props="props"
clearable
collapse-tags
/>
</el-form-item>
</el-form-item>
</el-col>
......@@ -201,12 +192,12 @@
{{ form.createTime }}
</el-form-item>
</el-col>
<el-col v-if="form.customers==='1'" :span="8">
<el-col v-if="form.customers !=='0'" :span="8">
<el-form-item label="会员等级:">
{{ form.membershipLevel ? form.membershipLevel : '-' }}
</el-form-item>
</el-col>
<el-col v-if="form.customers==='1'" :span="8">
<el-col v-if="form.customers !=='0'" :span="8">
<el-form-item label="会员卡余额:">
{{ form.cardBalance ? form.cardBalance : '-' }}
</el-form-item>
......
......@@ -104,7 +104,7 @@
<el-steps :active="schedule" align-center>
<el-step title="开具处方单" :description="createTime" />
<el-step title="缴费开票" :description="checkDetail.payTime || '暂未缴费'" />
<el-step title="分配诊室" :description="checkDetail.treatStartTime || '暂未预约'" />
<el-step title="分配诊室" :description="checkDetail.consultRoomTime || '暂未预约'" />
<el-step title="治疗" :description="checkDetail.reportTime || '暂未治疗'" />
</el-steps>
</div>
......@@ -134,7 +134,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="缴费时间">
<span>{{ checkDetail.payTime || '-' }}</span>
<span>{{ payTime|| '-' }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -200,7 +200,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="日志上传时间">
<span>{{ checkDetail.reportTime || '暂未上传' }}</span>
<span>{{ reportTime|| '暂未上传' }}</span>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -219,7 +219,7 @@
<el-button style="width: 98px;height: 32px;" icon="el-icon-back" class="resetBtn" @click="goBack">返 回</el-button>
</div>
<!-- 分配诊室对话框 -->
<el-dialog title="分配诊室" :visible.sync="open" width="800px" append-to-body :close-on-press-escape="false" :close-on-click-modal="false">
<el-dialog title="分配诊室" :visible.sync="open" width="800px" append-to-body :close-on-press-escape="false" :close-on-click-modal="false" @close="closeDialogRoom">
<div style="display: flex;padding-bottom: 20px;">
<div class="tip1" />
<div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">预约记录</div>
......@@ -387,6 +387,10 @@ export default {
dicts: ['treat_type'],
data() {
return {
// 上传报时间
reportTime: null,
// 缴费时间
payTime: null,
// 开报告时间
createTime: '',
// 上传日志
......@@ -456,7 +460,7 @@ export default {
// 更新治疗表
const list = []
list.push(this.checkDetail)
if (this.videoReport !== '') {
if (this.videoReport !== '' && this.videoReport !== null) {
updateTreatList(list).then(res => {
if (res.code === 200) {
this.$message.success('上传成功')
......@@ -534,6 +538,7 @@ export default {
this.reservationForm.treatStartTime = this.appointmentRoom.treatDate + ' ' + this.appointmentRoom.sTime
this.reservationForm.treatEndTime = this.appointmentRoom.treatDate + ' ' + this.appointmentRoom.eTime
this.reservationForm.treatSchedule = '2'
this.reservationForm.consultRoomTime = parseTime(new Date())
const reservation = []
reservation.push(this.reservationForm)
console.log('this.reservationForm', this.reservationForm)
......@@ -547,11 +552,36 @@ export default {
}
})
},
closeDialogRoom() {
this.rest()
},
// 取消按钮
cancel() {
this.open = false
this.rest()
},
// 弹出框重置
rest() {
this.treatStartTime = ''
this.reservationForm.consultRoomName = ''
this.appointmentRoomList = []
// 预约诊室
this.appointmentRoom = {
consultRoomId: '',
treatDate: '',
sTime: '',
eTime: ''
}
// 分配诊室搜索预约记录
this.allocationForm = {
pageNum: 1,
pageSize: 10,
treatScheduleList: ['2', '3'],
consultRoomIdList: '',
treatStartTimeS: '',
treatStartTimeE: ''
}
},
// 分配诊室
handleSubscribe() {
this.open = true
......@@ -571,6 +601,12 @@ export default {
this.treatStartTime = dateString.substr(11, 5)
}
this.createTime = this.checkDetail.createTime.substring(0, 16)
if (this.checkDetail.reportTime !== null) {
this.reportTime = this.checkDetail.reportTime.replace(/-/g, '/')
}
if (this.checkDetail.payTime !== null) {
this.payTime = this.checkDetail.payTime.replace(/-/g, '/')
}
})
},
// 返回上一页
......
......@@ -77,8 +77,8 @@
<el-button style="position: relative; float: right;" class="queryBtn" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
</el-row>
<el-table v-loading="loading" ref="table" :data="treatmentList" border :row-key="getRowKeys" @selection-change="handleSelectionChange" :header-cell-class-name="cellClass">
<el-table-column type="selection" width="55" align="center" :reserve-selection="true"/>
<el-table ref="table" v-loading="loading" :data="treatmentList" border :row-key="getRowKeys" :header-cell-class-name="cellClass" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" :reserve-selection="true" />
<el-table-column label="序号" type="index" align="center" />
<el-table-column label="治疗项目" align="center" :show-overflow-tooltip="true" prop="treatItemsName">
<template slot-scope="scope">
......@@ -189,7 +189,7 @@
/>
<!-- 分配诊室对话框 -->
<el-dialog title="分配诊室" :visible.sync="open" width="800px" append-to-body :close-on-press-escape="false" :close-on-click-modal="false">
<el-dialog title="分配诊室" :visible.sync="open" width="800px" append-to-body :close-on-press-escape="false" :close-on-click-modal="false" @close="closeDialogRoom">
<div style="display: flex;padding-bottom: 20px;">
<div class="tip1" />
<div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">预约记录</div>
......@@ -327,8 +327,9 @@
</template>
<script>
import { consultRoomListAll, selectTreatAll, selectTreatListP, updateTreatList} from '@/api/business/treatment'
import { consultRoomListAll, selectTreatAll, selectTreatListP, updateTreatList } from '@/api/business/treatment'
import { listItemByType } from '@/api/business/item'
import { parseTime } from '@/utils/ruoyi'
export default {
name: 'MedicalRecordManagement',
......@@ -508,8 +509,12 @@ export default {
this.queryParams.isAsc = val.collation
this.sortedColumn = val.sortedColumn
},
closeDialogRoom() {
this.rest()
},
// 弹出框重置
rest() {
this.treatStartTime = ''
this.reservationForm.consultRoomName = ''
this.appointmentRoomList = []
// 预约诊室
......@@ -635,6 +640,7 @@ export default {
this.reservationForm.treatStartTime = this.appointmentRoom.treatDate + ' ' + this.appointmentRoom.sTime
this.reservationForm.treatEndTime = this.appointmentRoom.treatDate + ' ' + this.appointmentRoom.eTime
this.reservationForm.treatSchedule = '2'
this.reservationForm.consultRoomTime = parseTime(new Date())
const reservation = []
reservation.push(this.reservationForm)
console.log('this.reservationForm', this.reservationForm)
......
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