From bc05b05f38f4bd63d78c7613e0184160c514ec96 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 27 十月 2025 16:33:11 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng

---
 新建文件夹/WMS/src/views/taskinfo/Dt_SupplyTask.vue |   45 ++++++++++++++++-----------------------------
 1 files changed, 16 insertions(+), 29 deletions(-)

diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/taskinfo/Dt_SupplyTask.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/taskinfo/Dt_SupplyTask.vue"
index 8a36fd5..224d91d 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/taskinfo/Dt_SupplyTask.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/taskinfo/Dt_SupplyTask.vue"
@@ -89,7 +89,7 @@
       [
         {
           field: "taskType",
-          title: "浠诲姟绫诲瀷",
+          title: "鍗曟嵁绫诲瀷",
           type: "select",
           span: 12,
           dataKey:"TaskTypeEnum",
@@ -174,15 +174,12 @@
     });
     const searchFormOptions = ref([
       [
-        { title: "浠诲姟鍙�", field: "taskNum", type: "int" },
-        { title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
+        // { title: "浠诲姟鍙�", field: "taskNum", type: "int" },
+        { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
+        // { title: "鎵樼洏缂栧彿", field: "palletCode", type: "like" },
         { title: "鎵规鍙�", field: "batchNo", type: "like" },
-      ],
-      [
-        { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
-        { title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
-        { 
-          title: "浠诲姟绫诲瀷", 
+           { 
+          title: "鍗曟嵁绫诲瀷", 
           field: "taskType",
           type: "select", 
            data: [],
@@ -190,25 +187,15 @@
         },
       ],
       [
-        { 
-          title: "浠诲姟鐘舵��", 
-          field: "taskStatus",
-          type: "select", 
-          dataKey: "taskStatusEnum",
-          data: []
-        },
-        { 
-          title: "搴撴埧缂栧彿", 
-          field: "warehouseCode",
-          type: "select", 
-          dataKey: "warehouseNuber",
-          data: [],
-        },
-        { title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
-      ],
-      [
-        { title: "鍗曟嵁缂栧彿", field: "orderNo", type: "like" },
-        { title: "鍒涘缓浜�", field: "creater", type: "like" },
+        { title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
+        { title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
+      {
+        field: "materielSpec",
+        title: "鐗╂枡瑙勬牸",
+        type: "string",
+        width: 120,
+        align: "left",
+      },
       ],
     ]);
     const columns = ref([
@@ -266,7 +253,7 @@
       },
       {
         field: "taskType",
-        title: "浠诲姟绫诲瀷",
+        title: "鍗曟嵁绫诲瀷",
         type: "select",
         width: 100,
         align: "left",

--
Gitblit v1.9.3