From 902964a2cffea831912e32a81d48cd32542d75f3 Mon Sep 17 00:00:00 2001
From: liang <594755172@qq.com>
Date: Thu, 13 Nov 2025 10:49:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/taskMonitor.vue | 681 +++++++++++++++++++------------------
 src/layout/workFlow.vue    |  14 +-
 src/views/login.vue        | 246 +++++++-------
 3 files changed, 484 insertions(+), 457 deletions(-)

diff --git a/src/layout/taskMonitor.vue b/src/layout/taskMonitor.vue
index b64d9b7..46d27ec 100644
--- a/src/layout/taskMonitor.vue
+++ b/src/layout/taskMonitor.vue
@@ -1,379 +1,388 @@
 <template>
-    <div style="margin-bottom: 10px">
-        <el-config-provider :locale="zhCn">
-            <el-row>
-                <el-input v-model="goodsIdQuery" style="width: 196px; margin-right: 10px;" placeholder="料号" />
-                <el-input v-model="vehicleIdQuery" style="width: 196px; margin-right: 10px;" placeholder="箱号" />
-                <el-select-v2 v-model="taskTypeQuery" style="width: 196px; margin-right: 10px;" placeholder="请选择任务类型"
-                    :options="taskTypeOptions" @change="search()"></el-select-v2>
-                    <el-select-v2 v-model="taskStatusQuery" style="width: 196px; margin-right: 10px;" placeholder="请选择任务状态"
-                    :options="taskStatusOptions" @change="search()"></el-select-v2>
-                <el-button type="primary" @click="search()">搜索</el-button>
-                <el-button type="warning" @click="reset()">重置</el-button>
-            </el-row>
-            <br />
-            <el-table :data="tasks" stripe border v-loading="loading" style="width: 100%" max-height="684px"
-                class="table-class" :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }"
+  <div style="margin-bottom: 10px">
+    <el-config-provider :locale="zhCn">
+      <el-row>
+        <el-input v-model="goodsIdQuery" style="width: 196px; margin-right: 10px;" placeholder="料号"/>
+        <el-input v-model="vehicleIdQuery" style="width: 196px; margin-right: 10px;" placeholder="箱号"/>
+        <el-select-v2 v-model="taskTypeQuery" style="width: 196px; margin-right: 10px;" placeholder="请选择任务类型"
+                      :options="taskTypeOptions" @change="search()"></el-select-v2>
+        <el-select-v2 v-model="taskStatusQuery" style="width: 196px; margin-right: 10px;" placeholder="请选择任务状态"
+                      :options="taskStatusOptions" @change="search()"></el-select-v2>
+        <el-button type="primary" @click="search()">搜索</el-button>
+        <el-button type="warning" @click="reset()">重置</el-button>
+      </el-row>
+      <br/>
+      <el-table :data="tasks" stripe border v-loading="loading" style="width: 100%" max-height="684px"
+                class="table-class" :header-cell-style="{ 'text-align': 'center' }"
+                :cell-style="{ 'text-align': 'center' }"
                 @row-click="getCurrentRow">
