From f0f3f14f5a61e1b5275cd4f87bb92495adbf1948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Wed, 19 Apr 2023 10:05:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/assembly/kindergarlog.vue | 15 ++++++++++++++-
 src/views/system/user/index.vue     | 19 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/src/views/assembly/kindergarlog.vue b/src/views/assembly/kindergarlog.vue
index e9e0d89..4556423 100644
--- a/src/views/assembly/kindergarlog.vue
+++ b/src/views/assembly/kindergarlog.vue
@@ -74,6 +74,7 @@ import {
 import { getRoleInfo } from "@/api/system/quality";
 export default {
   name: "kindergar",
+  props: ["iddnamelist"],
   components: {},
   data() {
     return {
@@ -108,12 +109,24 @@ export default {
   created() {
     this.getList();
     this.onshow();
+    this.kindergartenId = this.iddnamelist.kindergartenId;
+    this.kindergartenName = this.iddnamelist.kindergartenName;
+    console.log(this.iddnamelist);
+    console.log(this.kindergartenId);
+  },
+  watch: {
+    iddnamelist: {
+      handler(newlist, oldlist) {
+        console.log(newlist);
+        this.kindergartenId = newlist.kindergartenId;
+        this.kindergartenName = newlist.kindergartenName;
+      }
+    }
   },
   methods: {
     onshow() {
       this.kindergartenName = "请选择幼儿园";
       this.kindergartenId = "";
-      this.$emit("kinbatlist", this.kindergartenId);
     },
     //幼儿园左侧点击
     kindergartenNameclick(row) {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index bcad347..15f0d33 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -398,6 +398,7 @@
           <el-col :span="12">
             <kindergarlog
               v-if="kinshow"
+              :iddnamelist="form"
               @kinbatlist="kinbatlist"
               style="width: 500px; display: inline;"
               ref="kinresets"
@@ -635,6 +636,8 @@ export default {
       row.forEach(e => {
         if (e == obj.roleId) {
           this.kinshow = true;
+          this.form.kindergartenId = "";
+          this.form.kindergartenName = "请选择幼儿园";
         }
       });
     },
@@ -768,6 +771,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.kinshow = false;
       this.reset();
       this.getTreeselect();
       getUser().then(response => {
@@ -780,6 +784,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.kinshow = false;
       this.reset();
       this.getTreeselect();
       const userId = row.userId || this.ids;
@@ -792,6 +797,20 @@ export default {
         this.open = true;
         this.title = "修改用户";
         this.form.password = "";
+        var obj = {};
+        this.roleOptions.forEach(el => {
+          if (el.roleKey == "garden") {
+            obj = el;
+          }
+        });
+        response.data.roles.forEach(e => {
+          if (e.roleId == obj.roleId) {
+            this.kinshow = true;
+          }
+        });
+        if (this.form.kindergartenId == "" || !this.form.kindergartenId) {
+          this.form.kindergartenNmae = "请选择幼儿园";
+        }
       });
     },
     /** 重置密码按钮操作 */