From 309752b8bb02507f76f3b9115487c82c2f93388d Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Tue, 30 Aug 2022 12:23:19 +0800
Subject: [PATCH] siteoptions

---
 src/views/dataList/enterprise/index.vue     | 21 ++++-----------------
 src/views/website/activity/active/index.vue |  4 +++-
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/views/dataList/enterprise/index.vue b/src/views/dataList/enterprise/index.vue
index 7ed4863..c11ad84 100644
--- a/src/views/dataList/enterprise/index.vue
+++ b/src/views/dataList/enterprise/index.vue
@@ -18,21 +18,7 @@
         />
       </el-form-item>
       <el-form-item label="所属站点" prop="tenantId">
-        <el-select
-          v-model="queryParams.tenantId"
-          placeholder="请选择，支持搜索"
-          size="default"
-          :loading="siteList.length === 0"
-          filterable
-          clearable
-        >
-          <el-option
-            v-for="item in siteList"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-          />
-        </el-select>
+        <SiteOptions v-model="queryParams.tenantId" :site-list="siteList" />
       </el-form-item>
 
       <el-form-item>
@@ -97,7 +83,7 @@
       </el-table-column>
       <el-table-column label="站点" align="center">
         <template #default="{ row }">
-          {{ siteList.find((el) => el.id === row.tenantId)?.name || "无" }}
+          {{ siteList.find((el) => el.id === row.tenantId)?.name ?? "无" }}
         </template>
       </el-table-column>
       <el-table-column label="所在地" align="center" prop="address" />
@@ -197,7 +183,8 @@ import {
   companyDelete,
 } from "@/api/dataList/enterprise";
 import { getToken } from "@/utils/auth";
-import axios from "axios";
+import SiteOptions from "@/views/components/SiteOptions";
+// import axios from "axios";
 // import { download } from "@/utils/request";
 // import dayjs from "dayjs";
 import { tansParams, blobValidate } from "@/utils/ruoyi";
diff --git a/src/views/website/activity/active/index.vue b/src/views/website/activity/active/index.vue
index 42bf241..940a221 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="tenantId">
-        <SiteOptions v-model="form.tenantId" :site-list="siteList" />
+        <SiteOptions v-model="queryParams.tenantId" :site-list="siteList" />
       </el-form-item>
       <el-form-item label="联系人" prop="contact">
         <el-input
@@ -625,6 +625,7 @@ const handleUpdate = async (row) => {
   showEditDialog.value = true;
   title.value = "修改";
 };
+
 const submitForm = () => {
   // let notifys = 0;
   // form.value.notifyCrowd.map((item) => {
@@ -651,6 +652,7 @@ const submitForm = () => {
     }
   });
 };
+
 /** 删除按钮操作 */
 const handleDelete = (row) => {
   ElMessageBox.confirm(`是否确认删除名为${row.title}的数据项？`)