From 59c8d02d2bc7c7d9651edbd755ad73e4e7843ed8 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 09 一月 2025 09:32:05 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
index d24a17b..c0ade98 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue"
@@ -22,9 +22,9 @@
key: "taskId",
footer: "Foots",
cnName: "浠诲姟鍘嗗彶淇℃伅",
- name: "task",
+ name: "task_hty",
url: "/Task_Hty/",
- sortName: "CreateDate",
+ sortName: "taskId",
});
const editFormFields = ref({});
const editFormOptions = ref([]);
@@ -48,7 +48,7 @@
{ title: "鍒涘缓浜�", field: "creater", type: "like" },
],
[
- { title: "浠诲姟绫诲瀷",field: "taskType",type: "selectList",dataKey: "taskTypeEnum",data: [],},
+ { title: "浠诲姟绫诲瀷",field: "taskType",type: "selectList",dataKey: "taskType",data: [],},
{ title: "浠诲姟鐘舵��",field: "taskStatus",type: "selectList",dataKey: "taskStatusEnum",data: [],},
{ title: "宸烽亾鍙�", field: "roadway", type: "like" },
],
@@ -73,30 +73,30 @@
field: "taskNum",
title: "浠诲姟鍙�",
type: "int",
- width: 80,
+ width: 120,
align: "left",
},
{
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
- width: 150,
+ width: 160,
align: "left",
},
{
field: "roadway",
title: "宸烽亾鍙�",
type: "string",
- width: 90,
+ width: 120,
align: "left",
},
{
field: "taskType",
title: "浠诲姟绫诲瀷",
type: "int",
- width: 90,
+ width: 120,
align: "left",
- bind: { key: "taskTypeEnum", data: [] },
+ bind: { key: "taskType", data: [] },
},
{
field: "taskStatus",
@@ -110,14 +110,14 @@
field: "sourceAddress",
title: "璧峰鍦板潃",
type: "int",
- width: 120,
+ width: 220,
align: "left",
},
{
field: "targetAddress",
title: "鐩爣鍦板潃",
type: "string",
- width: 120,
+ width: 220,
align: "left",
},
// {
@@ -182,7 +182,7 @@
field: "createDate",
title: "鍒涘缓鏃堕棿",
type: "datetime",
- width: 150,
+ width: 160,
align: "left",
},
{
@@ -197,13 +197,6 @@
title: "淇敼鏃堕棿",
type: "datetime",
width: 160,
- align: "left",
- },
- {
- field: "operateType",
- title: "澶囨敞",
- type: "string",
- width: 100,
align: "left",
},
{
--
Gitblit v1.9.3