From 5742d464fccb1d95d9fd9c73cdbe211506f2be3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com>
Date: Wed, 19 Jan 2022 19:32:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=99=E7=82=B9=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=8E=A5=E6=94=B6=E5=8F=82=E6=95=B0=E5=B9=B6=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BD=BF=E7=94=A8=E6=97=B6=E7=9A=84=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SiteOptions/index.vue          | 35 +++++++++----------
 src/views/website/aboutUs/index.vue           | 13 +++----
 src/views/website/activity/active/index.vue   | 13 +++----
 src/views/website/activity/apply/index.vue    |  2 +-
 .../website/innovate/navigation/index.vue     | 13 +++----
 src/views/website/innovate/service/index.vue  | 11 +++---
 src/views/website/siteSet/agreement/index.vue |  7 ++--
 src/views/website/siteSet/banner/index.vue    | 13 +++----
 src/views/website/siteSet/footer/index.vue    | 13 +++----
 src/views/website/solution/service/index.vue  | 13 +++----
 .../website/solution/serviceCase/index.vue    |  7 ++--
 11 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/src/components/SiteOptions/index.vue b/src/components/SiteOptions/index.vue
index af6cbfb..b900aab 100644
--- a/src/components/SiteOptions/index.vue
+++ b/src/components/SiteOptions/index.vue
@@ -2,7 +2,7 @@
   <el-cascader
     :size="size"
     :style="{ width: limitWidth ? '240px' : '100%' }"
-    v-model="tenant_id"
+    v-model="value.tenant_id"
     clearable
     separator="-"
     placeholder="请选择，支持搜索"
