From c317c0a0c5475c3889a2bc75d30d2ed83cd6e43b Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期四, 08 一月 2026 22:22:30 +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 | 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/inboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
index 90d3829..7591b62 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"
@@ -6,7 +6,7 @@
</view-grid>
</template>
<script>
-import extend from "@/extension/inbound/inboundOrder_copy.js";
+import extend from "@/extension/inbound/inboundOrder.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
setup() {
@@ -147,7 +147,7 @@
field: "orderStatistics",
title: "鍗曟嵁鐗╂枡缁熻",
type: "string",
- width: 230,
+ width: 300,
align: "left",
},
{
@@ -193,7 +193,7 @@
align: "left",
},
{
- field: "modifier",
+ field: "operator",
title: "淇敼浜�",
type: "string",
width: 100,
@@ -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",
@@ -282,6 +282,14 @@
required: true,
},
{
+ field: "outBoxbarcodes",
+ title: "澶栫鏉＄爜",
+ type: "decimal",
+ width: 90,
+ align: "left",
+ required: true,
+ },
+ {
field: "orderQuantity",
title: "鍗曟嵁鏁伴噺",
type: "decimal",
@@ -305,6 +313,13 @@
align: "left",
},
{
+ field: "unit",
+ title: "鍗曚綅",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
field: "orderDetailStatus",
title: "璁㈠崟鏄庣粏鐘舵��",
type: "string",
@@ -312,6 +327,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: "creater",
title: "鍒涘缓浜�",
--
Gitblit v1.9.3