From 7ae4b4b6679ba419cfd92d2a60ed603c2c8a446d Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Thu, 11 Aug 2022 16:59:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/system/user.vue |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index f056093..52af1a9 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -513,7 +513,7 @@
                   prop: "farmId",
                   labelWidth:110,
                   type: "tree",
-                  // multiple: true,
+                  multiple: true,
                   dicData: [],
                   props: {
                     label: "farmName",
@@ -952,6 +952,10 @@
         })
       },
       beforeOpen(done, type) {
+        const column = this.findObject(this.option.group, "farmId");
+        if(type == "add"&& column.dicData == ""){
+          this.initData(website.tenantId)
+        }
         if (["edit", "view"].includes(type)) {
           getUser(this.form.id).then(res => {
             this.form = res.data.data;

--
Gitblit v1.9.3