From ef1600bd828fb7daa528e5a92d561bdd27210ea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Fri, 1 Sep 2023 10:04:03 +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 | 54 +++++++++++++++++++++++------
 src/views/system/user/index.vue     |  1 +
 2 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/src/views/assembly/kindergarlog.vue b/src/views/assembly/kindergarlog.vue
index 1e996a7..88fed2b 100644
--- a/src/views/assembly/kindergarlog.vue
+++ b/src/views/assembly/kindergarlog.vue
@@ -1,14 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="90px">
+    <el-form ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item :label="kindergartitle" prop="kindergartenName">
+        <i class="el-icon-circle-close" @click="kindergartenicon" v-if="nameicon && nameicons"></i>
         <el-button
           @click="kindergartenshow = true"
-          v-if="kindergartenName == '请选择幼儿园'"
           class="btn"
-          style="color: #c0c4cc;"
+          :style="kindergartenName == '请选择幼儿园'?'color: #c0c4cc;':''"
         >{{ kindergartenName }}</el-button>
-        <el-button @click="kindergartenshow = true" class="btn" v-else>{{ kindergartenName }}</el-button>
       </el-form-item>
     </el-form>
     <!-- //幼儿园 -->
@@ -74,7 +73,7 @@ import {
 import { getRoleInfo } from "@/api/system/quality";
 export default {
   name: "kindergar",
-  props: ["iddnamelist"],
+  props: ["iddnamelist", "nameicon"],
   components: {},
   data() {
     return {
@@ -102,32 +101,61 @@ export default {
       //幼儿园名字
       kindergartenName: "请选择幼儿园",
       //幼儿园ID
-      kindergartenId: ""
+      kindergartenId: "",
+      nameicons: false
     };
   },
   mounted() {},
   created() {
     this.getList();
     this.reset();
-    this.kindergartenId = this.iddnamelist.kindergartenId;
-    this.kindergartenName = this.iddnamelist.kindergartenName;
+    if (this.iddnamelist) {
+      this.kindergartenId = this.iddnamelist.kindergartenId;
+    }
+    if (this.iddnamelist.kindergartenId) {
+      this.nameicons = true;
+    }
+    if (this.iddnamelist.kindergartenName) {
+      this.kindergartenName = this.iddnamelist.kindergartenName;
+    }
   },
   watch: {
     iddnamelist: {
       handler(newlist, oldlist) {
-        console.log(newlist);
+        if (newlist.kindergartenId) {
+          this.nameicons = true;
+        }
         this.kindergartenId = newlist.kindergartenId;
         this.kindergartenName = newlist.kindergartenName;
       }
     }
   },
   methods: {
+    kindergartenicon() {
+      this.kindergartenName = "请选择幼儿园";
+      this.kindergartenId = "";
+      this.nameicons = false;
+      if (this.kindergartenName != "请选择幼儿园") {
+        this.$emit("kinbatlist", this.kindergartenId, this.kindergartenName);
+      } else {
+        this.$emit("kinbatlist", this.kindergartenId, "");
+      }
+    },
+    resetlist() {
+      this.kindergartenName = "请选择幼儿园";
+      this.kindergartenId = "";
+    },
     //幼儿园左侧点击
     kindergartenNameclick(row) {
+      this.nameicons = true;
       this.kindergartenName = row.kindergartenName;
       this.kindergartenId = row.id;
       this.kindergartenshow = false;
-      this.$emit("kinbatlist", this.kindergartenId);
+      if (this.kindergartenName != "请选择幼儿园") {
+        this.$emit("kinbatlist", this.kindergartenId, this.kindergartenName);
+      } else {
+        this.$emit("kinbatlist", this.kindergartenId, "");
+      }
     },
     //幼儿园关闭
     kindergartencancel() {
@@ -183,4 +211,10 @@ export default {
   overflow: hidden;
   font-size: 13px;
 }
+::v-deep .el-icon-circle-close:before {
+  position: absolute;
+  left: 90%;
+  top: 33%;
+  color: #c0c8d3;
+}
 </style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 212508f..8faf883 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -975,6 +975,7 @@ export default {
     },
     //幼儿园传值
     kinbatlist(id, name) {
+      console.log(id,name)
       this.$set(this.form, "kindergartenId", id);
       this.$set(this.form, "kindergartenName", name);
       this.classinfoName = [];