From 696edbff3c8812e4b820f624d66a02ae6ddb1a06 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 16 四月 2026 13:40:18 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
index 79d4523..583abee 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/allocateinboundOrder.vue"
@@ -73,8 +73,7 @@
});
const searchFormOptions = ref([
[
- { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
- { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
+ { title: "璇锋壂鎻忓崟鎹垨鏉＄爜", field: "orderNo", type: "like" },
{
title: "鍗曟嵁绫诲瀷",
field: "orderType",
@@ -92,14 +91,17 @@
],
[
{
- title: "鍒涘缓鏂瑰紡",
- field: "createType",
+ title: "鍥炰紶MES鐘舵��",
+ field: "returnToMESStatus",
type: "select",
- dataKey: "createType",
+ dataKey: "outboundReturnToMESStatus",
data: [],
},
- { title: "鍒涘缓鑰�", field: "creater", type: "like" },
+ { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
{ title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ ],
+ [
+ { title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
],
]);
const columns = ref([
@@ -143,6 +145,7 @@
width: 150,
align: "left",
bind: { key: "businessType", data: [] },
+ hidden: true,
},
{
field: "orderStatus",
@@ -180,6 +183,11 @@
type: "string",
width: 120,
align: "left"
+ },{
+ field: "returnToMESStatus",
+ title: "鍥炰紶MES鐘舵��",
+ width: 120,
+ bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" },{ key: 3, value: "閮ㄥ垎鍥炰紶鎴愬姛" },{ key: 4, value: "閮ㄥ垎鍥炰紶澶辫触" },{ key: 5, value: "鏃犻渶鍥炰紶" }] },
},
{
field: "creater",
@@ -292,6 +300,14 @@
required: true,
},
{
+ field: "outBoxbarcodes",
+ title: "澶栫鏉＄爜",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ required: true,
+ },
+ {
field: "orderQuantity",
title: "鍗曟嵁鏁伴噺",
type: "decimal",
@@ -323,6 +339,13 @@
bind: { key: "orderDetailStatusEnum", data: [] },
},
{
+ field: "pallet",
+ title: "宸茬粍鎵樼洏鍙�",
+ type: "string",
+ width: 180,
+ align: "left",
+ },
+ {
field: "creater",
title: "鍒涘缓浜�",
type: "string",
--
Gitblit v1.9.3