From 0edf54ed133d45467ebf534d1eedcef97e1b436e Mon Sep 17 00:00:00 2001
From: icewint <icewint@qq.com>
Date: Tue, 11 Jun 2024 12:47:28 +0800
Subject: [PATCH] <save>

---
 src/enum/elTag/eltag.task.type.enum.js        | 24 +++++++++++++++++++
 .../component/elTagTask/ElTagTaskList.vue     |  8 +++++++
 src/view/component/elTagTask/SearchForm.vue   |  9 +++++++
 src/view/layout/MainAside.vue                 |  2 +-
 src/view/tab/taskManage/ElTagTask.vue         |  1 +
 5 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 src/enum/elTag/eltag.task.type.enum.js

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 @@
         <el-table-column fixed prop="taskId" label="任务号" width="230px" align="center" show-overflow-tooltip/>
         <el-table-column fixed prop="taskGroup" label="任务组" width="120px" align="center" show-overflow-tooltip/>
         <el-table-column prop="location" label="点位" width="120px" align="center" show-overflow-tooltip/>
+        <el-table-column prop="taskType" label="任务类型" width="140px" align="center">
+          <template #default="scope">
+            <el-tag class="ml-2" :type=formatterElTagTaskTypeEnum(scope.row.taskType).color>
+              {{formatterElTagTaskTypeEnum(scope.row.taskType).label }}</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column prop="orderId" label="订单号" width="100px" align="center" show-overflow-tooltip/>
         <el-table-column prop="vehicleNo" label="载具号" width="100px" align="center" show-overflow-tooltip/>
         <el-table-column prop="goodsId" label="物料编号" width="100px" align="center" show-overflow-tooltip/>
@@ -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 @@
         <el-form-item label="查询关键字：">
           <el-input placeholder="输入 点位/任务号/箱号/订单号 查询..." v-model="searchParams.searchStr" clearable></el-input>
         </el-form-item>
+        <el-form-item label="任务类型：">
+          <el-select v-model="searchParams.elTagTaskType" multiple placeholder="请选择需要查询的任务类型">
+            <el-option v-for="item in elTagTaskTypeEnum" :key="item.value" :label="item.label" :value="item.value"/>
+          </el-select>
+        </el-form-item>
         <el-form-item label="任务状态：">
           <el-select v-model="searchParams.elTagTaskStatus" multiple placeholder="请选择需要查询的任务状态">
             <el-option v-for="item in elTagTaskStatusEnum" :key="item.value" :label="item.label" :value="item.value"/>
@@ -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: {