Commit 828deb0a authored by 盖献康's avatar 盖献康

bug

parent 9e09e489
...@@ -196,9 +196,7 @@ ...@@ -196,9 +196,7 @@
placeholder="暂无数据" placeholder="暂无数据"
v-model="checkDetail.payAmount" v-model="checkDetail.payAmount"
disabled disabled
> />
<template #prefix></template>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -245,9 +243,7 @@ ...@@ -245,9 +243,7 @@
placeholder="暂无数据" placeholder="暂无数据"
v-model="checkDetail.devicePrice" v-model="checkDetail.devicePrice"
disabled disabled
> />
<template #prefix></template>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
...@@ -433,7 +429,7 @@ export default { ...@@ -433,7 +429,7 @@ export default {
if (price === null) { if (price === null) {
return null return null
} else { } else {
return price.toFixed(2) return '¥' + price.toFixed(2)
} }
}, },
// 点击 预约信息-立即预约 // 点击 预约信息-立即预约
......
...@@ -169,9 +169,7 @@ ...@@ -169,9 +169,7 @@
placeholder="暂无数据" placeholder="暂无数据"
v-model="subscribeMessage.payAmount" v-model="subscribeMessage.payAmount"
disabled disabled
> />
<template #prefix></template>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -361,7 +359,7 @@ export default { ...@@ -361,7 +359,7 @@ export default {
if (price === null) { if (price === null) {
return null return null
} else { } else {
return price.toFixed(2) return '¥' + price.toFixed(2)
} }
}, },
getList() {}, getList() {},
...@@ -378,7 +376,7 @@ export default { ...@@ -378,7 +376,7 @@ export default {
this.total = res.total this.total = res.total
if (this.subscribeMessage.checkType === '2' && this.deviceList.length > 0) { if (this.subscribeMessage.checkType === '2' && this.deviceList.length > 0) {
this.deviceList.forEach(item => { this.deviceList.forEach(item => {
item['price'] = this.subscribeMessage.payAmount item['price'] = this.keepTwoDecimals(this.subscribeMessage.payAmount)
}) })
} }
console.log('列表', this.deviceList) console.log('列表', this.deviceList)
......
...@@ -200,8 +200,8 @@ ...@@ -200,8 +200,8 @@
type="success" type="success"
icon="el-icon-check" icon="el-icon-check"
plain plain
:disabled="scope.row.deviceId !== null"
@click="handleSubscribe(scope.row)" @click="handleSubscribe(scope.row)"
:disabled="scope.row.deviceId !== null"
>立即预约 >立即预约
</el-button> </el-button>
</template> </template>
...@@ -343,7 +343,7 @@ export default { ...@@ -343,7 +343,7 @@ export default {
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
orderByColumn: null, orderByColumn: null,
isAsc: null, isAsc: null,
petNickname: null, petNickname: null,
...@@ -384,7 +384,7 @@ export default { ...@@ -384,7 +384,7 @@ export default {
], ],
deviceQueryParams: { deviceQueryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 20,
reservationTime: null, // 检查日期(默认当前日期) reservationTime: null, // 检查日期(默认当前日期)
isPrivate: null, // 检查类型(0-外部、1医院) isPrivate: null, // 检查类型(0-外部、1医院)
checkTypeList: [], // 检查项目ID(String[]) checkTypeList: [], // 检查项目ID(String[])
...@@ -441,6 +441,13 @@ export default { ...@@ -441,6 +441,13 @@ export default {
this.loading = false this.loading = false
}) })
}, },
keepTwoDecimals(price) {
if (price === null) {
return null
} else {
return '¥' + price.toFixed(2)
}
},
/** 表单选择框对齐 */ /** 表单选择框对齐 */
cellClass(row) { cellClass(row) {
if (row.columnIndex === 0) { if (row.columnIndex === 0) {
...@@ -633,7 +640,7 @@ export default { ...@@ -633,7 +640,7 @@ export default {
this.deviceTotal = res.total this.deviceTotal = res.total
if (this.currentCheckType === '2' && this.deviceList.length > 0) { if (this.currentCheckType === '2' && this.deviceList.length > 0) {
this.deviceList.forEach(item => { this.deviceList.forEach(item => {
item['price'] = this.currentPayAmount item['price'] = this.keepTwoDecimals(this.currentPayAmount)
}) })
} }
}) })
...@@ -784,4 +791,8 @@ export default { ...@@ -784,4 +791,8 @@ export default {
.app-container { .app-container {
background-color: #FFFFFF; background-color: #FFFFFF;
} }
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 0vh !important;
}
</style> </style>
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