Skip to content

P
pet-business-web
Commit ba79d090 authored by 小费同学阿's avatar 小费同学阿 💬
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/service-management/registration-queue/registration-queue.vue
parents 7952c5d5 bb6438c9
Show whitespace changes
Inline Side-by-side
Showing with 146 additions and 109 deletions
src/api/business/register.js
View file @ ba79d090
...@@ -9,6 +9,14 @@ export function listRegister(query) { ...@@ -9,6 +9,14 @@ export function listRegister(query) {
}) })
} }
// 查询科室下拉
export function getDepartment() {
return request({
url: '/system/department/listAllDepartment',
method: 'get'
})
}
// 查询挂号详细 // 查询挂号详细
export function getRegister(id) { export function getRegister(id) {
return request({ return request({
......
src/views/equipment-management/equipment-management/equipment-add.vue
View file @ ba79d090
...@@ -379,7 +379,7 @@ export default { ...@@ -379,7 +379,7 @@ export default {
{ type: 'number', validator: this.validUseNum, trigger: 'change' } { type: 'number', validator: this.validUseNum, trigger: 'change' }
], ],
address: [ address: [
{ required: true, message: '请输入服务地址', trigger: 'blur' } { required: true, message: '请输入详细地址地址(街道、楼牌号等)', trigger: 'blur' }
], ],
'useTime.ams': [ 'useTime.ams': [
{ required: true, validator: this.validateMorningStart, trigger: 'change' } { required: true, validator: this.validateMorningStart, trigger: 'change' }
......
src/views/equipment-management/equipment-management/equipment-detail.vue
View file @ ba79d090
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
<el-form-item :label="userType === '00' ?'平台自有设备':'医院自有设备'" prop="isPrivate"> <el-form-item :label="userType === '00' ?'平台自有设备':'医院自有设备'" prop="isPrivate">
<el-select v-model="form.isPrivate" disabled style="width: 250px"> <el-select v-model="form.isPrivate" disabled style="width: 250px">
<el-option <el-option
v-for="index in optionss" v-for="(item, index) in optionss"
:key="index" :key="index"
:label="index.label" :label="item.label"
:value="index.value" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
<el-cascader <el-cascader
ref="serviceArea" ref="serviceArea"
v-model="form.selectedOptions" v-model="form.selectedOptions"
disabled
size="large" size="large"
:options="cityOptions" :options="cityOptions"
placeholder="暂无数据" placeholder="暂无数据"
...@@ -180,7 +181,7 @@ ...@@ -180,7 +181,7 @@
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
<e-col :span="8"> <el-col :span="8">
<el-form-item label="下午开始时间"> <el-form-item label="下午开始时间">
<el-time-select <el-time-select
v-model="form.useTime.pme" v-model="form.useTime.pme"
...@@ -198,7 +199,7 @@ ...@@ -198,7 +199,7 @@
}" }"
/> />
</el-form-item> </el-form-item>
</e-col> </el-col>
</el-row> </el-row>
<!-- 6--> <!-- 6-->
<el-row> <el-row>
...@@ -335,9 +336,9 @@ ...@@ -335,9 +336,9 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="hpshow" label="医院自有设备" prop="deviceName"> <el-form-item v-if="hpshow" label="医院自有设备">
<el-select v-model="form.isPrivate"disabled style="width: 250px" placeholder="请选择医院自有设备"> <el-select v-model="form.isPrivate" disabled style="width: 250px" placeholder="请选择医院自有设备">
<el-option <el-option
v-for="(item ,index) in optionss" v-for="(item ,index) in optionss"
:key="index" :key="index"
...@@ -381,7 +382,7 @@ ...@@ -381,7 +382,7 @@
<el-form-item label="服务地点" prop="selectedOptions"> <el-form-item label="服务地点" prop="selectedOptions">
<el-cascader <el-cascader
ref="serviceArea" ref="serviceArea"
v-model="selectedOptions" v-model="form.selectedOptions"
size="large" size="large"
:options="cityOptions" :options="cityOptions"
placeholder="请选择服务地点" placeholder="请选择服务地点"
...@@ -650,7 +651,7 @@ export default { ...@@ -650,7 +651,7 @@ export default {
cityOptions: regionData, cityOptions: regionData,
// 存储省市区选中的地址码 // 存储省市区选中的地址码
selectedOptions: [], // selectedOptions: [],
// 地址码对用的文字 // 地址码对用的文字
addtions: { addtions: {
names: '' names: ''
...@@ -702,9 +703,13 @@ export default { ...@@ -702,9 +703,13 @@ export default {
deviceType: [ deviceType: [
{ required: true, message: '请选择设备类型', trigger: 'change' } { required: true, message: '请选择设备类型', trigger: 'change' }
], ],
addressCode: [ selectedOptions: [
{ required: true, message: '请选择服务地点', trigger: 'change,blur' } // { required: true, message: '请选择服务地点', trigger: 'blur' }
{ required: true, validator: this.validaddress, trigger: 'blur' }
], ],
// addressCode: [
// { required: true, message: '请选择服务地点', trigger: 'change,blur' }
// ],
address: [ address: [
{ required: true, message: '请输入服务地址', trigger: 'blur' } { required: true, message: '请输入服务地址', trigger: 'blur' }
], ],
...@@ -861,7 +866,7 @@ export default { ...@@ -861,7 +866,7 @@ export default {
}, },
// 权重不能为0 // 权重不能为0
validWeigh(rule, value, callback) { validWeigh(rule, value, callback) {
console.log('value', value) // console.log('value', value)
if (value > 0) { if (value > 0) {
callback() callback()
} else { } else {
...@@ -870,22 +875,30 @@ export default { ...@@ -870,22 +875,30 @@ export default {
}, },
// 单位时段服务数不能为0 // 单位时段服务数不能为0
validUseNum(rule, value, callback) { validUseNum(rule, value, callback) {
console.log('value', value) // console.log('value', value)
if (value > 0) { if (value > 0) {
callback() callback()
} else { } else {
callback(new Error('单位时段服务数不能为0')) callback(new Error('单位时段服务数不能为0'))
} }
}, },
validaddress(rule, value, callback) {
console.log('validaddress', this.form.selectedOptions)
if (this.form.selectedOptions.length>0) {
callback()
} else {
callback(new Error('请选择服务地点'))
}
},
// 四个时间的表单校验 // 四个时间的表单校验
validateMorningStart(rule, value, callback) { validateMorningStart(rule, value, callback) {
// // TODO: please clear this log // // TODO: please clear this log
const morningEnd = this.form.useTime.ame const morningEnd = this.form.useTime.ame
console.log('value', value) // console.log('value', value)
console.log('morningEnd', morningEnd) // console.log('morningEnd', morningEnd)
console.log('this.form.useTime.ame', this.form.useTime.ame) // console.log('this.form.useTime.ame', this.form.useTime.ame)
console.log('this.form.useTime.pms', this.form.useTime.pms) // console.log('this.form.useTime.pms', this.form.useTime.pms)
console.log('his.form.useTime.pme', this.form.useTime.pme) // console.log('his.form.useTime.pme', this.form.useTime.pme)
// if (isEmpty(value) && isEmpty(this.form.useTime.ams) || isEmpty(this.form.useTime.ame)) // if (isEmpty(value) && isEmpty(this.form.useTime.ams) || isEmpty(this.form.useTime.ame))
if (isEmpty(value) && isEmpty(this.form.useTime.ame) && isEmpty(this.form.useTime.pms) && isEmpty(this.form.useTime.pme)) { if (isEmpty(value) && isEmpty(this.form.useTime.ame) && isEmpty(this.form.useTime.pms) && isEmpty(this.form.useTime.pme)) {
console.log('上午开始时间第一层报错') console.log('上午开始时间第一层报错')
...@@ -943,16 +956,16 @@ export default { ...@@ -943,16 +956,16 @@ export default {
}, },
// 选择地址 // 选择地址
handleChangeAddress(value) { handleChangeAddress(value) {
this.selectedOptions = value this.form.selectedOptions = value
console.log('地区码', this.selectedOptions) console.log('地区码', this.form.selectedOptions)
var name = '' var name = ''
this.selectedOptions.map(item => name += CodeToText[item] + '') // 将省市区三个拼接一起 this.form.selectedOptions.map(item => name += CodeToText[item] + '') // 将省市区三个拼接一起
this.addtions.names = name this.addtions.names = name
console.log(this.addtions.names) console.log(this.addtions.names)
// 运用了CodeToText把编码转成了中文 // 运用了CodeToText把编码转成了中文
this.addForm.province = CodeToText[this.selectedOptions[0]] this.addForm.province = CodeToText[ this.form.selectedOptions[0]]
this.addForm.county = CodeToText[this.selectedOptions[1]] this.addForm.county = CodeToText[ this.form.selectedOptions[1]]
this.addForm.area = CodeToText[this.selectedOptions[2]] this.addForm.area = CodeToText[ this.form.selectedOptions[2]]
if (this.addForm.county === '市辖区' || this.addForm.county === '县') { if (this.addForm.county === '市辖区' || this.addForm.county === '县') {
this.city = this.addForm.province this.city = this.addForm.province
} else { } else {
...@@ -964,9 +977,9 @@ export default { ...@@ -964,9 +977,9 @@ export default {
// 提交 // 提交
submitForm() { submitForm() {
const form = deepClone(this.form) const form = deepClone(this.form)
console.log('selectedOptions', this.selectedOptions) console.log('selectedOptions', form.selectedOptions)
if (this.selectedOptions != null) { if (form.selectedOptions != null) {
form.addressCode = this.selectedOptions.join(',') form.addressCode = form.selectedOptions.join(',')
} }
if (this.addtions.names != null) { if (this.addtions.names != null) {
form.addressText = this.addtions.names form.addressText = this.addtions.names
...@@ -1022,15 +1035,13 @@ export default { ...@@ -1022,15 +1035,13 @@ export default {
handleUpdate() { handleUpdate() {
getDevice(this.id).then(response => { getDevice(this.id).then(response => {
this.form = response.data this.form = response.data
if (this.selectedOptions != null && this.selectedOptions !== '') { // if (this.form.selectedOptions != null && this.form.selectedOptions !== '') {
this.selectedOptions = response.data.addressCode.split(',') this.form.selectedOptions = response.data.addressCode.split(',')
console.log(':fsdfsddddddddd???????', response.data.addressCode) //
console.log('详细个bbbbb', this.selectedOptions) // }
console.log('详细个ccccccccccc', this.form.selectedOptions) // if (this.form.serviceArea != null && this.form.serviceArea !== '') {
}
if (this.form.serviceArea != null && this.form.serviceArea !== '') {
this.form.serviceArea = response.data.serviceArea.split(',') this.form.serviceArea = response.data.serviceArea.split(',')
} // }
if (this.form.checkType != null && this.form.checkType !== '') { if (this.form.checkType != null && this.form.checkType !== '') {
this.form.checkType = response.data.checkType.split(',') this.form.checkType = response.data.checkType.split(',')
} }
...@@ -1039,7 +1050,9 @@ export default { ...@@ -1039,7 +1050,9 @@ export default {
this.form.useTime = JSON.parse(response.data.useTime) this.form.useTime = JSON.parse(response.data.useTime)
} }
// this.checkType = response.data.checkType.split(',') // this.checkType = response.data.checkType.split(',')
console.log(':fsdfsddddddddd???????', response.data.addressCode)
console.log('详细个bbbbb', this.selectedOptions)
console.log('详细个ccccccccccc', this.form.selectedOptions)
console.log('详情数据---', this.form) console.log('详情数据---', this.form)
// this.serviceAreaS = this.form.serviceArea.split(';') // this.serviceAreaS = this.form.serviceArea.split(';')
// this.serviceArea = [] // this.serviceArea = []
......
src/views/service-management/medical-record-management/medical-record-management.vue
View file @ ba79d090
...@@ -176,8 +176,6 @@ ...@@ -176,8 +176,6 @@
:disabled="scope.row.deviceId !== null" :disabled="scope.row.deviceId !== null"
>立即预约 >立即预约
</el-button> </el-button>
@click="handleSubscribe(scope.row)"
>立即预约</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
src/views/service-management/registration-queue/components/prescribing-modle.vue
View file @ ba79d090
...@@ -348,6 +348,16 @@ export default { ...@@ -348,6 +348,16 @@ export default {
} }
}, },
watch: {
registerForm(val) {
if (val.checkManageBos.length > 0) {
this.prescribingForm.inspect = [...val.checkManageBos]
}
if (val.treatManageBo.length > 0) {
this.prescribingForm.treatment = [...val.treatManageBo]
}
}
},
data() { data() {
const validNum = (rule, value, callback) => { const validNum = (rule, value, callback) => {
console.log('这是自定义校验', value) console.log('这是自定义校验', value)
...@@ -452,7 +462,8 @@ export default { ...@@ -452,7 +462,8 @@ export default {
return { return {
label: item.name, label: item.name,
value: item.id, value: item.id,
type: item.type type: item.type,
price: item.price
} }
}) })
console.log('treatItemOptions!!!!!!!!!!!!!', this.treatItemOptions) console.log('treatItemOptions!!!!!!!!!!!!!', this.treatItemOptions)
......
src/views/service-management/registration-queue/components/register-modle.vue
View file @ ba79d090
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<el-table-column align="center" class-name="small-padding fixed-width" label="操作" min-width="160"> <el-table-column align="center" class-name="small-padding fixed-width" label="操作" min-width="160">
<template #default="{row}"> <template #default="{row}">
<el-button <el-button
:disabled="!inTimeRange(row.hours.split('~')[0], row.hours.split('~')[1])" :disabled="registrationType !== '0' ? !inTimeRange(row.hours.split('~')[0], row.hours.split('~')[1]) : afterTime(row.hours.split('~')[0], row.hours.split('~')[1])"
icon="el-icon-document" icon="el-icon-document"
plain plain
size="mini" size="mini"
...@@ -180,6 +180,7 @@ export default { ...@@ -180,6 +180,7 @@ export default {
* @param end 结束时间 时:分 * @param end 结束时间 时:分
*/ */
inTimeRange(start, end) { inTimeRange(start, end) {
console.log(start, end)
const current = moment() const current = moment()
const startTime = moment({ hour: start.split(':')[0], minute: start.split(':')[1] }) const startTime = moment({ hour: start.split(':')[0], minute: start.split(':')[1] })
const endTime = moment({ hour: end.split(':')[0], minute: end.split(':')[1] }) const endTime = moment({ hour: end.split(':')[0], minute: end.split(':')[1] })
...@@ -191,6 +192,17 @@ export default { ...@@ -191,6 +192,17 @@ export default {
console.log(`endTime.format('YYYY/MM/DD HH:mm:ss')`, endTime.format('YYYY/MM/DD HH:mm:ss')) console.log(`endTime.format('YYYY/MM/DD HH:mm:ss')`, endTime.format('YYYY/MM/DD HH:mm:ss'))
return current.isBetween(startTime, endTime, 'minute') return current.isBetween(startTime, endTime, 'minute')
}, },
/**
* 判断当前时间是否在传入的时间范围后
* @param start 开始时间 时:分
* @param end 结束时间 时:分
*/
afterTime(start, end) {
console.log(start, end)
const current = moment()
const endTime = moment({ hour: end.split(':')[0], minute: end.split(':')[1] })
return current.isAfter(endTime)
},
parseTime, parseTime,
/** /**
* 获取医生当日排班列表 * 获取医生当日排班列表
......
src/views/service-management/registration-queue/registration-add.vue
View file @ ba79d090
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
</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="vaccineSituation">
<el-select <el-select
v-model="form.vaccineSituation" v-model="form.vaccineSituation"
:disabled="!isEdit" :disabled="!isEdit"
......
src/views/service-management/registration-queue/registration-queue.vue
View file @ ba79d090
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="type"> <el-form-item prop="departmentId">
<el-select <el-select
v-model="queryParams.type" v-model="queryParams.type"
clearable clearable
...@@ -32,14 +32,14 @@ ...@@ -32,14 +32,14 @@
placeholder="所属科室" placeholder="所属科室"
> >
<el-option <el-option
v-for="item in registerList.departmentList" v-for="item in departmentList"
:key="item.value" :key="item.deptId"
:label="item.label" :label="item.departmentName"
:value="item.value" :value="item.departmentName"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="departmentId"> <el-form-item prop="doctorName">
<el-select <el-select
v-model="queryParams.doctorName" v-model="queryParams.doctorName"
clearable clearable
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
v-for="item in doctorNameList" v-for="item in doctorNameList"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.label"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</el-form-item> </el-form-item>
<el-form-item prop="sort"> <el-form-item prop="sort">
<el-select <el-select
v-model="queryParams.params.sort" v-model="queryParams.sort"
clearable clearable
placeholder="请选择排序方式" placeholder="请选择排序方式"
> >
...@@ -123,27 +123,27 @@ ...@@ -123,27 +123,27 @@
@select="selectChange" @select="selectChange"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<el-table-column align="center" type="selection" width="55" /> <el-table-column align="center" 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/>
<el-table-column align="center" label="宠物保险" min-width="70" prop="insure" show-overflow-tooltip> <el-table-column align="center" label="宠物保险" min-width="70" prop="insure" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.pet_insure" :value="scope.row.insure" /> <dict-tag :options="dict.type.pet_insure" :value="scope.row.insure"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="宠主姓名" min-width="70" prop="petOwnersName" show-overflow-tooltip /> <el-table-column align="center" label="宠主姓名" min-width="70" prop="petOwnersName" show-overflow-tooltip/>
<el-table-column align="center" label="联系方式" min-width="70" prop="petOwnersPhone" show-overflow-tooltip /> <el-table-column align="center" label="联系方式" min-width="70" prop="petOwnersPhone" show-overflow-tooltip/>
<el-table-column align="center" label="挂号时间" min-width="80" prop="registrationTime" show-overflow-tooltip> <el-table-column align="center" label="挂号时间" min-width="80" prop="registrationTime" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.registrationTime, '{y}/{m}/{d}') }}</span> <span>{{ parseTime(scope.row.registrationTime, '{y}/{m}/{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="预约兽医" min-width="60" prop="doctorName" show-overflow-tooltip /> <el-table-column align="center" label="预约兽医" min-width="60" prop="doctorName" show-overflow-tooltip/>
<el-table-column <el-table-column
align="center" align="center"
label="所属科室" label="所属科室"
...@@ -151,8 +151,8 @@ ...@@ -151,8 +151,8 @@
prop="hospitalDepartmentName" prop="hospitalDepartmentName"
show-overflow-tooltip show-overflow-tooltip
/> />
<el-table-column align="center" label="就诊方式" min-width="70" prop="visitWay" show-overflow-tooltip /> <el-table-column align="center" label="就诊方式" min-width="70" prop="visitWay" show-overflow-tooltip/>
<el-table-column align="center" label="是否首诊" min-width="70" prop="firstVisit" show-overflow-tooltip /> <el-table-column align="center" label="是否首诊" min-width="70" prop="firstVisit" show-overflow-tooltip/>
<el-table-column align="center" label="就诊时间" min-width="80" prop="visitDate" show-overflow-tooltip> <el-table-column align="center" label="就诊时间" min-width="80" prop="visitDate" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.visitDate, '{y}/{m}/{d}') }}</span> <span>{{ parseTime(scope.row.visitDate, '{y}/{m}/{d}') }}</span>
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="缴费状态" min-width="70" prop="payStatus" show-overflow-tooltip> <el-table-column align="center" label="缴费状态" min-width="70" prop="payStatus" show-overflow-tooltip>
<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" class-name="small-padding fixed-width" label="操作" min-width="180"> <el-table-column align="center" class-name="small-padding fixed-width" label="操作" min-width="180">
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
</template> </template>
<script> <script>
import { listRegister, checkPet } from '@/api/business/register' import { listRegister,getDepartment, checkPet } from '@/api/business/register'
export default { export default {
name: 'Register', name: 'Register',
...@@ -217,7 +217,7 @@ export default { ...@@ -217,7 +217,7 @@ export default {
registerTypeList: [ registerTypeList: [
{ {
label: '全部', label: '全部',
value: '0' value: ''
}, },
{ {
label: '现场挂号', label: '现场挂号',
...@@ -225,29 +225,12 @@ export default { ...@@ -225,29 +225,12 @@ export default {
}, },
{ {
label: '预约挂号', label: '预约挂号',
value: '2'
}
],
// 所属科室下拉框字典写死
departmentList: [
{
label: '全部',
value: '0' value: '0'
},
{
label: '胸肺科',
value: '1'
},
{
label: '呼吸科',
value: '2'
},
{
label: '脑科',
value: '3'
} }
], ],
// 所属科室下拉框字典写死 // 所属科室下拉框字典写死
departmentList: [],
// 所属科室下拉框字典写死
doctorNameList: [ doctorNameList: [
{ {
label: '全部', label: '全部',
...@@ -306,9 +289,7 @@ export default { ...@@ -306,9 +289,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
// 排序方式声明 // 排序方式声明
params: { sort: '',
sort: null
},
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
type: null, type: null,
...@@ -329,8 +310,8 @@ export default { ...@@ -329,8 +310,8 @@ export default {
doctorId: null, doctorId: null,
doctorName: null, doctorName: null,
deptId: null, deptId: null,
departmentId: null, hospitalDepartId: null,
departmentName: null, hospitalDepartmentName: null,
doctorPhone: null, doctorPhone: null,
visitWay: null, visitWay: null,
firstVisit: null, firstVisit: null,
...@@ -350,6 +331,7 @@ export default { ...@@ -350,6 +331,7 @@ export default {
}, },
created() { created() {
this.getList() this.getList()
this.getDeptList()
}, },
methods: { methods: {
/** 查询挂号列表 */ /** 查询挂号列表 */
...@@ -362,13 +344,17 @@ export default { ...@@ -362,13 +344,17 @@ export default {
this.registerIds = response.rows.idList this.registerIds = response.rows.idList
this.registerIdsForever = response.rows.idList this.registerIdsForever = response.rows.idList
console.log('这是我要调的挂号列表内容：', this.registerList) console.log('这是我要调的挂号列表内容：', this.registerList)
this.departmentList = response.rows.rows.hospitalDepartmentName
console.log('这就是我要的号呀~~：', this.departmentList)
this.total = response.total this.total = response.total
this.loading = false this.loading = false
this.manualCheck() this.manualCheck()
}) })
}, },
/** 查询科室下拉*/
getDeptList() {
getDepartment().then(res => {
this.departmentList = res.data
})
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false this.open = false
...@@ -396,8 +382,8 @@ export default { ...@@ -396,8 +382,8 @@ export default {
doctorId: null, doctorId: null,
doctorName: null, doctorName: null,
deptId: null, deptId: null,
departmentId: null, hospitalDepartmentId: null,
departmentName: null, hospitalDepartmentName: null,
doctorPhone: null, doctorPhone: null,
visitWay: null, visitWay: null,
firstVisit: null, firstVisit: null,
...@@ -419,7 +405,6 @@ export default { ...@@ -419,7 +405,6 @@ export default {
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1 this.queryParams.pageNum = 1
console.log('点击搜索', this.queryParams)
this.getList() this.getList()
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
...@@ -497,7 +482,7 @@ export default { ...@@ -497,7 +482,7 @@ export default {
this.download('business/register/export', { this.download('business/register/export', {
...this.queryParams, ...this.queryParams,
params: { params: {
sort: this.queryParams.params.sort, sort: this.sort,
idList: this.ids idList: this.ids
} }
}, `register_${new Date().getTime()}.xlsx`) }, `register_${new Date().getTime()}.xlsx`)
......
src/views/service-management/treatment-management/treatment-detail.vue
View file @ ba79d090
...@@ -102,10 +102,10 @@ ...@@ -102,10 +102,10 @@
<!-- 步骤条 --> <!-- 步骤条 -->
<div> <div>
<el-steps :active="schedule" align-center> <el-steps :active="schedule" align-center>
<el-step title="开具处方单" :description="checkDetail.createTime" /> <el-step title="开具处方单" :description="createTime" />
<el-step title="缴费开票" :description="checkDetail.payTime || '暂未缴费'" /> <el-step title="缴费开票" :description="checkDetail.payTime || '暂未缴费'" />
<el-step title="分配诊室" :description="checkDetail.treatStartTime || '暂未预约'" /> <el-step title="分配诊室" :description="checkDetail.treatStartTime || '暂未预约'" />
<el-step title="治疗" :description="checkDetail.reportTime || '暂未检查'" /> <el-step title="治疗" :description="checkDetail.reportTime || '暂未治疗'" />
</el-steps> </el-steps>
</div> </div>
<div class="title-paragraph"> <div class="title-paragraph">
...@@ -115,13 +115,15 @@ ...@@ -115,13 +115,15 @@
<el-row v-show="treatSchedule<=1"> <el-row v-show="treatSchedule<=1">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="代缴费金额"> <el-form-item label="代缴费金额">
<span>{{ checkDetail.payAmount }}</span> <span v-show="checkDetail.payAmount!==null&&checkDetail.payAmount!==''">￥</span>
<span>{{ checkDetail.payAmount || '-' }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-show="treatSchedule>1"> <el-row v-show="treatSchedule>1">
<el-col :span="8"> <el-col :span="8">
<el-form-item label="缴费金额"> <el-form-item label="缴费金额">
<span v-show="checkDetail.payAmount!==null&&checkDetail.payAmount!==''">￥</span>
<span>{{ checkDetail.payAmount || '-' }}</span> <span>{{ checkDetail.payAmount || '-' }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -179,12 +181,12 @@ ...@@ -179,12 +181,12 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="治疗类型"> <el-form-item label="治疗类型">
<span>{{ checkDetail.treatItemsType || '-' }}</span> <dict-tag :options="dict.type.treat_type" :value="checkDetail.treatItemsType" />
</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="治疗项目">
<span>{{checkDetail.treatItemsName || '-'}}</span> <span>{{ checkDetail.treatItemsName || '-' }}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -198,13 +200,13 @@ ...@@ -198,13 +200,13 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="日志上传时间"> <el-form-item label="日志上传时间">
<span>{{ checkDetail.reportTime || '暂未上传'}}</span> <span>{{ checkDetail.reportTime || '暂未上传' }}</span>
</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="治疗日志">
<span v-if="checkDetail.shadowReport===''||checkDetail.shadowReport===null">{{ '暂未上传' }}</span> <span v-if="checkDetail.shadowReport===''||checkDetail.shadowReport===null">{{ '暂未上传' }}</span>
<el-button v-else @click="viewTheReport" class="fourWordsBtn">查看报告</el-button> <el-button v-else class="fourWordsBtn" @click="viewTheReport">查看报告</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -382,10 +384,13 @@ import { parseTime } from '@/utils/ruoyi' ...@@ -382,10 +384,13 @@ import { parseTime } from '@/utils/ruoyi'
export default { export default {
name: 'TreatmentDetail', name: 'TreatmentDetail',
dicts: ['treat_type'],
data() { data() {
return { return {
// 开报告时间
createTime: '',
// 上传日志 // 上传日志
videoReport: null, videoReport: '',
// 治疗时间 // 治疗时间
treatStartDate: '', treatStartDate: '',
treatStartTime: '', treatStartTime: '',
...@@ -451,6 +456,7 @@ export default { ...@@ -451,6 +456,7 @@ export default {
// 更新治疗表 // 更新治疗表
const list = [] const list = []
list.push(this.checkDetail) list.push(this.checkDetail)
if (this.videoReport !== '') {
updateTreatList(list).then(res => { updateTreatList(list).then(res => {
if (res.code === 200) { if (res.code === 200) {
this.$message.success('上传成功') this.$message.success('上传成功')
...@@ -458,6 +464,9 @@ export default { ...@@ -458,6 +464,9 @@ export default {
} }
}) })
this.videoReportVisible = false this.videoReportVisible = false
} else {
this.$message.error('请上传日志')
}
}, },
/** 上传报告对话框取消 */ /** 上传报告对话框取消 */
cancelVideo() { cancelVideo() {
...@@ -561,6 +570,7 @@ export default { ...@@ -561,6 +570,7 @@ export default {
this.treatStartDate = dateString.substr(0, 10) this.treatStartDate = dateString.substr(0, 10)
this.treatStartTime = dateString.substr(11, 5) this.treatStartTime = dateString.substr(11, 5)
} }
this.createTime = this.checkDetail.createTime.substring(0, 16)
}) })
}, },
// 返回上一页 // 返回上一页
......
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