Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 4afa7aab 1b9c7bcf
Hide whitespace changes
Inline Side-by-side
Showing with 218 additions and 260 deletions
src/components/InputTips/InputTips.vue
View file @ 0023d04e
......@@ -2,8 +2,8 @@
<el-tooltip :content="text" placement="top-start" :disabled="tipDisabled">
<el-input
v-model="text"
readonly="true"
disabled="true"
readonly
disabled
:style="{width: width}"
@mouseover.native="inputOnMouseOver($event)"
/>
......
src/components/imageCropper/index.vue
View file @ 0023d04e
......@@ -16,9 +16,11 @@
:auto-crop-height="autoCropHeight"
:auto-crop="true"
:fixed="false"
:fixed-box="false"
:fixed-box="true"
:output-size="1"
output-type="png"
:centerBox="true"
:canScale="true"
/>
<template #footer>
<span class="dialog-footer">
......
src/router/index.js
View file @ 0023d04e
......@@ -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/data-statistics/hospital-data-statistics/hospital-data-statistics.vue
View file @ 0023d04e
......@@ -510,7 +510,14 @@ export default {
},
handleSortChange(column) {
console.log('更换排序', column)
this.queryParams.orderByColumn = column.prop// 查询字段是表格中字段名字
// 查询字段是表格中字段名字
if (column.prop.orderByColumn === 'hospitalName' ||
column.prop.orderByColumn === 'hospitalAddress' ||
column.prop.orderByColumn === 'contactPerson') {
this.queryParams.orderByColumn = column.prop + 'Sort'
} else {
this.queryParams.orderByColumn = column.prop
}
this.queryParams.isAsc = column.order// 动态取值排序顺序
this.$refs.hospitalList.clearSort()
this.getHospitalList()
......
src/views/data-statistics/pet-data-statistics/pet-data-statistics.vue
View file @ 0023d04e
......@@ -127,17 +127,17 @@
<overlong-tool :text="(item.ownerId || '-') + ' (' + item.nickname + ')'" :max="30" />
</div>
<div style="display: flex">
<div class="progressWidth">
<el-progress
:percentage="item.money/petOwnerConsumeRank[0].money*100"
:stroke-width="9"
:show-text="false"
class="consumeRankProgress"
/>
</div>
<div class="consumeRankFont">
{{ moneyFormat(item.money) }} 元
</div>
<div class="progressWidth">
<el-progress
:percentage="item.money/petOwnerConsumeRank[0].money*100"
:stroke-width="9"
:show-text="false"
class="consumeRankProgress"
/>
</div>
<div class="consumeRankFont">
{{ moneyFormat(item.money) }} 元
</div>
</div>
</div>
</div>
......
src/views/data-statistics/service-statistics/service-statistics.vue
View file @ 0023d04e
......@@ -993,7 +993,11 @@ export default {
},
handleSortChangeForPlatform(column) {
console.log('更换排序', column)
this.queryOrder.orderByColumn = column.prop// 查询字段是表格中字段名字
if (column.prop === 'checkItemsName') {
this.queryOrder.orderByColumn = column.prop + 'sort' // 查询字段是表格中字段名字
} else {
this.queryOrder.orderByColumn = column.prop// 查询字段是表格中字段名字
}
this.queryOrder.isAsc = column.order// 动态取值排序顺序
this.$refs.orderTable.clearSort()
this.getOrderList()
......
src/views/equipment-management/equipment-management/equipment-detail.vue
View file @ 0023d04e
......@@ -8,7 +8,10 @@
</div>
<el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="auto">
<div class="title-paragraph">
<div style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;">基本信息</div>
<div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
>基本信息
</div>
</div>
<!-- 1-->
<el-row>
......@@ -77,26 +80,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
......@@ -121,7 +105,7 @@
controls-position="right"
class="inputNumber_Width"
/>
<span class="text">{{ "次" }}</span>
<span class="text">{{ '次' }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -274,7 +258,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 +273,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
......@@ -302,7 +285,10 @@
</el-row>
</el-form>
<div class="title-paragraph">
<div style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;">使用信息</div>
<div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
>使用信息
</div>
</div>
<el-table :data="useList" :header-cell-style="{ background:'#F4F4F4'}" border>
<el-table-column label="检查项目" align="center" prop="checkItemsName" show-overflow-tooltip />
......@@ -317,7 +303,11 @@
<el-table-column label="检查时段" align="center" prop="deve" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.checkStartTime === null && scope.row.checkEndTime === null">{{ '-' }}</span>
<span v-else>{{ parseTime(scope.row.checkStartTime, '{h}:{i}') + '~' + parseTime(scope.row.checkEndTime, '{h}:{i}') || '-' }}</span>
<span
v-else
>{{
parseTime(scope.row.checkStartTime, '{h}:{i}') + '~' + parseTime(scope.row.checkEndTime, '{h}:{i}') || '-'
}}</span>
</template>
</el-table-column>
<el-table-column label="检查状态" align="center" prop="payType" show-overflow-tooltip>
......@@ -345,13 +335,21 @@
</div>
<el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="auto">
<div class="title-paragraph">
<div style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;">基本信息</div>
<div
style="padding-left: 13px;font-size: 16px;font-family: Microsoft YaHei-Bold, Microsoft YaHei,serif;font-weight: bold;color: #333333;"
>基本信息
</div>
</div>
<!-- 1-->
<el-row>
<el-col :span="8">
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model.trim="form.deviceName" placeholder="请输入设备名称" class="inputWidth" maxlength="20" />
<el-input
v-model.trim="form.deviceName"
placeholder="请输入设备名称"
class="inputWidth"
maxlength="20"
/>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -448,7 +446,7 @@
@blur="handleuseNum"
@keydown.native="keydown($event)"
/>
<span class="text">{{ "次" }}</span>
<span class="text">{{ '次' }}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -597,7 +595,7 @@
</div>
</el-col>
</el-row>
<!-- 8-->
8
<el-row>
<el-col>
<el-form-item label="支持服务地区" prop="serviceArea">
......@@ -617,11 +615,18 @@
</el-form-item>
</el-col>
</el-row>
<!-- 9-->
9
<el-row>
<el-col>
<el-form-item label="支持检查项目" prop="checkType">
<el-select v-model="form.checkType" placeholder="请选择支持检查项目" class="inputWidth" multiple collapse-tags clearable>
<el-select
v-model="form.checkType"
placeholder="请选择支持检查项目"
class="inputWidth"
multiple
collapse-tags
clearable
>
<el-option
v-for="(item, index) in checkItemOptions"
:key="index"
......@@ -635,7 +640,8 @@
</el-form>
<el-row>
<el-col style="display: flex;justify-content: left; margin-left: 20px; margin-top: 20px">
<el-button class="queryBtn" type="primary" size="mini" icon="el-icon-check" @click="submitForm">提交</el-button>
<el-button class="queryBtn" type="primary" size="mini" icon="el-icon-check" @click="submitForm">提交
</el-button>
<el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返回</el-button>
</el-col>
</el-row>
......@@ -653,10 +659,11 @@ 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'
export default {
name: 'EquipmentDetail',
components: { InputTips },
......@@ -664,9 +671,9 @@ export default {
data() {
return {
// 日期格式
// replace(time) {
// return parseTime(time, '{y}/{m}/{d}')
// },
replace(time) {
return parseTime(time, '{y}/{m}/{d}')
},
// 检查类型
// checkType: [],
// 地址列表
......@@ -712,8 +719,8 @@ export default {
deviceName: '',
// appointmentMethod: '',
serviceArea: [],
serviceAreaText: [],
checkTypeText: [],
serviceAreaText: '',
checkTypeText: '',
head: '',
phone: '',
deviceType: '',
......@@ -742,7 +749,7 @@ export default {
],
phone: [
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
pattern: /^1[3-9][0-9]\d{8}$/,
message: '请输入正确的手机号码',
trigger: 'blur'
}
......@@ -851,22 +858,16 @@ 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
console.log(' this.form.isPrivate', this.form.isPrivate)
if (this.identify === '1') {
// this.$route.meta.title = ''
console.log('1')
} else if (this.identify === '2') {
// this.$route.meta.title = ''
console.log('2')
}
this.getAreaData()
this.handleUpdate()
this.getUserInfo()
this.getuseList()
console.time('start option')
Promise.all([this.getUserInfo(), this.getAreaData(), this.getuseList(), this.getItemByType()])
.then(_ => {
console.timeLog('start option')
console.time('detail')
this.handleUpdate()
})
},
computed: {
...mapGetters(['userType'])
......@@ -875,40 +876,22 @@ export default {
parseTime,
// 获取登陆人信息
getUserInfo() {
getInfo().then(res => {
// this.userType = res.user.userType
console.log(' this.userType', this.userType)
return getInfo().then(_ => {
if (this.userType === '3') {
this.isShow = false
this.hpshow = true
this.itemType = 0
if (this.form.isPrivate === '1') {
signHospitalMessage().then(response => {
console.log('查到医院信息', response)
this.form.serviceArea.push(response.data.addressCode)
this.serviceAreaShow = true
console.log('查到医院地址', this.form.serviceArea)
})
}
}
if (this.userType === '00') {
} else if (this.userType === '00') {
this.isShow = true
this.hpshow = false
this.itemType = 3
}
this.getItemByType()
this.getAllByType()
console.log('登陆人', res)
})
},
// 时间段获取
getam() {
console.log(this.useTime)
},
getpm() {
console.log(this.useTime)
},
// 禁止输入空格
keydown(e) {
if (e.keyCode === 32) {
......@@ -930,7 +913,6 @@ export default {
},
// 权重不能为0
validWeigh(rule, value, callback) {
// console.log('value', value)
if (value > 0) {
callback()
} else {
......@@ -939,7 +921,6 @@ export default {
},
// 单位时段服务数不能为0
validUseNum(rule, value, callback) {
// console.log('value', value)
if (value > 0) {
callback()
} else {
......@@ -948,7 +929,6 @@ export default {
},
// 服务地点表单校验
validaddress(rule, value, callback) {
console.log('validaddress', this.form.selectedOptions)
if (this.form.selectedOptions.length > 0) {
callback()
} else {
......@@ -957,7 +937,6 @@ export default {
},
// 支持服务地区表单校验
validserviceArea(rule, value, callback) {
console.log('validaddress', this.form.serviceArea)
if (this.form.serviceArea.length > 0) {
callback()
} else {
......@@ -966,7 +945,6 @@ export default {
},
// 支持检查类型表单校验
validcheckType(rule, value, callback) {
console.log('validaddress', this.form.checkType)
if (this.form.checkType.length > 0) {
callback()
} else {
......@@ -975,14 +953,11 @@ 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('上午开始时间第一层报错')
callback(new Error('请选择上午开始时间'))
} else {
if (isEmpty(value) && isEmpty(!morningEnd)) {
console.log('上午开始时间第二层报错')
callback(new Error('请选择上午开始时间'))
} else {
callback()
......@@ -992,11 +967,9 @@ export default {
validateMorningEnd(rule, value, callback) {
const morningStart = this.form.useTime.ams
if (isEmpty(value) && isEmpty(this.form.useTime.ams) && isEmpty(this.form.useTime.pms) && isEmpty(this.form.useTime.pme)) {
console.log('上午结束时间第一层报错')
callback(new Error('请选择上午结束时间'))
} else {
if (isEmpty(value) && isEmpty(!morningStart)) {
console.log('上午结束时间第一层报错')
callback(new Error('请选择上午结束时间'))
} else {
callback()
......@@ -1006,11 +979,9 @@ export default {
validateAfternoonStart(rule, value, callback) {
const afternoonEnd = this.form.useTime.pme
if (isEmpty(value) && isEmpty(this.form.useTime.ams) && isEmpty(this.form.useTime.ame) && isEmpty(this.form.useTime.pme)) {
console.log(' 下午开始时间第一层报错')
callback(new Error('请选择下午开始时间'))
} else {
if (isEmpty(value) && isEmpty(!afternoonEnd)) {
console.log('下午开始时间开始第二层报错')
callback(new Error('请选择下午开始时间'))
} else {
callback()
......@@ -1020,11 +991,9 @@ export default {
validateAfternoonEnd(rule, value, callback) {
const afternoonStart = this.form.useTime.pms
if (isEmpty(value) && isEmpty(this.form.useTime.ams) && isEmpty(this.form.useTime.ame) && isEmpty(this.form.useTime.pms)) {
console.log('下午结束时间结束第一层报错')
callback(new Error('请选择下午结束时间'))
} else {
if (isEmpty(value) && isEmpty(!afternoonStart)) {
console.log('下午结束时间结束第二层报错')
callback(new Error('请选择下午结束时间'))
} else {
callback()
......@@ -1033,87 +1002,33 @@ export default {
},
// 获取检查项目下拉框
getItemByType() {
listItemByType({ 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)
if (this.userType === '3') {
this.itemType = 0
} else if (this.userType === '00') {
this.itemType = 3
}
return listItemByType({ itemType: this.itemType }).then(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 => {
// // this.checkItemOptions = res.rows
// // // 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
// // // })
// },
// 获取地址数据
getAreaData() {
getAreTreeStructure().then(response => {
console.log('地区三级', response)
if (response.code === 200) {
this.removeEmptyChildren(response.data)
this.areaOptions = response.data
console.log(' this.form.serviceArea', this.form.serviceArea)
const valueGroups = this.form.serviceArea
const labelList = []
for (let i = 0; i < valueGroups.length; i++) {
const values = valueGroups[i].split(',')
let currentData = this.areaOptions
const currentLabel = []
let foundLabel = true
for (let j = 0; j < values.length; j++) {
const value = parseInt(values[j])
const item = currentData.find((item) => item.value === value)
if (item) {
if (currentLabel.length === 0) {
currentLabel.push(item.label)
} else {
currentLabel.push(`-${item.label}`)
}
currentData = item.children
} else {
foundLabel = false
break
}
}
if (foundLabel) {
labelList.push(currentLabel.join(''))
} else {
labelList.push('-')
}
}
this.form.serviceAreaText = labelList
console.log(labelList)
console.log('----------------------------------------111111111111', labelList)
console.log(' this.areaOptions', this.areaOptions)
}
return getAreTreeStructure().then(response => {
this.removeEmptyChildren(response.data)
this.areaOptions = response.data
})
},
removeEmptyChildren(array) {
......@@ -1134,7 +1049,6 @@ export default {
}
},
handleChangeCascader(value) {
console.log('handleChangeCascader', value)
if (value.length > 0) {
this.getAreNameById(value)
} else {
......@@ -1144,7 +1058,6 @@ export default {
}
},
handleChangeServiceArea(value) {
console.log('handleChangeServiceArea', value)
// 拿到所选的省级id 把重复的过滤掉
const uniqueFirstItems = value.map((arr) => arr[0]).filter((item, index, arr) => arr.indexOf(item) === index)
this.form.serviceProvince = uniqueFirstItems.toString()
......@@ -1162,15 +1075,12 @@ export default {
}
this.addtions.names = addressText
this.city = city
console.log('地区名', addressText)
console.log('城市名', city)
})
},
// 提交
submitForm() {
const form = deepClone(this.form)
console.log('selectedOptions', form.selectedOptions)
if (form.selectedOptions != null) {
form.addressCode = form.selectedOptions.join(',')
}
......@@ -1181,7 +1091,6 @@ export default {
form.checkType = form.checkType.join(',')
}
if (!isEmpty(form.serviceArea)) {
console.log('支持服务地区', form.serviceArea)
form.serviceArea = form.serviceArea.join(';')
}
if (!isEmpty(form.useTime)) {
......@@ -1202,7 +1111,6 @@ export default {
updateDevice(form).then(response => {
this.$modal.msgSuccess('编辑成功')
this.cancel()
console.log('this.form)', form)
})
})
}
......@@ -1217,43 +1125,72 @@ export default {
// 查询使用信息
getuseList() {
this.queryParams.deviceId = this.id
listCheckManage(this.queryParams).then(response => {
console.log('a使用信息', response)
return listCheckManage(this.queryParams).then(response => {
this.useList = response.rows
console.log(' -----------------this.useList', this.useList)
})
},
// id查询
handleUpdate() {
getDevice(this.id).then(response => {
this.form = response.data
console.log('查询是否为医院设备', this.form.isPrivate)
this.form.selectedOptions = response.data.addressCode.split(',').map(Number)
console.log('地址编码-------------', this.form.selectedOptions)
this.getAreNameById(this.form.selectedOptions)
// if (this.form.isPrivate === '1') {
// signHospitalMessage().then(response => {
// console.log('查到医院信息', response)
// this.form.serviceArea.push(response.data.addressCode)
// this.serviceAreaShow = true
// console.log('查到医院地址', this.form.serviceArea)
// })
// } else {
this.form.serviceArea = response.data.serviceArea.split(';')
return getDevice(this.id).then(({ data }) => {
data.selectedOptions = data.addressCode.split(',').map(Number)
data.serviceArea = data.serviceArea.split(';')
if (data.checkType != null && data.checkType !== '') {
data.checkType = data.checkType.split(',').map(Number)
}
if (data.useTime !== null && data.useTime !== '') {
data.useTime = JSON.parse(data.useTime)
}
data.createTimeShow = this.replace(data.createTime)
// 回显检查项目
data.checkTypeText = this.checkItemOptions.filter(({ id }) => data.checkType.includes(id))
.map(({ name }) => name)
.join(',')
// 回显服务地区
const valueGroups = data.serviceArea
const labelList = []
// const getAreaName = (valueList, parentNameList) => {
//
// }
console.log(' this.areaOptions--------------------------', this.areaOptions)
console.log('支持检查地区回显值', this.form.serviceArea)
if (this.form.checkType != null && this.form.checkType !== '') {
this.form.checkType = response.data.checkType.split(',').map(Number)
console.log('this.form.checkType', this.form.checkType)
}
for (let i = 0; i < valueGroups.length; i++) {
const values = valueGroups[i].split(',')
let currentData = this.areaOptions
const currentLabel = []
let foundLabel = true
for (let j = 0; j < values.length; j++) {
const value = parseInt(values[j])
const item = currentData.find((item) => item.value === value)
if (item) {
if (currentLabel.length === 0) {
currentLabel.push(item.label)
} else {
currentLabel.push(`-${item.label}`)
}
currentData = item.children
} else {
foundLabel = false
break
}
}
if (this.form.useTime != null && this.form.useTime !== '') {
this.form.useTime = JSON.parse(response.data.useTime)
if (foundLabel) {
labelList.push(currentLabel.join(''))
} else {
labelList.push('-')
}
}
this.form.createTimeShow = this.replace(this.form.createTime)
console.log('详情数据---', this.form)
data.serviceAreaText = labelList.join('，')
this.form = data
console.timeLog('detail')
})
}
}
......@@ -1261,33 +1198,34 @@ export default {
</script>
<style scoped lang="scss">
.tip1{
.tip1 {
height: 30px;
border-left: 5px solid #409eff;
}
::v-deep.app-container {
//background-color: #f0f2f5;
//position: absolute;
//bottom: 0;
//top: 0;
//right: 0;
//left: 0;
//background-color: #f0f2f5;
//position: absolute;
//bottom: 0;
//top: 0;
//right: 0;
//left: 0;
}
.title-paragraph {
margin-bottom: 20px;
border-left: 5px solid #5FB54B;
.title-text {
margin-left: 10px;
}
.title-text {
margin-left: 10px;
}
.title {
color: #666666;
font-weight: 600;
font-size: 17px
.title {
color: #666666;
font-weight: 600;
font-size: 17px
}
}
}
.headerTitle {
......@@ -1297,19 +1235,24 @@ export default {
line-height: 50px;
padding-left: 45px;
}
.address{
.address {
width: 520px;
}
.inputWidth{
.inputWidth {
width: 300px;
}
.inputNumber_Width{
.inputNumber_Width {
width: 270px;
}
.text{
.text {
margin-left: 10px;
}
.remark_with{
.remark_with {
width: 1360px;
}
......@@ -1326,6 +1269,7 @@ export default {
font-weight: bold;
cursor: pointer
}
.time-select-item.selected:not(.disabled) {
color: #5FB54B;
font-weight: bold;
......
src/views/equipment-management/equipment-management/equipment-management.vue
View file @ 0023d04e
......@@ -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 @ 0023d04e
......@@ -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 @ 0023d04e
......@@ -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"
......@@ -277,7 +277,7 @@
</el-form>
<el-table
:data="appointmentRoomList"
style="width: 100%"
style="width: 100%;padding-left: 22px;"
:header-cell-style="{background:'#F4F4F4'}"
>
<el-table-column prop="consulting_name" align="left" label="诊室名称" :show-overflow-tooltip="true">
......@@ -318,7 +318,7 @@
<div class="tip1" />
<div style="padding-top: 3px;padding-left: 18px;font-size: 16px;font-weight: bold;color: #333333;">添加预约</div>
</div>
<el-form ref="useRecordForm" :model="reservationForm" :rules="useRecordrules" label-width="auto">
<el-form ref="useRecordForm" :model="reservationForm" :rules="useRecordrules" label-width="6.5rem">
<el-row>
<el-col :span="8">
<el-form-item label="诊室" prop="consultRoomName">
......@@ -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