diff --git a/ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue b/ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue index 8f6d231..48c135a 100644 --- a/ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue +++ b/ant-design-vue-jeecg/src/views/system/task/AgvTaskList.vue @@ -154,7 +154,14 @@ export default { { title: '任务类型', align: "center", - dataIndex: 'taskType_dictText' + dataIndex: 'taskType_dictText', + filterMultiple: false, + filters: [ + {text: '取放货任务', value: '100'}, + {text: '行走任务', value: '200'}, + {text: '取货任务', value: '300'}, + {text: '放货任务', value: '400'}, + ] }, { title: '容器编码', @@ -175,7 +182,15 @@ export default { title: '任务状态', align: "center", dataIndex: 'status_dictText', - scopedSlots: {customRender: 'status_dictText'} + scopedSlots: {customRender: 'status_dictText'}, + filterMultiple: false, + filters: [ + {text: '生成任务', value: '1'}, + {text: '下发任务', value: '10'}, + {text: '开始执行', value: '20'}, + {text: '取货完成', value: '50'}, + {text: '任务完成', value: '100'}, + ] }, { title: '起始点位', @@ -252,6 +267,22 @@ export default { }, }, methods: { + handleTableChange(pagination, filters, sorter) { + //分页、排序、筛选变化时触发 + if (Object.keys(sorter).length > 0) { + this.isorter.column = sorter.field; + this.isorter.order = "ascend" == sorter.order ? "asc" : "desc" + } + //这种筛选方式只支持单选 + if (filters && Object.keys(filters).length > 0 && filters.taskType_dictText) { + this.filters.taskType = filters.taskType_dictText[0]; + } + if (filters && Object.keys(filters).length > 0 && filters.status_dictText) { + this.filters.status = filters.status_dictText[0]; + } + this.ipagination = pagination; + this.loadData(); + }, getStatusColor(status) { const colors = { '生成任务': 'green', diff --git a/ant-design-vue-jeecg/src/views/system/task/AllTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/AllTaskHeaderList.vue index 80906a9..71500dd 100644 --- a/ant-design-vue-jeecg/src/views/system/task/AllTaskHeaderList.vue +++ b/ant-design-vue-jeecg/src/views/system/task/AllTaskHeaderList.vue @@ -232,7 +232,24 @@ export default { title: '任务类型', align: "center", dataIndex: 'taskType_dictText', - scopedSlots: {customRender: 'taskType_dictText'} + scopedSlots: {customRender: 'taskType_dictText'}, + filterMultiple: false, + filters: [ + {text: '整盘入库', value: '100'}, + {text: '补充入库', value: '200'}, + {text: '空容器入库', value: '500'}, + {text: '空托盘组入库', value: '1100'}, + {text: '整盘出库', value: '300'}, + {text: '分拣出库', value: '400'}, + {text: '空容器出库', value: '600'}, + {text: '空托盘组出库', value: '1200'}, + {text: '移库', value: '800'}, + {text: '换站', value: '1000'}, + {text: '空托盘组换站', value: '1300'}, + {text: '盘点', value: '700'}, + {text: '质检', value: '1400'}, + {text: '出库查看', value: '900'}, + ] }, { title: '容器编码', @@ -266,7 +283,15 @@ export default { align: "center", dataIndex: 'status_dictText', key: 'status_dictText', - scopedSlots: {customRender: 'status_dictText'} + scopedSlots: {customRender: 'status_dictText'}, + filterMultiple: false, + filters: [ + {text: '生成任务', value: '1'}, + {text: '下发任务', value: '10'}, + {text: '开始执行', value: '20'}, + {text: '到达拣选台', value: '50'}, + {text: '任务完成', value: '100'}, + ] }, { title: '异常信息', @@ -377,6 +402,22 @@ export default { } }, methods: { + handleTableChange(pagination, filters, sorter) { + //分页、排序、筛选变化时触发 + if (Object.keys(sorter).length > 0) { + this.isorter.column = sorter.field; + this.isorter.order = "ascend" == sorter.order ? "asc" : "desc" + } + //这种筛选方式只支持单选 + if (filters && Object.keys(filters).length > 0 && filters.taskType_dictText) { + this.filters.taskType = filters.taskType_dictText[0]; + } + if (filters && Object.keys(filters).length > 0 && filters.status_dictText) { + this.filters.status = filters.status_dictText[0]; + } + this.ipagination = pagination; + this.loadData(); + }, getStatusColor(status) { const colors = { '生成任务': 'green', diff --git a/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue index 4c33f8b..46ec01e 100644 --- a/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue +++ b/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue @@ -233,7 +233,13 @@ export default { align: "center", dataIndex: 'taskType_dictText', customFilterDropdown: true, - scopedSlots: {customRender: 'taskType_dictText'} + scopedSlots: {customRender: 'taskType_dictText'}, + filterMultiple: false, + filters: [ + {text: '盘点', value: '700'}, + {text: '质检', value: '1400'}, + {text: '出库查看', value: '900'}, + ] }, { title: '容器编码', @@ -266,7 +272,15 @@ export default { title: '任务状态', align: "center", dataIndex: 'status_dictText', - scopedSlots: {customRender: 'status_dictText'} + scopedSlots: {customRender: 'status_dictText'}, + filterMultiple: false, + filters: [ + {text: '生成任务', value: '1'}, + {text: '下发任务', value: '10'}, + {text: '开始执行', value: '20'}, + {text: '到达拣选台', value: '50'}, + {text: '任务完成', value: '100'}, + ] }, { title: '异常信息', @@ -376,6 +390,22 @@ export default { } }, methods: { + handleTableChange(pagination, filters, sorter) { + //分页、排序、筛选变化时触发 + if (Object.keys(sorter).length > 0) { + this.isorter.column = sorter.field; + this.isorter.order = "ascend" == sorter.order ? "asc" : "desc" + } + //这种筛选方式只支持单选 + if (filters && Object.keys(filters).length > 0 && filters.taskType_dictText) { + this.filters.taskType = filters.taskType_dictText[0]; + } + if (filters && Object.keys(filters).length > 0 && filters.status_dictText) { + this.filters.status = filters.status_dictText[0]; + } + this.ipagination = pagination; + this.loadData(); + }, getStatusColor(status) { const colors = { '生成任务': 'green', diff --git a/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue index ea571bf..6dfc7a4 100644 --- a/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue +++ b/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue @@ -246,7 +246,14 @@ export default { title: '任务类型', align: "center", dataIndex: 'taskType_dictText', - scopedSlots: {customRender: 'taskType_dictText'} + scopedSlots: {customRender: 'taskType_dictText'}, + filterMultiple: false, + filters: [ + {text: '整盘入库', value: '100'}, + {text: '补充入库', value: '200'}, + {text: '空容器入库', value: '500'}, + {text: '空托盘组入库', value: '1100'}, + ] }, { title: '容器编码', @@ -280,7 +287,15 @@ export default { align: "center", dataIndex: 'status_dictText', key: 'status_dictText', - scopedSlots: {customRender: 'status_dictText'} + scopedSlots: {customRender: 'status_dictText'}, + filterMultiple: false, + filters: [ + {text: '生成任务', value: '1'}, + {text: '下发任务', value: '10'}, + {text: '开始执行', value: '20'}, + {text: '到达拣选台', value: '50'}, + {text: '任务完成', value: '100'}, + ] }, { title: '异常信息', @@ -391,6 +406,22 @@ export default { } }, methods: { + handleTableChange(pagination, filters, sorter) { + //分页、排序、筛选变化时触发 + if (Object.keys(sorter).length > 0) { + this.isorter.column = sorter.field; + this.isorter.order = "ascend" == sorter.order ? "asc" : "desc" + } + //这种筛选方式只支持单选 + if (filters && Object.keys(filters).length > 0 && filters.taskType_dictText) { + this.filters.taskType = filters.taskType_dictText[0]; + } + if (filters && Object.keys(filters).length > 0 && filters.status_dictText) { + this.filters.status = filters.status_dictText[0]; + } + this.ipagination = pagination; + this.loadData(); + }, getStatusColor(status) { const colors = { '生成任务': 'green', diff --git a/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue index 5b7fe14..f0dfee2 100644 --- a/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue +++ b/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue @@ -242,7 +242,14 @@ export default { title: '任务类型', align: "center", dataIndex: 'taskType_dictText', - scopedSlots: {customRender: 'taskType_dictText'} + scopedSlots: {customRender: 'taskType_dictText'}, + filterMultiple: false, + filters: [ + {text: '整盘出库', value: '300'}, + {text: '分拣出库', value: '400'}, + {text: '空容器出库', value: '600'}, + {text: '空托盘组出库', value: '1200'}, + ] }, { title: '容器编码', @@ -276,7 +283,15 @@ export default { align: "center", dataIndex: 'status_dictText', key: 'status_dictText', - scopedSlots: {customRender: 'status_dictText'} + scopedSlots: {customRender: 'status_dictText'}, + filterMultiple: false, + filters: [ + {text: '生成任务', value: '1'}, + {text: '下发任务', value: '10'}, + {text: '开始执行', value: '20'}, + {text: '到达拣选台', value: '50'}, + {text: '任务完成', value: '100'}, + ] }, { title: '异常信息', @@ -386,6 +401,22 @@ export default { } }, methods: { + handleTableChange(pagination, filters, sorter) { + //分页、排序、筛选变化时触发 + if (Object.keys(sorter).length > 0) { + this.isorter.column = sorter.field; + this.isorter.order = "ascend" == sorter.order ? "asc" : "desc" + } + //这种筛选方式只支持单选 + if (filters && Object.keys(filters).length > 0 && filters.taskType_dictText) { + this.filters.taskType = filters.taskType_dictText[0]; + } + if (filters && Object.keys(filters).length > 0 && filters.status_dictText) { + this.filters.status = filters.status_dictText[0]; + } + this.ipagination = pagination; + this.loadData(); + }, getStatusColor(status) { const colors = { '生成任务': 'green', diff --git a/ant-design-vue-jeecg/src/views/system/task/TaskHeaderHistoryList.vue b/ant-design-vue-jeecg/src/views/system/task/TaskHeaderHistoryList.vue index ea52106..c0782e5 100644 --- a/ant-design-vue-jeecg/src/views/system/task/TaskHeaderHistoryList.vue +++ b/ant-design-vue-jeecg/src/views/system/task/TaskHeaderHistoryList.vue @@ -195,7 +195,24 @@ export default { title: '任务类型', align: "center", dataIndex: 'taskType_dictText', - scopedSlots: {customRender: 'taskType_dictText'} + scopedSlots: {customRender: 'taskType_dictText'}, + filterMultiple: false, + filters: [ + {text: '整盘入库', value: '100'}, + {text: '补充入库', value: '200'}, + {text: '空容器入库', value: '500'}, + {text: '空托盘组入库', value: '1100'}, + {text: '整盘出库', value: '300'}, + {text: '分拣出库', value: '400'}, + {text: '空容器出库', value: '600'}, + {text: '空托盘组出库', value: '1200'}, + {text: '移库', value: '800'}, + {text: '换站', value: '1000'}, + {text: '空托盘组换站', value: '1300'}, + {text: '盘点', value: '700'}, + {text: '质检', value: '1400'}, + {text: '出库查看', value: '900'}, + ] }, { title: '容器编码', @@ -229,7 +246,15 @@ export default { align: "center", dataIndex: 'status_dictText', key: 'status_dictText', - scopedSlots: {customRender: 'status_dictText'} + scopedSlots: {customRender: 'status_dictText'}, + filterMultiple: false, + filters: [ + {text: '生成任务', value: '1'}, + {text: '下发任务', value: '10'}, + {text: '开始执行', value: '20'}, + {text: '到达拣选台', value: '50'}, + {text: '任务完成', value: '100'}, + ] }, { title: '异常信息', @@ -313,6 +338,22 @@ export default { } }, methods: { + handleTableChange(pagination, filters, sorter) { + //分页、排序、筛选变化时触发 + if (Object.keys(sorter).length > 0) { + this.isorter.column = sorter.field; + this.isorter.order = "ascend" == sorter.order ? "asc" : "desc" + } + //这种筛选方式只支持单选 + if (filters && Object.keys(filters).length > 0 && filters.taskType_dictText) { + this.filters.taskType = filters.taskType_dictText[0]; + } + if (filters && Object.keys(filters).length > 0 && filters.status_dictText) { + this.filters.status = filters.status_dictText[0]; + } + this.ipagination = pagination; + this.loadData(); + }, getStatusColor(status) { const colors = { '生成任务': 'green', diff --git a/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue index 6fcb446..b13c43c 100644 --- a/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue +++ b/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue @@ -228,7 +228,13 @@ export default { title: '任务类型', align: "center", dataIndex: 'taskType_dictText', - scopedSlots: {customRender: 'taskType_dictText'} + scopedSlots: {customRender: 'taskType_dictText'}, + filterMultiple: false, + filters: [ + {text: '移库', value: '800'}, + {text: '换站', value: '1000'}, + {text: '空托盘组换站', value: '1300'}, + ] }, { title: '容器编码', @@ -266,7 +272,15 @@ export default { title: '任务状态', align: "center", dataIndex: 'status_dictText', - scopedSlots: {customRender: 'status_dictText'} + scopedSlots: {customRender: 'status_dictText'}, + filterMultiple: false, + filters: [ + {text: '生成任务', value: '1'}, + {text: '下发任务', value: '10'}, + {text: '开始执行', value: '20'}, + {text: '到达拣选台', value: '50'}, + {text: '任务完成', value: '100'}, + ] }, { title: '异常信息', @@ -376,6 +390,22 @@ export default { } }, methods: { + handleTableChange(pagination, filters, sorter) { + //分页、排序、筛选变化时触发 + if (Object.keys(sorter).length > 0) { + this.isorter.column = sorter.field; + this.isorter.order = "ascend" == sorter.order ? "asc" : "desc" + } + //这种筛选方式只支持单选 + if (filters && Object.keys(filters).length > 0 && filters.taskType_dictText) { + this.filters.taskType = filters.taskType_dictText[0]; + } + if (filters && Object.keys(filters).length > 0 && filters.status_dictText) { + this.filters.status = filters.status_dictText[0]; + } + this.ipagination = pagination; + this.loadData(); + }, getStatusColor(status) { const colors = { '生成任务': 'green',