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/cachePoint.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue"
index acca645..e448d8c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue"
@@ -38,10 +38,10 @@
});
const editFormOptions = ref([
[
- {title: "鍖哄煙涓婚敭",required: true,field: "areaId",type: "string",},
{title: "缂撳瓨鐐圭紪鍙�",required: true,field: "pointCode",type: "string",},
+ {title: "鍖哄煙涓婚敭",required: true,field: "areaId",type: "select",dataKey: "areainfo", data: [] ,},
{title: "缂撳瓨鐐圭姸鎬�",field: "pointStatus",type: "select",dataKey: "locationStatusEnum",data: [],},
- {title: "鏄惁绂佺敤",field: "enableStatus",type: "select",dataKey: "enableEnum",data: [],},
+ {title: "鏄惁绂佺敤",field: "enableStatus",type: "select",dataKey: "enableStatusEnum",data: [],},
],[
{ title: "琛�", field: "row", type: "string" },
{ title: "鍒�", field: "column", type: "string" },
@@ -61,10 +61,10 @@
});
const searchFormOptions = ref([
[
- {title: "鍖哄煙涓婚敭",field: "areaId",type: "string",},
{title: "缂撳瓨鐐圭紪鍙�",field: "pointCode",type: "string",},
+ {title: "鍖哄煙涓婚敭",field: "areaId",type: "select",dataKey: "areainfo",data: [],},
{title: "缂撳瓨鐐圭姸鎬�",field: "pointStatus",type: "select",dataKey: "locationStatusEnum",data: [],},
- {title: "鏄惁绂佺敤",field: "enableStatus",type: "select",dataKey: "enableEnum",data: [],},
+ {title: "鏄惁绂佺敤",field: "enableStatus",type: "select",dataKey: "enableStatusEnum",data: [],},
],[
{ title: "琛�", field: "row", type: "string" },
{ title: "鍒�", field: "column", type: "string" },
@@ -87,8 +87,9 @@
field: "areaId",
title: "鍖哄煙涓婚敭",
type: "int",
- width: 90,
+ width: 120,
align: "left",
+ bind:{ key: "areainfo", data: [] },
},
{
field: "pointCode",
@@ -111,7 +112,7 @@
type: "decimal",
width: 90,
align: "left",
- bind: { key: "enableEnum", data: [] },
+ bind: { key: "enableStatusEnum", data: [] },
},
{
field: "row",
@@ -161,6 +162,7 @@
type: "datetime",
width: 160,
align: "left",
+ sort: true,
},
{
field: "modifier",
@@ -175,6 +177,7 @@
type: "datetime",
width: 160,
align: "left",
+ sort: true,
},
{
field: "remark",
--
Gitblit v1.9.3