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 | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 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 6772d31..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,7 +29,6 @@
const editFormFields = ref({
areaCode: "",
areaName: "",
-
warehouseId: "",
areaDes: "",
});
@@ -55,11 +54,7 @@
dataKey: "warehouse",
data: [],
},
- {
- title: "鍖哄煙鎻忚堪",
- field: "areaDes",
- type: "textarea",
- },{ title: "鍖哄煙鐘舵��", field: "areaStatus" ,type: "select",dataKey: "enableEnum",data: [],},
+
],
[
{
@@ -68,6 +63,12 @@
field: "areaType",
type: "int",
},
+ {
+ title: "鍖哄煙鎻忚堪",
+ field: "areaDes",
+ type: "textarea",
+ },
+ { title: "鍖哄煙鐘舵��", field: "areaStatus" ,type: "select",dataKey: "enableEnum",data: [],},
],
]);
const searchFormFields = ref({
@@ -80,7 +81,7 @@
[
{ title: "鍖哄煙缂栧彿", field: "areaCode", type: "like" },
{ title: "鍖哄煙鍚嶇О", field: "areaName", type: "like" },
- { title: "鍖哄煙绫诲瀷", field: "areaType" },
+
{
title: "鍖哄煙鐘舵��",
field: "areaStatus",
@@ -96,7 +97,7 @@
type: "select",
dataKey: "warehouse",
data: [],
- },
+ },{ title: "鍖哄煙绫诲瀷", field: "areaType" },
],
]);
const columns = ref([
@@ -111,19 +112,19 @@
align: "left",
},
{
+ field: "areaCode",
+ title: "鍖哄煙缂栧彿",
+ type: "string",
+ width: 80,
+ align: "left",
+ },
+ {
field: "warehouseId",
title: "浠撳簱涓婚敭",
type: "string",
width: 90,
align: "left",
bind:{ key: "warehouse", data: [] },
- },
- {
- field: "areaCode",
- title: "鍖哄煙缂栧彿",
- type: "string",
- width: 150,
- align: "left",
},
{
field: "areaName",
@@ -167,6 +168,7 @@
type: "datetime",
width: 160,
align: "left",
+ sort: true,
},
{
field: "modifier",
@@ -181,6 +183,7 @@
type: "datetime",
width: 160,
align: "left",
+ sort: true,
},
{
field: "remark",
--
Gitblit v1.9.3