From 526b70eecc5dac5aea91bfffbe0b98118f25827f Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 23 六月 2025 09:01:01 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/mesPPBackInboundOrderDetail.vue | 100 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 65 insertions(+), 35 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesPPBackInboundOrderDetail.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesPPBackInboundOrderDetail.vue"
index fb7d4a2..915a940 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesPPBackInboundOrderDetail.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/mesPPBackInboundOrderDetail.vue"
@@ -111,58 +111,88 @@
align: "left",
},
{
- field: "inboundOrderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- width: 120,
- align: "left",
- link: true,
- },
- {
- field: "warehouseId",
- title: "浠撳簱",
- type: "string",
- width: 90,
- align: "left",
- bind:{key: "warehouses", data: []}
- },
- {
- field: "SourceAddressCode",
- title: "婧愬湴鍧�鐮�",
- type: "string",
- width: 90,
- align: "left",
- },
- {
- field: "CarrierCode",
- title: "杞藉叿鍙�",
+ field: "orderId",
+ title: "鍏ュ簱鍗曚富閿�",
type: "string",
width: 90,
align: "left",
},
{
- field: "orderType",
- title: "鍗曟嵁绫诲瀷",
+ field: "materielCode",
+ title: "鐗╂枡缂栧彿",
type: "string",
width: 150,
align: "left",
- bind: { key: "inOrderType", data: [] },
},
{
- field: "orderStatus",
- title: "鍗曟嵁鐘舵��",
- type: "decimal",
+ field: "materielName",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 150,
+ align: "left",
+ },
+ {
+ field: "materialLot",
+ title: "鎵规鍙�",
+ type: "string",
width: 90,
align: "left",
- bind: { key: "inboundState", data: [] },
},
{
- field: "createType",
- title: "鍒涘缓鏂瑰紡",
+ field: "orderQuantity",
+ title: "鍗曟嵁鏁伴噺",
+ type: "string",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "receiptQuantity",
+ title: "缁勭洏鏁伴噺",
+ type: "int",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "overInQuantity",
+ title: "涓婃灦鏁伴噺",
+ type: "string",
+ width: 200,
+ align: "left",
+ },
+ {
+ field: "orderDetailStatus",
+ title: "璁㈠崟鏄庣粏鐘舵��",
+ type: "string",
+ width: 180,
+ align: "left",
+ },
+ {
+ field: "cutedWidth",
+ title: "瑁佸垏瀹�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "unit",
+ title: "鍗曚綅",
+ type: "string",
+ width: 50,
+ align: "left",
+ },
+ {
+ field: "productionDate",
+ title: "鐢熶骇鏃ユ湡",
type: "string",
width: 120,
align: "left",
- bind: { key: "createType", data: [] },
+ },
+ {
+ field: "effectiveDate",
+ title: "鏈夋晥鏃ユ湡",
+ type: "string",
+ width: 120,
+ align: "left",
},
{
field: "creater",
--
Gitblit v1.9.3