公会信息-增加公会长地区

src/views/guildOperationManagement/guildInfo.vue

@@ -3,27 +3,30 @@
     <!-- 查询 -->
     <div class="inquire">
       <span>公会ID</span>
-      <el-input
+      <el-input v-model="inquire.familyId"
-          v-model="inquire.familyId"
                 class="input"
-          type="number"
+                type="number"></el-input>
-      ></el-input>
     </div>
     <div class="inquire">
       <span>会长ID</span>
-      <el-input
+      <el-input v-model="inquire.userId"
-        v-model="inquire.userId"
                 placeholder=""
-        class="input"
+                class="input"></el-input>
-      ></el-input>
     </div>
     <div class="inquire">
       <div class="block">
         <span class="demonstration">分区</span>
         <partition-select v-model:partition-id="inquire.partitionId"
-                          v-model:partition-infos="inquire.partitionArr"
+                          v-model:partition-infos="inquire.partitionArr" />
-                          v-model:after-init="getData"
+      </div>
-        />
+    </div>
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">地区</span>
+        <partition-region-select v-model:partition-id="inquire.partitionId"
+                                 v-model:region-id="inquire.regionId"
+                                 v-model:region-infos="inquire.regionArr"
+                                 v-model:after-init="getData" />
       </div>
     </div>
     <!-- <div class="inquire">
@@ -49,107 +52,114 @@
       </div>
     </div> -->
     <!-- 查询按钮 -->
-    <el-button class="primary" type="primary" @click="getData()"
+    <el-button class="primary"
-      >查询</el-button
+               type="primary"
-    >
+               @click="getData()">查询</el-button>
-    <el-button class="primary" type="primary" @click="addDialog = true"
+    <el-button class="primary"
-      >添加</el-button
+               type="primary"
-    >
+               @click="addDialog = true">添加</el-button>
-    <el-button class="primary" type="primary" @click="exportInfoFun()"
+    <el-button class="primary"
-      >导出</el-button
+               type="primary"
-    >
+               @click="exportInfoFun()">导出</el-button>
 
     <!-- 表格 -->
-    <el-table
+    <el-table v-loading="loading"
-      v-loading="loading"
               :data="tableData"
               border
-      style="width: 100%; margin-top: 25px"
+              style="width: 100%; margin-top: 25px">
-    >
+      <el-table-column prop="id"
-      <el-table-column prop="id" align="center" label="公会ID" />
-      <!-- <el-table-column prop="referrer" align="center" label="推荐人" /> -->
-      <el-table-column prop="ownerErbanNo" align="center" label="会长ID" />
-      <el-table-column prop="ownerNick" align="center" label="会长昵称" />
-      <el-table-column
-        prop="ownerPartitionName"
                        align="center"
-        label="会长分区"
+                       label="公会ID" />
-      />
+      <!-- <el-table-column prop="referrer" align="center" label="推荐人" /> -->
-      <el-table-column prop="name" align="center" label="公会昵称" />
+      <el-table-column prop="ownerErbanNo"
-      <el-table-column align="center" prop="giftInfo" label="公会头像">
+                       align="center"
+                       label="会长ID" />
+      <el-table-column prop="ownerNick"
+                       align="center"
+                       label="会长昵称" />
+      <el-table-column prop="ownerPartitionName"
+                       align="center"
+                       label="会长分区" />
+      <el-table-column prop="ownerRegionName"
+                       align="center"
+                       label="会长地区" />
+      <el-table-column prop="name"
+                       align="center"
+                       label="公会昵称" />
+      <el-table-column align="center"
+                       prop="giftInfo"
+                       label="公会头像">
         <template v-slot="scope">
-          <el-image
+          <el-image style="width: 100px; height: 100px"
-            style="width: 100px; height: 100px"
                     :src="scope.row.avatar"
                     :zoom-rate="1.1"
                     :preview-src-list="[scope.row.avatar]"
                     fit="scale-down"
                     preview-teleported="true"
-            hide-on-click-modal="true"
+                    hide-on-click-modal="true" />
-          />
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="giftInfo" label="公会背景图">
+      <el-table-column align="center"
+                       prop="giftInfo"
+                       label="公会背景图">
         <template v-slot="scope">
-          <el-image
+          <el-image style="width: 100px; height: 100px"
-            style="width: 100px; height: 100px"
                     :src="scope.row.backgroundUrl"
                     :zoom-rate="1.1"
                     :preview-src-list="[scope.row.backgroundUrl]"
                     fit="scale-down"
                     preview-teleported="true"
-            hide-on-click-modal="true"
+                    hide-on-click-modal="true" />
-          />
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" align="center" label="创建日期" />
+      <el-table-column prop="createTime"
+                       align="center"
+                       label="创建日期" />
       <!-- <el-table-column prop="memberNum" align="center" label="成员数量" /> -->
-      <el-table-column align="center" label="成员数量/上限">
+      <el-table-column align="center"
+                       label="成员数量/上限">
         <template v-slot="scope">
-          <el-button
+          <el-button @click="memberDialogFun(scope.row)"
-            @click="memberDialogFun(scope.row)"
                      type="text"
