Commit 16f29314 authored by 高滢's avatar 高滢

使用

parent aecbeff6
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</div> </div>
<div style="display: flex; padding-left: 20px;padding-bottom: 10px;"> <div style="display: flex; padding-left: 20px;padding-bottom: 10px;">
<div class="tip1" /> <div class="tip1" />
<div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">设备信息</div> <div style="padding-top: 3px;padding-left: 15px;font-size: 16px;font-weight: bold;color: #333333;">当前设备信息</div>
</div> </div>
<div style="width: 90%"> <div style="width: 90%">
<el-form :model="form" label-width="150px"> <el-form :model="form" label-width="150px">
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<el-form-item label="预约方式" prop="reservationMethod"> <el-form-item label="预约方式" prop="reservationMethod">
<el-select v-model="form.reservationMethod" :disabled="true" placeholder="暂无数据"> <el-select v-model="form.reservationMethod" :disabled="true" placeholder="暂无数据">
<el-option <el-option
v-for="dict in dict.type.device_type" v-for="dict in dict.type.reservation_method"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
...@@ -140,8 +140,8 @@ ...@@ -140,8 +140,8 @@
<el-form-item label="支持检查类型" prop="checkType"> <el-form-item label="支持检查类型" prop="checkType">
<el-select v-model="form.checkType" placeholder="暂无数据" multiple clearable :disabled="true"> <el-select v-model="form.checkType" placeholder="暂无数据" multiple clearable :disabled="true">
<el-option <el-option
v-for="(item,index) in checkList" v-for="item in checkList"
:key="index" :key="item.id"
:label="item.dictName" :label="item.dictName"
:value="item.id" :value="item.id"
/> />
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
</el-row> </el-row>
<div style=" display: flex;position: relative;left: 20px;padding-bottom: 20px;"> <div style=" display: flex;position: relative;left: 20px;padding-bottom: 20px;">
<div class="tip1" /> <div class="tip1" />
<div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">宠物信息</div> <div style="padding-top: 3px;padding-left: 15px;font-size: 16px;font-weight: bold;color: #333333;">宠物信息</div>
</div> </div>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
</el-row> </el-row>
<div style="display: flex;position: relative;left: 20px;padding-bottom: 20px;"> <div style="display: flex;position: relative;left: 20px;padding-bottom: 20px;">
<div class="tip1" /> <div class="tip1" />
<div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">宠主信息</div> <div style="padding-top: 3px;padding-left: 15px;font-size: 16px;font-weight: bold;color: #333333;">宠主信息</div>
</div> </div>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
<div style="display: flex;position: relative;left: 20px;padding-bottom: 20px;"> <div style="display: flex;position: relative;left: 20px;padding-bottom: 20px;">
<div class="tip1" /> <div class="tip1" />
<div style="padding-top: 3px;padding-left: 18px;color: #666666; font-weight: 500; font-size: 16px;">设备使用信息</div> <div style="padding-top: 3px;padding-left: 15px;font-size: 16px;font-weight: bold;color: #333333;">设备使用信息</div>
</div> </div>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="缴费金额"> <el-form-item label="缴费金额">
<el-input v-model="form.payAmount" :disabled="true" placeholder="暂无数据" /> <el-input v-model="form.payAmount" :disabled="true" placeholder="暂无数据"/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -303,8 +303,8 @@ ...@@ -303,8 +303,8 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<div style="padding-left: 150px;width: 90%;padding-bottom: 20px;"> <div style="padding-left: 150px;width: 90%;padding-bottom: 20px;;text-align: center;">
<el-button style="width: 98px;height: 32px;" icon="el-icon-back" class="resetBtn" @click="cancel">返 回</el-button> <el-button icon="el-icon-back" class="resetBtn" @click="cancel">返 回</el-button>
</div> </div>
</div> </div>
</div> </div>
...@@ -316,7 +316,7 @@ import { CodeToText } from 'element-china-area-data' ...@@ -316,7 +316,7 @@ import { CodeToText } from 'element-china-area-data'
export default { export default {
name: 'UseDetails', name: 'UseDetails',
dicts: ['payment_status', 'exam_type', 'device_status', 'device_type', 'pet_sex', 'sterilization_status', 'vaccine_situation', 'pet_insure'], dicts: ['payment_status', 'exam_type', 'device_status', 'device_type', 'pet_sex', 'sterilization_status', 'vaccine_situation', 'pet_insure', 'reservation_method'],
data() { data() {
return { return {
useId: '', useId: '',
...@@ -399,11 +399,17 @@ export default { ...@@ -399,11 +399,17 @@ export default {
const newArr = arr.map(num => Number(num)) const newArr = arr.map(num => Number(num))
this.form.checkType = newArr this.form.checkType = newArr
} }
if (this.form.createTime !== null && this.form.createTime !== '') {
this.createTime = (this.form.createTime.slice(0, this.form.createTime.length - 8)).replace(/-/g, '/') this.createTime = (this.form.createTime.slice(0, this.form.createTime.length - 8)).replace(/-/g, '/')
}
if (this.form.checkStartTime !== null && this.form.checkStartTime !== '') {
this.checkDate = (this.form.checkStartTime.slice(0, this.form.checkStartTime.length - 8)).replace(/-/g, '/') this.checkDate = (this.form.checkStartTime.slice(0, this.form.checkStartTime.length - 8)).replace(/-/g, '/')
const hour = this.form.checkStartTime.substring(this.form.checkStartTime.indexOf(' ') + 1, this.form.checkStartTime.indexOf(':')) const hour = this.form.checkStartTime.substring(this.form.checkStartTime.indexOf(' ') + 1, this.form.checkStartTime.indexOf(':'))
const minute = this.form.checkStartTime.substring(this.form.checkStartTime.indexOf(':') + 1, this.form.checkStartTime.lastIndexOf(':')) const minute = this.form.checkStartTime.substring(this.form.checkStartTime.indexOf(':') + 1, this.form.checkStartTime.lastIndexOf(':'))
this.checkTime = hour + ':' + minute this.checkTime = hour + ':' + minute
}
const payAmount = this.form.payAmount.toFixed(2)
this.form.payAmount = payAmount.toString()
}) })
} }
} }
......
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
</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>{{ 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">
...@@ -275,6 +275,10 @@ export default { ...@@ -275,6 +275,10 @@ export default {
this.getCheckList() this.getCheckList()
}, },
methods: { methods: {
// 表格显示病房单价保留两位小数
formatPrice(cellValue) {
return cellValue.toFixed(2) + '元'
},
// 表单选择框对齐 // 表单选择框对齐
cellClass(row) { cellClass(row) {
if (row.columnIndex === 0) { return 'disabledCheck' } if (row.columnIndex === 0) { return 'disabledCheck' }
...@@ -332,7 +336,7 @@ export default { ...@@ -332,7 +336,7 @@ export default {
this.$refs.table.clearSelection() this.$refs.table.clearSelection()
}) })
} else { } else {
this.$modal.msgError('请选择至少一条数据导出') this.$modal.msgWarning('请选择至少一条数据导出')
return return
} }
}, },
...@@ -344,6 +348,7 @@ export default { ...@@ -344,6 +348,7 @@ export default {
}, },
// 获取列表数据 // 获取列表数据
getUseList() { getUseList() {
this.loading = true
// if (this.daterangeCreateTime !== '') { // if (this.daterangeCreateTime !== '') {
// this.queryParams.beginCheckTime = this.daterangeCreateTime + ' 00:00:00' // this.queryParams.beginCheckTime = this.daterangeCreateTime + ' 00:00:00'
// this.queryParams.endCheckTime = this.daterangeCreateTime + ' 23:59:59' // this.queryParams.endCheckTime = this.daterangeCreateTime + ' 23:59:59'
...@@ -351,6 +356,7 @@ export default { ...@@ -351,6 +356,7 @@ export default {
listUseManagement(this.queryParams).then(res => { listUseManagement(this.queryParams).then(res => {
this.total = res.total this.total = res.total
this.userList = res.rows this.userList = res.rows
this.loading = false
console.log('列表', res) console.log('列表', res)
}) })
}, },
...@@ -423,6 +429,10 @@ export default { ...@@ -423,6 +429,10 @@ export default {
</script> </script>
<style scoped> <style scoped>
/*表格内容选中后的样式*/
::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td.el-table__cell{
background-color: #F6FCF5 !important;
}
::v-deep.app-container{ ::v-deep.app-container{
background-color:#ffffff; background-color:#ffffff;
} }
......
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