diff --git a/src/views/specialEquipment/check/Record.vue b/src/views/specialEquipment/check/Record.vue index 30407ac9..59657d3c 100644 --- a/src/views/specialEquipment/check/Record.vue +++ b/src/views/specialEquipment/check/Record.vue @@ -80,7 +80,7 @@ export default { data() { return { addOrUpdateVisible: false, - searchBarKeys: ['equipmentId', 'actualTime', 'specialType'], + searchBarKeys: ['name', 'actualCheckTime'], tableBtn: [ this.$auth.hasPermi('equipment:check-record:detail') ? { @@ -102,43 +102,69 @@ export default { : undefined, ].filter((v) => v), tableProps: [ - { prop: 'configName', label: '配置名称' }, - { prop: 'equipmentName', label: '设备名称' }, + { prop: 'name', label: '巡检单名称' }, + { prop: 'department', label: '部门' }, + { prop: 'actualCheckTime', label: '巡检时间', filter: parseTime }, + { prop: 'groupClass', label: '班次' }, { - prop: 'origin', - label: '数据来源', - filter: (val) => ['', '手动', 'PDA'][val], + prop: '_detail', + label: '巡检内容', + subcomponent: { + name: 'ViewDetail', + props: ['injectData'], + data() { + return {}; + }, + methods: { + handleClick() { + this.$emit('emitData', { + action: this.injectData.label, + value: this.injectData, + }); + }, + }, + render: function (h) { + return ( + + 详情 + + ); + }, + }, }, - // { prop: 'sectionName', label: '计划巡检时间' }, - { prop: 'actualTime', label: '实际巡检时间', filter: parseTime }, - // { prop: 'maintenanceDetail', label: '完成状态' }, - { prop: 'responsible', label: '巡检人' }, + { prop: 'remark', label: '备注' }, ], searchBarFormConfig: [ + // { + // type: 'select', + // label: '设备大类', + // placeholder: '请选择设备大类', + // param: 'specialType', + // onchange: true, + // selectOptions: [ + // { id: 1, name: '安全设备' }, + // { id: 2, name: '消防设备' }, + // { id: 3, name: '特种设备' }, + // ], + // filterable: true, + // }, + // { + // type: 'select', + // label: '设备', + // placeholder: '请选择设备', + // param: 'equipmentId', + // filterable: true, + // }, { - type: 'select', - label: '设备大类', - placeholder: '请选择设备大类', - param: 'specialType', - onchange: true, - selectOptions: [ - { id: 1, name: '安全设备' }, - { id: 2, name: '消防设备' }, - { id: 3, name: '特种设备' }, - ], - filterable: true, - }, - { - type: 'select', - label: '设备', - placeholder: '请选择设备', - param: 'equipmentId', - filterable: true, + type: 'input', + label: '巡检单名称', + placeholder: '请输入巡检单名称', + param: 'name', }, // 开始结束时间 { type: 'datePicker', - label: '时间段', + label: '巡检时间', dateType: 'daterange', // datetimerange format: 'yyyy-MM-dd', valueFormat: 'yyyy-MM-dd HH:mm:ss', @@ -146,7 +172,7 @@ export default { startPlaceholder: '开始日期', endPlaceholder: '结束日期', defaultTime: ['00:00:00', '23:59:59'], - param: 'actualTime', + param: 'actualCheckTime', // width: 350, }, { @@ -252,21 +278,20 @@ export default { queryParams: { pageNo: 1, pageSize: 10, - maintenanceStatus: null, - createTime: null, - equipmentId: null, + actualTime: null, + configId: null, special: true, specialType: null, }, // 表单参数 form: {}, - basePath: '/base/equipment-check-log', + basePath: '/base/equipment-check-order', mode: null, allSpecialEquipments: [], }; }, created() { - this.initSearchBar(); + // this.initSearchBar(); this.getList(); }, methods: { @@ -303,7 +328,8 @@ export default { this.loading = true; // 执行查询 this.recv(this.queryParams).then((response) => { - this.list = response.data.list; + // this.list = response.data.list; + this.list = [{}]; this.total = response.data.total; this.loading = false; });