From a23f4d86c588a3fa0bc23e5252bc1ddd1f5a1787 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 08 一月 2025 23:19:36 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue |   44 +++++++++++++++-----------------------------
 1 files changed, 15 insertions(+), 29 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue"
index a6eeafc..ac92e4e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue"
@@ -24,7 +24,7 @@
       cnName: "鍏ュ簱鍗�",
       name: "purchaseOrder",
       url: "/PurchaseOrder/",
-      sortName: "CreateDate",
+      sortName: "id",
     });
     const editFormFields = ref({
       // orderType: "",
@@ -60,44 +60,28 @@
       // ],
     ]);
     const searchFormFields = ref({
-      inboundOrderNo: "",
-      upperOrderNo: "",
-      orderType: "",
-      orderStatus: "",
-      createType: "",
-      creater: "",
-      createDate: "",
+      purchaseOrderNo: "",
+      purchaseOrderType: "",
+      purchaseOrderStatus: "",
     });
     const searchFormOptions = ref([
       [
-        { title: "鍗曟嵁缂栧彿", field: "inboundOrderNo", type: "like" },
-        { title: "涓婃父鍗曟嵁缂栧彿", field: "upperOrderNo", type: "like" },
+        { title: "閲囪喘鍗曞彿", field: "purchaseOrderNo", type: "like" },
         {
           title: "鍗曟嵁绫诲瀷",
-          field: "orderType",
+          field: "purchaseOrderType",
           type: "select",
-          dataKey: "inOrderType",
+          dataKey: "purchaseType",
           data: [],
         },
         {
           title: "鍗曟嵁鐘舵��",
-          field: "orderStatus",
+          field: "purchaseOrderStatus",
           type: "select",
-          dataKey: "inboundState",
+          dataKey: "purchaseOrderStatus",
           data: [],
         },
-      ],
-      [
-        {
-          title: "鍒涘缓鏂瑰紡",
-          field: "createType",
-          type: "select",
-          dataKey: "createType",
-          data: [],
-        },
-        { title: "鍒涘缓鑰�", field: "creater", type: "like" },
-        { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
-      ],
+      ]
     ]);
     const columns = ref([
       {
@@ -114,7 +98,7 @@
         field: "purchaseOrderNo",
         title: "閲囪喘鍗曞彿",
         type: "string",
-        width: 120,
+        width: 150,
         align: "left",
         link: true,
       },
@@ -124,12 +108,13 @@
         type: "string",
         width: 150,
         align: "left",
+        bind: { key: "purchaseType", data: [] },
       },
       {
         field: "supplierCode",
         title: "渚涘簲鍟嗙紪鍙�",
         type: "string",
-        width: 150,
+        width: 120,
         align: "left",
       },
       {
@@ -145,12 +130,13 @@
         type: "string",
         width: 90,
         align: "left",
+        bind: { key: "purchaseOrderStatus", data: [] },
       },
       {
         field: "orderDate",
         title: "涓嬪崟鏃ユ湡",
         type: "string",
-        width: 90,
+        width: 160,
         align: "left",
       },
       {

--
Gitblit v1.9.3