From 2f8fc989f339a936b01092caebd4c46e6109da1b Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期二, 16 十二月 2025 11:29:37 +0800
Subject: [PATCH] 代码提交

---
 WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue |  123 +++++++++++++++++++++++++++++++++-------
 1 files changed, 101 insertions(+), 22 deletions(-)

diff --git a/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue b/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue
index b7d41ad..04bddb0 100644
--- a/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue
+++ b/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue
@@ -28,7 +28,7 @@
     });
     const editFormFields = ref({
       orderType: "",
-      orderNo:"",
+      orderNo: "",
       upperOrderNo: "",
       remark: "",
     });
@@ -43,19 +43,58 @@
           data: [],
         },
         {
-        field: "orderNo",
-        title: "鍗曟嵁缂栧彿",
-        type: "string",
-      },
+          field: "warehouseId",
+          title: "浠撳簱ID",
+          type: "select",
+          dataKey: "warehouses",
+          data: [],
+        },
+        {
+          field: "orderNo",
+          title: "鍗曟嵁缂栧彿",
+          type: "string",
+          readonly: true,
+        },
+        {
+          title: "鍗曟嵁鐘舵��",
+          field: "orderStatus",
+          type: "select",
+          dataKey: "inboundState",
+          data: [],
+        },
         {
           title: "涓婃父鍗曟嵁缂栧彿",
           field: "upperOrderNo",
           type: "string",
+          readonly: true,
+        },
+      ],
+      [
+        {
+          title: "鍒涘缓鏂瑰紡",
+          field: "createType",
+          type: "select",
+          dataKey: "createType",
+          data: [],
         },
         {
           title: "澶囨敞",
           field: "remark",
           type: "textarea",
+        },
+        {
+          field: "inoutType",
+          title: "鍑哄叆搴撶被鍨�",
+          type: "select",
+          dataKey:"inoutTypeEnum",
+          data:[],
+          readonly:true
+        },
+        {
+          field: "system",
+          title: "鍗曟嵁鏉ユ簮",
+          type: "string",
+          readonly:true
         },
       ],
     ]);
@@ -89,14 +128,30 @@
       ],
       [
         {
+          title: "鍑哄叆搴撶被鍨�",
+          field: "inoutType",
+          type: "select",
+          dataKey: "inoutTypeEnum",
+          data: [],
+        },
+        {
+          title: "鎵�灞炰粨搴�",
+          field: "warehouseId",
+          type: "select",
+          dataKey: "warehouses",
+          data: [],
+        },
+        { title: "鍒涘缓鑰�", field: "creater", type: "like" },
+        { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+      ],
+      [
+        {
           title: "鍒涘缓鏂瑰紡",
           field: "createType",
           type: "select",
           dataKey: "createType",
           data: [],
         },
-        { title: "鍒涘缓鑰�", field: "creater", type: "like" },
-        { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
       ],
     ]);
     const columns = ref([
@@ -111,10 +166,19 @@
         align: "left",
       },
       {
+        field: "warehouseId",
+        title: "浠撳簱",
+        type: "string",
+        width: 120,
+        align: "left",
+        bind: { key: "warehouses", data: [] },
+      },
+
+      {
         field: "orderNo",
         title: "鍗曟嵁缂栧彿",
         type: "string",
-        width: 120,
+        width: 170,
         align: "left",
         link: true,
       },
@@ -127,19 +191,19 @@
       },
       {
         field: "orderType",
-        title: "鍗曟嵁绫诲瀷",
+        title: "鍗曟嵁澶х被",
         type: "string",
         width: 150,
         align: "left",
         bind: { key: "inOrderType", data: [] },
       },
-            {
+      {
         field: "inoutType",
-        title: "鍗曟嵁澶х被",
-        type: "string",
-        width: 150,
+        title: "鍑哄叆搴撶被鍨�",
+        type: "select",
+        width: 90,
         align: "left",
-        bind: { key: "inoutType", data: [] },
+        bind: { key: "inoutTypeEnum", data: [] },
       },
       {
         field: "orderStatus",
@@ -153,9 +217,16 @@
         field: "createType",
         title: "鍒涘缓鏂瑰紡",
         type: "string",
-        width: 90,
+        width: 120,
         align: "left",
         bind: { key: "createType", data: [] },
+      },
+      {
+        field: "system",
+        title: "鍗曟嵁鏉ユ簮",
+        type: "string",
+        width: 90,
+        align: "left",
       },
       {
         field: "creater",
@@ -222,7 +293,6 @@
           width: 150,
           align: "left",
           edit: { type: "" },
-
         },
         {
           field: "materielName",
@@ -233,13 +303,21 @@
           edit: { type: "" },
         },
         {
-          field: "batchNo",
-          title: "鎵规鍙�",
-          type: "decimal",
-          width: 90,
+          field: "supplierBatch",
+          title: "渚涘簲鍟嗘壒娆″彿",
+          type: "string",
+          width: 150,
           align: "left",
           edit: { type: "" },
           required: true,
+        },
+        {
+          field: "batchNo",
+          title: "鍐呴儴鎵规鍙�",
+          type: "string",
+          width: 130,
+          align: "left",
+          readonly: true,
         },
         {
           field: "orderQuantity",
@@ -247,7 +325,6 @@
           type: "decimal",
           width: 90,
           align: "left",
-          edit: { type: "number" },
           required: true,
         },
         {
@@ -256,6 +333,7 @@
           type: "int",
           width: 120,
           align: "left",
+          edit: { type: "number" },
         },
         {
           field: "overInQuantity",
@@ -267,10 +345,11 @@
         {
           field: "orderDetailStatus",
           title: "璁㈠崟鏄庣粏鐘舵��",
-          type: "string",
+          type: "select",
           width: 180,
           align: "left",
           bind: { key: "orderDetailStatusEnum", data: [] },
+          edit: { type: "number" },
         },
         {
           field: "creater",

--
Gitblit v1.9.3