@@ -15,7 +15,7 @@
 import { tenantSelect } from "@/api/subPlatform/tenant";
 export default {
   props: {
-    value: String,
+    value: Object,
     size: {
       type: String,
       default: "small",
@@ -28,24 +28,23 @@ export default {
   data() {
     return {
       tenantOptions: [],
-      tenant_id: undefined,
     };
   },
-  watch: {
-    value: {
-      handler(newVal, oldVal) {
-        if (newVal == "") {
-          this.tenant_id = undefined;
-        } else {
-          this.tenant_id = newVal;
-        }
-      },
-      immediate: true,
-    },
-    tenant_id(newVal, oldVal) {
-      this.$emit("handleChange", newVal);
-    },
-  },
+  // watch: {
+  //   value: {
+  //     handler(newVal, oldVal) {
+  //       if (newVal == "" || newVal == null) {
+  //         this.tenant_id = undefined;
+  //       } else {
+  //         this.tenant_id = newVal;
+  //       }
+  //     },
+  //     immediate: true,
+  //   },
+  //   tenant_id(newVal, oldVal) {
+  //     this.$emit("handleChange", newVal);
+  //   },
+  // },
   created() {
     tenantSelect().then((res) => {
       for (const key in res.data) {
diff --git a/src/views/website/aboutUs/index.vue b/src/views/website/aboutUs/index.vue
index 5d216e4..64c5fe6 100644
--- a/src/views/website/aboutUs/index.vue
+++ b/src/views/website/aboutUs/index.vue
@@ -9,7 +9,7 @@
       @submit.native.prevent
     >
       <el-form-item label="所属站点" prop="tenant_id">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item>
         <el-button
@@ -94,10 +94,7 @@
     <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="所属站点:" prop="tenant_id">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="上级导航" prop="parent_id">
           <treeselect
@@ -165,7 +162,11 @@ export default {
       // 表单校验
       rules: {
         tenant_id: [
-          { required: true, message: "所属站点不能为空", trigger: "blur" },
+          {
+            required: true,
+            message: "所属站点不能为空",
+            trigger: ["blur", "change"],
+          },
         ],
         title: [
           { required: true, message: "导航名称不能为空", trigger: "blur" },
diff --git a/src/views/website/activity/active/index.vue b/src/views/website/activity/active/index.vue
index fbdd6af..9935919 100644
--- a/src/views/website/activity/active/index.vue
+++ b/src/views/website/activity/active/index.vue
@@ -17,7 +17,7 @@
         />
       </el-form-item>
       <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item label="联系人" prop="contact">
         <el-input
@@ -175,10 +175,7 @@
     <el-dialog :title="title" :visible.sync="open" width="35%">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="所属站点" prop="tenant_id">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="活动名称:" prop="title">
           <el-input v-model="form.title" placeholder="请输入活动名称" />
@@ -447,7 +444,11 @@ export default {
           },
         ],
         tenant_id: [
-          { required: true, message: "所属站点不能为空", trigger: "blur" },
+          {
+            required: true,
+            message: "所属站点不能为空",
+            trigger: ["blur", "change"],
+          },
         ],
         begin_at: [
           { required: true, message: "开始时间不能为空", trigger: "change" },
diff --git a/src/views/website/activity/apply/index.vue b/src/views/website/activity/apply/index.vue
index 573e075..d901e2f 100644
--- a/src/views/website/activity/apply/index.vue
+++ b/src/views/website/activity/apply/index.vue
@@ -17,7 +17,7 @@
         />
       </el-form-item>
       <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item label="申请人" prop="contact">
         <el-input
diff --git a/src/views/website/innovate/navigation/index.vue b/src/views/website/innovate/navigation/index.vue
index 7d918b3..1f92848 100644
--- a/src/views/website/innovate/navigation/index.vue
+++ b/src/views/website/innovate/navigation/index.vue
@@ -8,7 +8,7 @@
       @submit.native.prevent
     >
       <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item>
         <el-button
@@ -84,10 +84,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="所属站点" prop="tenant_id">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="导航名称:" prop="title">
           <el-input v-model="form.title" placeholder="请输入导航名称" />
@@ -132,7 +129,11 @@ export default {
           { required: true, message: "导航名称不能为空", trigger: "blur" },
         ],
         tenant_id: [
-          { required: true, message: "所属站点不能为空", trigger: "blur" },
+          {
+            required: true,
+            message: "所属站点不能为空",
+            trigger: ["blur", "change"],
+          },
         ],
       },
     };
diff --git a/src/views/website/innovate/service/index.vue b/src/views/website/innovate/service/index.vue
index 5a6cc64..1b9a71f 100644
--- a/src/views/website/innovate/service/index.vue
+++ b/src/views/website/innovate/service/index.vue
@@ -99,10 +99,7 @@
     <el-dialog :title="title" :visible.sync="open" width="40%">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="所属站点" prop="tenant_id">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="归属导航:" prop="kind_id">
           <el-select v-model="form.kind_id" placeholder="请选择">
@@ -176,7 +173,11 @@ export default {
           { required: true, message: "服务描述不能为空", trigger: "blur" },
         ],
         tenant_id: [
-          { required: true, message: "所属站点不能为空", trigger: "blur" },
+          {
+            required: true,
+            message: "所属站点不能为空",
+            trigger: ["blur", "change"],
+          },
         ],
         kind_id: [
           { required: true, message: "导航名称不能为空", trigger: "change" },
diff --git a/src/views/website/siteSet/agreement/index.vue b/src/views/website/siteSet/agreement/index.vue
index b6e3187..ef7d73f 100644
--- a/src/views/website/siteSet/agreement/index.vue
+++ b/src/views/website/siteSet/agreement/index.vue
@@ -8,7 +8,7 @@
       @submit.native.prevent
     >
       <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item>
         <el-button
@@ -89,10 +89,7 @@
     <el-dialog :title="title" :visible.sync="open" width="40%">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="所属站点:" prop="tenant_id" v-if="is_super">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="启用状态:" prop="status">
           <el-radio v-model="form.status" :label="1">启用</el-radio>
diff --git a/src/views/website/siteSet/banner/index.vue b/src/views/website/siteSet/banner/index.vue
index cc64e63..8dd92b9 100644
--- a/src/views/website/siteSet/banner/index.vue
+++ b/src/views/website/siteSet/banner/index.vue
@@ -21,7 +21,7 @@
         ></el-cascader>
       </el-form-item>
       <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item>
         <el-button
@@ -109,10 +109,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px">
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="所属站点:" prop="tenant_id" v-if="is_super">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="所在位置:" prop="local">
           <div style="display: flex">
@@ -213,7 +210,11 @@ export default {
       form: {},
       rules: {
         tenant_id: [
-          { required: true, message: "归属导航不能为空", trigger: "change" },
+          {
+            required: true,
+            message: "归属导航不能为空",
+            trigger: ["blur", "change"],
+          },
         ],
         local: [
           { required: true, message: "所在位置不能为空", trigger: "change" },
diff --git a/src/views/website/siteSet/footer/index.vue b/src/views/website/siteSet/footer/index.vue
index 883b022..b7b6f64 100644
--- a/src/views/website/siteSet/footer/index.vue
+++ b/src/views/website/siteSet/footer/index.vue
@@ -9,7 +9,7 @@
       @submit.native.prevent
     >
       <el-form-item label="所属站点" prop="tenant_id">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item>
         <el-button
@@ -99,10 +99,7 @@
     <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="所属站点:" prop="tenant_id">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="上级导航" prop="parent_id">
           <treeselect
@@ -168,7 +165,11 @@ export default {
       // 表单校验
       rules: {
         tenant_id: [
-          { required: true, message: "所属站点不能为空", trigger: "blur" },
+          {
+            required: true,
+            message: "所属站点不能为空",
+            trigger: ["blur", "change"],
+          },
         ],
         title: [
           { required: true, message: "导航名称不能为空", trigger: "blur" },
diff --git a/src/views/website/solution/service/index.vue b/src/views/website/solution/service/index.vue
index cf84ce9..24b6115 100644
--- a/src/views/website/solution/service/index.vue
+++ b/src/views/website/solution/service/index.vue
@@ -36,7 +36,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item>
         <el-button
@@ -131,10 +131,7 @@
           <el-input v-model="form.title" placeholder="请输入数据名称" />
         </el-form-item>
         <el-form-item label="所属站点:" prop="tenant_id" v-if="is_super">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="归属导航:" prop="mode">
           <el-select v-model="form.mode" placeholder="请选择">
@@ -202,7 +199,11 @@ export default {
           { required: true, message: "数据名称不能为空", trigger: "blur" },
         ],
         tenant_id: [
-          { required: true, message: "归属导航不能为空", trigger: "change" },
+          {
+            required: true,
+            message: "归属导航不能为空",
+            trigger: ["blur", "change"],
+          },
         ],
         image: [
           {
diff --git a/src/views/website/solution/serviceCase/index.vue b/src/views/website/solution/serviceCase/index.vue
index 4740f6c..a917173 100644
--- a/src/views/website/solution/serviceCase/index.vue
+++ b/src/views/website/solution/serviceCase/index.vue
@@ -18,7 +18,7 @@
         />
       </el-form-item>
       <el-form-item label="所属站点" prop="tenant_id" v-if="is_super">
-        <SiteOptions @handleChange="queryParams.tenant_id = $event" />
+        <SiteOptions v-model="queryParams" />
       </el-form-item>
       <el-form-item>
         <el-button
@@ -124,10 +124,7 @@
           <ImageUpload v-model="form.image" :isShowTip="false" :limit="1" />
         </el-form-item>
         <el-form-item label="所属站点:" prop="tenant_id" v-if="is_super">
-          <SiteOptions
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
+          <SiteOptions v-model="form" />
         </el-form-item>
         <el-form-item label="案例类型:" prop="kind_id">
           <el-cascader