From 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 01 十一月 2025 19:54:25 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng

---
 新建文件夹/WMS/src/views/inbound/inboundOrder.vue |   52 ++++++++++++++++++++++++++--------------------------
 1 files changed, 26 insertions(+), 26 deletions(-)

diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue"
index d43aa0e..68a1a2d 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/inbound/inboundOrder.vue"
@@ -75,7 +75,7 @@
           title: "搴撴埧鍙�",
           field: "warehouse_no",
           type: "select",
-          dataKey: "warehouse",
+         dataKey: "warehouseNuber", 
           data: [],
           required: true,
         },
@@ -128,22 +128,22 @@
           dataKey: "order_type",
           data: [],
         },
-        {
-          title: "琛ㄥご鐘舵��",
-          field: "odrderStatus",
+        // {
+        //   title: "琛ㄥご鐘舵��",
+        //   field: "odrderStatus",
+        //   type: "select",
+        //   dataKey: "odrderStatus",
+        //   data: [],
+        // },
+          {
+          title: "搴撴埧鍙�",
+          field: "warehouse_no",
           type: "select",
-          dataKey: "odrderStatus",
+           dataKey: "warehouseNuber", 
           data: [],
         },
       ],
       [
-        {
-          title: "搴撴埧鍙�",
-          field: "warehouse_no",
-          type: "select",
-          dataKey: "warehouse",
-          data: [],
-        },
         {
           title: "鍏ュ簱璁拌处鏃堕棿",
           field: "account_tiem",
@@ -216,13 +216,13 @@
         align: "left",
         bind: { key: "odrderStatus", data: [] },
       },
-      {
-        field: "creater",
-        title: "鍒涘缓浜�",
-        type: "string",
-        width: 90,
-        align: "left",
-      },
+      // {
+      //   field: "creater",
+      //   title: "鍒涘缓浜�",
+      //   type: "string",
+      //   width: 90,
+      //   align: "left",
+      // },
       {
         field: "createDate",
         title: "鍒涘缓鏃堕棿",
@@ -230,13 +230,13 @@
         width: 160,
         align: "left",
       },
-      {
-        field: "modifier",
-        title: "淇敼浜�",
-        type: "string",
-        width: 100,
-        align: "left",
-      },
+      // {
+      //   field: "modifier",
+      //   title: "淇敼浜�",
+      //   type: "string",
+      //   width: 100,
+      //   align: "left",
+      // },
       {
         field: "modifyDate",
         title: "淇敼鏃堕棿",

--
Gitblit v1.9.3