From 4bc0e18b94a2bf17c1b7277910d63ef82fbe616a Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 10 一月 2025 09:39:51 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 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 63637e8..6750ee2 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"
@@ -28,35 +28,32 @@
});
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: "suppliersId", type: "select",dataKey:"suppliers",data:[]},
{ title: "鍒涘缓鑰�", field: "creater", type: "like" },
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
],
]);
@@ -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",
--
Gitblit v1.9.3