From d842fb603597a5db23c4359081a4e564ce716892 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期一, 17 十一月 2025 11:41:31 +0800
Subject: [PATCH] 更新前端页面

---
 项目代码/WMS/WMSClient/src/views/inbound/inboundOrder.vue |  247 ++++++-------------------------------------------
 1 files changed, 31 insertions(+), 216 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/inboundOrder.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/inboundOrder.vue"
index 0e1d17a..b6bc973 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/inboundOrder.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/inbound/inboundOrder.vue"
@@ -1,19 +1,10 @@
-
 <template>
-  <view-grid
-    ref="grid"
-    :columns="columns"
-    :detail="detail"
-    :editFormFields="editFormFields"
-    :editFormOptions="editFormOptions"
-    :searchFormFields="searchFormFields"
-    :searchFormOptions="searchFormOptions"
-    :table="table"
-    :extend="extend"
-  >
+  <view-grid ref="grid" :columns="columns" :detail="detail" :editFormFields="editFormFields"
+    :editFormOptions="editFormOptions" :searchFormFields="searchFormFields" :searchFormOptions="searchFormOptions"
+    :table="table" :extend="extend">
   </view-grid>
 </template>
-    <script>
+<script>
 import extend from "@/extension/inbound/inboundOrder.js";
 import { ref, defineComponent } from "vue";
 export default defineComponent({
@@ -21,84 +12,36 @@
     const table = ref({
       key: "id",
       footer: "Foots",
-      cnName: "鍏ュ簱鍗�",
+      cnName: "鏂板巶鍏ュ簱鍗�",
       name: "inboundOrder",
       url: "/InboundOrder/",
       sortName: "id",
     });
     const editFormFields = ref({
-      orderType: "",
-      inboundOrderNo: "",
-      upperOrderNo: "",
-      remark: "",
+
     });
     const editFormOptions = ref([
-      [
-        {
-          title: "鍗曟嵁绫诲瀷",
-          required: true,
-          field: "orderType",
-          type: "select",
-          dataKey: "inOrderType",
-          data: [],
-        },
-        {
-          field: "inboundOrderNo",
-          title: "鍗曟嵁缂栧彿",
-          type: "string",
-        },
-        {
-          title: "涓婃父鍗曟嵁缂栧彿",
-          field: "upperOrderNo",
-          type: "string",
-        },
-        {
-          title: "澶囨敞",
-          field: "remark",
-          type: "textarea",
-        },
-      ],
+
     ]);
     const searchFormFields = ref({
+      warehouseId: "",
       inboundOrderNo: "",
       upperOrderNo: "",
       orderType: "",
       orderStatus: "",
-      createType: "",
-      creater: "",
       createDate: "",
     });
     const searchFormOptions = ref([
       [
+        { title: "浠撳簱", field: "warehouseId", type: "select", dataKey: "warehouses", data: [] },
         { title: "鍗曟嵁缂栧彿", field: "inboundOrderNo", type: "like" },
         { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
-        {
-          title: "鍗曟嵁绫诲瀷",
-          field: "orderType",
-          type: "select",
-          dataKey: "inOrderType",
-          data: [],
-        },
-        {
-          title: "鍗曟嵁鐘舵��",
-          field: "orderStatus",
-          type: "select",
-          dataKey: "inboundState",
-          data: [],
-        },
+        { title: "鍗曟嵁绫诲瀷", field: "orderType", type: "select", dataKey: "inOrderTypeEnum", data: [], },
       ],
       [
-        {
-          title: "鍒涘缓鏂瑰紡",
-          field: "createType",
-          type: "select",
-          dataKey: "createType",
-          data: [],
-        },
-        { title: "鍒涘缓鑰�", field: "creater", type: "like" },
+        { title: "鐘舵��", field: "orderStatus", type: "select", dataKey: "inboundState", data: [], },
         { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
-        { title: "鎵�灞炰粨搴�", field: "warehouseId",type: "selectList",dataKey: "warehouses",data: [],}
-      ],
+      ]
     ]);
     const columns = ref([
       {
@@ -112,12 +55,19 @@
         align: "left",
       },
       {
+        field: "warehouseId",
+        title: "浠撳簱",
+        type: "string",
+        width: 90,
+        align: "left",
+        bind: { key: "warehouses", data: [] }
+      },
+      {
         field: "inboundOrderNo",
         title: "鍗曟嵁缂栧彿",
         type: "string",
-        width: 120,
+        width: 200,
         align: "left",
-        link: true,
       },
       {
         field: "upperOrderNo",
@@ -127,23 +77,15 @@
         align: "left",
       },
       {
-          field: "warehouseId",
-          title: "浠撳簱",
-          type: "string",
-          width: 90,
-          align: "left",
-          bind:{key: "warehouses", data: []}
-      },
-      {
         field: "orderType",
         title: "鍗曟嵁绫诲瀷",
         type: "string",
         width: 150,
         align: "left",
-        bind: { key: "inOrderType", data: [] },
+        bind: { key: "inOrderTypeEnum", data: [] },
       },
       {
-        field: "orderStatus",
+        field: "inboundOrderStatus",
         title: "鍗曟嵁鐘舵��",
         type: "decimal",
         width: 90,
@@ -151,12 +93,11 @@
         bind: { key: "inboundState", data: [] },
       },
       {
-        field: "createType",
-        title: "鍒涘缓鏂瑰紡",
+        field: "remark",
+        title: "澶囨敞",
         type: "string",
-        width: 120,
+        width: 150,
         align: "left",
-        bind: { key: "createType", data: [] },
       },
       {
         field: "creater",
@@ -186,138 +127,13 @@
         width: 160,
         align: "left",
       },
-      {
-        field: "remark",
-        title: "澶囨敞",
-        type: "string",
-        width: 100,
-        align: "left",
-      },
     ]);
     const detail = ref({
       cnName: "鍏ュ簱鍗曟槑缁�",
-      table: "InboundOrderDetail",
-      columns: [
-        {
-          field: "id",
-          title: "Id",
-          type: "int",
-          width: 90,
-          hidden: true,
-          readonly: true,
-          require: true,
-          align: "left",
-        },
-        {
-          field: "orderId",
-          title: "鍏ュ簱鍗曚富閿�",
-          type: "string",
-          width: 90,
-          align: "left",
-          hidden: true,
-        },
-        {
-          field: "materielCode",
-          title: "鐗╂枡缂栧彿",
-          type: "select",
-          width: 150,
-          align: "left",
-          edit: { type: "" },
-          required: true,
-        },
-        {
-          field: "materielName",
-          title: "鐗╂枡鍚嶇О",
-          type: "string",
-          width: 100,
-          align: "left",
-        },
-        {
-          field: "materielSpec",
-          title: "鐗╂枡瑙勬牸",
-          type: "select",
-          type: "string",
-          width: 100,
-          align: "left",
-        },
-        {
-          field: "batchNo",
-          title: "鎵规鍙�",
-          type: "decimal",
-          width: 90,
-          align: "left",
-          edit: { type: "" },
-          required: true,
-        },
-        {
-          field: "orderQuantity",
-          title: "鍗曟嵁鏁伴噺",
-          type: "decimal",
-          width: 90,
-          align: "left",
-          edit: { type: "number" },
-          required: true,
-        },
-        {
-          field: "receiptQuantity",
-          title: "缁勭洏鏁伴噺",
-          type: "int",
-          width: 120,
-          align: "left",
-        },
-        {
-          field: "overInQuantity",
-          title: "涓婃灦鏁伴噺",
-          type: "string",
-          width: 200,
-          align: "left",
-        },
-        {
-          field: "orderDetailStatus",
-          title: "璁㈠崟鏄庣粏鐘舵��",
-          type: "string",
-          width: 180,
-          align: "left",
-          bind: { key: "orderDetailStatusEnum", data: [] },
-        },
-        {
-          field: "creater",
-          title: "鍒涘缓浜�",
-          type: "string",
-          width: 90,
-          align: "left",
-        },
-        {
-          field: "createDate",
-          title: "鍒涘缓鏃堕棿",
-          type: "datetime",
-          width: 160,
-          align: "left",
-        },
-        {
-          field: "modifier",
-          title: "淇敼浜�",
-          type: "string",
-          width: 100,
-          align: "left",
-        },
-        {
-          field: "modifyDate",
-          title: "淇敼鏃堕棿",
-          type: "datetime",
-          width: 160,
-          align: "left",
-        },
-        {
-          field: "remark",
-          title: "澶囨敞",
-          type: "string",
-          width: 100,
-          align: "left",
-        },
-      ],
-      sortName: "id",
-      key: "id",
+      table: "",
+      columns: [],
+      sortName: "",
+      key: "",
     });
     return {
       table,
@@ -331,5 +147,4 @@
     };
   },
 });
-</script>
-    
\ No newline at end of file
+</script>
\ No newline at end of file

--
Gitblit v1.9.3