From 30eb20ab1384b221801bbcff50ce6d05923dcd84 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 05 六月 2025 09:21:37 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue | 53 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 42 insertions(+), 11 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
index b684958..310b96c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue"
@@ -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" },
],
@@ -56,6 +56,9 @@
{ title: "璧峰鍦板潃", field: "sourceAddress", type: "like" },
{ title: "鐩爣鍦板潃", field: "targetAddress", type: "like" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ ],
+ [
+ { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],}
],
]);
const columns = ref([
@@ -73,30 +76,38 @@
field: "taskNum",
title: "浠诲姟鍙�",
type: "int",
- width: 80,
+ width: 120,
align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "鎵�灞炰粨搴�",
+ type: "string",
+ width: 100,
+ align: "left",
+ bind: { key: "warehouses", data: [] },
},
{
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 +121,21 @@
field: "sourceAddress",
title: "璧峰鍦板潃",
type: "int",
- width: 120,
+ width: 220,
align: "left",
},
{
field: "targetAddress",
title: "鐩爣鍦板潃",
type: "string",
- width: 120,
+ width: 220,
+ align: "left",
+ },
+ {
+ field: "orderNo",
+ title: "鍗曟嵁缂栧彿",
+ type: "string",
+ width: 150,
align: "left",
},
// {
@@ -140,7 +158,6 @@
type: "string",
width: 90,
align: "left",
- hidden: true,
},
{
field: "grade",
@@ -160,7 +177,7 @@
field: "dispatchertime",
title: "浠诲姟涓嬪彂鏃堕棿",
type: "datetime",
- width: 150,
+ width: 160,
align: "left",
hidden:true,
},
@@ -183,7 +200,7 @@
field: "createDate",
title: "鍒涘缓鏃堕棿",
type: "datetime",
- width: 150,
+ width: 160,
align: "left",
},
{
@@ -208,6 +225,20 @@
align: "left",
hidden: true,
},
+ {
+ field: "materielCode",
+ title: "鐗╂枡缂栧彿",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "quantity",
+ title: "鐗╂枡鏁伴噺",
+ type: "float",
+ width: 100,
+ align: "left",
+ },
]);
const detail = ref({
cnName: "#detailCnName",
--
Gitblit v1.9.3