From 61a7d9eb8c0bb672fdd3a0da2b7f48dc8cfef389 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期二, 31 三月 2026 10:48:39 +0800
Subject: [PATCH] Merge branch 'zheng'
---
Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue b/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue
index f8fed3d..7266c31 100644
--- a/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue
+++ b/Code/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue
@@ -48,7 +48,7 @@
{ title: "鍒涘缓浜�", field: "creater", type: "like" },
],
[
- { title: "浠诲姟绫诲瀷",field: "taskType",type: "selectList",dataKey: "taskType",data: [],},
+ { title: "浠诲姟绫诲瀷",field: "taskType",type: "selectList",dataKey: "taskTypeEnum",data: [],},
{ title: "浠诲姟鐘舵��",field: "taskStatus",type: "selectList",dataKey: "taskStatusEnum",data: [],},
{ title: "宸烽亾鍙�", field: "roadway", type: "like" },
],
@@ -96,7 +96,7 @@
type: "int",
width: 120,
align: "left",
- bind: { key: "taskType", data: [] },
+ bind: { key: "taskTypeEnum", data: [] },
},
{
field: "taskStatus",
@@ -120,20 +120,20 @@
width: 220,
align: "left",
},
- // {
- // field: "currentAddress",
- // title: "褰撳墠浣嶇疆",
- // type: "string",
- // width: 120,
- // align: "left",
- // },
- // {
- // field: "nextAddress",
- // title: "涓嬩竴浣嶇疆",
- // type: "string",
- // width: 120,
- // align: "left",
- // },
+ {
+ field: "currentAddress",
+ title: "褰撳墠浣嶇疆",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "nextAddress",
+ title: "涓嬩竴浣嶇疆",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
{
field: "exceptionMessage",
title: "寮傚父淇℃伅",
@@ -154,6 +154,7 @@
type: "int",
width: 80,
align: "left",
+ bind: { key: "locationDepth", data: [] },
},
{
field: "dispatchertime",
@@ -161,7 +162,7 @@
type: "datetime",
width: 160,
align: "left",
- hidden:true,
+ // hidden:true,
},
{
field: "wMSId",
--
Gitblit v1.9.3