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/taskinfo/Dt_SupplyTask_Hty.vue | 68 ++++++++++++---------------------
1 files changed, 25 insertions(+), 43 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_Hty.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/taskinfo/Dt_SupplyTask_Hty.vue"
index ee6b205..795f4e4 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/taskinfo/Dt_SupplyTask_Hty.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/taskinfo/Dt_SupplyTask_Hty.vue"
@@ -42,53 +42,29 @@
createDate: "",
});
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: "taskType",
+ type: "select",
+ data: [],
+ dataKey:"TaskTypeEnum"
+ },
],
[
{ title: "鐗╂枡缂栧彿", field: "materielCode", type: "like" },
{ title: "鐗╂枡鍚嶇О", field: "materielName", type: "like" },
- {
- title: "鎿嶄綔绫诲瀷",
- field: "operateType",
- type: "select",
- data: [
- { key: "鏂板", value: "鏂板" },
- { key: "淇敼", value: "淇敼" },
- { key: "鍒犻櫎", value: "鍒犻櫎" }
- ]
- },
- ],
- [
- {
- title: "浠诲姟绫诲瀷",
- field: "taskType",
- type: "select",
- data: [],
- dataKey:"TaskTypeEnum",
- },
- {
- title: "浠诲姟鐘舵��",
- field: "taskStatus",
- type: "select",
- data: []
- },
- {
- title: "搴撴埧缂栧彿",
- field: "warehouseCode",
- type: "select",
- data: [],
- dataKey: "warehouseNuber",
- },
- ],
- [
- { title: "璐т綅缂栧彿", field: "locationCode", type: "like" },
- { title: "鍒涘缓浜�", field: "creater", type: "like" },
- ],
- [
- { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ {
+ field: "materielSpec",
+ title: "鐗╂枡瑙勬牸",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
],
]);
const columns = ref([
@@ -128,6 +104,7 @@
field: "taskNum",
title: "浠诲姟鍙�",
type: "int",
+ hidden: true,
width: 120,
align: "left",
},
@@ -136,6 +113,7 @@
title: "鎵樼洏缂栧彿",
type: "string",
width: 120,
+ hidden: true,
align: "left",
},
{
@@ -168,7 +146,7 @@
},
{
field: "taskType",
- title: "浠诲姟绫诲瀷",
+ title: "鍗曟嵁绫诲瀷",
type: "select",
width: 100,
align: "left",
@@ -181,6 +159,7 @@
type: "select",
width: 100,
align: "left",
+ bind: { key: "taskStatusEnum", data: [] },
data: [],
},
{
@@ -223,6 +202,7 @@
field: "dispatchertime",
title: "浠诲姟涓嬪彂鏃堕棿",
type: "datetime",
+ hidden: true,
width: 160,
align: "left",
},
@@ -231,6 +211,7 @@
title: "鍒涘缓浜�",
type: "string",
width: 90,
+ hidden: true,
align: "left",
},
{
@@ -238,6 +219,7 @@
title: "鍒涘缓鏃堕棿",
type: "datetime",
width: 160,
+ hidden: true,
align: "left",
},
{
--
Gitblit v1.9.3