Merge pull request 'projects/mesxc-lb' (#246) from projects/mesxc-lb into projects/mesxc-test

Reviewed-on: #246

src/views/specialEquipment/check/Record.vue

@@ -49,12 +49,21 @@
 import basicPageMixin from '@/mixins/lb/basicPageMixin';
 import { parseTime } from '../../core/mixins/code-filter';
 import RecordDetail from './Record-detail.vue';
+import moment from 'moment';
 
 export default {
 	name: 'SpecialEquipmentCheckRecord',
 	components: { RecordDetail },
 	mixins: [basicPageMixin],
 	data() {
+		const today = new Date();
+		const twoDaysAgo = new Date(today.getTime() - 2 * 24 * 60 * 60 * 1000);
+		twoDaysAgo.setHours(0, 0, 0, 0);
+		const t = [
+			moment(twoDaysAgo).format('yyyy-MM-DD HH:mm:ss'),
+			moment(today).format('yyyy-MM-DD HH:mm:ss'),
+		];
+
 		return {
 			detailOpen: false,
 			addOrUpdateVisible: false,
@@ -151,6 +160,7 @@ export default {
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
 					param: 'actualCheckTime',
+					defaultSelect: t,
 					// width: 350,
 				},
 				{
@@ -189,6 +199,7 @@ export default {
 				pageSize: 10,
 				special: true,
 				status: 2,
+				actualCheckTime: t,
 			},
 			// 表单参数
 			form: {},
@@ -204,7 +215,7 @@ export default {
 		getList() {
 			this.loading = true;
 			// 执行查询
-			this.recv(this.queryParams).then((response) => {
+			this.recv({ ...this.queryParams }).then((response) => {
 				this.list = response.data.list;
 				this.total = response.data.total;
 				this.loading = false;

src/views/specialEquipment/maintain/Record.vue

@@ -108,6 +108,14 @@ export default {
 	components: { DialogForm, RecordDetail },
 	mixins: [basicPageMixin],
 	data() {
+		const today = new Date();
+		const twoDaysAgo = new Date(today.getTime() - 2 * 24 * 60 * 60 * 1000);
+		twoDaysAgo.setHours(0, 0, 0, 0);
+		const t = [
+			moment(twoDaysAgo).format('yyyy-MM-DD HH:mm:ss'),
+			moment(today).format('yyyy-MM-DD HH:mm:ss'),
+		];
+
 		return {
 			recordDetailVisible: false,
 			searchBarKeys: [
@@ -301,7 +309,7 @@ export default {
 					endPlaceholder: '结束日期',
 					defaultTime: ['00:00:00', '23:59:59'],
 					param: 'startTime',
-					defaultSelect: null,
+					defaultSelect: t,
 					// width: 350,
 				},
 				// {
@@ -500,7 +508,7 @@ export default {
 				pageNo: 1,
 				pageSize: 10,
 				maintainPlanId: null,
-				startTime: null,
+				startTime: t,
 				// relatePlan: null,
 				// equipmentId: null,
 				special: true,