From 2bd11479349e0e7d549495f8034997c5f8be1077 Mon Sep 17 00:00:00 2001
From: icewint <icewint@qq.com>
Date: Fri, 31 May 2024 13:36:09 +0800
Subject: [PATCH] =?UTF-8?q?<add>[important]=E7=94=B5=E5=AD=90=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/axios/el.tag.js                           |   4 +
 src/enum/elTag/eltag.task.enum.js             |   9 +-
 src/view/component/elTagTask/AddElTagTask.vue | 161 ++++++++++++++++++
 .../component/elTagTask/EditElTagTask.vue     |   5 +-
 .../component/elTagTask/ElTagTaskList.vue     |   3 +
 src/view/component/elTagTask/SearchForm.vue   |  12 +-
 6 files changed, 189 insertions(+), 5 deletions(-)
 create mode 100644 src/view/component/elTagTask/AddElTagTask.vue

diff --git a/src/axios/el.tag.js b/src/axios/el.tag.js
index 3ab2e30..06ddd74 100644
--- a/src/axios/el.tag.js
+++ b/src/axios/el.tag.js
@@ -9,4 +9,8 @@ export default {
     updateElTagTask(request) {
         return axios.post('/api/wcs/elTag/editTaskInfo', request);
     },
+    // 添加一条电子标签任务
+    insertElTagTask(request) {
+        return axios.post('/api/wcs/elTag/addTask', request);
+    },
 }
