From a1ee30471cb90cbea25627d5dddcb979bb612693 Mon Sep 17 00:00:00 2001 From: hutongqing <hutongqing@hnkhzn.com> Date: 星期日, 19 一月 2025 14:08:42 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn --- 代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" index e84bd89..0f6b3d0 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" @@ -24,7 +24,7 @@ cnName: "鍏ュ簱鍗�", name: "inboundOrder", url: "/InboundOrder/", - sortName: "CreateDate", + sortName: "id", }); const editFormFields = ref({ orderType: "", @@ -126,6 +126,14 @@ align: "left", }, { + field: "warehouseId", + title: "浠撳簱", + type: "string", + width: 90, + align: "left", + bind:{key: "warehouses", data: []} + }, + { field: "orderType", title: "鍗曟嵁绫诲瀷", type: "string", @@ -145,7 +153,7 @@ field: "createType", title: "鍒涘缓鏂瑰紡", type: "string", - width: 90, + width: 120, align: "left", bind: { key: "createType", data: [] }, }, @@ -217,12 +225,12 @@ required: true, }, { - field: "materielName", + field: "materielCode", title: "鐗╂枡鍚嶇О", type: "string", - width: 150, + width: 100, align: "left", - edit: { type: "" }, + bind: { key: "MaterielNames", data: [] }, }, { field: "batchNo", -- Gitblit v1.9.3