-                <el-table-column width="65px" fixed="left">
-                    <template v-slot="scope">
-                        <el-radio :label="scope.row.taskId" v-model="taskId">&nbsp;</el-radio>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="taskId" label="任务号" fixed="left" show-overflow-tooltip min-width="120px" />
-                <el-table-column prop="taskType" label="任务类型" fixed="left" :formatter="taskTypeFormat" min-width="120px" />
-                <el-table-column prop="vehicleId" label="箱号"  min-width="120px" show-overflow-tooltip />
-                <el-table-column prop="goodsRelated.goodsId" label="料号" min-width="120px" show-overflow-tooltip />
-                <el-table-column prop="goodsRelated.goodsName" label="料名" min-width="120px" show-overflow-tooltip />
-                <el-table-column prop="taskGroup" label="任务组" min-width="120px" show-overflow-tooltip />
-                <el-table-column prop="origin" label="起点" min-width="120px" />
-                <el-table-column prop="destination" label="终点" min-width="120px" />
-                <el-table-column prop="goodsRelated.opNum" label="操作数量" min-width="120px" />
-                <el-table-column prop="goodsRelated.originNum" label="库存数量" min-width="120px" />
-                <el-table-column prop="taskPriority" label="任务优先级" min-width="120px" />
-                <el-table-column prop="preTask" label="前置任务" min-width="120px" show-overflow-tooltip />
-                <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px" show-overflow-tooltip />
-                <el-table-column prop="createTime" label="运行时长" :formatter="dueFormat" min-width="120px" show-overflow-tooltip />
-                <el-table-column prop="userName" label="操作人员姓名" min-width="120px" />
-                <el-table-column prop="taskStatus" label="任务状态" fixed="right" :formatter="taskStatusFormat"
-                    min-width="120px" show-overflow-tooltip />
-                <el-table-column fixed="right" label="操作" width="120px">
-                    <template v-slot="scope">
-                        <el-button plain type="primary" @click="editCurrentRowTask(scope.row)">编辑</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <br />
-            <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]"
-                :small="false" :disabled="false" :background="false" :default-page-size="10"
-                layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
-                @current-change="search" />
-            <el-dialog v-model="dialogVisible" title="任务信息" width="40%" draggable :show-close="false">
-                <el-form ref="taskFormRef" :model="taskFormEntity" :label-position="labelPosition" label-width="100px"
-                    style="max-width: 100%" :rules="rules" status-icon>
-                    <el-row :gutter="16">
-                        <el-col :span="12" :offset="0">
-                            <el-form-item label="任务号" prop="taskId">
-                                <el-input v-model="taskFormEntity.taskId" disabled />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="任务优先级" prop="taskPriority">
-                                <el-input-number v-model.number="taskFormEntity.taskPriority" controls-position="right"
-                                    :min="1" :max="9" disabled />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="16">
-                        <el-col :span="12" :offset="0">
-                            <el-form-item label="料箱号" prop="vehicleId">
-                                <el-input v-model="taskFormEntity.vehicleId" disabled />
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="料号" prop="goodsId">
-                                <el-input v-model="taskFormEntity.goodsId" disabled />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="16">
-                        <el-col :span="12" :offset="0">
-                            <el-form-item label="起点" prop="origin">
-                                <el-input v-model="taskFormEntity.origin" disabled />
-                            </el-form-item>
-                        </el-col>
-                        <!-- <el-col :span="12" v-if="taskFormEntity.taskType == 1">
-                            <el-form-item label="终点" prop="destination">
-                                <el-select-v2 v-model="taskFormEntity.destination"
-                                    :options="availableLocationOptions"></el-select-v2>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12" v-if="taskFormEntity.taskType == 2">
-                            <el-form-item label="终点" prop="destination">
-                                <el-input v-model="taskFormEntity.destination" disabled />
-                            </el-form-item>
-                        </el-col> -->
-                        <el-col :span="12">
-                            <el-form-item label="终点" prop="destination">
-                                <el-input v-model="taskFormEntity.destination" disabled />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="16">
-                        <el-col :span="12" :offset="0">
-                            <el-form-item label="任务类型" prop="taskType">
-                                <el-select-v2 v-model="taskFormEntity.taskType" placeholder="请选择任务类型" disabled
-                                    :options="taskTypeOptions"></el-select-v2>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item label="任务状态" prop="taskStatus">
-                                <el-select-v2 v-model="taskFormEntity.taskStatus" placeholder="请选择任务状态"
-                                    :options="taskStatusOptions"></el-select-v2>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                </el-form>
-                <template #footer>
+        <el-table-column width="65px" fixed="left">
+          <template v-slot="scope">
+            <el-radio :label="scope.row.taskId" v-model="taskId">&nbsp;</el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column prop="taskId" label="任务号" fixed="left" show-overflow-tooltip min-width="120px"/>
+        <el-table-column prop="taskType" label="任务类型" fixed="left" :formatter="taskTypeFormat" min-width="120px"/>
+        <el-table-column prop="vehicleId" label="箱号" min-width="120px" show-overflow-tooltip/>
+        <el-table-column prop="goodsRelated.goodsId" label="料号" min-width="120px" show-overflow-tooltip/>
+        <el-table-column prop="goodsRelated.goodsName" label="料名" min-width="120px" show-overflow-tooltip/>
+        <el-table-column prop="taskGroup" label="任务组" min-width="120px" show-overflow-tooltip/>
+        <el-table-column prop="origin" label="起点" min-width="120px"/>
+        <el-table-column prop="destination" label="终点" min-width="120px"/>
+        <el-table-column prop="goodsRelated.opNum" label="操作数量" min-width="120px"/>
+        <el-table-column prop="goodsRelated.originNum" label="库存数量" min-width="120px"/>
+        <el-table-column prop="taskPriority" label="任务优先级" min-width="120px"/>
+        <el-table-column prop="preTask" label="前置任务" min-width="120px" show-overflow-tooltip/>
+        <el-table-column prop="pickStand" label="下发站台" min-width="120px" show-overflow-tooltip/>
+        <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px"
+                         show-overflow-tooltip/>
+        <el-table-column prop="createTime" label="运行时长" :formatter="dueFormat" min-width="120px"
+                         show-overflow-tooltip/>
+        <el-table-column prop="userName" label="操作人员姓名" min-width="120px"/>
+        <el-table-column prop="taskStatus" label="任务状态" fixed="right" :formatter="taskStatusFormat"
+                         min-width="120px" show-overflow-tooltip/>
+        <el-table-column fixed="right" label="操作" width="120px">
+          <template v-slot="scope">
+            <el-button plain type="primary" @click="editCurrentRowTask(scope.row)">编辑</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <br/>
+      <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]"
+                     :small="false" :disabled="false" :background="false" :default-page-size="10"
+                     layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
+                     @current-change="search"/>
+      <el-dialog v-model="dialogVisible" title="任务信息" width="40%" draggable :show-close="false">
+        <el-form ref="taskFormRef" :model="taskFormEntity" :label-position="labelPosition" label-width="100px"
+                 style="max-width: 100%" :rules="rules" status-icon>
+          <el-row :gutter="16">
+            <el-col :span="12" :offset="0">
+              <el-form-item label="任务号" prop="taskId">
+                <el-input v-model="taskFormEntity.taskId" disabled/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="任务优先级" prop="taskPriority">
+                <el-input-number v-model.number="taskFormEntity.taskPriority" controls-position="right"
+                                 :min="1" :max="9" disabled/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="16">
+            <el-col :span="12" :offset="0">
+              <el-form-item label="料箱号" prop="vehicleId">
+                <el-input v-model="taskFormEntity.vehicleId" disabled/>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="料号" prop="goodsId">
+                <el-input v-model="taskFormEntity.goodsId" disabled/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="16">
+            <el-col :span="12" :offset="0">
+              <el-form-item label="起点" prop="origin">
+                <el-input v-model="taskFormEntity.origin" disabled/>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="12" v-if="taskFormEntity.taskType == 1">
+                <el-form-item label="终点" prop="destination">
+                    <el-select-v2 v-model="taskFormEntity.destination"
+                        :options="availableLocationOptions"></el-select-v2>
+                </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="taskFormEntity.taskType == 2">
+                <el-form-item label="终点" prop="destination">
+                    <el-input v-model="taskFormEntity.destination" disabled />
+                </el-form-item>
+            </el-col> -->
+            <el-col :span="12">
+              <el-form-item label="终点" prop="destination">
+                <el-input v-model="taskFormEntity.destination" disabled/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="16">
+            <el-col :span="12" :offset="0">
+              <el-form-item label="任务类型" prop="taskType">
+                <el-select-v2 v-model="taskFormEntity.taskType" placeholder="请选择任务类型" disabled
+                              :options="taskTypeOptions"></el-select-v2>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="任务状态" prop="taskStatus">
+                <el-select-v2 v-model="taskFormEntity.taskStatus" placeholder="请选择任务状态"
+                              :options="taskStatusOptions"></el-select-v2>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <template #footer>
                     <span class="dialog-footer">
                         <el-button @click="dialogVisible = false">取消</el-button>
                         <el-button type="primary" @click="submitTaskInfo(taskFormEntity)">
                             确定
                         </el-button>
                     </span>
