Commit 08015bbd authored by 高滢's avatar 高滢

使用 添加上传报告时间

parent 4f3c3686
...@@ -153,7 +153,7 @@ export const constantRoutes = [ ...@@ -153,7 +153,7 @@ export const constantRoutes = [
props: true, props: true,
component: () => import('@/views/equipment-management/use-management/use-details'), component: () => import('@/views/equipment-management/use-management/use-details'),
name: 'UseDetails', name: 'UseDetails',
meta: { title: '详情', icon: 'table', activeMenu: '/use-details' } meta: { title: '详情', icon: 'table' }
} }
] ]
}, },
......
<template> <template>
<div> <div>
<div style="background-color: #fff;height: 100%;margin-top: 20px;"> <div style="background-color: #fff;height: 100%;margin-top: 20px;">
<div style=" text-align: center;padding-top: 40px;height: 100px;"> <div style=" text-align: center;padding-top: 30px;height: 100px;">
<span style="font-size: 24px;font-weight: bold; color: #333333;line-height: 20px;">详情</span> <span style="font-size: 24px;font-weight: bold; color: #333333;line-height: 20px;">详情</span>
</div> </div>
<div style="display: flex; padding-left: 20px;padding-top: 20px;padding-bottom: 20px;"> <div style="display: flex; padding-left: 20px;padding-top: 10px;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: 18px;color: #666666; font-weight: 500; font-size: 16px;">设备信息</div>
</div> </div>
...@@ -317,14 +317,10 @@ import { CodeToText } from 'element-china-area-data' ...@@ -317,14 +317,10 @@ 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'],
props: {
id: {
type: Number,
required: true
}
},
data() { data() {
return { return {
useId: '',
createTime: '',
// 检查时间 // 检查时间
checkTime: '', checkTime: '',
// 检查日期 // 检查日期
...@@ -353,6 +349,7 @@ export default { ...@@ -353,6 +349,7 @@ export default {
} }
}, },
created() { created() {
this.useId = localStorage.getItem('useId')
this.getUseDetail() this.getUseDetail()
this.getCheckList() this.getCheckList()
}, },
...@@ -382,7 +379,7 @@ export default { ...@@ -382,7 +379,7 @@ export default {
}, },
// 查询详情 // 查询详情
getUseDetail() { getUseDetail() {
useManagementDetail(this.id).then(res => { useManagementDetail(this.useId).then(res => {
this.form = res.data this.form = res.data
console.log('xiangq', res) console.log('xiangq', res)
if (res.data.useTime !== '' && res.data.useTime !== null) { if (res.data.useTime !== '' && res.data.useTime !== null) {
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
v-model="daterangeCreateTime" v-model="daterangeCreateTime"
type="date" type="date"
style="width: 240px" style="width: 240px"
placeholder="选择创建日期" placeholder="选择检查日期"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
/> />
</el-form-item> </el-form-item>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-table ref="table" v-loading="loading" :data="userList" border :row-key="getRowKeys" :header-cell-class-name="cellClass" @selection-change="handleSelectionChange"> <el-table ref="table" v-loading="loading" :data="userList" :row-key="getRowKeys" :header-cell-style="{background:'#E8E9E8'}" @selection-change="handleSelectionChange">
<el-table-column type="selection" min-width="50" align="center" :reserve-selection="true" /> <el-table-column type="selection" min-width="50" align="center" :reserve-selection="true" />
<el-table-column type="index" label="序号" min-width="60" /> <el-table-column type="index" label="序号" min-width="60" />
<el-table-column label="设备名称" align="left" prop="deviceName" min-width="80" :show-overflow-tooltip="true"> <el-table-column label="设备名称" align="left" prop="deviceName" min-width="80" :show-overflow-tooltip="true">
...@@ -128,12 +128,12 @@ ...@@ -128,12 +128,12 @@
</el-table-column> </el-table-column>
<el-table-column label="检查日期" align="left" prop="checkStartTime"> <el-table-column label="检查日期" align="left" prop="checkStartTime">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.checkStartTime, '{y}/{m}/{d}') || '-' }}</span> <span>{{ parseTime(scope.row.reportTime, '{y}/{m}/{d}') || '-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检查时间" align="left" prop="checkStartTime"> <el-table-column label="检查时间" align="left" prop="checkStartTime">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.checkStartTime, '{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">
...@@ -215,29 +215,29 @@ export default { ...@@ -215,29 +215,29 @@ export default {
sortedColumn: '', sortedColumn: '',
// 排序规则 // 排序规则
sortedList: [ sortedList: [
{
id: '1',
collation: 'asc',
sortedColumn: '按检查时间升序',
nameColumn: 'checkItemsName'
},
{ {
id: '2', id: '2',
collation: 'desc', collation: 'desc',
sortedColumn: '按检查时间序', sortedColumn: '按检查时间序',
nameColumn: 'checkItemsName' nameColumn: 'c.report_time'
}, },
{ {
id: '3', id: '1',
collation: 'asc', collation: 'asc',
sortedColumn: '按预约时间升序', sortedColumn: '按检查时间正序',
nameColumn: 'appointTime' nameColumn: 'c.report_time'
}, },
{ {
id: '4', id: '4',
collation: 'desc', collation: 'desc',
sortedColumn: '按预约时间降序', sortedColumn: '按预约时间倒序',
nameColumn: 'appointTime' nameColumn: 'c.appoint_time'
},
{
id: '3',
collation: 'asc',
sortedColumn: '按预约时间正序',
nameColumn: 'c.appoint_time'
} }
], ],
total: 0, total: 0,
...@@ -385,11 +385,9 @@ export default { ...@@ -385,11 +385,9 @@ export default {
}, },
// 去详情页 // 去详情页
detailsUse(row) { detailsUse(row) {
localStorage.setItem('useId', row.id)
this.$router.push({ this.$router.push({
name: 'UseDetails', name: 'UseDetails'
params: {
id: row.id
}
}) })
}, },
// 设备状态 value 和label 的转换 // 设备状态 value 和label 的转换
......
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