From 225d11e2ddaa55d1d482201cb4d89c9486cdba69 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 20 六月 2025 12:27:52 +0800
Subject: [PATCH] 更新代码
---
代码管理/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue | 55 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 49 insertions(+), 6 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
index 0a1977b..6b61d28 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
@@ -24,7 +24,7 @@
cnName: "鍑哄簱鍗�",
name: "outboundOrder",
url: "/OutboundOrder/",
- sortName: "CreateDate",
+ sortName: "id",
});
const editFormFields = ref({
orderType: "",
@@ -32,6 +32,7 @@
upperOrderNo: "",
orderStatus: "",
remark: "",
+ warehouseId:""
});
const editFormOptions = ref([
[
@@ -47,6 +48,7 @@
field: "orderNo",
title: "鍗曟嵁缂栧彿",
type: "string",
+ readonly:true
},
{
title: "涓婃父鍗曟嵁缂栧彿",
@@ -60,6 +62,14 @@
dataKey: "inboundState",
data: [],
readonly: true,
+ },
+ {
+ title: "浠撳簱",
+ field: "warehouseId",
+ type: "select",
+ dataKey: "warehouses",
+ data: [],
+ required: true,
},
{
title: "澶囨敞",
@@ -92,7 +102,7 @@
title: "鍗曟嵁鐘舵��",
field: "orderStatus",
type: "select",
- dataKey: "inboundState",
+ dataKey: "outboundStatusEnum",
data: [],
},
],
@@ -106,6 +116,7 @@
},
{ title: "鍒涘缓鑰�", field: "creater", type: "like" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],}
],
]);
const columns = ref([
@@ -120,18 +131,26 @@
align: "left",
},
{
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "string",
+ width: 90,
+ align: "left",
+ bind:{key: "warehouses", data: []}
+ },
+ {
field: "orderNo",
title: "鍗曟嵁缂栧彿",
type: "string",
- width: 120,
+ width: 160,
align: "left",
- link: true,
+ // link: true,
},
{
field: "upperOrderNo",
title: "涓婃父鍗曟嵁缂栧彿",
type: "string",
- width: 150,
+ width: 160,
align: "left",
},
{
@@ -154,9 +173,24 @@
field: "createType",
title: "鍒涘缓鏂瑰紡",
type: "string",
- width: 90,
+ width: 120,
align: "left",
bind: { key: "createType", data: [] },
+ },
+ {
+ field: "departmentCode",
+ title: "淇敼鏃堕棿",
+ type: "string",
+ width: 120,
+ align: "left",
+ hidden:true
+ },
+ {
+ field: "departmentName",
+ title: "閮ㄩ棬鍚嶇О",
+ type: "string",
+ width: 160,
+ align: "left",
},
{
field: "creater",
@@ -252,6 +286,15 @@
required: true,
},
{
+ field: "rowNo",
+ title: "琛屽彿",
+ type: "string",
+ width: 90,
+ align: "left",
+ edit: { type: "number" },
+ required: true,
+ },
+ {
field: "lockQuantity",
title: "閿佸畾鏁伴噺",
type: "int",
--
Gitblit v1.9.3