From b680585c3a6d43f0c72a83a115ea537ce8c91a07 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 13 十二月 2025 17:44:10 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 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 9782bb1..c59e488 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"
@@ -57,6 +57,7 @@
type: "select",
dataKey: "inOrderType",
data: [],
+ hidden:true
},
{
field: "inboundOrderNo",
@@ -86,14 +87,14 @@
});
const searchFormOptions = ref([
[
- { title: "鍗曟嵁缂栧彿", field: "inboundOrderNo", type: "like" },
+ { title: "鎵弿鍗曟嵁鎴栨潯鐮�", field: "inboundOrderNo", type: "like" },
{ title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
{
- title: "鍗曟嵁绫诲瀷",
- field: "orderType",
+ title: "涓氬姟绫诲瀷",
+ field: "businessType",
type: "select",
- dataKey: "inOrderType",
- data: [0],
+ dataKey: "documentTypeEmun",
+ data: [],
},
{
title: "鍗曟嵁鐘舵��",
@@ -148,6 +149,7 @@
width: 150,
align: "left",
bind: { key: "inOrderType", data: [] },
+ hidden:true
},
{
field: "businessType",
@@ -166,12 +168,32 @@
bind: { key: "inboundState", data: [] },
},
{
+ field: "orderStatistics",
+ title: "鍗曟嵁鐗╂枡缁熻",
+ type: "string",
+ width: 230,
+ align: "left",
+ },
+ {
field: "createType",
title: "鍒涘缓鏂瑰紡",
type: "string",
width: 120,
align: "left",
bind: { key: "createType", data: [] },
+ },
+ {
+ field: "remark",
+ title: "澶囨敞",
+ type: "string",
+ width: 180,
+ align: "left"
+ },
+ {
+ field: "returnToMESStatus",
+ title: "鍥炰紶MES鐘舵��",
+ width: 120,
+ bind: { key: "createType", data:[{key:0, value:"鏈洖浼�"},{key:1, value:"宸插洖浼犳垚鍔�"},{key:2, value:"鍥炰紶澶辫触"}]},
},
{
field: "factoryArea",
@@ -208,13 +230,6 @@
width: 160,
align: "left",
},
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
]);
const detail = ref({
cnName: "鍏ュ簱鍗曟槑缁�",
@@ -242,7 +257,7 @@
field: "materielCode",
title: "鐗╂枡缂栧彿",
type: "select",
- width: 150,
+ width: 120,
align: "left",
edit: { type: "" },
required: true,
@@ -251,7 +266,7 @@
field: "materielCode",
title: "鐗╂枡鍚嶇О",
type: "string",
- width: 100,
+ width: 120,
align: "left",
bind: { key: "MaterielNames", data: [] },
},
@@ -259,7 +274,7 @@
field: "batchNo",
title: "鎵规鍙�",
type: "decimal",
- width: 90,
+ width: 150,
align: "left",
edit: { type: "" },
required: true,
@@ -268,7 +283,7 @@
field: "supplyCode",
title: "渚涘簲鍟嗙紪鍙�",
type: "decimal",
- width: 90,
+ width: 100,
align: "left",
edit: { type: "" },
required: true,
@@ -285,7 +300,7 @@
field: "barcode",
title: "鏉＄爜",
type: "decimal",
- width: 90,
+ width: 180,
align: "left",
edit: { type: "" },
required: true,
@@ -303,21 +318,21 @@
field: "receiptQuantity",
title: "缁勭洏鏁伴噺",
type: "int",
- width: 120,
+ width: 90,
align: "left",
},
{
field: "overInQuantity",
title: "涓婃灦鏁伴噺",
type: "string",
- width: 200,
+ width: 90,
align: "left",
},
{
field: "orderDetailStatus",
title: "璁㈠崟鏄庣粏鐘舵��",
type: "string",
- width: 180,
+ width: 100,
align: "left",
bind: { key: "orderDetailStatusEnum", data: [] },
},
--
Gitblit v1.9.3