更新

src/views/asrs/jobMainTaskHistory/index.vue

@@ -30,46 +30,38 @@ const tableProps = [
 	{
 		prop: 'mainTaskCode',
 		label: '任务编码',
-		align: 'center',
 	},
 	{
 		prop: 'mainTaskType',
 		label: '任务类型',
-		align: 'center',
 		filter: codeFilter('mainTaskType'),
 	},
 	{
 		prop: 'stacker',
 		label: '堆垛机',
-		align: 'center',
 	},
 	{
 		prop: 'agv',
 		label: 'agv',
-		align: 'center',
 	},
 	{
 		prop: 'mainTaskState',
 		label: '状态',
-		align: 'center',
 		filter: codeFilter('mainTaskState'),
 	},
 	{
 		prop: 'taskSource',
 		label: '任务来源',
-		align: 'center',
 		filter: codeFilter('taskSource'),
 	},
 	{
 		prop: 'createTime',
 		label: '创建时间',
-		align: 'center',
 		filter: parseTime,
 	},
 	{
 		prop: 'cancellation',
 		label: '是否取消',
-		align: 'center',
 		filter: codeFilter('cancellation'),
 	},
 ];
@@ -117,6 +109,34 @@ const mainTaskState = [
 		id: 5,
 	},
 ];
+const agvArr = [
+	{
+		name: 'A1',
+		id: 1,
+	},
+	{
+		name: 'A2',
+		id: 2,
+	},
+	{
+		name: 'A3',
+		id: 3,
+	},
+];
+const stackerArr = [
+	{
+		name: 'D1',
+		id: 1,
+	},
+	{
+		name: 'D2',
+		id: 2,
+	},
+	{
+		name: 'D3',
+		id: 3,
+	},
+];
 export default {
 	mixins: [basicPage],
 	data() {
@@ -150,23 +170,27 @@ export default {
 					filterable: true,
 				},
 				{
-					type: 'input',
+					type: 'select',
 					label: '堆垛机',
-					placeholder: '堆垛机',
+					selectOptions: stackerArr,
 					param: 'stacker',
+					defaultSelect: '',
+					filterable: true,
 				},
 				{
-					type: 'input',
+					type: 'select',
 					label: 'agv',
-					placeholder: 'agv',
+					selectOptions: agvArr,
 					param: 'agv',
+					defaultSelect: '',
+					filterable: true,
 				},
 				{
 					type: 'datePicker',
 					label: '选择日期',
 					dateType: 'daterange',
 					format: 'yyyy-MM-dd',
-					valueFormat: 'yyyy-MM-dd',
+					valueFormat: 'yyyy-MM-dd hh:mm:ss',
 					rangeSeparator: '-',
 					startPlaceholder: '开始时间',
 					endPlaceholder: '结束时间',
@@ -202,6 +226,7 @@ export default {
 					this.listQuery.mainTaskState = val.status;
 					this.listQuery.stacker = val.stacker;
 					this.listQuery.agv = val.agv;
+					this.listQuery.createTime = val.searchTime;
 					this.listQuery.startTime = val.searchTime ? val.searchTime[0] : '';
 					this.listQuery.endTime = val.searchTime ? val.searchTime[1] : '';
 					this.getDataList();