src/views/specialEquipment/basic/FireFighthing.vue

@@ -170,12 +170,7 @@ 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: [
@@ -255,8 +250,8 @@ export default {
 				[
 					{
 						datetime: true,
-						label: '有效期',
+						label: '有效期至',
-						prop: 'dueDate',
+						prop: 'dueTime',
 						bind: { clearable: true },
 					},
 					{},

src/views/specialEquipment/maintain/Record.vue

@@ -195,21 +195,18 @@ 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
 				},
 				// 开始结束时间
 				{
@@ -223,7 +220,6 @@ export default {
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
 					param: 'startTime',
-					defaultSelect: null
 					// width: 350,
 				},
 				{
@@ -233,7 +229,6 @@ export default {
 						{ name: '是', id: 1 },
 						{ name: '否', id: 2 },
 					],
-					defaultSelect: null,
 					param: 'relatePlan',
 				},
 				{
@@ -439,16 +434,12 @@ 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 =