From 2b4d966dac40a5dc9eb3af0f0aeea63a08056de7 Mon Sep 17 00:00:00 2001
From: yujiacong <1016029365@qq.com>
Date: Thu, 21 Aug 2025 18:14:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E4=BF=A1=E6=81=AF=20-=20?=
 =?UTF-8?q?=E8=A1=A8=E5=A4=B4=E6=96=B0=E5=A2=9E=E5=85=AC=E4=BC=9A=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=BA=EF=BC=8C=E7=BC=96=E8=BE=91=E6=96=B0=E5=A2=9E=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=85=AC=E4=BC=9A=E5=9C=B0=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/noblemanNew/noblemanNew.js            |  8 +++++
 .../guildOperationManagement/guildInfo.vue    | 32 +++++++++++++++++--
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/api/noblemanNew/noblemanNew.js b/src/api/noblemanNew/noblemanNew.js
index 4b05385..34b0e15 100644
--- a/src/api/noblemanNew/noblemanNew.js
+++ b/src/api/noblemanNew/noblemanNew.js
@@ -143,4 +143,12 @@ export const getGuildOperatorListAll = query => {
         method: 'get',
         params: query
     });
+};
+// 获取 国家列表
+export const getlistByPartitionId = query => {
+    return request({
+        url: '/admin/regionInfo/listByPartitionId',
+        method: 'get',
+        params: query
+    });
 };
\ No newline at end of file
diff --git a/src/views/guildOperationManagement/guildInfo.vue b/src/views/guildOperationManagement/guildInfo.vue
index ec6de9a..e845ecb 100644
--- a/src/views/guildOperationManagement/guildInfo.vue
+++ b/src/views/guildOperationManagement/guildInfo.vue
@@ -81,6 +81,9 @@
       <el-table-column prop="ownerRegionName"
                        align="center"
                        label="会长地区" />
+                       <el-table-column prop="regionName"
+                       align="center"
+                       label="公会地区" />
       <el-table-column prop="name"
                        align="center"
                        label="公会昵称" />
@@ -351,6 +354,19 @@
         <el-input v-model="ediObj.guildNick"
                   style="width: 75%"
                   class="input"></el-input>
+      </div>
+            <!-- 公会地区 -->
+      <div style="margin-bottom: 25px; margin-top: 10px">
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">公会地区</span>
+              <el-select v-model="ediObj.regionId"
+                 placeholder="请选择">
+        <el-option v-for="item in adminCountryArr"
+                   :key="item.id"
+                   :label="item.name"
+                   :value="item.id">
+        </el-option>
+      </el-select>
       </div>
       <!-- 公会头像 -->
       <div class="selectBox selectBoxImg">
@@ -607,7 +623,8 @@ import {
   addMember,
   setManager,
   removeMember,
-  getGuildOperatorListAll
+  getGuildOperatorListAll,
+  getlistByPartitionId
 } from "@/api/noblemanNew/noblemanNew";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
@@ -667,7 +684,8 @@ export default {
         imageUrl2: "",
         enableEditInvite: false,
         inviteErbanNo: '',
-        operatorId: ''
+        operatorId: '',
+        regionId:''
       },
       // 收款账户弹窗
       payAccountDialog: false,
@@ -690,6 +708,7 @@ export default {
       memberRemoveDialog: false,
       memberRemoveObj: {},
       adminListArr: [],//负责人列表
+      adminCountryArr:[],
     };
   },
   mounted () {
@@ -930,6 +949,12 @@ export default {
       this.ediObj.guildContactType = obj.guildContactType;
       this.ediObj.guildContact = obj.guildContact;
       this.ediObj.inviteErbanNo = obj.inviteErbanNo;
+      this.ediObj.regionId = obj.regionId;
+      getlistByPartitionId({ partitionId: obj.partitionId,containAll: false }).then((res) => {
+        if (res.code == 200) {
+          this.adminCountryArr = res.data;
+        }
+      });
       this.editDialog = true;
     },
     // 二次确认弹窗
@@ -944,7 +969,8 @@ export default {
         guildContactType: this.ediObj.guildContactType,
         guildContact: this.ediObj.guildContact,
         inviteErbanNo: this.ediObj.inviteErbanNo,
-        operatorId: this.ediObj.operatorId
+        operatorId: this.ediObj.operatorId,
+        regionId:this.ediObj.regionId
       }).then((res) => {
         if (res.code == 200) {
           ElMessage({