From 18ca3750ce28d407afb518cadecdd29d79876c8b Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期二, 09 十二月 2025 19:40:15 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 56 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 34 insertions(+), 22 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 1b81cea..10582cf 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"
@@ -79,7 +79,7 @@
const searchFormFields = ref({
inboundOrderNo: "",
upperOrderNo: "",
- orderType: "0",
+ orderType: "",
orderStatus: "",
createType: "",
creater: "",
@@ -87,15 +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],
- hidden:true
+ dataKey: "documentTypeEmun",
+ data: [],
},
{
title: "鍗曟嵁鐘舵��",
@@ -169,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",
@@ -211,13 +230,6 @@
width: 160,
align: "left",
},
- {
- field: "remark",
- title: "澶囨敞",
- type: "string",
- width: 100,
- align: "left",
- },
]);
const detail = ref({
cnName: "鍏ュ簱鍗曟槑缁�",
@@ -245,7 +257,7 @@
field: "materielCode",
title: "鐗╂枡缂栧彿",
type: "select",
- width: 150,
+ width: 120,
align: "left",
edit: { type: "" },
required: true,
@@ -254,7 +266,7 @@
field: "materielCode",
title: "鐗╂枡鍚嶇О",
type: "string",
- width: 100,
+ width: 120,
align: "left",
bind: { key: "MaterielNames", data: [] },
},
@@ -262,7 +274,7 @@
field: "batchNo",
title: "鎵规鍙�",
type: "decimal",
- width: 90,
+ width: 150,
align: "left",
edit: { type: "" },
required: true,
@@ -271,7 +283,7 @@
field: "supplyCode",
title: "渚涘簲鍟嗙紪鍙�",
type: "decimal",
- width: 90,
+ width: 100,
align: "left",
edit: { type: "" },
required: true,
@@ -288,7 +300,7 @@
field: "barcode",
title: "鏉＄爜",
type: "decimal",
- width: 90,
+ width: 180,
align: "left",
edit: { type: "" },
required: true,
@@ -306,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