From 6695afe1e1c478dbb599a1d382d8d6628b456d03 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期六, 18 一月 2025 17:30:49 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue"
index 6750ee2..4eb6919 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue"
@@ -236,7 +236,7 @@
align: "left",
},
{
- field: "orderId",
+ field: "receiveOrderId",
title: "鏀惰揣鍗曚富閿�",
type: "string",
width: 90,
@@ -244,8 +244,8 @@
hidden: true,
},
{
- field: "rowNo",
- title: "琛屽彿",
+ field: "purchaseOrderDetailRowNo",
+ title: "閲囪喘鍗曟槑缁嗚鍙�",
type: "string",
width: 60,
align: "left",
@@ -256,7 +256,6 @@
type: "select",
width: 160,
align: "left",
- edit: { type: "" },
required: true,
},
{
@@ -265,7 +264,6 @@
type: "select",
width: 150,
align: "left",
- edit: { type: "" },
required: true,
},
{
@@ -274,7 +272,6 @@
type: "string",
width: 150,
align: "left",
- edit: { type: "" },
},
{
field: "lotNo",
@@ -282,16 +279,14 @@
type: "decimal",
width: 90,
align: "left",
- edit: { type: "" },
required: true,
},
{
- field: "receivedQty",
+ field: "receivedQuantity",
title: "鏀惰揣鏁伴噺",
type: "decimal",
width: 90,
align: "left",
- edit: { type: "number" },
required: true,
},
{
@@ -300,6 +295,7 @@
type: "int",
width: 90,
align: "left",
+ bind: { key: "enable", data: [] },
},
{
field: "priceInTax",
@@ -316,8 +312,8 @@
align: "left",
},
{
- field: "currCode",
- title: "甯佸埆缂栫爜",
+ field: "unit",
+ title: "鍗曚綅",
type: "string",
width: 90,
align: "left",
--
Gitblit v1.9.3