From d5430d9a9e73eae213c16baea9fbbcf54cc5d5da Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 22 一月 2025 16:13:53 +0800
Subject: [PATCH] 库存导出，采购单接收，物料接收优化，前端显示优化，测试架AGV任务大小托盘更改
---
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue | 59 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 28 insertions(+), 31 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 bfcb977..b26e5b0 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"
@@ -24,39 +24,36 @@
cnName: "鏀惰揣鍗�",
name: "receiveOrder",
url: "/ReceiveOrder/",
- sortName: "CreateDate",
+ sortName: "receiveOrderId",
});
const searchFormFields = ref({
- orderNo: "",
- upperOrderNo: "",
- orderType: "",
- orderStatus: "",
- createType: "",
+ receiveOrderNo: "",
+ receiveOrderType: "",
+ receiveOrderStatus: "",
creater: "",
- createDate: "",
});
const searchFormOptions = ref([
[
- { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
+ { title: "鍗曟嵁缂栧彿", field: "receiveOrderNo", type: "like" },
{
title: "鍗曟嵁绫诲瀷",
- field: "orderType",
+ field: "receiveOrderType",
type: "select",
- dataKey: "inOrderType",
+ dataKey: "receiveOrderTypeEnum",
data: [],
},
{
title: "鍗曟嵁鐘舵��",
- field: "orderStatus",
- type: "select",
- dataKey: "inboundState",
+ field: "receiveOrderStatus",
+ type: "selectList",
+ dataKey: "receiveStatus",
data: [],
},
],
[
- { title: "鍒涘缓鑰�", field: "creater", type: "like" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ { title: "渚涘簲鍟�", field: "suppliersId", type: "select",dataKey:"suppliers",data:[]},
+ { title: "鍒涘缓鑰�", field: "creater", type: "like" }
],
]);
@@ -139,8 +136,9 @@
field: "receiveOrderStatus",
title: "璁㈠崟鐘舵��",
type: "string",
- width: 150,
+ width: 120,
align: "left",
+ bind: { key: "receiveStatus", data: [] },
},
{
field: "customerId",
@@ -148,6 +146,7 @@
type: "string",
width: 90,
align: "left",
+ hidden:true
},
{
field: "suppliersId",
@@ -158,23 +157,24 @@
},
{
field: "warehouseId",
- title: "浠撳簱涓婚敭",
+ title: "浠撳簱",
type: "string",
width: 90,
align: "left",
+ bind:{key: "warehouses", data: []}
},
{
field: "receiveDate",
title: "鏀惰揣鏃ユ湡",
type: "string",
- width: 90,
+ width: 160,
align: "left",
},
{
field: "deliveryCode",
title: "閫佽揣鍗曞彿",
type: "string",
- width: 90,
+ width: 150,
align: "left",
},
{
@@ -183,6 +183,7 @@
type: "string",
width: 90,
align: "left",
+ bind:{key:"enable",data:[]}
},
{
field: "creater",
@@ -235,7 +236,7 @@
align: "left",
},
{
- field: "orderId",
+ field: "receiveOrderId",
title: "鏀惰揣鍗曚富閿�",
type: "string",
width: 90,
@@ -243,8 +244,8 @@
hidden: true,
},
{
- field: "rowNo",
- title: "琛屽彿",
+ field: "purchaseOrderDetailRowNo",
+ title: "閲囪喘鍗曟槑缁嗚鍙�",
type: "string",
width: 60,
align: "left",
@@ -255,7 +256,6 @@
type: "select",
width: 160,
align: "left",
- edit: { type: "" },
required: true,
},
{
@@ -264,16 +264,14 @@
type: "select",
width: 150,
align: "left",
- edit: { type: "" },
required: true,
},
{
field: "materielName",
title: "鐗╂枡鍚嶇О",
type: "string",
- width: 150,
+ width: 100,
align: "left",
- edit: { type: "" },
},
{
field: "lotNo",
@@ -281,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,
},
{
@@ -299,6 +295,7 @@
type: "int",
width: 90,
align: "left",
+ bind: { key: "enable", data: [] },
},
{
field: "priceInTax",
@@ -315,8 +312,8 @@
align: "left",
},
{
- field: "currCode",
- title: "甯佸埆缂栫爜",
+ field: "unit",
+ title: "鍗曚綅",
type: "string",
width: 90,
align: "left",
--
Gitblit v1.9.3