From 4fb1e7daa4f4920ba70fce9d66e31cc8d84cfb04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=B4=E7=82=B3=E6=9E=97?= <15237758276@163.com>
Date: Fri, 14 Jun 2024 15:49:56 +0800
Subject: [PATCH] no message

---
 src/views/business-data/pick/index.vue          | 1 +
 src/views/business-data/pickDetail/pickTask.vue | 8 ++++----
 src/views/system/timing/index.vue               | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/views/business-data/pick/index.vue b/src/views/business-data/pick/index.vue
index fa6f23e..951cb6b 100644
--- a/src/views/business-data/pick/index.vue
+++ b/src/views/business-data/pick/index.vue
@@ -45,6 +45,7 @@
         <el-table-column prop="code" label="出库单头" />
         <el-table-column prop="lineNo" label="序号" />
         <el-table-column prop="status" label="状态" />
+        <el-table-column prop="point.code" label="封包点位" />
         <el-table-column prop="gdDetail.id" label="关联工单明细" />
         <el-table-column v-if="checkPer(['admin','pick:edit','pick:del'])" label="操作" width="150px" align="center">
           <template slot-scope="scope">
diff --git a/src/views/business-data/pickDetail/pickTask.vue b/src/views/business-data/pickDetail/pickTask.vue
index a2724e4..b8d8f7b 100644
--- a/src/views/business-data/pickDetail/pickTask.vue
+++ b/src/views/business-data/pickDetail/pickTask.vue
@@ -68,13 +68,13 @@
           </template>
         </el-table-column>
         <el-table-column prop="srcStockCode" label="容器编码" />
-        <el-table-column prop="srcPointCode" label="原点位" />
-        <el-table-column prop="dstPointCode" label="目标点位" />
-        <el-table-column prop="agvStatus" label="任务状态">
+        <el-table-column prop="taskStatus" label="任务状态">
           <template slot-scope="scope">
-            {{ dict.label.task_status[scope.row.agvTask.status] }}
+            {{ dict.label.task_status[scope.row.taskStatus] }}
           </template>
         </el-table-column>
+        <el-table-column prop="srcPointCode" label="原点位" />
+        <el-table-column prop="dstPointCode" label="目标点位" />
         <el-table-column prop="planQty" label="计划数量" />
         <el-table-column prop="moveQty" label="移位数量" />
         <el-table-column prop="createBy" label="创建人" />
diff --git a/src/views/system/timing/index.vue b/src/views/system/timing/index.vue
index 9299537..70c0825 100644
--- a/src/views/system/timing/index.vue
+++ b/src/views/system/timing/index.vue
@@ -27,9 +27,6 @@
         <el-form-item label="任务名称" prop="jobName">
           <el-input v-model="form.jobName" style="width: 220px;" />
         </el-form-item>
-        <el-form-item label="任务描述" prop="description">
-          <el-input v-model="form.description" style="width: 220px;" />
-        </el-form-item>
         <el-form-item label="Bean名称" prop="beanName">
           <el-input v-model="form.beanName" style="width: 220px;" />
         </el-form-item>
@@ -60,6 +57,9 @@
             <el-radio :label="true">暂停</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="任务描述" prop="description">
+          <el-input v-model="form.description" style="width: 556px;" rows="4" type="textarea" />
+        </el-form-item>
         <el-form-item label="参数内容">
           <el-input v-model="form.params" style="width: 556px;" rows="4" type="textarea" />
         </el-form-item>