From e7037a128a61a6f8d3095960ead68a65dd6d69f2 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 13 一月 2025 19:40:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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 f4929a5..517719b 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,11 +24,11 @@
cnName: "鍏ュ簱鍗�",
name: "inboundOrder",
url: "/InboundOrder/",
- sortName: "CreateDate",
+ sortName: "id",
});
const editFormFields = ref({
orderType: "",
- orderNo:"",
+ inboundOrderNo: "",
upperOrderNo: "",
remark: "",
});
@@ -43,10 +43,10 @@
data: [],
},
{
- field: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- },
+ field: "inboundOrderNo",
+ title: "鍗曟嵁缂栧彿",
+ type: "string",
+ },
{
title: "涓婃父鍗曟嵁缂栧彿",
field: "upperOrderNo",
@@ -60,7 +60,7 @@
],
]);
const searchFormFields = ref({
- orderNo: "",
+ inboundOrderNo: "",
upperOrderNo: "",
orderType: "",
orderStatus: "",
@@ -70,7 +70,7 @@
});
const searchFormOptions = ref([
[
- { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
+ { title: "鍗曟嵁缂栧彿", field: "inboundOrderNo", type: "like" },
{ title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
{
title: "鍗曟嵁绫诲瀷",
@@ -111,7 +111,7 @@
align: "left",
},
{
- field: "orderNo",
+ field: "inboundOrderNo",
title: "鍗曟嵁缂栧彿",
type: "string",
width: 120,
@@ -124,6 +124,14 @@
type: "string",
width: 150,
align: "left",
+ },
+ {
+ field: "warehouseId",
+ title: "浠撳簱",
+ type: "string",
+ width: 90,
+ align: "left",
+ bind:{key: "warehouses", data: []}
},
{
field: "orderType",
@@ -145,7 +153,7 @@
field: "createType",
title: "鍒涘缓鏂瑰紡",
type: "string",
- width: 90,
+ width: 120,
align: "left",
bind: { key: "createType", data: [] },
},
--
Gitblit v1.9.3