Skip to content

P
pet-business-web
Commit 3b2fc9fe authored by 王飞龙's avatar 王飞龙
Browse files
Options

设备地区修改

parent 513dc9e6
Hide whitespace changes
Inline Side-by-side
Showing with 178 additions and 118 deletions
src/assets/styles/element-ui.scss
View file @ 3b2fc9fe
...@@ -14,7 +14,18 @@ ...@@ -14,7 +14,18 @@
.el-upload__input { .el-upload__input {
display: none; display: none;
} }
.el-input-number__increase{
top:0.125rem!important;
right: 0.125rem!important;
}
.el-input-number__decrease{
right: 0.125rem!important;
.el-icon-arrow-down {
position: relative;
top: 0.186rem;
}
}
/** 下拉框选中样式*/ /** 下拉框选中样式*/
.el-select .el-input.is-focus .el-input__inner { .el-select .el-input.is-focus .el-input__inner {
border: 1px solid #5FB54B; border: 1px solid #5FB54B;
......
src/views/equipment-management/equipment-management/equipment-add.vue
View file @ 3b2fc9fe
...@@ -134,6 +134,7 @@ ...@@ -134,6 +134,7 @@
<el-time-select <el-time-select
v-model="form.useTime.ams" v-model="form.useTime.ams"
class="inputWidth" class="inputWidth"
popper-class="equipment-use-time"
is-range is-range
placeholder="请选择上午开始时间" placeholder="请选择上午开始时间"
format="HH:mm" format="HH:mm"
...@@ -152,6 +153,7 @@ ...@@ -152,6 +153,7 @@
<el-time-select <el-time-select
v-model="form.useTime.ame" v-model="form.useTime.ame"
class="inputWidth" class="inputWidth"
popper-class="equipment-use-time"
is-range is-range
placeholder="请选择上午结束时间" placeholder="请选择上午结束时间"
format="HH:mm" format="HH:mm"
...@@ -174,6 +176,7 @@ ...@@ -174,6 +176,7 @@
<el-time-select <el-time-select
v-model="form.useTime.pms" v-model="form.useTime.pms"
class="inputWidth" class="inputWidth"
popper-class="equipment-use-time"
is-range is-range
placeholder="请选择下午开始时间" placeholder="请选择下午开始时间"
format="HH:mm" format="HH:mm"
...@@ -192,6 +195,7 @@ ...@@ -192,6 +195,7 @@
<el-time-select <el-time-select
v-model="form.useTime.pme" v-model="form.useTime.pme"
class="inputWidth" class="inputWidth"
popper-class="equipment-use-time"
is-range is-range
placeholder="请选择下午结束时间" placeholder="请选择下午结束时间"
format="HH:mm" format="HH:mm"
...@@ -296,9 +300,9 @@ ...@@ -296,9 +300,9 @@
</el-form> </el-form>
<el-row> <el-row>
<el-col style="display: flex;justify-content: left; margin-left: 20px; margin-top: 20px"> <el-col style="display: flex;justify-content: left; margin-left: 20px; margin-top: 20px">
<el-button :loading="submitShow" class="queryBtn" size="mini" icon="el-icon-check" @click="submitForm"> <el-button :loading="submitShow" class="queryBtn" size="mini" icon="el-icon-check" @click="submitForm">
提交 提交
</el-button> </el-button>
<el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返 回</el-button> <el-button class="resetBtn" size="mini" icon="el-icon-back" @click="cancel">返 回</el-button>
</el-col> </el-col>
</el-row> </el-row>
...@@ -882,4 +886,17 @@ export default { ...@@ -882,4 +886,17 @@ export default {
// cursor: pointer // cursor: pointer
//} //}
</style> </style>
<style lang="scss">
.equipment-use-time {
.time-select-item:hover {
background: #F6fcf5;
color: #5FB54B;
font-weight: bold;
cursor: pointer
}
.time-select-item.selected:not(.disabled) {
color: #5FB54B;
font-weight: bold;
}
}
</style>
src/views/equipment-management/equipment-management/equipment-detail.vue
View file @ 3b2fc9fe
...@@ -88,10 +88,11 @@ ...@@ -88,10 +88,11 @@
class="overflow-hidden" class="overflow-hidden"
@change="handleChangeCascader" @change="handleChangeCascader"
@mouseover.native="showTooltip = true" @mouseover.native="showTooltip = true"
@mouseout.native="showTooltip = false"> @mouseout.native="showTooltip = false"
>
<template #suffix> <template #suffix>
<el-tooltip placement="top" content="这是提示内容" :disabled="!showTooltip" :offset="[0, 8]"> <el-tooltip placement="top" content="这是提示内容" :disabled="!showTooltip" :offset="[0, 8]">
<i class="el-icon-question"></i> <i class="el-icon-question" />
</el-tooltip> </el-tooltip>
</template> </template>
</el-cascader> </el-cascader>
...@@ -453,6 +454,7 @@ ...@@ -453,6 +454,7 @@
<el-time-select <el-time-select
v-model="form.useTime.ams" v-model="form.useTime.ams"
class="inputWidth" class="inputWidth"
popper-class="equipment-use-time"
is-range is-range
placeholder="请选择上午开始时间" placeholder="请选择上午开始时间"
format="HH:mm" format="HH:mm"
...@@ -471,6 +473,7 @@ ...@@ -471,6 +473,7 @@
<el-time-select <el-time-select
v-model="form.useTime.ame" v-model="form.useTime.ame"
class="inputWidth" class="inputWidth"
popper-class="equipment-use-time"
is-range is-range
placeholder="请选择上午结束时间" placeholder="请选择上午结束时间"
format="HH:mm" format="HH:mm"
...@@ -492,6 +495,7 @@ ...@@ -492,6 +495,7 @@
<el-time-select <el-time-select
v-model="form.useTime.pms" v-model="form.useTime.pms"
class="inputWidth" class="inputWidth"
popper-class="equipment-use-time"
is-range is-range
placeholder="请选择下午开始时间" placeholder="请选择下午开始时间"
format="HH:mm" format="HH:mm"
...@@ -510,6 +514,7 @@ ...@@ -510,6 +514,7 @@
<el-time-select <el-time-select
v-model="form.useTime.pme" v-model="form.useTime.pme"
class="inputWidth" class="inputWidth"
popper-class="equipment-use-time"
is-range is-range
placeholder="请选择下午结束时间" placeholder="请选择下午结束时间"
format="HH:mm" format="HH:mm"
...@@ -1272,3 +1277,17 @@ export default { ...@@ -1272,3 +1277,17 @@ export default {
background-color: #F6FCF5 !important; background-color: #F6FCF5 !important;
} }
</style> </style>
<style lang="scss">
.equipment-use-time {
.time-select-item:hover {
background: #F6fcf5;
color: #5FB54B;
font-weight: bold;
cursor: pointer
}
.time-select-item.selected:not(.disabled) {
color: #5FB54B;
font-weight: bold;
}
}
</style>
src/views/equipment-management/use-management/use-details.vue
View file @ 3b2fc9fe
...@@ -365,7 +365,20 @@ export default { ...@@ -365,7 +365,20 @@ export default {
pme: '' pme: ''
}, },
// 详情表单 // 详情表单
form: {} form: {
selectedOptions: [],
deviceName: '',
// appointmentMethod: '',
serviceArea: [],
serviceAreaText: [],
checkTypeText: [],
head: '',
phone: '',
deviceType: '',
reservationMethod: '',
status: '',
remark: ''
}
} }
}, },
created() { created() {
...@@ -441,8 +454,8 @@ export default { ...@@ -441,8 +454,8 @@ export default {
this.form.serviceAreaText = labelList this.form.serviceAreaText = labelList
console.log(labelList) console.log(labelList)
console.log('----------------------------------------111111111111', labelList) console.log('111111111111', labelList)
console.log(' this.areaOptions', this.areaOptions) console.log(' ----------------引人注目----------------------------his.form.serviceAreaText', this.form.serviceAreaText)
} }
}) })
}, },
......
src/views/equipment-management/use-management/use-management.vue
View file @ 3b2fc9fe
...@@ -136,11 +136,11 @@ ...@@ -136,11 +136,11 @@
<span>{{ parseTime(scope.row.reportTime, '{h}:{m}') || '-' }}</span> <span>{{ parseTime(scope.row.reportTime, '{h}:{m}') || '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="支付金额" align="left" prop="payAmount"> <el-table-column label="支付金额" align="left" prop="payAmount">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ formatPrice(scope.row.payAmount) || '-' }}</span> <span>{{ formatPrice(scope.row.payAmount) || '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="设备当前状态" align="left" prop="status"> <el-table-column label="设备当前状态" align="left" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
......
src/views/medical-record-management/medical-edit.vue
View file @ 3b2fc9fe
...@@ -973,106 +973,106 @@ color: #333333;" ...@@ -973,106 +973,106 @@ color: #333333;"
<div class="table-content"> <div class="table-content">
<el-form v-if="!petInHospitalStatus" ref="inHosForm" :model="inHosForm" :rule="inHosRules" hide-required-asterisk class="demo-ruleForm" label-width="0"> <el-form v-if="!petInHospitalStatus" ref="inHosForm" :model="inHosForm" :rule="inHosRules" hide-required-asterisk class="demo-ruleForm" label-width="0">
<el-table ref="inHospitalForm" :data="petInHospitalList" :header-cell-style="{ background:'#F4F4F4'}" border> <el-table ref="inHospitalForm" :data="petInHospitalList" :header-cell-style="{ background:'#F4F4F4'}" border>
<el-table-column align="center" label="病情等级" prop="diseaseLevel"> <el-table-column align="center" label="病情等级" prop="diseaseLevel">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag v-if="!petInHospitalUpdateShow" :options="dict.type.disease_level" :value="scope.row.diseaseLevel" /> <dict-tag v-if="!petInHospitalUpdateShow" :options="dict.type.disease_level" :value="scope.row.diseaseLevel" />
<el-form-item v-else :prop="'diseaseLevel'" style="height: 55px" :rule="inHosRules.diseaseLevel"> <el-form-item v-else :prop="'diseaseLevel'" style="height: 55px" :rule="inHosRules.diseaseLevel">
<el-select v-model="scope.row.diseaseLevel" placeholder="请选择病情等级" clearable="true"> <el-select v-model="scope.row.diseaseLevel" placeholder="请选择病情等级" clearable="true">
<el-option <el-option
v-for="item in dict.type.disease_level" v-for="item in dict.type.disease_level"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="病房类型" prop="wardType"> <el-table-column align="center" label="病房类型" prop="wardType">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.diseaseLevel ? (scope.row.diseaseLevel === '1' ? 'ICU病房':'普通病房'): '-' }} {{ scope.row.diseaseLevel ? (scope.row.diseaseLevel === '1' ? 'ICU病房':'普通病房'): '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="能否沐浴" prop="bathe"> <el-table-column align="center" label="能否沐浴" prop="bathe">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="!petInHospitalUpdateShow">{{ scope.row.bathe === '0' ? '能':'否' }}</span> <span v-if="!petInHospitalUpdateShow">{{ scope.row.bathe === '0' ? '能':'否' }}</span>
<el-form-item v-else :prop="'bathe'" style="height: 55px" :rule="inHosRules.bathe"> <el-form-item v-else :prop="'bathe'" style="height: 55px" :rule="inHosRules.bathe">
<el-select v-model="scope.row.bathe" placeholder="请选择能否沐浴" clearable="true"> <el-select v-model="scope.row.bathe" placeholder="请选择能否沐浴" clearable="true">
<el-option <el-option
label="能" label="能"
value="0" value="0"
/> />
<el-option <el-option
label="否" label="否"
value="1" value="1"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="病房号" prop="wardRuleId"> <el-table-column align="center" label="病房号" prop="wardRuleId">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.wardRuleId || '-' }} {{ scope.row.wardRuleId || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="入院日期" prop="admissionDate"> <el-table-column align="center" label="入院日期" prop="admissionDate">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.admissionDate || '-' }} {{ scope.row.admissionDate || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="天数" prop="actualDays"> <el-table-column align="center" label="天数" prop="actualDays">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.actualDays || '-' }} {{ scope.row.actualDays || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="状态" prop="status"> <el-table-column align="center" label="状态" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="!scope.row.status">{{ '-' }}</span> <span v-if="!scope.row.status">{{ '-' }}</span>
<dict-tag :options="dict.type.hospital_status_in" :value="scope.row.status" /> <dict-tag :options="dict.type.hospital_status_in" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
v-if="isEdit && !petInHospitalStatus" v-if="isEdit && !petInHospitalStatus"
align="center" align="center"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
label="操作" label="操作"
min-width="180" min-width="180"
show-overflow-tooltip show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
v-if="isEdit && !petInHospitalStatus && !petInHospitalUpdateShow" v-if="isEdit && !petInHospitalStatus && !petInHospitalUpdateShow"
icon="el-icon-edit" icon="el-icon-edit"
plain plain
size="mini" size="mini"
style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(52,144,206);" style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(52,144,206);"
type="primary" type="primary"
@click="updatePetInHospitalShow()" @click="updatePetInHospitalShow()"
>编辑 >编辑
</el-button> </el-button>
<el-button <el-button
v-if="isEdit && !petInHospitalStatus && petInHospitalUpdateShow" v-if="isEdit && !petInHospitalStatus && petInHospitalUpdateShow"
icon="el-icon-document" icon="el-icon-document"
plain plain
size="mini" size="mini"
style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(95,181,75);" style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(95,181,75);"
type="success" type="success"
@click="saveUpdatePetInHospital(scope.row)" @click="saveUpdatePetInHospital(scope.row)"
>保存 >保存
</el-button> </el-button>
<el-button <el-button
v-if="isEdit && !petInHospitalStatus && !petInHospitalUpdateShow" v-if="isEdit && !petInHospitalStatus && !petInHospitalUpdateShow"
icon="el-icon-document" icon="el-icon-document"
plain plain
size="mini" size="mini"
style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(155,0,65);" style="width: 50px; border-radius: 6px 6px 6px 6px;border: 1px solid rgb(155,0,65);"
type="danger" type="danger"
@click="delPetInHospital(scope.row)" @click="delPetInHospital(scope.row)"
>删除 >删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-form> </el-form>
<el-table v-else :data="petInHospitalList" :header-cell-style="{ background:'#F4F4F4'}" border> <el-table v-else :data="petInHospitalList" :header-cell-style="{ background:'#F4F4F4'}" border>
<el-table-column align="center" label="病房类型" prop="wardType"> <el-table-column align="center" label="病房类型" prop="wardType">
...@@ -1216,9 +1216,9 @@ color: #333333;" ...@@ -1216,9 +1216,9 @@ color: #333333;"
style="width: 100%; height: 60vh" style="width: 100%; height: 60vh"
scrolling="auto" scrolling="auto"
/> />
<!-- <div slot="footer" class="dialog-footer">--> <!-- <div slot="footer" class="dialog-footer">-->
<!-- <el-button class="queryBtn" @click="closeReportModle">确 定</el-button>--> <!-- <el-button class="queryBtn" @click="closeReportModle">确 定</el-button>-->
<!-- </div>--> <!-- </div>-->
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
......
vue.config.js
View file @ 3b2fc9fe
...@@ -69,7 +69,7 @@ module.exports = { ...@@ -69,7 +69,7 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:8091`, // target: `http://localhost:8090`,
target: `http://114.67.241.140:8091`, target: `http://114.67.241.140:8091`,
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
......
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