From b367bfcbe479292e0b38e338a43d519a4fc97cec Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Wed, 27 Mar 2024 16:46:06 +0800
Subject: [PATCH] bugfix zentao

---
 .../specialEquipment/check/Record-detail.vue  | 38 ++++++++++++++-----
 src/views/specialEquipment/check/Record.vue   | 22 +----------
 .../specialEquipment/maintain/PlanConfig.vue  |  9 ++++-
 .../specialEquipment/maintain/Record.vue      | 15 +++++---
 4 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/src/views/specialEquipment/check/Record-detail.vue b/src/views/specialEquipment/check/Record-detail.vue
index 6396e241..95812609 100644
--- a/src/views/specialEquipment/check/Record-detail.vue
+++ b/src/views/specialEquipment/check/Record-detail.vue
@@ -19,7 +19,9 @@
 
 		<div class="drawer-body flex">
 			<div class="drawer-body__content">
-				<div class="form-part" style="margin-bottom: 32px">
+				<div
+					class="form-part"
+					style="margin-bottom: 32px">
 					<!-- <el-skeleton v-if="!showForm" animated /> -->
 					<el-form
 						class="equipment-info-form"
@@ -30,37 +32,49 @@
 						v-loading="formLoading">
 						<el-row :gutter="20">
 							<el-col :span="8">
-								<el-form-item label="巡检单名称" prop="name">
+								<el-form-item
+									label="巡检单名称"
+									prop="name">
 									<div style="">{{ form.name || '---' }}</div>
 								</el-form-item>
 							</el-col>
 
 							<el-col :span="8">
-								<el-form-item label="部门" prop="department">
+								<el-form-item
+									label="部门"
+									prop="department">
 									<div style="">{{ form.department || '---' }}</div>
 								</el-form-item>
 							</el-col>
 
 							<el-col :span="8">
-								<el-form-item label="班次" prop="groupClass">
+								<el-form-item
+									label="班次"
+									prop="groupClass">
 									<div style="">{{ form.groupClass || '---' }}</div>
 								</el-form-item>
 							</el-col>
 
 							<el-col :span="8">
-								<el-form-item label="巡检人" prop="checkPerson">
+								<el-form-item
+									label="巡检人"
+									prop="checkPerson">
 									<div style="">{{ form.checkPerson || '---' }}</div>
 								</el-form-item>
 							</el-col>
 
 							<el-col :span="8">
-								<el-form-item label="巡检时间" prop="planCheckTime">
-									<div style="">{{ form.planCheckTime | parseTime }}</div>
+								<el-form-item
+									label="巡检时间"
+									prop="planCheckTime">
+									<div style="">{{ form.actualCheckTime | parseTime }}</div>
 								</el-form-item>
 							</el-col>
 
 							<el-col :span="8">
-								<el-form-item label="确认人" prop="confirmPerson">
+								<el-form-item
+									label="确认人"
+									prop="confirmPerson">
 									<div style="">{{ form.confirmPerson || '---' }}</div>
 								</el-form-item>
 							</el-col>
@@ -81,7 +95,9 @@
 					<div
 						v-if="!disableEdit"
 						style="position: absolute; top: -40px; right: 0">
-						<el-button @click="handleAddAttr" type="text">
+						<el-button
+							@click="handleAddAttr"
+							type="text">
 							<i class="el-icon-plus"></i>
 							添加内容
 						</el-button>
@@ -112,7 +128,9 @@
 			</div>
 
 			<div class="drawer-body__footer">
-				<el-button v-if="!disableEdit" @click="handleCancel">
+				<el-button
+					v-if="!disableEdit"
+					@click="handleCancel">
 					{{ disableEdit ? '返回' : '取消' }}
 				</el-button>
 				<el-button
diff --git a/src/views/specialEquipment/check/Record.vue b/src/views/specialEquipment/check/Record.vue
index 6d827b55..ef108cf0 100644
--- a/src/views/specialEquipment/check/Record.vue
+++ b/src/views/specialEquipment/check/Record.vue
@@ -94,7 +94,7 @@ export default {
 				{ prop: 'name', label: '巡检单名称', showOverflowtooltip: true },
 				{ prop: 'department', label: '部门', showOverflowtooltip: true },
 				{
-					prop: 'planCheckTime',
+					prop: 'actualCheckTime',
 					label: '巡检时间',
 					width: 160,
 					filter: parseTime,
@@ -130,26 +130,6 @@ export default {
 				{ 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: 'input',
 					label: '巡检单名称',
diff --git a/src/views/specialEquipment/maintain/PlanConfig.vue b/src/views/specialEquipment/maintain/PlanConfig.vue
index 074e6d7c..f703b05e 100644
--- a/src/views/specialEquipment/maintain/PlanConfig.vue
+++ b/src/views/specialEquipment/maintain/PlanConfig.vue
@@ -105,7 +105,12 @@ export default {
 					: undefined,
 			].filter((v) => v),
 			tableProps: [
-				{ prop: 'name', label: '保养计划名称', showOverflowtooltip: true },
+				{
+					minWidth: 120,
+					prop: 'name',
+					label: '保养计划名称',
+					showOverflowtooltip: true,
+				},
 				{ prop: 'departmentName', label: '部门', showOverflowtooltip: true },
 				{
 					prop: 'lineName',
@@ -113,7 +118,7 @@ export default {
 					showOverflowtooltip: true,
 				},
 				{
-					minWidth: 120,
+					minWidth: 160,
 					prop: 'maintenancePeriod',
 					label: '保养频率(天/次)',
 					showOverflowtooltip: true,
diff --git a/src/views/specialEquipment/maintain/Record.vue b/src/views/specialEquipment/maintain/Record.vue
index 67201a53..7b2b12ba 100644
--- a/src/views/specialEquipment/maintain/Record.vue
+++ b/src/views/specialEquipment/maintain/Record.vue
@@ -88,7 +88,8 @@ import {
 import RecordDetail from './Record--detail.vue';
 import { TableBtn } from '@/components/tableInnerComponents';
 
-const timeFilter = (val) => moment(val).format('yyyy-MM-DD HH:mm:ss');
+const timeFilter = (val) =>
+	val ? moment(val).format('yyyy-MM-DD HH:mm:ss') : '---';
 
 export default {
 	name: 'SpecialEquipmentMaintainRecord',
@@ -485,11 +486,13 @@ export default {
 		getList() {
 			this.loading = true;
 			// 执行查询
-			this.recv({ ...this.queryParams, special: true }).then((response) => {
-				this.list = response.data.list;
-				this.total = response.data.total;
-				this.loading = false;
-			});
+			this.recv({ ...this.queryParams, special: true, confirmed: true }).then(
+				(response) => {
+					this.list = response.data.list;
+					this.total = response.data.total;
+					this.loading = false;
+				}
+			);
 		},
 		/** 取消按钮 */
 		cancel() {