-                </template>
-            </el-dialog>
-        </el-config-provider>
-    </div>
+        </template>
+      </el-dialog>
+    </el-config-provider>
+  </div>
 </template>
 
 <script setup>
-import { getTasksByPage, updateTaskInfo } from '@/api/task.js'
-import { dateFormatter, taskStatusFormatter, timeFormatter, dueFormatter } from '@/utils/formatter.js'
+import {getTasksByPage, updateTaskInfo} from '@/api/task.js'
+import {dateFormatter, taskStatusFormatter, timeFormatter, dueFormatter} from '@/utils/formatter.js'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
-import { errorBox } from '@/utils/myMessageBox.js'
-import { ElMessage } from 'element-plus'
+import {errorBox} from '@/utils/myMessageBox.js'
+import {ElMessage} from 'element-plus'
 import store from '@/store'
-import { ref, reactive } from 'vue'
+import {ref, reactive} from 'vue'
 </script>
 <script>
 export default {
-    name: 'taskMonitor',
-    data() {
-        return {
-            tasks: [],
-            currentPage: 1,
-            pageSize: 10,
-            total: 0,
-            goodsIdQuery: '',
-            vehicleIdQuery: '',
-            taskTypeQuery: -99,
-            taskStatusQuery: -99,
-            loading: true,
-            dialogVisible: false,
-            taskFormEntity: reactive({}),
-            labelPosition: 'top',
-            taskFormRef: ref(),
-            rules: reactive({}),
-            taskId: '',
-            taskTypeOptions: [
-                {
-                    value: -99,
-                    label: '所有类型'
-                },
-                {
-                    value: 1,
-                    label: '入库'
-                },
-                {
-                    value: 2,
-                    label: '出库'
-                },
-                {
-                    value: 3,
-                    label: '盘点'
-                },
-                {
-                    value: 9,
-                    label: '移库'
-                },
-            ],
-            taskStatusOptions: [
-                {
-                    value: -99,
-                    label: '所有状态'
-                },
-                {
-                    value: -2,
-                    label: '重复入库'
-                },
-                {
-                    value: -1,
-                    label: '暂存'
-                },
-                {
-                    value: 0,
-                    label: '新建待下发'
-                },
-                {
-                    value: 1,
-                    label: '已下发'
-                },
-                {
-                    value: 2,
-                    label: '开始执行'
-                },
-                {
-                    value: 8,
-                    label: '拣选中'
-                },
-                {
-                    value: 9,
-                    label: '盘点中'
-                },
-                {
-                    value: 100,
-                    label: '任务完成'
-                },
-                {
-                    value: 998,
-                    label: '任务取消'
-                },
-                {
-                    value: 999,
-                    label: '任务异常'
-                }
-            ],
-            availableLocationOptions: []
+  name: 'taskMonitor',
+  data() {
+    return {
+      tasks: [],
+      currentPage: 1,
+      pageSize: 10,
+      total: 0,
+      goodsIdQuery: '',
+      vehicleIdQuery: '',
+      taskTypeQuery: -99,
+      taskStatusQuery: -99,
+      loading: true,
+      dialogVisible: false,
+      taskFormEntity: reactive({}),
+      labelPosition: 'top',
+      taskFormRef: ref(),
+      rules: reactive({}),
+      taskId: '',
+      taskTypeOptions: [
+        {
+          value: -99,
+          label: '所有类型'
+        },
+        {
+          value: 1,
+          label: '入库'
+        },
+        {
+          value: 2,
+          label: '出库'
+        },
+        {
+          value: 3,
+          label: '盘点'
+        },
+        {
+          value: 9,
+          label: '移库'
+        },
+      ],
+      taskStatusOptions: [
+        {
+          value: -99,
+          label: '所有状态'
+        },
+        {
+          value: -2,
+          label: '重复入库'
+        },
+        {
+          value: -1,
+          label: '暂存'
+        },
+        {
+          value: 0,
+          label: '新建待下发'
+        },
+        {
+          value: 1,
+          label: '已下发'
+        },
+        {
+          value: 2,
+          label: '开始执行'
+        },
+        {
+          value: 8,
+          label: '拣选中'
+        },
+        {
+          value: 9,
+          label: '盘点中'
+        },
+        {
+          value: 100,
+          label: '任务完成'
+        },
+        {
+          value: 998,
+          label: '任务取消'
+        },
+        {
+          value: 999,
+          label: '任务异常'
         }
+      ],
+      availableLocationOptions: []
+    }
+  },
+  mounted() {
+    this.search()
+  },
+  methods: {
+    dateFormat: (row, column, cellValue, index) => {
+      return dateFormatter(cellValue)
     },
-    mounted() {
-        this.search()
+    timeFormat: (row, column, cellValue, index) => {
+      return timeFormatter(cellValue)
     },
-    methods: {
-        dateFormat: (row, column, cellValue, index) => {
-            return dateFormatter(cellValue)
-        },
-        timeFormat: (row, column, cellValue, index) => {
-            return timeFormatter(cellValue)
-        },
-        taskStatusFormat: (row, column, cellValue, index) => {
-            return taskStatusFormatter(cellValue)
-        },
-        taskTypeFormat: (row, column, cellValue, index) => {
-            switch (cellValue) {
-                case 1: return '入库'
-                case 2: return '出库'
-                case 3: return '盘点'
-                case 9: return '移库'
-                default: return '未知'
-            }
-        },
-        dueFormat: (row, column, cellValue, index) => {
-            return dueFormatter(cellValue)
-        },
-        search() {
-            this.loading = true
-            const tableRequest = {
-                pageNo: this.currentPage,
-                pageSize: this.pageSize,
-                taskType: this.taskTypeQuery == -99 ? null : this.taskTypeQuery,
-                taskStatus: this.taskStatusQuery == -99 ? null : this.taskStatusQuery,
-                goodsId: this.goodsIdQuery.trim(),
-                vehicleId: this.vehicleIdQuery.trim(),
-                userName: store.getters.getUserName
-            }
-            getTasksByPage(tableRequest).then(res => {
-                const tableResponse = res.data
-                if (tableResponse.code == 0) {
-                    this.tasks = tableResponse.returnData.lists
-                    this.total = tableResponse.returnData.total
-                    console.log(this.tasks)
-                } else {
-                    errorBox(tableResponse.message)
-                }
-            }).catch(err => {
-                console.log(err)
-                errorBox('查询任务错误')
-            })
-            this.loading = false
-        },
-        reset() {
-            this.goodsIdQuery = ''
-            this.vehicleIdQuery = ''
-        },
-        editCurrentRowTask(row) {
-            console.log(row)
-            // if (row.taskType == 1) {
-            //     this.availableLocationOptions = []
-            //     var currentOption = {
-            //         value: row.destination,
-            //         label: locationFormatter(row.destination)
-            //     }
-            //     this.availableLocationOptions.push(currentOption)
-            //     // 生成可用库位列表
-            //     const requestParam = {
-            //         areaId: 1
-            //     }
-            //     getAvailableLocations(requestParam).then(res => {
-            //         if (res.data.code == 0) {
-            //             for (const location of res.data.returnData) {
-            //                 var newOption = {}
-            //                 newOption.value = location.locationId
-            //                 newOption.label = locationFormatter(location.locationId)
-            //                 this.availableLocationOptions.push(newOption)
-            //             }
-            //         }
-            //     }).catch(err => {
-            //         errorBox('查找可用库位失败:' + err)
-            //     })
-            // }
-            this.taskFormEntity = {
-                taskId: row.taskId,
-                taskPriority: row.taskPriority,
-                vehicleId: row.vehicleId,
-                goodsId: row.goodsRelated == null ? '' : row.goodsRelated.goodsId,
-                origin: row.origin,
-                destination: row.destination,
-                taskType: row.taskType,
-                taskStatus: row.taskStatus,
-            }
-            this.dialogVisible = true
-        },
-        submitTaskInfo() {
-            if (this.taskFormEntity.taskStatus == null || this.taskFormEntity.taskStatus == undefined) {
-                errorBox('请选择任务状态')
-                return
-            }
-            const request = {
-                taskId: this.taskFormEntity.taskId,
-                taskStatus: this.taskFormEntity.taskStatus,
-                userName: store.getters.getUserName
-            }
-            updateTaskInfo(request).then(res => {
-                if (res.data.code == 0) {
-                    this.dialogVisible = false
-                    ElMessage.success('修改任务成功')
-                    this.search()
-                } else {
-                    errorBox(res.data.message)
-                }
-            }).catch(err => {
-                console.log(err)
-                errorBox('修改任务失败')
-            })
-        },
-        getCurrentRow(row) {
-            this.taskId = row.taskId
+    taskStatusFormat: (row, column, cellValue, index) => {
+      return taskStatusFormatter(cellValue)
+    },
+    taskTypeFormat: (row, column, cellValue, index) => {
+      switch (cellValue) {
+        case 1:
+          return '入库'
+        case 2:
+          return '出库'
+        case 3:
+          return '盘点'
+        case 9:
+          return '移库'
+        default:
+          return '未知'
+      }
+    },
+    dueFormat: (row, column, cellValue, index) => {
+      return dueFormatter(cellValue)
+    },
+    search() {
+      this.loading = true
+      const tableRequest = {
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+        taskType: this.taskTypeQuery == -99 ? null : this.taskTypeQuery,
+        taskStatus: this.taskStatusQuery == -99 ? null : this.taskStatusQuery,
+        goodsId: this.goodsIdQuery.trim(),
+        vehicleId: this.vehicleIdQuery.trim(),
+        userName: store.getters.getUserName
+      }
+      getTasksByPage(tableRequest).then(res => {
+        const tableResponse = res.data
+        if (tableResponse.code == 0) {
+          this.tasks = tableResponse.returnData.lists
+          this.total = tableResponse.returnData.total
+          console.log(this.tasks)
+        } else {
+          errorBox(tableResponse.message)
         }
+      }).catch(err => {
+        console.log(err)
+        errorBox('查询任务错误')
+      })
+      this.loading = false
     },
+    reset() {
+      this.goodsIdQuery = ''
+      this.vehicleIdQuery = ''
+    },
+    editCurrentRowTask(row) {
+      console.log(row)
+      // if (row.taskType == 1) {
+      //     this.availableLocationOptions = []
+      //     var currentOption = {
+      //         value: row.destination,
+      //         label: locationFormatter(row.destination)
+      //     }
+      //     this.availableLocationOptions.push(currentOption)
+      //     // 生成可用库位列表
+      //     const requestParam = {
+      //         areaId: 1
+      //     }
+      //     getAvailableLocations(requestParam).then(res => {
+      //         if (res.data.code == 0) {
+      //             for (const location of res.data.returnData) {
+      //                 var newOption = {}
+      //                 newOption.value = location.locationId
+      //                 newOption.label = locationFormatter(location.locationId)
+      //                 this.availableLocationOptions.push(newOption)
+      //             }
+      //         }
+      //     }).catch(err => {
+      //         errorBox('查找可用库位失败:' + err)
+      //     })
+      // }
+      this.taskFormEntity = {
+        taskId: row.taskId,
+        taskPriority: row.taskPriority,
+        vehicleId: row.vehicleId,
+        goodsId: row.goodsRelated == null ? '' : row.goodsRelated.goodsId,
+        origin: row.origin,
+        destination: row.destination,
+        taskType: row.taskType,
+        taskStatus: row.taskStatus,
+      }
+      this.dialogVisible = true
+    },
+    submitTaskInfo() {
+      if (this.taskFormEntity.taskStatus == null || this.taskFormEntity.taskStatus == undefined) {
+        errorBox('请选择任务状态')
+        return
+      }
+      const request = {
+        taskId: this.taskFormEntity.taskId,
+        taskStatus: this.taskFormEntity.taskStatus,
+        userName: store.getters.getUserName
+      }
+      updateTaskInfo(request).then(res => {
+        if (res.data.code == 0) {
+          this.dialogVisible = false
+          ElMessage.success('修改任务成功')
+          this.search()
+        } else {
+          errorBox(res.data.message)
+        }
+      }).catch(err => {
+        console.log(err)
+        errorBox('修改任务失败')
+      })
+    },
+    getCurrentRow(row) {
+      this.taskId = row.taskId
+    }
+  },
 }
 </script>
 
 <style scoped>
 .el-pagination {
-    padding-left: 5px;
+  padding-left: 5px;
 }
 
 .el-row .el-button {
-    width: 72px;
-    margin-left: 0px;
-    margin-right: 5px;
+  width: 72px;
+  margin-left: 0px;
+  margin-right: 5px;
 }
 
 .table-class {
-    width: 100%;
+  width: 100%;
 }
 
 .el-row .el-form-item .el-select-v2 {
-    width: 100% !important;
+  width: 100% !important;
 }
 
 .el-row .el-form-item .el-input-number {
-    width: 100% !important;
+  width: 100% !important;
 }
 
 .el-row .el-form-item .el-button {
-    margin: auto;
+  margin: auto;
 }
 </style>
\ No newline at end of file
diff --git a/src/layout/workFlow.vue b/src/layout/workFlow.vue
index 84ad6e0..a4061f4 100644
--- a/src/layout/workFlow.vue
+++ b/src/layout/workFlow.vue
@@ -44,6 +44,7 @@
         <el-table-column prop="goodsId" label="料号" min-width="120px" show-overflow-tooltip/>
         <el-table-column prop="needNum" label="需求数量" min-width="120px"/>
         <el-table-column prop="pickedNum" label="已拣数量" min-width="120px"/>
+        <el-table-column prop="distributedNum" label="已分配数量" min-width="120px"/>
         <el-table-column prop="lightStatus" label="亮灯状态" :formatter="lightStatusFormat" min-width="120px"/>
         <el-table-column prop="workStatus" label="工作状态" :formatter="workStatusFormat" min-width="120px"/>
         <el-table-column prop="machineType" label="机型" :formatter="machineTypeFormat" min-width="120px"/>
@@ -52,7 +53,7 @@
                          show-overflow-tooltip/>
         <el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" min-width="120px"
                          show-overflow-tooltip/>
-        <el-table-column prop="opUser" label="操作用户" min-width="120px"/>
+        <el-table-column prop="opUser" label="操作用户" min-width="120px" show-overflow-tooltip/>
         <el-table-column fixed="right" label="操作" width="120px">
           <template v-slot="scope">
             <el-button plain type="primary" @click="editCurrentRow(scope.row)">编辑</el-button>
@@ -152,6 +153,13 @@
                   <el-input v-model="workFlowFormEntity.opUser" disabled/>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="已分配数量" prop="distributedNum">
+                  <el-input-number v-model.number="workFlowFormEntity.distributedNum"
+                                   controls-position="right" :min="0" :max="workFlowFormEntity.needNum"
+                                   clearable/>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </div>
@@ -344,6 +352,8 @@ export default {
     },
     workStatusFormat: (row, column, cellValue, index) => {
       switch (cellValue) {
+        case -1:
+          return '暂存'
         case 0:
           return '未开始'
         case 1:
@@ -382,6 +392,7 @@ export default {
         goodsId: row.goodsId,
         pickedNum: row.pickedNum,
         needNum: row.needNum,
+        distributedNum: row.distributedNum,
         lightStatus: row.lightStatus,
         workStatus: row.workStatus,
         createTime: row.createTime,
@@ -394,6 +405,7 @@ export default {
       const params = {
         workFlowId: formData.workFlowId,
         pickedNum: formData.pickedNum,
+        distributedNum: formData.distributedNum,
         lightStatus: formData.lightStatus,
         workStatus: formData.workStatus,
         userName: store.getters.getUserName
diff --git a/src/views/login.vue b/src/views/login.vue
index c601767..4b77eba 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,28 +1,28 @@
 <template>
-    <body id="login-page">
-        <el-form class="login-container" :model="loginForm" label-position="left" label-width="0px">
-            <h3 class="login_title">系统登录</h3>
-            <el-form-item>
-                <el-input type="text" v-model="loginForm.loginAccount" auto-complete="off" placeholder="账号"></el-input>
-            </el-form-item>
-            <el-form-item>
-                <el-input type="password" v-model="loginForm.loginPassword" auto-complete="off" placeholder="密码"></el-input>
-            </el-form-item>
-            <el-form-item style="width: 100%">
-                <el-button type="primary" style="width: 100%;  border: none" @click="login">登录</el-button>
-            </el-form-item>
-            <el-form-item style="width: 100%">
-                <el-button type="primary" style="width: 100%;  border: none" @click="loginCate">卡特账号登录</el-button>
-            </el-form-item>
-        </el-form>
-    </body>
+  <body id="login-page">
+  <el-form class="login-container" :model="loginForm" label-position="left" label-width="0px">
+    <h3 class="login_title">系统登录</h3>
+    <el-form-item>
+      <el-input type="text" v-model="loginForm.loginAccount" auto-complete="off" placeholder="账号"></el-input>
+    </el-form-item>
+    <el-form-item>
+      <el-input type="password" v-model="loginForm.loginPassword" auto-complete="off" placeholder="密码"></el-input>
+    </el-form-item>
+    <el-form-item style="width: 100%">
+      <el-button type="primary" style="width: 100%;  border: none" @click="login">登录</el-button>
+    </el-form-item>
+    <el-form-item style="width: 100%">
+      <el-button type="primary" style="width: 100%;  border: none" @click="loginCate">卡特账号登录</el-button>
+    </el-form-item>
+  </el-form>
+  </body>
 </template>
 
 <script setup>
-import { getUser, loginWithAuth, loginWithoutAuth } from '@/api/login.js'
-import { postToGetToken } from "@/api/kateLogin.js";
-import { ElMessage, ElLoading } from 'element-plus'
-import { reactive, onMounted } from 'vue';
+import {getUser, loginWithAuth, loginWithoutAuth} from '@/api/login.js'
+import {postToGetToken} from "@/api/kateLogin.js";
+import {ElMessage, ElLoading} from 'element-plus'
+import {reactive, onMounted} from 'vue';
 import store from '@/store'
 import router from '@/router'
 import crypto from 'crypto'
@@ -30,35 +30,37 @@ import loading from "@/utils/loading";
 // Dependency: Node.js crypto module
 // https://nodejs.org/api/crypto.html#crypto_crypto
 function base64URLEncode(str) {
-    return str.toString('base64')
-        .replace(/\+/g, '-')
-        .replace(/\//g, '_')
-        .replace(/=/g, '');
+  return str.toString('base64')
+      .replace(/\+/g, '-')
+      .replace(/\//g, '_')
+      .replace(/=/g, '');
 }
+
 var verifier = base64URLEncode(crypto.randomBytes(32));
 // Dependency: Node.js crypto module
 // https://nodejs.org/api/crypto.html#crypto_crypto
 function sha256(buffer) {
-    return crypto.createHash('sha256').update(buffer).digest();
+  return crypto.createHash('sha256').update(buffer).digest();
 }
+
 var challenge = base64URLEncode(sha256(verifier));
 
 const loginForm = reactive({
-    loginAccount: "",
-    loginPassword: "",
+  loginAccount: "",
+  loginPassword: "",
 })
 // todo 参数待设置
 const oauthConstants = {
-    client_id: 'f921b5f5-ba70-4bcb-8a4b-f3c7d90ec84e',// 客户端id，卡特提供
-    // client_id: 'ASRS_ac_client',
-    response_type: 'code',// 授权类型，固定为code
-    state: '001',// 客户端当前状态，任意值
-    scope: 'openid%20profile',// 权限范围，固定为openid
-    grant_type: 'authorization_code',
-    code_challenge: challenge,
-    code_challenge_method: 'S256',
-    // response_mode: "form_post",
-    redirect_uri: 'https://csclasrs.ecorp.cat.com/wms'
+  client_id: 'f921b5f5-ba70-4bcb-8a4b-f3c7d90ec84e',// 客户端id，卡特提供
+  // client_id: 'ASRS_ac_client',
+  response_type: 'code',// 授权类型，固定为code
+  state: '001',// 客户端当前状态，任意值
+  scope: 'openid%20profile',// 权限范围，固定为openid
+  grant_type: 'authorization_code',
+  code_challenge: challenge,
+  code_challenge_method: 'S256',
+  // response_mode: "form_post",
+  redirect_uri: 'https://csclasrs.ecorp.cat.com/wms'
 }
 
 
@@ -66,108 +68,112 @@ const oauthConstants = {
 const cateLoginUrl = `https://login.microsoftonline.com/caterpillar.onmicrosoft.com/oauth2/v2.0/authorize?client_id=${oauthConstants.client_id}&response_type=${oauthConstants.response_type}&code_challenge=${oauthConstants.code_challenge}&code_challenge_method=S256&grant_type=${oauthConstants.grant_type}&scope=${oauthConstants.scope}&state=${oauthConstants.state}&redirect_uri=${oauthConstants.redirect_uri}`
 // 登录
 const login = () => {
-    const loading = ElLoading.service({
-        lock: true,
-        text: 'Loading',
-        background: 'rgba(0, 0, 0, 0.7)',
-    })
+  const loading = ElLoading.service({
+    lock: true,
+    text: 'Loading',
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
   loginWithAuth(loginForm).then(res => {
-        loading.close()
-        if (res.data.code === 0) {
-            store.commit('mutationUser', res.data.returnData.user)// 用户信息
-            store.commit('mutationMenu', res.data.returnData.menuList)// 菜单信息
-            store.commit('mutationStandId', res.data.returnData.standId)
-            // router.replace({ path: '/' })// 直接跳转到主页
-            router.replace({ path: '/systemCenter' })// 跳转到系统选择的界面
-        } else {
-            ElMessage.error(res.data.message)
-        }
-    }).catch(err => {
-        console.log(err)
-        loading.close()
-        ElMessage.error('登录失败！')
-    })
+    loading.close()
+    if (res.data.code === 0) {
+      store.commit('mutationUser', res.data.returnData.user)// 用户信息
+      store.commit('mutationMenu', res.data.returnData.menuList)// 菜单信息
+      store.commit('mutationStandId', res.data.returnData.standId)
+      // router.replace({ path: '/' })// 直接跳转到主页
+      router.replace({path: '/systemCenter'})// 跳转到系统选择的界面
+    } else {
+      ElMessage.error(res.data.message)
+    }
+  }).catch(err => {
+    console.log(err)
+    loading.close()
+    ElMessage.error('登录失败！')
+  })
 }
 
 // 跳转卡特登录接口
 const loginCate = () => {
-    store.commit('mutationAddVerify', verifier)// 添加认证信息
-    // console.log(cateLoginUrl)
-    window.location.href = cateLoginUrl// 打开新窗口
-    // window.open(cateLoginUrl)// 不打开新窗口
+  store.commit('mutationAddVerify', verifier)// 添加认证信息
+  // console.log(cateLoginUrl)
+  window.location.href = cateLoginUrl// 打开新窗口
+  // window.open(cateLoginUrl)// 不打开新窗口
 }
 onMounted(() => {
-    if (router.currentRoute.value.query.code !== undefined) {
-        loading.open('请求登录中...')
-        const tokenParam = {
-            code_verifier: store.getters.getVerify,
-            client_id: '609f8296-74ab-441e-904f-3a8508030511',
-            // scope: 'openid',
-            code: router.currentRoute.value.query.code,
-            redirect_uri: 'https://csclasrs.ecorp.cat.com/wms',
-            grant_type: 'authorization_code',
-            // client_secret: 'o6h8Q~iLegnIBG.GzJngXk.03FYdBJzIoCtTtcwj',
-            // response_type: 'id_token',
-            // response_mode: 'form_post'
-        }
-        postToGetToken(tokenParam).then(res => {
-            store.commit('mutationClearVerify', verifier)// 删除认证信息
-            if (res.data.id_token !== undefined) {
-                const codeInfo = {
-                    id_token: res.data.id_token
-                }
-                getUser(codeInfo).then(res => {
-                    if (res.data.code === 0) {
-                        store.commit('mutationUser', res.data.returnData.user)// 用户信息
-                        store.commit('mutationMenu', res.data.returnData.menuList)// 菜单信息
-                        store.commit('mutationStandId', res.data.returnData.standId)
-                        router.replace({ path: '/systemCenter' })
-                    } else {
-                        ElMessage.error(res.data.message)
-                    }
-                }).catch(err => {
-                    console.log(err)
-                    ElMessage.error('登录失败！')
-                })
-            }
-        }).catch(err => {
-            console.log(err)
-            ElMessage.error('登录错误')
-        }).finally(() => {
-            loading.close()
-        })
+  const urlParams = new URLSearchParams(window.location.search);
+  const code = urlParams.get('code');
+  console.log(code); // 输出 ?code= 后面的值
+  if (code !== undefined && code !== null && code !== '') {
+    console.log('跳转并尝试登录。code：' + code)
+    loading.open('请求登录中...')
+    const tokenParam = {
+      code_verifier: store.getters.getVerify,
+      client_id: 'f921b5f5-ba70-4bcb-8a4b-f3c7d90ec84e',
+      // scope: 'openid',
+      code: code,
+      redirect_uri: 'https://csclasrs.ecorp.cat.com/wms',
+      grant_type: 'authorization_code',
+      // client_secret: 'o6h8Q~iLegnIBG.GzJngXk.03FYdBJzIoCtTtcwj',
+      // response_type: 'id_token',
+      // response_mode: 'form_post'
     }
+    postToGetToken(tokenParam).then(res => {
+      store.commit('mutationClearVerify', verifier)// 删除认证信息
+      if (res.data.id_token !== undefined) {
+        const codeInfo = {
+          id_token: res.data.id_token
+        }
+        getUser(codeInfo).then(res => {
+          if (res.data.code === 0) {
+            store.commit('mutationUser', res.data.returnData.user)// 用户信息
+            store.commit('mutationMenu', res.data.returnData.menuList)// 菜单信息
+            store.commit('mutationStandId', res.data.returnData.standId)
+            router.replace({path: '/systemCenter'})
+          } else {
+            ElMessage.error(res.data.message)
+          }
+        }).catch(err => {
+          console.log(err)
+          ElMessage.error('登录失败！')
+        })
+      }
+    }).catch(err => {
+      console.log(err)
+      ElMessage.error('登录错误')
+    }).finally(() => {
+      loading.close()
+    })
+  }
 })
 </script>
-  
+
 <style scoped>
 #login-page {
-    /* background: url("../assets/img/bg.jpg") no-repeat; */
-    background-position: center;
-    height: 100%;
-    width: 100%;
-    background-size: cover;
-    position: fixed;
+  /* background: url("../assets/img/bg.jpg") no-repeat; */
+  background-position: center;
+  height: 100%;
+  width: 100%;
+  background-size: cover;
+  position: fixed;
 }
 
 body {
-    margin: 0px;
+  margin: 0px;
 }
 
 .login-container {
-    border-radius: 15px;
-    background-clip: padding-box;
-    margin: 90px auto;
-    width: 350px;
-    padding: 35px 35px 15px 35px;
-    background: #fff;
-    border: 1px solid #eaeaea;
-    box-shadow: 0 0 25px #cac6c6;
+  border-radius: 15px;
+  background-clip: padding-box;
+  margin: 90px auto;
+  width: 350px;
+  padding: 35px 35px 15px 35px;
+  background: #fff;
+  border: 1px solid #eaeaea;
+  box-shadow: 0 0 25px #cac6c6;
 }
 
 .login_title {
-    margin: 0px auto 40px auto;
-    text-align: center;
-    color: #505458;
+  margin: 0px auto 40px auto;
+  text-align: center;
+  color: #505458;
 }
 </style>  
\ No newline at end of file