Commit 80a9e9ad authored by 王飞龙's avatar 王飞龙

bug修改

parent 9be7028e
......@@ -156,11 +156,11 @@
<span>{{ scope.row.phone || "-" }}</span>
</template>
</el-table-column>
<el-table-column label="设备类型" align="left" prop="deviceType" min-width="100" show-overflow-tooltip>
<el-table-column label="设备类型" align="left" prop="deviceType" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.deviceType=== null||scope.row.deviceType=== '' ">{{ "-" }}</span>
<span v-else>
<dict-tag :options="dict.type.device_type" :value="scope.row.deviceType " />
<span>{{ selectDictLabel(dict.type.device_type,scope.row.deviceType) }}</span>
</span>
</template>
</el-table-column>
......@@ -278,7 +278,7 @@
import { regionData } from 'element-china-area-data'
import { listDevice, delDevice } from '@/api/business/device'
import { getInfo } from '@/api/login'
import { parseTime } from '@/utils/ruoyi'
import { parseTime, selectDictLabel } from '@/utils/ruoyi'
import { mapGetters } from 'vuex'
import { listItem } from '@/api/business/item'
import { signHospitalMessage } from '@/api/business/hospital'
......@@ -370,6 +370,7 @@ export default {
}
],
dictdata: '设备类型超长字符测试啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊啊',
// 预约方式
options: [{
value: '1',
......@@ -509,6 +510,7 @@ export default {
this.getUserInfo()
},
methods: {
selectDictLabel,
// 获取登陆人信息
getUserInfo() {
getInfo().then(res => {
......
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