diff --git a/src/views/specialEquipment/basic/FireFighthing.vue b/src/views/specialEquipment/basic/FireFighthing.vue index 9f925444..2bd3409e 100644 --- a/src/views/specialEquipment/basic/FireFighthing.vue +++ b/src/views/specialEquipment/basic/FireFighthing.vue @@ -170,7 +170,12 @@ export default { { width: 256, prop: 'code', label: '设备编码' }, { prop: 'location', label: '位置' }, { prop: 'responsiblePeopleName', label: '负责人' }, - { prop: 'dueTime', label: '有效期至' }, + { + prop: 'dueDate', + label: '有效期至', + filter: (val) => + val != null ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '--', + }, { prop: 'remark', label: '备注' }, ], searchBarFormConfig: [ @@ -250,8 +255,8 @@ export default { [ { datetime: true, - label: '有效期至', - prop: 'dueTime', + label: '有效期', + prop: 'dueDate', bind: { clearable: true }, }, {}, diff --git a/src/views/specialEquipment/maintain/Record.vue b/src/views/specialEquipment/maintain/Record.vue index bf33d9a0..be4d1309 100644 --- a/src/views/specialEquipment/maintain/Record.vue +++ b/src/views/specialEquipment/maintain/Record.vue @@ -195,18 +195,21 @@ export default { { id: 3, name: '特种设备' }, ], filterable: true, + defaultSelect: null }, { type: 'select', label: '设备', placeholder: '请选择设备', param: 'equipmentId', + defaultSelect: null }, { type: 'select', label: '计划名称', placeholder: '请选择计划名称', param: 'maintainPlanId', + defaultSelect: null }, // 开始结束时间 { @@ -220,6 +223,7 @@ export default { endPlaceholder: '结束日期', defaultTime: ['00:00:00', '23:59:59'], param: 'startTime', + defaultSelect: null // width: 350, }, { @@ -229,6 +233,7 @@ export default { { name: '是', id: 1 }, { name: '否', id: 2 }, ], + defaultSelect: null, param: 'relatePlan', }, { @@ -434,12 +439,16 @@ export default { created() { this.initSearchBar(); if (this.$route.query) { + this.queryParams.specialType = + this.$route.query?.specialType ?? undefined; this.queryParams.equipmentId = this.$route.query?.equipmentId ?? undefined; this.queryParams.maintainPlanId = this.$route.query?.maintainPlanId ?? undefined; this.queryParams.relatePlan = this.$route.query?.relatePlan ?? undefined; this.queryParams.startTime = this.$route.query?.createTime ?? undefined; + this.searchBarFormConfig[0].defaultSelect = + this.$route.query.specialType ?? undefined; this.searchBarFormConfig[1].defaultSelect = this.$route.query.equipmentId ?? undefined; this.searchBarFormConfig[2].defaultSelect =