Commit c0008813 authored by 高滢's avatar 高滢

治疗 加分配诊室日期

parent 9b3d1961
......@@ -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">
......@@ -387,6 +387,10 @@ export default {
dicts: ['treat_type'],
data() {
return {
// 上传报时间
reportTime: null,
// 缴费时间
payTime: null,
// 开报告时间
createTime: '',
// 上传日志
......@@ -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)
......@@ -571,6 +576,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">
......@@ -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',
......@@ -635,6 +636,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