diff --git a/src/enum/elTag/eltag.task.type.enum.js b/src/enum/elTag/eltag.task.type.enum.js
new file mode 100644
index 0000000..b5291cc
--- /dev/null
+++ b/src/enum/elTag/eltag.task.type.enum.js
@@ -0,0 +1,24 @@
+// 电子标签任务类型
+export const elTagTaskTypeEnum = {
+ pick: {
+ value: 1,
+ label: '拣选任务',
+ color: 'primary'
+ },
+ stock: {
+ value: 2,
+ label: '存储任务',
+ color: 'warning'
+ }
+}
+
+export function formatterElTagTaskTypeEnum(value) {
+ switch (parseInt(value)){
+ case elTagTaskTypeEnum.pick.value:
+ return {label: elTagTaskTypeEnum.pick.label, color: elTagTaskTypeEnum.pick.color};
+ case elTagTaskTypeEnum.stock.value:
+ return {label: elTagTaskTypeEnum.stock.label, color: elTagTaskTypeEnum.stock.color};
+ default:
+ return {label: `未知类型:${value}`, color: 'danger'};
+ }
+}
\ No newline at end of file
diff --git a/src/view/component/elTagTask/ElTagTaskList.vue b/src/view/component/elTagTask/ElTagTaskList.vue
index 87a9a28..4d77bef 100644
--- a/src/view/component/elTagTask/ElTagTaskList.vue
+++ b/src/view/component/elTagTask/ElTagTaskList.vue
@@ -6,6 +6,12 @@
+
+
+
+ {{formatterElTagTaskTypeEnum(scope.row.taskType).label }}
+
+
@@ -63,6 +69,7 @@ import {Switch} from "@element-plus/icons-vue";
import formatterTime from "@/plugins/formatter/formatter.time";
import {formatterElTagTaskStatusEnum} from "@/enum/elTag/eltag.task.enum";
import EditElTagTask from "@/view/component/elTagTask/EditElTagTask.vue";
+import {formatterElTagTaskTypeEnum} from "@/enum/elTag/eltag.task.type.enum";
export default {
// import 引入的组件需要注入到对象中才能使用
@@ -86,6 +93,7 @@ export default {
watch: {},
// 方法集合
methods: {
+ formatterElTagTaskTypeEnum,
formatterElTagTaskStatusEnum,
// 变更任务状态
changeTaskStatus(row) {
diff --git a/src/view/component/elTagTask/SearchForm.vue b/src/view/component/elTagTask/SearchForm.vue
index c08cf07..28b19db 100644
--- a/src/view/component/elTagTask/SearchForm.vue
+++ b/src/view/component/elTagTask/SearchForm.vue
@@ -5,6 +5,11 @@
+
+
+
+
+
@@ -38,6 +43,7 @@
// import 《组件名称》 from '《组件路径》 ';
import {elTagTaskStatusEnum} from "@/enum/elTag/eltag.task.enum";
+import {elTagTaskTypeEnum} from "@/enum/elTag/eltag.task.type.enum";
import {ElLoading, ElMessage} from "element-plus";
import elTagApi from "@/axios/el.tag"
import AddElTagTask from "@/view/component/elTagTask/AddElTagTask.vue";
@@ -57,6 +63,9 @@ export default {
computed: {
elTagTaskStatusEnum() {
return elTagTaskStatusEnum
+ },
+ elTagTaskTypeEnum() {
+ return elTagTaskTypeEnum
}
},
// 监控 data 中的数据变化
diff --git a/src/view/layout/MainAside.vue b/src/view/layout/MainAside.vue
index cb01fdf..174078b 100644
--- a/src/view/layout/MainAside.vue
+++ b/src/view/layout/MainAside.vue
@@ -63,7 +63,7 @@ export default {
h('div', null, '(。•́︿•̀。) ')
]),
'页面维护', {
- confirmButtonText: '我知道啦',
+ confirmButtonText: '摸摸头',
callback: (action) => {}
})
return
diff --git a/src/view/tab/taskManage/ElTagTask.vue b/src/view/tab/taskManage/ElTagTask.vue
index 6cc743b..431a387 100644
--- a/src/view/tab/taskManage/ElTagTask.vue
+++ b/src/view/tab/taskManage/ElTagTask.vue
@@ -26,6 +26,7 @@ export default {
// 搜索参数
searchParams: {
searchStr: '',
+ elTagTaskType: [1,2],
elTagTaskStatus: [0,1,2,9],
timeRange: [],
page: {