From d01658c63cd541fe4ea5cec5c4bd7f23b9408cdb Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期六, 18 十月 2025 15:04:56 +0800
Subject: [PATCH] 前端，pda，后端接口更改，新增，优化

---
 WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue |   80 ++++++++++++++++++++++++++++------------
 1 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue b/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue
index 3d83141..ff69a6f 100644
--- a/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue
+++ b/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue
@@ -45,12 +45,15 @@
         {
           field: "warehouseId",
           title: "浠撳簱ID",
-          type: "int",
+          type: "select",
+          dataKey:"warehouses",
+          data:[]
         },
         {
           field: "orderNo",
           title: "鍗曟嵁缂栧彿",
           type: "string",
+          readonly:true
         },
                 {
           title: "鍗曟嵁鐘舵��",
@@ -63,12 +66,9 @@
           title: "涓婃父鍗曟嵁缂栧彿",
           field: "upperOrderNo",
           type: "string",
+          readonly:true
         },
-        {
-          title: "澶囨敞",
-          field: "remark",
-          type: "textarea",
-        },
+        
       ],
       [
         {
@@ -77,6 +77,11 @@
           type: "select",
           dataKey: "createType",
           data: [],
+        },
+        {
+          title: "澶囨敞",
+          field: "remark",
+          type: "textarea",
         },
       ],
     ]);
@@ -110,14 +115,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([
@@ -133,16 +154,18 @@
       },
       {
         field: "warehouseId",
-        title: "浠撳簱ID",
-        type: "int",
-        width: 90,
+        title: "浠撳簱",
+        type: "string",
+        width: 120,
         align: "left",
+        bind:{key:"warehouses",data:[]}
       },
+      
       {
         field: "orderNo",
         title: "鍗曟嵁缂栧彿",
         type: "string",
-        width: 120,
+        width: 170,
         align: "left",
         link: true,
       },
@@ -155,7 +178,7 @@
       },
       {
         field: "orderType",
-        title: "鍗曟嵁绫诲瀷",
+        title: "鍗曟嵁澶х被",
         type: "string",
         width: 150,
         align: "left",
@@ -163,11 +186,11 @@
       },
       {
         field: "inoutType",
-        title: "鍗曟嵁澶х被",
-        type: "string",
-        width: 150,
+        title: "鍑哄叆搴撶被鍨�",
+        type: "select",
+        width: 90,
         align: "left",
-        bind: { key: "inoutType", data: [] },
+        bind: { key: "inoutTypeEnum", data: [] },
       },
       {
         field: "orderStatus",
@@ -260,13 +283,22 @@
           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",
@@ -274,7 +306,6 @@
           type: "decimal",
           width: 90,
           align: "left",
-          edit: { type: "number" },
           required: true,
         },
         {
@@ -283,6 +314,7 @@
           type: "int",
           width: 120,
           align: "left",
+          edit: { type: "number" },
         },
         {
           field: "overInQuantity",
@@ -294,11 +326,11 @@
         {
           field: "orderDetailStatus",
           title: "璁㈠崟鏄庣粏鐘舵��",
-          type: "string",
+          type: "select",
           width: 180,
           align: "left",
-                    edit: { type: "" },
           bind: { key: "orderDetailStatusEnum", data: [] },
+          edit: { type: "number" },
         },
         {
           field: "creater",

--
Gitblit v1.9.3