From eca403e764d507646c7a3bac530b6b5fb6c75308 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 28 Dec 2023 08:40:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/grid/gridman.vue | 63 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/src/views/grid/gridman.vue b/src/views/grid/gridman.vue
index 30f3aa9..3373865 100644
--- a/src/views/grid/gridman.vue
+++ b/src/views/grid/gridman.vue
@@ -47,12 +47,41 @@
dialogClickModal: false,
column: [
{
+ label: "网格员",
+ prop: "gridmanName",
+ searchSpan: 4,
+ search: true,
+ rules: [
+ {
+ required: true,
+ message: "请输入网格员",
+ trigger: "blur",
+ },
+ ],
+ },
+
+ {
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ label: "所属社区",
+ prop: "communityName",
+ search: true,
+ searchSpan: 4,
+ rules: [{
+ required: true,
+ message: "请选择所属社区",
+ trigger: "blur",
+ }],
+ },
+
+
+ {
+ hide: true,
parent: false,
label: "所属社区",
prop: "communityCode",
- search: true,
- searchSpan: 4,
- width: 150,
+ search: false,
type: "tree",
dicUrl: "/api/blade-system/region/tree",
props: {
@@ -70,7 +99,20 @@
},
{
- label: "网格名称",
+ addDisplay: false,
+ editDisplay: false,
+ viewDisplay: false,
+ label: "所属网格",
+ prop: "gridName",
+ rules: [{
+ required: true,
+ message: "请选择所属网格",
+ trigger: "blur",
+ }],
+ },
+
+ {
+ label: "所属网格",
prop: "gridId",
hide: true,
type: "tree",
@@ -90,19 +132,6 @@
],
},
- {
- label: "网格员",
- prop: "gridmanName",
- searchSpan: 4,
- search: true,
- rules: [
- {
- required: true,
- message: "请输入网格员",
- trigger: "blur",
- },
- ],
- },
{
label: "联系电话",
prop: "mobile",
--
Gitblit v1.9.3