机构加所在地区

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 });
       },
       /* 刷新表格 */

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,