From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 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..14f4655 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"
@@ -54,6 +54,7 @@
[
{ title: "渚涘簲鍟�", field: "suppliersId", type: "select",dataKey:"suppliers",data:[]},
{ title: "鍒涘缓鑰�", field: "creater", type: "like" },
+ { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],}
],
]);
@@ -186,6 +187,14 @@
bind:{key:"enable",data:[]}
},
{
+ field: "createInOrderStatus",
+ title: "鍏ュ簱鍗曞垱寤虹姸鎬�",
+ type: "string",
+ width: 130,
+ align: "left",
+ bind:{key:"enable",data:[]}
+ },
+ {
field: "creater",
title: "鍒涘缓浜�",
type: "string",
@@ -236,7 +245,7 @@
align: "left",
},
{
- field: "orderId",
+ field: "receiveOrderId",
title: "鏀惰揣鍗曚富閿�",
type: "string",
width: 90,
@@ -244,8 +253,8 @@
hidden: true,
},
{
- field: "rowNo",
- title: "琛屽彿",
+ field: "purchaseOrderDetailRowNo",
+ title: "閲囪喘鍗曟槑缁嗚鍙�",
type: "string",
width: 60,
align: "left",
@@ -256,7 +265,6 @@
type: "select",
width: 160,
align: "left",
- edit: { type: "" },
required: true,
},
{
@@ -265,16 +273,22 @@
type: "select",
width: 150,
align: "left",
- edit: { type: "" },
required: true,
},
{
field: "materielName",
title: "鐗╂枡鍚嶇О",
type: "string",
- width: 150,
+ width: 100,
align: "left",
- edit: { type: "" },
+ },
+ {
+ field: "materielSpec",
+ title: "鐗╂枡瑙勬牸",
+ type: "select",
+ type: "string",
+ width: 100,
+ align: "left",
},
{
field: "lotNo",
@@ -282,16 +296,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 +312,7 @@
type: "int",
width: 90,
align: "left",
+ bind: { key: "enable", data: [] },
},
{
field: "priceInTax",
@@ -316,8 +329,8 @@
align: "left",
},
{
- field: "currCode",
- title: "甯佸埆缂栫爜",
+ field: "unit",
+ title: "鍗曚綅",
type: "string",
width: 90,
align: "left",
--
Gitblit v1.9.3