From 0705cb6170a9ba77ba48bbb6dcebb9cf3d73cbea Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 14 十月 2025 02:12:25 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 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 0f6b3d0..faba829 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"
@@ -97,6 +97,11 @@
},
{ title: "鍒涘缓鑰�", field: "creater", type: "like" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],}
+ ],
+ [
+ { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
+ { title: "鎵规鍙�", field: "batchNo", type: "like" },
],
]);
const columns = ref([
@@ -110,11 +115,12 @@
require: true,
align: "left",
},
+
{
field: "inboundOrderNo",
title: "鍗曟嵁缂栧彿",
type: "string",
- width: 120,
+ width: 180,
align: "left",
link: true,
},
@@ -131,7 +137,7 @@
type: "string",
width: 90,
align: "left",
- bind:{key: "warehouses", data: []}
+ bind:{ key: "warehouses", data: []}
},
{
field: "orderType",
@@ -149,6 +155,7 @@
align: "left",
bind: { key: "inboundState", data: [] },
},
+
{
field: "createType",
title: "鍒涘缓鏂瑰紡",
@@ -156,6 +163,13 @@
width: 120,
align: "left",
bind: { key: "createType", data: [] },
+ },
+ {
+ field: "id",
+ title: "鍏ュ簱鍗曚富閿�",
+ type: "int",
+ width: 90,
+ align: "left",
},
{
field: "creater",
@@ -225,18 +239,25 @@
required: true,
},
{
- field: "materielCode",
+ field: "materielName",
title: "鐗╂枡鍚嶇О",
type: "string",
width: 100,
align: "left",
- bind: { key: "MaterielNames", data: [] },
+ },
+ {
+ field: "materielSpec",
+ title: "鐗╂枡瑙勬牸",
+ type: "select",
+ type: "string",
+ width: 100,
+ align: "left",
},
{
field: "batchNo",
title: "鎵规鍙�",
type: "decimal",
- width: 90,
+ width: 130,
align: "left",
edit: { type: "" },
required: true,
@@ -261,7 +282,7 @@
field: "overInQuantity",
title: "涓婃灦鏁伴噺",
type: "string",
- width: 200,
+ width: 120,
align: "left",
},
{
--
Gitblit v1.9.3