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.vue | 80 ++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 44 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 3ff55cb..b9ab106 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",
@@ -100,6 +100,7 @@
title: "浠诲姟鐘舵��",
type: "select",
span: 12,
+ dataKey:"taskStatusEnum",
data: []
}
],
@@ -173,41 +174,28 @@
});
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: [],
dataKey:"TaskTypeEnum"
-
},
],
[
- {
- title: "浠诲姟鐘舵��",
- field: "taskStatus",
- type: "select",
- 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([
@@ -229,12 +217,27 @@
align: "left",
},
{
+ field: "orderNo",
+ title: "鍗曟嵁缂栧彿",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
field: "palletCode",
title: "鎵樼洏缂栧彿",
type: "string",
width: 120,
align: "left",
},
+ {
+ field: "materielCode",
+ title: "鐗╂枡缂栧彿",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+
{
field: "batchNo",
title: "鎵规鍙�",
@@ -242,13 +245,7 @@
width: 120,
align: "left",
},
- {
- field: "materielCode",
- title: "鐗╂枡缂栧彿",
- type: "string",
- width: 120,
- align: "left",
- },
+
{
field: "materielName",
title: "鐗╂枡鍚嶇О",
@@ -265,11 +262,11 @@
},
{
field: "taskType",
- title: "浠诲姟绫诲瀷",
+ title: "鍗曟嵁绫诲瀷",
type: "select",
width: 100,
align: "left",
- bind: { key: "TaskTypeEnum", data: [] },
+ bind:{ key: "TaskTypeEnum", data: [] } ,
data: [],
},
{
@@ -278,6 +275,7 @@
type: "select",
width: 100,
align: "left",
+ bind:{ key: "taskStatusEnum", data: [] } ,
data: [],
},
{
@@ -310,13 +308,7 @@
width: 100,
align: "left",
},
- {
- field: "orderNo",
- title: "鍗曟嵁缂栧彿",
- type: "string",
- width: 120,
- align: "left",
- },
+
{
field: "dispatchertime",
title: "浠诲姟涓嬪彂鏃堕棿",
--
Gitblit v1.9.3