From 68628c6cc163cddfcc745c225a9f3f34767261ef Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 22 十一月 2025 20:44:40 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
index a835138..e4defc7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
@@ -78,7 +78,7 @@
const searchFormFields = ref({
inboundOrderNo: "",
upperOrderNo: "",
- orderType: "",
+ orderType: "0",
orderStatus: "",
createType: "",
creater: "",
@@ -93,7 +93,7 @@
field: "orderType",
type: "select",
dataKey: "inOrderType",
- data: [],
+ data: [0],
},
{
title: "鍗曟嵁鐘舵��",
@@ -142,20 +142,20 @@
align: "left",
},
{
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 90,
- align: "left",
- bind:{key: "warehouses", data: []}
- },
- {
field: "orderType",
title: "鍗曟嵁绫诲瀷",
type: "string",
width: 150,
align: "left",
bind: { key: "inOrderType", data: [] },
+ },
+ {
+ field: "businessType",
+ title: "涓氬姟绫诲瀷",
+ type: "string",
+ width: 150,
+ align: "left",
+ bind: { key: "businessType", data: [] },
},
{
field: "orderStatus",
@@ -172,6 +172,13 @@
width: 120,
align: "left",
bind: { key: "createType", data: [] },
+ },
+ {
+ field: "factoryArea",
+ title: "鍘傚尯",
+ type: "string",
+ width: 120,
+ align: "left"
},
{
field: "creater",
@@ -267,6 +274,14 @@
required: true,
},
{
+ field: "warehouseCode",
+ title: "浠撳簱鍙�",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ required: true
+ },
+ {
field: "barcode",
title: "鏉＄爜",
type: "decimal",
--
Gitblit v1.9.3