-            size="default"
+                     size="default">{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button>
-            >{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button
-          >
         </template>
       </el-table-column>
-      <el-table-column prop="adminName" align="center" label="操作人" />
+      <el-table-column prop="adminName"
-      <el-table-column
-          prop="guildContactType"
                        align="center"
-          label="联系方式类型"
+                       label="操作人" />
-      />
+      <el-table-column prop="guildContactType"
-      <el-table-column
-        prop="guildContact"
                        align="center"
-        label="公会联系方式"
+                       label="联系方式类型" />
-      />
+      <el-table-column prop="guildContact"
-      <el-table-column align="center" prop="idCard" label="公会长身份证件">
+                       align="center"
+                       label="公会联系方式" />
+      <el-table-column align="center"
+                       prop="idCard"
+                       label="公会长身份证件">
         <template v-slot="scope">
-          <el-image
+          <el-image style="width: 100px; height: 100px"
-            style="width: 100px; height: 100px"
                     :src="scope.row.idCard"
                     :zoom-rate="1.1"
                     :preview-src-list="[scope.row.idCard]"
                     fit="scale-down"
                     preview-teleported="true"
-            hide-on-click-modal="true"
+                    hide-on-click-modal="true" />
-          />
         </template>
       </el-table-column>
-      <el-table-column prop="inviteErbanNo" align="center" label="邀请人ID" />
+      <el-table-column prop="inviteErbanNo"
-      <el-table-column prop="inviteCheck" align="center" label="邀请人证明">
+                       align="center"
+                       label="邀请人ID" />
+      <el-table-column prop="inviteCheck"
+                       align="center"
+                       label="邀请人证明">
         <template v-slot="scope">
-          <el-image
+          <el-image style="width: 100px; height: 100px"
-            style="width: 100px; height: 100px"
                     :src="scope.row.inviteCheck"
                     :zoom-rate="1.1"
                     :preview-src-list="[scope.row.inviteCheck]"
                     fit="scale-down"
                     preview-teleported="true"
-            hide-on-click-modal="true"
+                    hide-on-click-modal="true" />
-          />
         </template>
       </el-table-column>
       <!-- <el-table-column align="center" label="收款账户" width="300">
@@ -190,50 +200,41 @@
       <!-- <el-table-column prop="goldIncome" align="center" label="金币总收入" />
       <el-table-column prop="diamondRemain" align="center" label="钻石总收入" /> -->
 
-      <el-table-column align="center" label="操作" width="300">
+      <el-table-column align="center"
+                       label="操作"
+                       width="300">
         <template v-slot="scope">
-          <el-button
+          <el-button @click="ediClick(scope)"
-            @click="ediClick(scope)"
                      class="primary"
                      type="primary"
                      size="default"
-            :disabled="!scope.row.enable"
+                     :disabled="!scope.row.enable">编辑</el-button>
-            >编辑</el-button
+          <el-button @click="
-          >
-          <el-button
-            @click="
               delDialog = true;
               delDialogData = scope.row;
             "
                      :class="scope.row.enable ? 'danger' : 'info'"
                      :type="scope.row.enable ? 'danger' : 'info'"
                      size="default"
-            :disabled="!scope.row.enable"
+                     :disabled="!scope.row.enable">{{ scope.row.enable ? "移除" : "已解散" }}</el-button>
-            >{{ scope.row.enable ? "移除" : "已解散" }}</el-button
-          >
         </template>
       </el-table-column>
     </el-table>
     <!-- 新增弹窗 -->
-    <el-dialog v-model="addDialog" title="新增" width="28%" center>
+    <el-dialog v-model="addDialog"
+               title="新增"
+               width="28%"
+               center>
       <div style="margin-bottom: 25px">
-        <span
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
-          style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">会长ID</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="resource.id"
-          >会长ID</span
-        >
-        <el-input
-          v-model="resource.id"
                   style="width: 75%"
-          class="input"
+                  class="input"></el-input>
-        ></el-input>
       </div>
       <div style="margin-bottom: 25px">
-        <span
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
-            style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">联系方式类型</span>
-            class="col-sm-2 control-label"
-        >联系方式类型</span
-        >
         <el-select v-model="resource.guildContactType"
                    style="width: 75%"
                    class="input">
@@ -242,28 +243,18 @@
         </el-select>
       </div>
       <div style="margin-bottom: 25px">
-        <span
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
-            style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">联系方式</span>
-            class="col-sm-2 control-label"
+        <el-input v-model="resource.guildContact"
-        >联系方式</span
-        >
-        <el-input
-            v-model="resource.guildContact"
                   style="width: 75%"
-            class="input"
+                  class="input"></el-input>
-        ></el-input>
       </div>
       <div style="margin-bottom: 25px">
-        <span
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
-          style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">邀请人ID</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="resource.inviteErbanNo"
-          >邀请人ID</span
-        >
-        <el-input
-          v-model="resource.inviteErbanNo"
                   style="width: 75%"
-          class="input"
+                  class="input"></el-input>
-        ></el-input>
       </div>
       <!-- <div style="margin-bottom: 25px">
         <span
@@ -292,13 +283,13 @@
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="addDialog = false">取消</el-button>
-          <el-button type="primary" @click="add()"> 确认 </el-button>
+          <el-button type="primary"
+                     @click="add()"> 确认 </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 分页 -->
-    <el-pagination
+    <el-pagination style="margin-top: 10px"
-      style="margin-top: 10px"
                    class="paginationClass"
                    v-model:current-page="currentPage"
                    v-model:page-size="pageSize"
@@ -306,243 +297,204 @@
                    layout="sizes, prev, pager, next"
                    :total="total"
                    @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
+                   @current-change="handleCurrentChange" />
-    />
     <!-- 编辑弹窗 -->
-    <el-dialog v-model="editDialog" title="编辑" width="28%" center>
+    <el-dialog v-model="editDialog"
+               title="编辑"
+               width="28%"
+               center>
       <!-- 公会ID -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-          style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">公会ID</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="ediObj.id"
-          >公会ID</span
-        >
-        <el-input
-          v-model="ediObj.id"
                   style="width: 75%"
                   class="input"
-          disabled
+                  disabled></el-input>
-        ></el-input>
       </div>
       <!-- 会长ID -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-          style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">会长ID</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="ediObj.leaderId"
-          >会长ID</span
-        >
-        <el-input
-          v-model="ediObj.leaderId"
                   style="width: 75%"
                   class="input"
-          disabled
+                  disabled></el-input>
-        ></el-input>
       </div>
       <!-- 会长昵称 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-          style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">会长昵称</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="ediObj.leaderNick"
-          >会长昵称</span
-        >
-        <el-input
-          v-model="ediObj.leaderNick"
                   style="width: 75%"
                   class="input"
-          disabled
+                  disabled></el-input>
-        ></el-input>
       </div>
       <!-- 公会昵称 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-          style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">公会昵称</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="ediObj.guildNick"
-          >公会昵称</span
-        >
-        <el-input
-          v-model="ediObj.guildNick"
                   style="width: 75%"
-          class="input"
+                  class="input"></el-input>
-        ></el-input>
       </div>
       <!-- 公会头像 -->
       <div class="selectBox selectBoxImg">
-        <span class="left" style="margin-right: 20px">公会头像</span>
+        <span class="left"
+              style="margin-right: 20px">公会头像</span>
         <!-- action="/admin/tencent/cos/upload/file" -->
-        <el-upload
+        <el-upload class="avatar-uploader"
-          class="avatar-uploader"
                    action="/admin/tencent/cos/upload/file"
                    :show-file-list="false"
                    :on-success="handleAvatarSuccess2"
                    :before-upload="beforeAvatarUpload"
-          :on-error="handleAvatarError"
+                   :on-error="handleAvatarError">
-        >
+          <img v-if="ediObj.imageUrl2"
-          <img v-if="ediObj.imageUrl2" :src="ediObj.imageUrl2" class="avatar" />
+               :src="ediObj.imageUrl2"
-          <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+               class="avatar" />
+          <el-icon v-else
+                   class="avatar-uploader-icon">
+            <Plus />
+          </el-icon>
         </el-upload>
       </div>
       <!-- 公会背景图 -->
       <div class="selectBox selectBoxImg">
-        <span class="left" style="margin-right: 20px">公会背景图</span>
+        <span class="left"
+              style="margin-right: 20px">公会背景图</span>
         <!-- action="/admin/tencent/cos/upload/file" -->
-        <el-upload
+        <el-upload class="avatar-uploader"
-          class="avatar-uploader"
                    action="/admin/tencent/cos/upload/file"
                    :show-file-list="false"
                    :on-success="handleAvatarSuccess"
                    :before-upload="beforeAvatarUpload"
-          :on-error="handleAvatarError"
+                   :on-error="handleAvatarError">
-        >
+          <img v-if="ediObj.imageUrl1"
-          <img v-if="ediObj.imageUrl1" :src="ediObj.imageUrl1" class="avatar" />
+               :src="ediObj.imageUrl1"
-          <el-icon v-else class="avatar-uploader-icon">
+               class="avatar" />
+          <el-icon v-else
+                   class="avatar-uploader-icon">
             <Plus />
           </el-icon>
         </el-upload>
       </div>
       <!-- 成员数量上限 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-          style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">成员数量上限</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="ediObj.guildNumber"
-          >成员数量上限</span
-        >
-        <el-input
-          v-model="ediObj.guildNumber"
                   style="width: 75%"
-          class="input"
+                  class="input"></el-input>
-        ></el-input>
       </div>
       <!-- 公会联系方式 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-            style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">联系方式类型</span>
-            class="col-sm-2 control-label"
-        >联系方式类型</span>
         <el-select v-model="ediObj.guildContactType">
           <el-option value="whatsapp">whatsapp</el-option>
           <el-option value="facebook">facebook</el-option>
         </el-select>
       </div>
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-            style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">公会联系方式</span>
-            class="col-sm-2 control-label"
+        <el-input v-model="ediObj.guildContact"
-        >公会联系方式</span
-        >
-        <el-input
-            v-model="ediObj.guildContact"
                   style="width: 75%"
-            class="input"
+                  class="input"></el-input>
-        ></el-input>
       </div>
       <!-- 邀请人ID -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-          style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">邀请人ID</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="ediObj.inviteErbanNo"
-          >邀请人ID</span
-        >
-        <el-input
-          v-model="ediObj.inviteErbanNo"
                   style="width: 75%"
                   class="input"
-          :disabled="!ediObj.enableEditInvite"
+                  :disabled="!ediObj.enableEditInvite"></el-input>
-        ></el-input>
       </div>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="editDialog = false">取消</el-button>
-          <el-button type="primary" @click="editDialogClick()">
+          <el-button type="primary"
+                     @click="editDialogClick()">
             确认
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 二次确认删除弹窗 -->
-    <el-dialog v-model="delDialog" title="提示" width="30%" center>
+    <el-dialog v-model="delDialog"
+               title="提示"
+               width="30%"
+               center>
       <span> 确定要解散该公会吗?</span>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="delDialog = false">取消</el-button>
-          <el-button type="primary" @click="delClick()"> 确认 </el-button>
+          <el-button type="primary"
+                     @click="delClick()"> 确认 </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 编辑收款账户弹窗 -->
-    <el-dialog
+    <el-dialog v-model="payAccountDialog"
-      v-model="payAccountDialog"
                :title="payAccountTitle"
                width="28%"
-      center
+               center>
-    >
       <!-- Payoneer -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-          style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">Payoneer</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="payAccount.payoneer"
-          >Payoneer</span
-        >
-        <el-input
-          v-model="payAccount.payoneer"
                   style="width: 75%"
-          class="input"
+                  class="input"></el-input>
-        ></el-input>
       </div>
       <!-- USDT-ERC20 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-          style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">USDT-ERC20</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="payAccount.usdt"
-          >USDT-ERC20</span
-        >
-        <el-input
-          v-model="payAccount.usdt"
                   style="width: 75%"
-          class="input"
+                  class="input"></el-input>
-        ></el-input>
       </div>
       <!-- PayPal -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-          style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">PayPal</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="payAccount.payPal"
-          >PayPal</span
-        >
-        <el-input
-          v-model="payAccount.payPal"
                   style="width: 75%"
-          class="input"
+                  class="input"></el-input>
-        ></el-input>
       </div>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="payAccountDialog = false">取消</el-button>
-          <el-button type="primary" @click="payAccountClick()">
+          <el-button type="primary"
+                     @click="payAccountClick()">
             保存
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 编辑成员弹窗 -->
-    <el-dialog v-model="memberDialog" :title="memberTitle" width="36%" center>
+    <el-dialog v-model="memberDialog"
+               :title="memberTitle"
+               width="36%"
+               center>
       <!-- 新增用户 -->
       <div class="inquire">
         <span>平台ID</span>
-        <el-input
+        <el-input v-model="member.userID"
-          v-model="member.userID"
                   placeholder="请输入新增平台id"
-          class="input"
+                  class="input"></el-input>
-        ></el-input>
+        <el-button type="primary"
-        <el-button type="primary" @click="addMemberFun()"> 新增 </el-button>
+                   @click="addMemberFun()"> 新增 </el-button>
       </div>
       <!-- 内嵌表格 -->
-      <el-table
+      <el-table v-loading="loading"
-        v-loading="loading"
                 :data="member.tableData"
                 border
-        style="width: 100%; margin-top: 25px"
+                style="width: 100%; margin-top: 25px">
-      >
+        <el-table-column align="center"
-        <el-table-column align="center" label="用户平台ID">
+                         label="用户平台ID">
           <template v-slot="scope">
             {{ scope.row.erbanNo
             }}{{
@@ -555,54 +507,61 @@
             {{ scope.row.enable == false ? "(已离开)" : "" }}
           </template>
         </el-table-column>
-        <el-table-column prop="nick" align="center" label="用户昵称" />
+        <el-table-column prop="nick"
-        <el-table-column prop="createTime" align="center" label="加入时间" />
+                         align="center"
-        <el-table-column prop="adminName" align="center" label="操作人" />
+                         label="用户昵称" />
-        <el-table-column align="center" label="操作" width="300">
+        <el-table-column prop="createTime"
+                         align="center"
+                         label="加入时间" />
+        <el-table-column prop="adminName"
+                         align="center"
+                         label="操作人" />
+        <el-table-column align="center"
+                         label="操作"
+                         width="300">
           <template v-slot="scope">
-            <el-button
+            <el-button @click="setMemberFun(scope.row)"
-              @click="setMemberFun(scope.row)"
                        :class="scope.row.roleType == 2 ? 'danger' : 'primary'"
                        :type="scope.row.roleType == 2 ? 'danger' : 'primary'"
                        size="default"
-              :disabled="scope.row.roleType == 1 ? true : false"
+                       :disabled="scope.row.roleType == 1 ? true : false">{{
-              >{{
                 scope.row.roleType == 1
                   ? "会长"
                   : scope.row.roleType == 2
                   ? "取消管理员"
                   : "设为管理员"
-              }}</el-button
+              }}</el-button>
-            >
+            <el-button @click="
-            <el-button
-              @click="
                 memberRemoveObj = scope.row;
                 memberRemoveDialog = true;
               "
                        class="danger"
                        type="danger"
                        size="default"
-              :disabled="scope.row.roleType == 1 ? true : false"
+                       :disabled="scope.row.roleType == 1 ? true : false">删除</el-button>
-              >删除</el-button
-            >
           </template>
         </el-table-column>
       </el-table>
       <template #footer>
         <span class="dialog-footer">
-          <el-button type="primary" @click="memberDialog = false">
+          <el-button type="primary"
+                     @click="memberDialog = false">
             关闭
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 二次确认删除弹窗 -->
-    <el-dialog v-model="memberRemoveDialog" title="提示" width="30%" center>
+    <el-dialog v-model="memberRemoveDialog"
+               title="提示"
+               width="30%"
+               center>
       <span> 确定要删除该成员吗?</span>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="memberRemoveDialog = false">取消</el-button>
-          <el-button type="primary" @click="delmemberRemoveClick()">
+          <el-button type="primary"
+                     @click="delmemberRemoveClick()">
             确认
           </el-button>
         </span>
@@ -627,11 +586,12 @@ import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
 import { ElMessage } from "element-plus";
 import PartitionSelect from "@/views/common/partitionSelect.vue";
+import PartitionRegionSelect from "@/views/common/partitionRegionSelect.vue";
 import { savePayAccount } from "@/api/nobleman/nobleman";
 // import { fa } from "element-plus/es/locale";
 export default {
   name: "GuildInfoNew",
-  components: {PartitionSelect},
+  components: { PartitionSelect, PartitionRegionSelect },
   data () {
     return {
       loading: false,
@@ -645,6 +605,8 @@ export default {
         time: "",
         partitionId: undefined,
         partitionArr: [],
+        regionId: undefined,
+        regionArr: [],
       },
       //新增所需对象
       resource: {
@@ -715,6 +677,7 @@ export default {
         referrer: this.inquire.referrer,
         familyName: this.inquire.nick,
         partitionId: this.inquire.partitionId,
+        regionId: this.inquire.regionId == 0 ? undefined : this.inquire.regionId,
         // startDate: startTime,
         // endDate: endTime,
         pageNum: this.currentPage,
@@ -866,6 +829,7 @@ export default {
         referrer: this.inquire.referrer,
         familyName: this.inquire.nick,
         partitionId: this.inquire.partitionId,
+        regionId: this.inquire.regionId == 0 ? undefined : this.inquire.regionId,
         // startDate: startTime,
         // endDate: endTime,
       }).then((res) => { });

src/views/guildOperationManagement/guildInfoCustomerService.vue

@@ -3,19 +3,25 @@
     <!-- 查询 -->
     <div class="inquire">
       <span>ID</span>
-      <el-input
+      <el-input v-model="inquire.userId"
-        v-model="inquire.userId"
                 placeholder=""
-        class="input"
+                class="input"></el-input>
-      ></el-input>
     </div>
     <div class="inquire">
       <div class="block">
         <span class="demonstration">分区</span>
         <partition-select v-model:partition-id="inquire.partitionId"
                           v-model:partition-infos="inquire.partitionArr"
-                          v-model:after-init="getData"
+                          v-model:after-init="getData" />
-        />
+      </div>
+    </div>
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">地区</span>
+        <partition-region-select v-model:partition-id="inquire.partitionId"
+                                 v-model:region-id="inquire.regionId"
+                                 v-model:region-infos="inquire.regionArr"
+                                 v-model:after-init="getData" />
       </div>
     </div>
     <!-- <div class="inquire">
@@ -41,102 +47,111 @@
       </div>
     </div> -->
     <!-- 查询按钮 -->
-    <el-button class="primary" type="primary" @click="getData()"
+    <el-button class="primary"
-      >查询</el-button
+               type="primary"
-    >
+               @click="getData()">查询</el-button>
-    <el-button class="primary" type="primary" @click="addDialog = true"
+    <el-button class="primary"
-      >添加</el-button
+               type="primary"
-    >
+               @click="addDialog = true">添加</el-button>
-    <el-button class="primary" type="primary" @click="exportInfoFun()"
+    <el-button class="primary"
-      >导出</el-button
+               type="primary"
-    >
+               @click="exportInfoFun()">导出</el-button>
 
     <!-- 表格 -->
-    <el-table
+    <el-table v-loading="loading"
-      v-loading="loading"
               :data="tableData"
               border
-      style="width: 100%; margin-top: 25px"
+              style="width: 100%; margin-top: 25px">
-    >
+      <el-table-column prop="id"
-      <el-table-column prop="id" align="center" label="公会ID" />
-      <!-- <el-table-column prop="referrer" align="center" label="推荐人" /> -->
-      <el-table-column prop="ownerErbanNo" align="center" label="会长ID" />
-      <el-table-column prop="ownerNick" align="center" label="会长昵称" />
-      <el-table-column
-        prop="ownerPartitionName"
                        align="center"
-        label="会长分区"
+                       label="公会ID" />
-      />
+      <!-- <el-table-column prop="referrer" align="center" label="推荐人" /> -->
-      <el-table-column prop="name" align="center" label="公会昵称" />
+      <el-table-column prop="ownerErbanNo"
-      <el-table-column align="center" prop="giftInfo" label="公会头像">
+                       align="center"
+                       label="会长ID" />
+      <el-table-column prop="ownerNick"
+                       align="center"
+                       label="会长昵称" />
+      <el-table-column prop="ownerPartitionName"
+                       align="center"
+                       label="会长分区" />
+      <el-table-column prop="ownerRegionName"
+                       align="center"
+                       label="会长地区" />
+      <el-table-column prop="name"
+                       align="center"
+                       label="公会昵称" />
+      <el-table-column align="center"
+                       prop="giftInfo"
+                       label="公会头像">
         <template v-slot="scope">
-          <el-image
+          <el-image style="width: 100px; height: 100px"
-            style="width: 100px; height: 100px"
                     :src="scope.row.avatar"
                     :zoom-rate="1.1"
                     :preview-src-list="[scope.row.avatar]"
                     fit="scale-down"
                     preview-teleported="true"
-            hide-on-click-modal="true"
+                    hide-on-click-modal="true" />
-          />
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="giftInfo" label="公会背景图">
+      <el-table-column align="center"
+                       prop="giftInfo"
+                       label="公会背景图">
         <template v-slot="scope">
-          <el-image
+          <el-image style="width: 100px; height: 100px"
-            style="width: 100px; height: 100px"
                     :src="scope.row.backgroundUrl"
                     :zoom-rate="1.1"
                     :preview-src-list="[scope.row.backgroundUrl]"
                     fit="scale-down"
                     preview-teleported="true"
-            hide-on-click-modal="true"
+                    hide-on-click-modal="true" />
-          />
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" align="center" label="创建日期" />
+      <el-table-column prop="createTime"
-      <!-- <el-table-column prop="memberNum" align="center" label="成员数量" /> -->
-      <el-table-column align="center" label="成员数量/上限">
-        <template v-slot="scope">
-          <el-button
-            @click="memberDialogFun(scope.row)"
-            type="text"
-            size="default"
-            >{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button
-          >
-        </template>
-      </el-table-column>
-      <el-table-column prop="adminName" align="center" label="操作人" />
-      <el-table-column
-        prop=""
                        align="center"
-        label="公会联系方式"
+                       label="创建日期" />
-      />
+      <!-- <el-table-column prop="memberNum" align="center" label="成员数量" /> -->
-      <el-table-column align="center" prop="idCard" label="公会长身份证件">
+      <el-table-column align="center"
+                       label="成员数量/上限">
         <template v-slot="scope">
-          <el-image
+          <el-button @click="memberDialogFun(scope.row)"
-            style="width: 100px; height: 100px"
+                     type="text"
+                     size="default">{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column prop="adminName"
+                       align="center"
+                       label="操作人" />
+      <el-table-column prop=""
+                       align="center"
+                       label="公会联系方式" />
+      <el-table-column align="center"
+                       prop="idCard"
+                       label="公会长身份证件">
+        <template v-slot="scope">
+          <el-image style="width: 100px; height: 100px"
                     :src="scope.row.idCard"
                     :zoom-rate="1.1"
                     :preview-src-list="[scope.row.idCard]"
                     fit="scale-down"
                     preview-teleported="true"
-            hide-on-click-modal="true"
+                    hide-on-click-modal="true" />
-          />
         </template>
       </el-table-column>
-      <el-table-column prop="inviteErbanNo" align="center" label="邀请人ID" />
+      <el-table-column prop="inviteErbanNo"
-      <el-table-column prop="inviteCheck" align="center" label="邀请人证明">
+                       align="center"
+                       label="邀请人ID" />
+      <el-table-column prop="inviteCheck"
+                       align="center"
+                       label="邀请人证明">
         <template v-slot="scope">
-          <el-image
+          <el-image style="width: 100px; height: 100px"
-            style="width: 100px; height: 100px"
                     :src="scope.row.inviteCheck"
                     :zoom-rate="1.1"
                     :preview-src-list="[scope.row.inviteCheck]"
                     fit="scale-down"
                     preview-teleported="true"
-            hide-on-click-modal="true"
+                    hide-on-click-modal="true" />
-          />
         </template>
       </el-table-column>
       <!-- <el-table-column align="center" label="收款账户" width="300">
@@ -177,43 +192,37 @@
       <!-- <el-table-column prop="goldIncome" align="center" label="金币总收入" />
       <el-table-column prop="diamondRemain" align="center" label="钻石总收入" /> -->
 
-      <el-table-column align="center" label="操作" width="300">
+      <el-table-column align="center"
+                       label="操作"
+                       width="300">
         <template v-slot="scope">
-          <el-button
+          <el-button @click="ediClick(scope)"
-            @click="ediClick(scope)"
                      class="primary"
                      type="primary"
                      size="default"
-            :disabled="!scope.row.enable"
+                     :disabled="!scope.row.enable">编辑</el-button>
-            >编辑</el-button
+          <el-button @click="
-          >
-          <el-button
-            @click="
               delDialog = true;
               delDialogData = scope.row;
             "
                      :class="scope.row.enable ? 'danger' : 'info'"
                      :type="scope.row.enable ? 'danger' : 'info'"
                      size="default"
-            :disabled="!scope.row.enable"
+                     :disabled="!scope.row.enable">{{ scope.row.enable ? "移除" : "已解散" }}</el-button>
-            >{{ scope.row.enable ? "移除" : "已解散" }}</el-button
-          >
         </template>
       </el-table-column>
     </el-table>
     <!-- 新增弹窗 -->
-    <el-dialog v-model="addDialog" title="新增" width="28%" center>
+    <el-dialog v-model="addDialog"
+               title="新增"
+               width="28%"
+               center>
       <div style="margin-bottom: 25px">
-        <span
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
-          style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">会长ID</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="resource.id"
-          >会长ID</span
-        >
-        <el-input
-          v-model="resource.id"
                   style="width: 75%"
-          class="input"
+                  class="input"></el-input>
-        ></el-input>
       </div>
       <!-- <div style="margin-bottom: 25px">
         <span
@@ -242,13 +251,13 @@
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="addDialog = false">取消</el-button>
-          <el-button type="primary" @click="add()"> 确认 </el-button>
+          <el-button type="primary"
+                     @click="add()"> 确认 </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 分页 -->
-    <el-pagination
+    <el-pagination style="margin-top: 10px"
-      style="margin-top: 10px"
                    class="paginationClass"
                    v-model:current-page="currentPage"
                    v-model:page-size="pageSize"
@@ -256,206 +265,179 @@
                    layout="sizes, prev, pager, next"
                    :total="total"
                    @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
+                   @current-change="handleCurrentChange" />
-    />
     <!-- 编辑弹窗 -->
-    <el-dialog v-model="editDialog" title="编辑" width="28%" center>
+    <el-dialog v-model="editDialog"
+               title="编辑"
+               width="28%"
+               center>
       <!-- 公会ID -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-          style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">公会ID</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="ediObj.id"
-          >公会ID</span
-        >
-        <el-input
-          v-model="ediObj.id"
                   style="width: 75%"
                   class="input"
-          disabled
+                  disabled></el-input>
-        ></el-input>
       </div>
       <!-- 会长ID -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-          style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">会长ID</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="ediObj.leaderId"
-          >会长ID</span
-        >
-        <el-input
-          v-model="ediObj.leaderId"
                   style="width: 75%"
                   class="input"
-          disabled
+                  disabled></el-input>
-        ></el-input>
       </div>
       <!-- 会长昵称 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-          style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">会长昵称</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="ediObj.leaderNick"
-          >会长昵称</span
-        >
-        <el-input
-          v-model="ediObj.leaderNick"
                   style="width: 75%"
                   class="input"
-          disabled
+                  disabled></el-input>
-        ></el-input>
       </div>
       <!-- 公会昵称 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-          style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">公会昵称</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="ediObj.guildNick"
-          >公会昵称</span
-        >
-        <el-input
-          v-model="ediObj.guildNick"
                   style="width: 75%"
-          class="input"
+                  class="input"></el-input>
-        ></el-input>
       </div>
       <!-- 公会头像 -->
       <div class="selectBox selectBoxImg">
-        <span class="left" style="margin-right: 20px">公会头像</span>
+        <span class="left"
+              style="margin-right: 20px">公会头像</span>
         <!-- action="/admin/tencent/cos/upload/file" -->
-        <el-upload
+        <el-upload class="avatar-uploader"
-          class="avatar-uploader"
                    action="/admin/tencent/cos/upload/file"
                    :show-file-list="false"
                    :on-success="handleAvatarSuccess2"
                    :before-upload="beforeAvatarUpload"
-          :on-error="handleAvatarError"
+                   :on-error="handleAvatarError">
-        >
+          <img v-if="ediObj.imageUrl2"
-          <img v-if="ediObj.imageUrl2" :src="ediObj.imageUrl2" class="avatar" />
+               :src="ediObj.imageUrl2"
-          <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+               class="avatar" />
+          <el-icon v-else
+                   class="avatar-uploader-icon">
+            <Plus />
+          </el-icon>
         </el-upload>
       </div>
       <!-- 公会背景图 -->
       <div class="selectBox selectBoxImg">
-        <span class="left" style="margin-right: 20px">公会背景图</span>
+        <span class="left"
+              style="margin-right: 20px">公会背景图</span>
         <!-- action="/admin/tencent/cos/upload/file" -->
-        <el-upload
+        <el-upload class="avatar-uploader"
-          class="avatar-uploader"
                    action="/admin/tencent/cos/upload/file"
                    :show-file-list="false"
                    :on-success="handleAvatarSuccess"
                    :before-upload="beforeAvatarUpload"
-          :on-error="handleAvatarError"
+                   :on-error="handleAvatarError">
-        >
+          <img v-if="ediObj.imageUrl1"
-          <img v-if="ediObj.imageUrl1" :src="ediObj.imageUrl1" class="avatar" />
+               :src="ediObj.imageUrl1"
-          <el-icon v-else class="avatar-uploader-icon">
+               class="avatar" />
+          <el-icon v-else
+                   class="avatar-uploader-icon">
             <Plus />
           </el-icon>
         </el-upload>
       </div>
       <!-- 成员数量上限 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-          style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">成员数量上限</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="ediObj.guildNumber"
-          >成员数量上限</span
-        >
-        <el-input
-          v-model="ediObj.guildNumber"
                   style="width: 75%"
-          class="input"
+                  class="input"></el-input>
-        ></el-input>
       </div>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="editDialog = false">取消</el-button>
-          <el-button type="primary" @click="editDialogClick()">
+          <el-button type="primary"
+                     @click="editDialogClick()">
             确认
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 二次确认删除弹窗 -->
-    <el-dialog v-model="delDialog" title="提示" width="30%" center>
+    <el-dialog v-model="delDialog"
+               title="提示"
+               width="30%"
+               center>
       <span> 确定要解散该公会吗?</span>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="delDialog = false">取消</el-button>
-          <el-button type="primary" @click="delClick()"> 确认 </el-button>
+          <el-button type="primary"
+                     @click="delClick()"> 确认 </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 编辑收款账户弹窗 -->
-    <el-dialog
+    <el-dialog v-model="payAccountDialog"
-      v-model="payAccountDialog"
                :title="payAccountTitle"
                width="28%"
-      center
+               center>
-    >
       <!-- Payoneer -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-          style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">Payoneer</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="payAccount.payoneer"
-          >Payoneer</span
-        >
-        <el-input
-          v-model="payAccount.payoneer"
                   style="width: 75%"
-          class="input"
+                  class="input"></el-input>
-        ></el-input>
       </div>
       <!-- USDT-ERC20 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-          style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">USDT-ERC20</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="payAccount.usdt"
-          >USDT-ERC20</span
-        >
-        <el-input
-          v-model="payAccount.usdt"
                   style="width: 75%"
-          class="input"
+                  class="input"></el-input>
-        ></el-input>
       </div>
       <!-- PayPal -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
+        <span style="display: inline-block; margin-right: 20px"
-          style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">PayPal</span>
-          class="col-sm-2 control-label"
+        <el-input v-model="payAccount.payPal"
-          >PayPal</span
-        >
-        <el-input
-          v-model="payAccount.payPal"
                   style="width: 75%"
-          class="input"
+                  class="input"></el-input>
-        ></el-input>
       </div>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="payAccountDialog = false">取消</el-button>
-          <el-button type="primary" @click="payAccountClick()">
+          <el-button type="primary"
+                     @click="payAccountClick()">
             保存
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 编辑成员弹窗 -->
-    <el-dialog v-model="memberDialog" :title="memberTitle" width="36%" center>
+    <el-dialog v-model="memberDialog"
+               :title="memberTitle"
+               width="36%"
+               center>
       <!-- 新增用户 -->
       <div class="inquire">
         <span>平台ID</span>
-        <el-input
+        <el-input v-model="member.userID"
-          v-model="member.userID"
                   placeholder="请输入新增平台id"
-          class="input"
+                  class="input"></el-input>
-        ></el-input>
+        <el-button type="primary"
-        <el-button type="primary" @click="addMemberFun()"> 新增 </el-button>
+                   @click="addMemberFun()"> 新增 </el-button>
       </div>
       <!-- 内嵌表格 -->
-      <el-table
+      <el-table v-loading="loading"
-        v-loading="loading"
                 :data="member.tableData"
                 border
-        style="width: 100%; margin-top: 25px"
+                style="width: 100%; margin-top: 25px">
-      >
+        <el-table-column align="center"
-        <el-table-column align="center" label="用户平台ID">
+                         label="用户平台ID">
           <template v-slot="scope">
             {{ scope.row.erbanNo
             }}{{
@@ -468,54 +450,61 @@
             {{ scope.row.enable == false ? "(已离开)" : "" }}
           </template>
         </el-table-column>
-        <el-table-column prop="nick" align="center" label="用户昵称" />
+        <el-table-column prop="nick"
-        <el-table-column prop="createTime" align="center" label="加入时间" />
+                         align="center"
-        <el-table-column prop="adminName" align="center" label="操作人" />
+                         label="用户昵称" />
-        <el-table-column align="center" label="操作" width="300">
+        <el-table-column prop="createTime"
+                         align="center"
+                         label="加入时间" />
+        <el-table-column prop="adminName"
+                         align="center"
+                         label="操作人" />
+        <el-table-column align="center"
+                         label="操作"
+                         width="300">
           <template v-slot="scope">
-            <el-button
+            <el-button @click="setMemberFun(scope.row)"
-              @click="setMemberFun(scope.row)"
                        :class="scope.row.roleType == 2 ? 'danger' : 'primary'"
                        :type="scope.row.roleType == 2 ? 'danger' : 'primary'"
                        size="default"
-              :disabled="scope.row.roleType == 1 ? true : false"
+                       :disabled="scope.row.roleType == 1 ? true : false">{{
-              >{{
                 scope.row.roleType == 1
                   ? "会长"
                   : scope.row.roleType == 2
                   ? "取消管理员"
                   : "设为管理员"
-              }}</el-button
+              }}</el-button>
-            >
+            <el-button @click="
-            <el-button
-              @click="
                 memberRemoveObj = scope.row;
                 memberRemoveDialog = true;
               "
                        class="danger"
                        type="danger"
                        size="default"
-              :disabled="scope.row.roleType == 1 ? true : false"
+                       :disabled="scope.row.roleType == 1 ? true : false">删除</el-button>
-              >删除</el-button
-            >
           </template>
         </el-table-column>
       </el-table>
       <template #footer>
         <span class="dialog-footer">
-          <el-button type="primary" @click="memberDialog = false">
+          <el-button type="primary"
+                     @click="memberDialog = false">
             关闭
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 二次确认删除弹窗 -->
-    <el-dialog v-model="memberRemoveDialog" title="提示" width="30%" center>
+    <el-dialog v-model="memberRemoveDialog"
+               title="提示"
+               width="30%"
+               center>
       <span> 确定要删除该成员吗?</span>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="memberRemoveDialog = false">取消</el-button>
-          <el-button type="primary" @click="delmemberRemoveClick()">
+          <el-button type="primary"
+                     @click="delmemberRemoveClick()">
             确认
           </el-button>
         </span>
@@ -543,9 +532,10 @@ import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
 import { ElMessage } from "element-plus";
 import PartitionSelect from "@/views/common/partitionSelect.vue";
+import PartitionRegionSelect from "@/views/common/partitionRegionSelect.vue";
 export default {
   name: "GuildInfoNewCustomerService",
-  components: {PartitionSelect},
+  components: { PartitionSelect, PartitionRegionSelect },
   data () {
     return {
       loading: false,
@@ -558,6 +548,8 @@ export default {
         time: "",
         partitionId: undefined,
         partitionArr: [],
+        regionId: undefined,
+        regionArr: [],
       },
       //新增所需对象
       resource: {
@@ -622,6 +614,7 @@ export default {
         referrer: this.inquire.referrer,
         familyName: this.inquire.nick,
         partitionId: this.inquire.partitionId,
+        regionId: this.inquire.regionId == 0 ? undefined : this.inquire.regionId,
         // startDate: startTime,
         // endDate: endTime,
         pageNum: this.currentPage,
@@ -771,6 +764,8 @@ export default {
         erbanNo: this.inquire.userId,
         referrer: this.inquire.referrer,
         familyName: this.inquire.nick,
+        partitionId: this.inquire.partitionId,
+        regionId: this.inquire.regionId == 0 ? undefined : this.inquire.regionId,
         // startDate: startTime,
         // endDate: endTime,
       }).then((res) => { });