From 3a3f17f0890d721d97b139f88dde7df5c13ba688 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 06 一月 2025 18:51:21 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue |    7 ++++---
 1 files changed, 4 insertions(+), 3 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..a52acca 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,7 +24,7 @@
       cnName: "鏀惰揣鍗�",
       name: "receiveOrder",
       url: "/ReceiveOrder/",
-      sortName: "CreateDate",
+      sortName: "receiveOrderId",
     });
 
     const searchFormFields = ref({
@@ -49,8 +49,8 @@
         {
           title: "鍗曟嵁鐘舵��",
           field: "orderStatus",
-          type: "select",
-          dataKey: "inboundState",
+          type: "selectList",
+          dataKey: "receiveStatus",
           data: [],
         },
       ],
@@ -141,6 +141,7 @@
         type: "string",
         width: 150,
         align: "left",
+        bind: { key: "receiveStatus", data: [] },
       },
       {
         field: "customerId",

--
Gitblit v1.9.3