\ No newline at end of file
diff --git a/src/enum/elTag/eltag.task.enum.js b/src/enum/elTag/eltag.task.enum.js
index 619161c..641eb67 100644
--- a/src/enum/elTag/eltag.task.enum.js
+++ b/src/enum/elTag/eltag.task.enum.js
@@ -3,7 +3,7 @@
 export const elTagTaskStatusEnum = {
     creat: {
         value: 0,
-        label: '新创建',
+        label: '待点亮',
         color: 'info'
     },
     queue: {
@@ -14,6 +14,11 @@ export const elTagTaskStatusEnum = {
     running: {
         value: 2,
         label: '已确认',
+        color: 'warning'
+    },
+    off: {
+        value: 3,
+        label: '已熄灭',
         color: 'primary'
     },
     error: {
@@ -31,6 +36,8 @@ export function  formatterElTagTaskStatusEnum(value) {
             return {label: elTagTaskStatusEnum.queue.label, color: elTagTaskStatusEnum.queue.color};
         case elTagTaskStatusEnum.running.value:
             return {label: elTagTaskStatusEnum.running.label, color: elTagTaskStatusEnum.running.color};
+        case elTagTaskStatusEnum.off.value:
+            return {label: elTagTaskStatusEnum.off.label, color: elTagTaskStatusEnum.off.color};
 
         case elTagTaskStatusEnum.error.value:
             return {label: elTagTaskStatusEnum.error.label, color: elTagTaskStatusEnum.error.color};
diff --git a/src/view/component/elTagTask/AddElTagTask.vue b/src/view/component/elTagTask/AddElTagTask.vue
new file mode 100644
index 0000000..2be816b
--- /dev/null
+++ b/src/view/component/elTagTask/AddElTagTask.vue
@@ -0,0 +1,161 @@
+<template>
+  <div>
+    <el-dialog :model-value="modelValue" :show-close="false" title="添加电子标签新任务"
+               @close="() => $emit('update:modelValue', false)">
+      <div>
+        <el-form
+            label-width="100px"
+            :model="elTagTaskItem"
+            require-asterisk-position="left"
+        >
+          <el-form-item label="任务组：">
+            <el-input v-model="elTagTaskItem.taskGroup"/>
+          </el-form-item>
+          <el-form-item label="任务号：">
+            <el-input v-model="elTagTaskItem.taskId"/>
+          </el-form-item>
+          <el-form-item label="点位：" required>
+            <el-input v-model="elTagTaskItem.location"/>
+          </el-form-item>
+          <el-form-item label="订单号：">
+            <el-input v-model="elTagTaskItem.orderId"/>
+          </el-form-item>
+          <el-form-item label="载具号：" required>
+            <el-input v-model="elTagTaskItem.vehicleNo"/>
+          </el-form-item>
+          <el-form-item label="物料编号：">
+            <el-input v-model="elTagTaskItem.goodsId"/>
+          </el-form-item>
+          <el-form-item label="物料名称：">
+            <el-input v-model="elTagTaskItem.goodsName"/>
+          </el-form-item>
+          <el-form-item label="需求数量：" required>
+            <el-input-number v-model="elTagTaskItem.needNum" :min="0" :max="999"/>
+          </el-form-item>
+          <el-form-item label="备注信息：">
+            <el-input v-model="elTagTaskItem.remark"/>
+          </el-form-item>
+        </el-form>
+      </div>
+      <template #footer>
+        <div>
+          <el-button type="primary" @click="add">添加任务</el-button>
+          <el-button type="danger" @click="$emit('update:modelValue', false)">关闭窗口</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+// import  《组件名称》  from '《组件路径》 ';
+import elTagApi from "@/axios/el.tag"
+
+import {ElLoading, ElMessage, ElMessageBox} from "element-plus";
+
+export default {
+  // import 引入的组件需要注入到对象中才能使用
+  components: {},
+  props: ['modelValue'],
+  emits: ['update:modelValue'],
+  data() {
+    // 这里存放数据
+    return {
+      elTagTaskItem: {
+        taskGroup: '',
+        taskId: '',
+        location: '',
+        orderId: '',
+        vehicleNo: '',
+        goodsId: '',
+        goodsName: '',
+        taskStatus: 0,
+        needNum: 0,
+        remark: ''
+      }
+    }
+  },
+  // 计算属性 类似于 data 概念
+  computed: {},
+  // 监控 data 中的数据变化
+  watch: {},
+  // 方法集合
+  methods: {
+    add() {
+      if(this.elTagTaskItem.location === '' || this.elTagTaskItem.vehicleNo === '' || this.elTagTaskItem.needNum === 0) {
+        ElMessage({
+          message: '您有必填的项未填或者拣选数量为0',
+          type: 'warning',
+        })
+        return;
+      }
+      ElMessageBox.confirm(`确定添加：${this.elTagTaskItem.taskId} 的任务？`,
+          '警告',
+          {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          }).catch(() => {})
+          .then(()=>{
+            const loading = ElLoading.service({
+              lock: true,
+              text: '请稍后...',
+            })
+            elTagApi.insertElTagTask(this.elTagTaskItem).then((response) => {
+              const responseData = response.data
+              if (responseData.code === 0) {
+                ElMessage({
+                  message: '添加任务成功',
+                  type: 'success',
+                })
+              } else {
+                // 服务报错
+                ElMessage({
+                  message: '服务器返回失败：' + responseData.msg,
+                  type: 'warning',
+                })
+              }
+              loading.close()
+            }).catch((ex) => {
+              ElMessage({
+                message: '请求服务器失败：' + ex,
+                type: 'error',
+              })
+              loading.close()
+            })
+          })
+    }
+  },
+  // 组合式 API
+  setup() {
+  },
+  // 创建之前
+  beforeCreate() {
+  },
+  // 创建完成(可以访问 this 实例)
+  created() {
+  },
+  // 生命周期 - 挂载之前
+  beforeMount() {
+  },
+  // 生命周期 - 挂载完成（可以访问 DOM 元素）
+  mounted() {
+  },
+  // 更新之前
+  beforeUpdate() {
+  },
+  // 更新之后
+  updated() {
+  },
+  // 销毁之前
+  beforeUnmount() {
+  },
+  // 销毁完成
+  unmounted() {
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/view/component/elTagTask/EditElTagTask.vue b/src/view/component/elTagTask/EditElTagTask.vue
index e4b8215..866ee75 100644
--- a/src/view/component/elTagTask/EditElTagTask.vue
+++ b/src/view/component/elTagTask/EditElTagTask.vue
@@ -7,6 +7,9 @@
             label-width="100px"
             :model="elTagTaskItem"
         >
+          <el-form-item label="任务组：">
+            <el-input v-model="elTagTaskItem.taskGroup" disabled/>
+          </el-form-item>
           <el-form-item label="任务号：">
             <el-input v-model="elTagTaskItem.taskId" disabled/>
           </el-form-item>
@@ -82,7 +85,7 @@ export default {
   methods: {
     // 保存变更
     update() {
-      ElMessageBox.confirm(`确定变更：${this.elTagTaskItem.taskId} d的任务状态？`,
+      ElMessageBox.confirm(`确定变更：${this.elTagTaskItem.taskId} 的任务状态？`,
           '警告',
           {
             confirmButtonText: '确定',
diff --git a/src/view/component/elTagTask/ElTagTaskList.vue b/src/view/component/elTagTask/ElTagTaskList.vue
index a0d7fd1..87a9a28 100644
--- a/src/view/component/elTagTask/ElTagTaskList.vue
+++ b/src/view/component/elTagTask/ElTagTaskList.vue
@@ -4,6 +4,7 @@
       <h5>电子标签任务列表</h5>
       <el-table :data="modelValue" border stripe max-height="calc(100vh - 550px)">
         <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="orderId" label="订单号" width="100px" align="center" show-overflow-tooltip/>
         <el-table-column prop="vehicleNo" label="载具号" width="100px" align="center" show-overflow-tooltip/>
@@ -21,6 +22,7 @@
         <el-table-column prop="createTime" label="创建时间" :formatter="formatterTime" width="160px" align="center" show-overflow-tooltip/>
         <el-table-column prop="lightTime" label="点亮时间" :formatter="formatterTime" width="160px" align="center" show-overflow-tooltip/>
         <el-table-column prop="confirmTime" label="确认时间" :formatter="formatterTime" width="160px" align="center" show-overflow-tooltip/>
+        <el-table-column prop="offTime" label="熄灭时间" :formatter="formatterTime" width="160px" align="center" show-overflow-tooltip/>
         <el-table-column prop="remark" label="备注" show-overflow-tooltip min-width="80px"/>
         <el-table-column fixed="right" label="操作" align="center" width="80">
           <template #default="scope">
@@ -88,6 +90,7 @@ export default {
     // 变更任务状态
     changeTaskStatus(row) {
       this.elTagTaskItem = {
+        taskGroup: row.taskGroup,
         taskId: row.taskId,
         location: row.location,
         orderId: row.orderId,
diff --git a/src/view/component/elTagTask/SearchForm.vue b/src/view/component/elTagTask/SearchForm.vue
index 1911a2c..c08cf07 100644
--- a/src/view/component/elTagTask/SearchForm.vue
+++ b/src/view/component/elTagTask/SearchForm.vue
@@ -26,8 +26,11 @@
     </el-row>
     <el-row>
       <el-button type="primary" @click="searchBtn">查询/刷新</el-button>
-<!--      <el-button type="success" @click="">新增任务</el-button>-->
+      <el-button type="success" @click="showAddForm = true">新增任务</el-button>
     </el-row>
+<!--    添加新任务的弹窗-->
+    <AddElTagTask v-model="showAddForm"></AddElTagTask>
+
   </div>
 </template>
 
@@ -37,15 +40,18 @@
 import {elTagTaskStatusEnum} from "@/enum/elTag/eltag.task.enum";
 import {ElLoading, ElMessage} from "element-plus";
 import elTagApi from "@/axios/el.tag"
+import AddElTagTask from "@/view/component/elTagTask/AddElTagTask.vue";
 
 export default {
   // import 引入的组件需要注入到对象中才能使用
-  components: {},
+  components: {AddElTagTask},
   props: ['modelValue', 'searchParams'],
   emits: ['update:modelValue','update:searchParams'],
   data() {
     // 这里存放数据
-    return {}
+    return {
+      showAddForm: false
+    }
   },
   // 计算属性 类似于 data 概念
   computed: {