From c866c43016f12a9db80095d9e5fd7bbc3dcaeb66 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期四, 19 三月 2026 15:45:30 +0800
Subject: [PATCH] 1

---
 项目代码/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue |   52 +++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 43 insertions(+), 9 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
index 90d3829..0cfb062 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue"
@@ -6,7 +6,7 @@
   </view-grid>
 </template>
 <script>
-import extend from "@/extension/inbound/inboundOrder_copy.js";
+import extend from "@/extension/inbound/inboundOrder.js";
 import { ref, defineComponent } from "vue";
 export default defineComponent({
   setup() {
@@ -23,6 +23,9 @@
       inboundOrderNo: "",
       upperOrderNo: "",
       remark: "",
+      orderStatus: "",
+      warehouseId: "",
+      supplierId: "",
     });
     const editFormOptions = ref([
       [
@@ -33,7 +36,6 @@
           type: "select",
           dataKey: "inOrderType",
           data: [],
-          hidden: true
         },
         {
           field: "inboundOrderNo",
@@ -60,6 +62,7 @@
       createType: "",
       creater: "",
       createDate: "",
+      materielCode: "",
     });
     const searchFormOptions = ref([
       [
@@ -69,7 +72,7 @@
           title: "涓氬姟绫诲瀷",
           field: "businessType",
           type: "select",
-          dataKey: "documentTypeEmun",
+          dataKey: "inboundbusinessType",
           data: [],
         },
         {
@@ -90,6 +93,7 @@
         },
         { title: "鍒涘缓鑰�", field: "creater", type: "like" },
         { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+        { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
       ],
     ]);
     const columns = ref([
@@ -147,7 +151,7 @@
         field: "orderStatistics",
         title: "鍗曟嵁鐗╂枡缁熻",
         type: "string",
-        width: 230,
+        width: 300,
         align: "left",
       },
       {
@@ -169,7 +173,7 @@
         field: "returnToMESStatus",
         title: "鍥炰紶MES鐘舵��",
         width: 120,
-        bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" }] },
+        bind: { key: "createType", data: [{ key: 0, value: "鏈洖浼�" }, { key: 1, value: "宸插洖浼犳垚鍔�" }, { key: 2, value: "鍥炰紶澶辫触" },{ key: 3, value: "閮ㄥ垎鍥炰紶鎴愬姛" },{ key: 4, value: "閮ㄥ垎鍥炰紶澶辫触" },{ key: 5, value: "鏃犻渶鍥炰紶" }] },
       },
       {
         field: "factoryArea",
@@ -177,6 +181,12 @@
         type: "string",
         width: 120,
         align: "left"
+      },
+      {
+        field: "isTestMaterials",
+        title: "鏄惁璇曚骇",
+        width: 120,
+        bind: { key: "isTestMaterials", data: [{ key: 0, value: "闈炶瘯浜х墿鏂�" }, { key: 1, value: "璇曚骇鐗╂枡" }] },
       },
       {
         field: "creater",
@@ -193,7 +203,7 @@
         align: "left",
       },
       {
-        field: "modifier",
+        field: "operator",
         title: "淇敼浜�",
         type: "string",
         width: 100,
@@ -239,12 +249,12 @@
           required: true,
         },
         {
-          field: "materielCode",
+          field: "materielName",
           title: "鐗╂枡鍚嶇О",
           type: "string",
-          width: 120,
+          width: 150,
           align: "left",
-          bind: { key: "MaterielNames", data: [] },
+          bind: { key: "materielInfo", data: [] },
         },
         {
           field: "batchNo",
@@ -282,6 +292,14 @@
           required: true,
         },
         {
+          field: "outBoxbarcodes",
+          title: "澶栫鏉＄爜",
+          type: "decimal",
+          width: 90,
+          align: "left",
+          required: true,
+        },
+        {
           field: "orderQuantity",
           title: "鍗曟嵁鏁伴噺",
           type: "decimal",
@@ -305,6 +323,15 @@
           align: "left",
         },
         {
+          field: "unit",
+          title: "鍗曚綅",
+          type: "string",
+          width: 90,
+          align: "left",
+          edit: { type: "" },
+          required: true,
+        },
+        {
           field: "orderDetailStatus",
           title: "璁㈠崟鏄庣粏鐘舵��",
           type: "string",
@@ -313,6 +340,13 @@
           bind: { key: "orderDetailStatusEnum", data: [] },
         },
         {
+          field: "palletCode",
+          title: "宸茬粍鎵樼洏鍙�",
+          type: "string",
+          width: 100,
+          align: "left",
+        },
+        {
           field: "creater",
           title: "鍒涘缓浜�",
           type: "string",

--
Gitblit v1.9.3