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: 'name', label: '巡检单名称' },
-				{ prop: 'equipmentName', label: '设备名称' },
+				{ prop: 'department', label: '部门' },
+				{ prop: 'actualCheckTime', label: '巡检时间', filter: parseTime },
+				{ prop: 'groupClass', label: '班次' },
 				{
-					prop: 'origin',
+					prop: '_detail',
-					label: '数据来源',
+					label: '巡检内容',
-					filter: (val) => ['', '手动', 'PDA'][val],
+					subcomponent: {
+						name: 'ViewDetail',
+						props: ['injectData'],
+						data() {
+							return {};
 						},
-				// { prop: 'sectionName', label: '计划巡检时间' },
+						methods: {
-				{ prop: 'actualTime', label: '实际巡检时间', filter: parseTime },
+							handleClick() {
-				// { prop: 'maintenanceDetail', label: '完成状态' },
+								this.$emit('emitData', {
-				{ prop: 'responsible', label: '巡检人' },
+									action: this.injectData.label,
+									value: this.injectData,
+								});
+							},
+						},
+						render: function (h) {
+							return (
+								<el-button type="text" onClick={this.handleClick}>
+									详情
+								</el-button>
+							);
+						},
+					},
+				},
+				{ 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',
+					type: 'input',
-					label: '设备大类',
+					label: '巡检单名称',
-					placeholder: '请选择设备大类',
+					placeholder: '请输入巡检单名称',
-					param: 'specialType',
+					param: 'name',
-					onchange: true,
-					selectOptions: [
-						{ id: 1, name: '安全设备' },
-						{ id: 2, name: '消防设备' },
-						{ id: 3, name: '特种设备' },
-					],
-					filterable: true,
-				},
-				{
-					type: 'select',
-					label: '设备',
-					placeholder: '请选择设备',
-					param: 'equipmentId',
-					filterable: true,
 				},
 				// 开始结束时间
 				{
 					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,
+				actualTime: null,
-				createTime: null,
+				configId: null,
-				equipmentId: 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;
 			});