Skip to content

P
pet-business-web
Commit 3bd11dac authored by 陈明豪's avatar 陈明豪
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 11c5bcde bad52098
Show whitespace changes
Inline Side-by-side
Showing with 72 additions and 106 deletions
src/router/index.js
View file @ 3bd11dac
......@@ -120,10 +120,10 @@ export const constantRoutes = [
},
{
path: 'equipment-edit',
path: 'equipment-detail',
props: true,
component: () => import('@/views/equipment-management/equipment-management/equipment-detail'),
name: 'EquipmentEdit',
name: 'EquipmentDetail',
meta: { title: '设备详情' }
},
{
......
src/views/equipment-management/equipment-management/equipment-detail.vue
View file @ 3bd11dac
......@@ -77,26 +77,7 @@
<el-col :span="16">
<el-form-item label="服务地点">
<InputTips :text="form.selectedOptions" class="inputWidth" />
<!-- <el-cascader-->
<!-- ref="serviceArea"-->
<!-- v-model="form.selectedOptions"-->
<!-- size="large"-->
<!-- :options="areaOptions"-->
<!-- placeholder="-"-->
<!-- expand-trigger="hover"-->
<!-- clearable-->
<!-- class="overflow-hidden"-->
<!-- @change="handleChangeCascader"-->
<!-- @mouseover.native="showTooltip = true"-->
<!-- @mouseout.native="showTooltip = false"-->
<!-- >-->
<!-- <template #suffix>-->
<!-- <el-tooltip placement="top" content="这是提示内容" :disabled="!showTooltip" :offset="[0, 8]">-->
<!-- <i class="el-icon-question" />-->
<!-- </el-tooltip>-->
<!-- </template>-->
<!-- </el-cascader>-->
<InputTips :text="form.addressText" width="18.75rem" />
</el-form-item>
<el-form-item prop="address">
<el-input
......@@ -274,7 +255,7 @@
<el-col>
<el-form-item label="支持服务地区">
<el-input
v-model.trim="form.serviceAreaText"
v-model="form.serviceAreaText"
type="textarea"
class="remark_with"
:row="4"
......@@ -289,10 +270,9 @@
<el-col>
<el-form-item label="支持检查项目">
<el-input
v-model.trim="form.checkTypeText"
v-model="form.checkTypeText"
type="textarea"
class="remark_with"
pacehpl
:row="4"
placeholder="-"
disabled
......@@ -597,27 +577,6 @@
</div>
</el-col>
</el-row>
<!-- 8-->
<el-row>
<el-col>
<el-form-item label="支持服务地区" prop="serviceArea">
<el-cascader
v-model="form.serviceArea"
size="large"
:options="areaOptions"
:props="props"
:disabled="serviceAreaShow"
placeholder="请选择支持服务地区"
collapse-tags
expand-trigger="hover"
clearable
class="inputWidth"
@change="handleChangeServiceArea"
/>
</el-form-item>
</el-col>
</el-row>
<!-- 9-->
<el-row>
<el-col>
<el-form-item label="支持检查项目" prop="checkType">
......@@ -653,7 +612,7 @@ import { getInfo } from '@/api/login'
import { listCheckManage } from '@/api/business/manage'
import { isEmpty, parseTime } from '@/utils/ruoyi'
import { deepClone } from '@/utils'
import { listAllByType, listItemByType } from '@/api/business/item'
import { listItemByType } from '@/api/business/item'
import { mapGetters } from 'vuex'
import { signHospitalMessage } from '@/api/business/hospital'
import InputTips from '@/components/InputTips/InputTips.vue'
......@@ -664,9 +623,9 @@ export default {
data() {
return {
// 日期格式
// replace(time) {
// return parseTime(time, '{y}/{m}/{d}')
// },
replace(time) {
return parseTime(time, '{y}/{m}/{d}')
},
// 检查类型
// checkType: [],
// 地址列表
......@@ -851,7 +810,6 @@ export default {
},
created() {
this.$route.meta.title = '2222'
console.log('當前router', this.$route)
this.id = this.$route.query.id
this.identify = this.$route.query.identify
this.form.isPrivate = this.$route.query.isPrivate
......@@ -865,7 +823,6 @@ export default {
}
this.getAreaData()
this.handleUpdate()
this.getUserInfo()
this.getuseList()
},
computed: {
......@@ -897,7 +854,7 @@ export default {
this.itemType = 3
}
this.getItemByType()
this.getAllByType()
// this.getAllByType()
console.log('登陆人', res)
})
......@@ -975,7 +932,6 @@ export default {
},
// 四个时间的表单校验
validateMorningStart(rule, value, callback) {
// // TODO: please clear this log
const morningEnd = this.form.useTime.ame
if (isEmpty(value) && isEmpty(this.form.useTime.ame) && isEmpty(this.form.useTime.pms) && isEmpty(this.form.useTime.pme)) {
console.log('上午开始时间第一层报错')
......@@ -1034,7 +990,16 @@ export default {
// 获取检查项目下拉框
getItemByType() {
listItemByType({ itemType: this.itemType }).then(res => {
console.log('检查项目', res)
this.form.checkType = this.form.checkType.filter(item => {
let flag = false
res.rows.forEach(row => {
if (row.id === item) {
flag = true
}
})
return flag
})
console.log('检查项目23333', res, this.form)
this.checkItemOptions = res.rows
console.log('xdddd', this.checkItemOptions)
const result = []
......@@ -1048,22 +1013,22 @@ export default {
console.log(' this.checkTypeText', this.form.checkTypeText)
})
},
getAllByType() {
listAllByType({ itemType: this.itemType }).then(res => {
console.log('检查全部项目', res)
this.checkItemOptions = res.rows
// console.log('xdddd', this.checkItemOptions)
const result = []
const ids = [... this.form.checkType]
for (let i = 0; i < this.checkItemOptions.length; i++) {
if (ids.includes(parseInt(this.checkItemOptions[i].id))) {
result.push(this.checkItemOptions[i].name)
}
}
// this.form.checkTypeText = result
// console.log(' this.checkTypeText', this.form.checkTypeText)
})
},
// getAllByType() {
// listAllByType({ itemType: this.itemType }).then(res => {
// console.log('检查全部项目', res)
// this.checkItemOptions = res.rows
// // console.log('xdddd', this.checkItemOptions)
// const result = []
// const ids = [... this.form.checkType]
// for (let i = 0; i < this.checkItemOptions.length; i++) {
// if (ids.includes(parseInt(this.checkItemOptions[i].id))) {
// result.push(this.checkItemOptions[i].name)
// }
// }
// // this.form.checkTypeText = result
// // console.log(' this.checkTypeText', this.form.checkTypeText)
// })
// },
// 获取地址数据
getAreaData() {
getAreTreeStructure().then(response => {
......@@ -1071,7 +1036,7 @@ export default {
if (response.code === 200) {
this.removeEmptyChildren(response.data)
this.areaOptions = response.data
console.log(' this.form.serviceArea', this.form.serviceArea)
console.log('这是我要遍历的this.form.serviceArea', this.form.serviceArea)
const valueGroups = this.form.serviceArea
const labelList = []
......@@ -1110,7 +1075,6 @@ export default {
}
this.form.serviceAreaText = labelList
console.log(labelList)
console.log('----------------------------------------111111111111', labelList)
console.log(' this.areaOptions', this.areaOptions)
}
......@@ -1228,9 +1192,10 @@ export default {
getDevice(this.id).then(response => {
this.form = response.data
console.log('查询是否为医院设备', this.form.isPrivate)
this.getUserInfo()
this.form.selectedOptions = response.data.addressCode.split(',').map(Number)
console.log('地址编码-------------', this.form.selectedOptions)
this.getAreNameById(this.form.selectedOptions)
// this.getAreNameById(this.form.selectedOptions)
// if (this.form.isPrivate === '1') {
// signHospitalMessage().then(response => {
// console.log('查到医院信息', response)
......
src/views/equipment-management/equipment-management/equipment-management.vue
View file @ 3bd11dac
......@@ -223,7 +223,7 @@
icon="el-icon-document"
class="el-button--success--solid"
plain
@click="detailsDevice(scope.row.id)"
@click="detailsDevice(scope.row)"
>详情
</el-button>
<el-button
......@@ -603,12 +603,13 @@ export default {
})
},
/** 跳转到详情页*/
detailsDevice(id) {
detailsDevice(data) {
this.$router.push({
name: 'EquipmentEdit',
name: 'EquipmentDetail',
query: {
identify: '2',
id: id
id: data.id,
isPrivate: data.isPrivate
}
})
},
......@@ -619,11 +620,11 @@ export default {
})
},
// 点击检查项目
handlecheck() {
this.$router.push({
name: 'EquipmentCheck'
})
},
// handlecheck() {
// this.$router.push({
// name: 'EquipmentCheck'
// })
// },
/**
* 全部选择
......
src/views/service-management/hospitalization-management/hospitalization-management.vue
View file @ 3bd11dac
......@@ -233,15 +233,15 @@
type="warning"
@click="handleDischargeMe(scope.row)"
>办理出院</el-button>
<!-- <el-button-->
<!-- v-else-if="scope.row.status==='4'"-->
<!-- icon="el-icon-paperclip"-->
<!-- plain-->
<!-- size="mini"-->
<!-- class="el-button&#45;&#45;warning&#45;&#45;solid&#45;&#45;four"-->
<!-- type="warning"-->
<!-- disabled-->
<!-- >导出明细</el-button>-->
<!-- <el-button-->
<!-- v-else-if="scope.row.status==='4'"-->
<!-- icon="el-icon-paperclip"-->
<!-- plain-->
<!-- size="mini"-->
<!-- class="el-button&#45;&#45;warning&#45;&#45;solid&#45;&#45;four"-->
<!-- type="warning"-->
<!-- disabled-->
<!-- >导出明细</el-button>-->
</template>
</el-table-column>
</el-table>
......
src/views/service-management/treatment-management/treatment-management.vue
View file @ 3bd11dac
......@@ -230,7 +230,7 @@
<el-dialog
title="分配诊室"
:visible.sync="open"
width="950px"
width="1000px"
append-to-body
:close-on-press-escape="false"
:close-on-click-modal="false"
......@@ -709,7 +709,7 @@ export default {
rest() {
this.treatStartTime = ''
this.reservationForm.consultRoomName = ''
this.appointmentRoomList = []
// this.appointmentRoomList = []
// 预约诊室
// 添加预约表单参数
this.reservationForm = {
......@@ -733,7 +733,7 @@ export default {
// 分配诊室搜索预约记录
this.allocationForm = {
pageNum: 1,
pageSize: 10,
pageSize: 5,
consultRoomIdList: '',
useDate: ''
}
......
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