From 8b4f546d0196b4e6949d4c8a0a90ef0426952967 Mon Sep 17 00:00:00 2001
From: dengbw <dengbw@shengshi.com.cn>
Date: Tue, 11 Oct 2022 15:29:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E5=8A=A0=E6=89=80=E5=9C=A8?=
 =?UTF-8?q?=E5=9C=B0=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sylive/activity/index.vue                 |  5 ++++-
 .../sylive/organization/components/org-edit.vue     | 13 +++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/sylive/activity/index.vue b/src/views/sylive/activity/index.vue
index 2b3aea0..ac38f42 100644
--- a/src/views/sylive/activity/index.vue
+++ b/src/views/sylive/activity/index.vue
@@ -223,7 +223,7 @@
       };
     },
     created() {
-      this.organizationQuery();
+      //this.organizationQuery();
     },
     methods: {
       /* 查询机构 */
@@ -245,6 +245,9 @@
       },
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {
+        if (page == 1) {
+          this.organizationQuery();
+        }
         return pageActivity({ ...where, ...order, page, limit });
       },
       /* 刷新表格 */
diff --git a/src/views/sylive/organization/components/org-edit.vue b/src/views/sylive/organization/components/org-edit.vue
index 0b18ac5..b3e5824 100644
--- a/src/views/sylive/organization/components/org-edit.vue
+++ b/src/views/sylive/organization/components/org-edit.vue
@@ -34,6 +34,13 @@
               placeholder="请输入机构全称"
             />
           </el-form-item>
+          <el-form-item label="所在地区:">
+            <regions-select
+              v-model="form.city"
+              placeholder="请选择省市区"
+              class="ele-fluid"
+            />
+          </el-form-item>
         </el-col>
         <el-col v-bind="styleResponsive ? { sm: 12 } : { span: 12 }">
           <el-form-item label="机构类型:" prop="organizationType">
@@ -73,13 +80,14 @@
 <script>
   import OrgSelect from './org-select.vue';
   import OrgTypeSelect from './org-type-select.vue';
+  import RegionsSelect from '@/components/RegionsSelect/index.vue';
   import {
     addOrganization,
     updateOrganization
   } from '@/api/sylive/organization';
 
   export default {
-    components: { OrgSelect, OrgTypeSelect },
+    components: { OrgSelect, OrgTypeSelect, RegionsSelect },
     props: {
       // 弹窗是否打开
       visible: Boolean,
@@ -98,7 +106,8 @@
         organizationFullName: '',
         organizationType: null,
         sortNumber: null,
-        comments: ''
+        comments: '',
+        city: []
       };
       return {
         defaultForm,