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/purchaseOrder.vue | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue"
index ac92e4e..5d3a627 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue"
@@ -21,7 +21,7 @@
const table = ref({
key: "id",
footer: "Foots",
- cnName: "鍏ュ簱鍗�",
+ cnName: "閲囪喘鍗�",
name: "purchaseOrder",
url: "/PurchaseOrder/",
sortName: "id",
@@ -108,8 +108,9 @@
type: "string",
width: 150,
align: "left",
- bind: { key: "purchaseType", data: [] },
+ bind: { key: "", data: [{key:'S',value:"鏍囧噯鍏ュ簱"},{key:'V',value:"瀵勫敭琛ョ粰鍏ュ簱"}] },
},
+
{
field: "supplierCode",
title: "渚涘簲鍟嗙紪鍙�",
@@ -152,6 +153,7 @@
type: "datetime",
width: 160,
align: "left",
+
},
{
field: "modifier",
@@ -176,7 +178,7 @@
},
]);
const detail = ref({
- cnName: "鍏ュ簱鍗曟槑缁�",
+ cnName: "閲囪喘鍗曟槑缁�",
table: "InboundOrderDetail",
columns: [
{
@@ -202,7 +204,7 @@
title: "琛屽彿",
type: "string",
width: 150,
- align: "left",
+ align: "left"
},
{
field: "materielCode",
@@ -217,9 +219,16 @@
field: "materielName",
title: "鐗╂枡鍚嶇О",
type: "string",
- width: 150,
+ width: 100,
+ align: "left"
+ },
+ {
+ field: "materielSpec",
+ title: "鐗╂枡瑙勬牸",
+ type: "select",
+ type: "string",
+ width: 100,
align: "left",
- edit: { type: "" },
},
// {
// field: "batchNo",
@@ -234,7 +243,14 @@
field: "purchaseDetailQuantity",
title: "鍗曟嵁鏁伴噺",
type: "decimal",
- width: 90,
+ width: 100,
+ align: "left",
+ },
+ {
+ field:"purchaseDetailReceiveQty",
+ title: "宸叉敹鏁伴噺",
+ type: "decimal",
+ width: 100,
align: "left",
},
{
@@ -246,10 +262,11 @@
},
{
field: "warehouseId",
- title: "浠撳簱缂栧彿",
+ title: "浠撳簱",
type: "string",
- width: 200,
+ width: 100,
align: "left",
+ bind: { key: "warehouses", data: [] },
},
{
field: "purchaseDetailStatus",
@@ -257,6 +274,7 @@
type: "string",
width: 180,
align: "left",
+ bind: { key: "purchaseOrderStatus", data: [] },
},
{
field: "creater",
--
Gitblit v1.9.3