修改站点组件接收参数并修改使用时的传参

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: {
+  // watch: {
-    value: {
+  //   value: {
-      handler(newVal, oldVal) {
+  //     handler(newVal, oldVal) {
-        if (newVal == "") {
+  //       if (newVal == "" || newVal == null) {
-          this.tenant_id = undefined;
+  //         this.tenant_id = undefined;
-        } else {
+  //       } else {
-          this.tenant_id = newVal;
+  //         this.tenant_id = newVal;
-        }
+  //       }
-      },
+  //     },
-      immediate: true,
+  //     immediate: true,
-    },
+  //   },
-    tenant_id(newVal, oldVal) {
+  //   tenant_id(newVal, oldVal) {
-      this.$emit("handleChange", newVal);
+  //     this.$emit("handleChange", newVal);
-    },
+  //   },
-  },
+  // },
   created() {
     tenantSelect().then((res) => {
       for (const key in res.data) {

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
+          <SiteOptions v-model="form" />
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
         </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" },

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
+          <SiteOptions v-model="form" />
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
         </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" },

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

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
+          <SiteOptions v-model="form" />
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
         </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"],
+          },
         ],
       },
     };

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
+          <SiteOptions v-model="form" />
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
         </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" },

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
+          <SiteOptions v-model="form" />
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
         </el-form-item>
         <el-form-item label="启用状态:" prop="status">
           <el-radio v-model="form.status" :label="1">启用</el-radio>

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
+          <SiteOptions v-model="form" />
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
         </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" },

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
+          <SiteOptions v-model="form" />
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
         </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" },

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
+          <SiteOptions v-model="form" />
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
         </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: [
           {

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
+          <SiteOptions v-model="form" />
-            v-model="form.tenant_id"
-            @handleChange="form.tenant_id = $event"
-          />
         </el-form-item>
         <el-form-item label="案例类型:" prop="kind_id">
           <el-cascader