From c020f31a67fc5aa5644511bddff075f7ecc85234 Mon Sep 17 00:00:00 2001
From: qinchulong <qinchulong@hnkhzn.com>
Date: 星期二, 27 五月 2025 15:35:27 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/ZhongHeLiTiKu
---
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue | 70 ++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 29 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue"
index b77540a..33c1729 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue"
@@ -29,8 +29,6 @@
const editFormFields = ref({
areaCode: "",
areaName: "",
- areaType: "",
- areaStatus: "",
warehouseId: "",
areaDes: "",
});
@@ -49,37 +47,33 @@
type: "string",
},
{
- title: "鍖哄煙绫诲瀷",
- required: true,
- field: "areaType",
- type: "string",
- },
- {
- title: "鍖哄煙鐘舵��",
- required: true,
- field: "areaStatus",
- type: "string",
- },
- ],
- [
- {
title: "浠撳簱涓婚敭",
required: true,
field: "warehouseId",
- type: "string",
+ type: "select",
+ dataKey: "warehouse",
+ data: [],
+ },
+
+ ],
+ [
+ {
+ title: "鍖哄煙绫诲瀷",
+ required: true,
+ field: "areaType",
+ type: "int",
},
{
title: "鍖哄煙鎻忚堪",
field: "areaDes",
type: "textarea",
},
+ { title: "鍖哄煙鐘舵��", field: "areaStatus" ,type: "select",dataKey: "enableEnum",data: [],},
],
]);
const searchFormFields = ref({
areaCode: "",
areaName: "",
- areaType: "",
- areaStatus: "",
warehouseId: "",
areaDes: "",
});
@@ -87,10 +81,24 @@
[
{ title: "鍖哄煙缂栧彿", field: "areaCode", type: "like" },
{ title: "鍖哄煙鍚嶇О", field: "areaName", type: "like" },
- { title: "鍖哄煙绫诲瀷", field: "areaType", type: "like" },
- { title: "鍖哄煙鐘舵��", field: "areaStatus", type: "like" },
+
+ {
+ title: "鍖哄煙鐘舵��",
+ field: "areaStatus",
+ type: "select",
+ dataKey: "enableEnum",
+ data: [],
+ },
],
- [{ title: "浠撳簱涓婚敭", field: "warehouseId", type: "like" }],
+ [
+ {
+ title: "浠撳簱涓婚敭",
+ field: "warehouseId",
+ type: "select",
+ dataKey: "warehouse",
+ data: [],
+ },{ title: "鍖哄煙绫诲瀷", field: "areaType" },
+ ],
]);
const columns = ref([
{
@@ -104,18 +112,19 @@
align: "left",
},
{
+ field: "areaCode",
+ title: "鍖哄煙缂栧彿",
+ type: "string",
+ width: 80,
+ align: "left",
+ },
+ {
field: "warehouseId",
title: "浠撳簱涓婚敭",
type: "string",
width: 90,
align: "left",
- },
- {
- field: "areaCode",
- title: "鍖哄煙缂栧彿",
- type: "string",
- width: 150,
- align: "left",
+ bind:{ key: "warehouse", data: [] },
},
{
field: "areaName",
@@ -137,6 +146,7 @@
type: "string",
width: 90,
align: "left",
+ bind: { key: "enableEnum", data: [] },
},
{
field: "areaDes",
@@ -158,6 +168,7 @@
type: "datetime",
width: 160,
align: "left",
+ sort: true,
},
{
field: "modifier",
@@ -172,6 +183,7 @@
type: "datetime",
width: 160,
align: "left",
+ sort: true,
},
{
field: "remark",
--
Gitblit v1.9.3