From 664df90a747e5a97b4e1131a5f958ded3176250c Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期四, 25 十二月 2025 11:23:35 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 4958422..27b4795 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"
@@ -239,12 +239,12 @@
required: true,
},
{
- field: "materielCode",
+ field: "materielName",
title: "鐗╂枡鍚嶇О",
type: "string",
- width: 120,
+ width: 150,
align: "left",
- bind: { key: "MaterielNames", data: [] },
+ bind: { key: "materielInfo", data: [] },
},
{
field: "batchNo",
@@ -319,14 +319,14 @@
align: "left",
bind: { key: "orderDetailStatusEnum", data: [] },
},
- {
- field: "returnToMESStatus",
- title: "鍥炰紶鐘舵��",
- type: "string",
- width: 90,
- align: "left",
- bind: { key: "returnStatus", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" }] }
- },
+ // {
+ // field: "returnToMESStatus",
+ // title: "鍥炰紶鐘舵��",
+ // type: "string",
+ // width: 90,
+ // align: "left",
+ // bind: { key: "returnStatus", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" }] }
+ // },
{
field: "creater",
title: "鍒涘缓浜�",
--
Gitblit v1.9.3