From 4f39dcc195f28fa275fc2d065fbf1bf6a46c21b7 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 17 六月 2025 00:41:18 +0800
Subject: [PATCH] 优化出入库逻辑

---
 代码管理/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
index 5712ece..d65c7ec 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue"
@@ -24,11 +24,13 @@
       cnName: "鍑哄簱鍗�",
       name: "outboundOrder",
       url: "/OutboundOrder/",
-      sortName: "id",
+      sortName: "CreateDate",
     });
     const editFormFields = ref({
       orderType: "",
+      orderNo:"",
       upperOrderNo: "",
+      orderStatus: "",
       remark: "",
     });
     const editFormOptions = ref([
@@ -42,9 +44,22 @@
           data: [],
         },
         {
+        field: "orderNo",
+        title: "鍗曟嵁缂栧彿",
+        type: "string",
+      },
+        {
           title: "涓婃父鍗曟嵁缂栧彿",
           field: "upperOrderNo",
           type: "string",
+        },
+        {
+          title: "鍗曟嵁鐘舵��",
+          field: "orderStatus",
+          type: "select",
+          dataKey: "inboundState",
+          data: [],
+          readonly: true,
         },
         {
           title: "澶囨敞",
@@ -90,7 +105,7 @@
           data: [],
         },
         { title: "鍒涘缓鑰�", field: "creater", type: "like" },
-        { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datatime" },
+        { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
       ],
     ]);
     const columns = ref([
@@ -110,6 +125,7 @@
         type: "string",
         width: 120,
         align: "left",
+        link: true,
       },
       {
         field: "upperOrderNo",
@@ -124,6 +140,7 @@
         type: "string",
         width: 150,
         align: "left",
+        bind: { key: "outOrderType", data: [] },
       },
       {
         field: "orderStatus",
@@ -131,6 +148,7 @@
         type: "decimal",
         width: 90,
         align: "left",
+        bind: { key: "outboundStatusEnum", data: [] },
       },
       {
         field: "createType",
@@ -138,6 +156,7 @@
         type: "string",
         width: 90,
         align: "left",
+        bind: { key: "createType", data: [] },
       },
       {
         field: "creater",
@@ -200,10 +219,11 @@
         {
           field: "materielCode",
           title: "鐗╂枡缂栧彿",
-          type: "string",
+          type: "select",
           width: 150,
           align: "left",
-          edit: { type: "string" },
+          edit: { type: "selectList", keep: true, data: [] },
+          bind: { key: "materielInfo", data: [] },
           required: true,
         },
         {
@@ -212,6 +232,7 @@
           type: "string",
           width: 150,
           align: "left",
+          // edit: { type: "string" },
         },
         {
           field: "batchNo",
@@ -251,6 +272,7 @@
           type: "string",
           width: 180,
           align: "left",
+          bind: { key: "orderDetailStatusEnum", data: [] },
         },
         {
           field: "creater",

--
Gitblit v1.9.3