完成土耳其化

src/api/nobleman/nobleman.js

@@ -1,6 +1,15 @@
 import request from '@/utils/request';
 import { genQueryParam } from '@/utils/maintainer';
 
+// 分区接口
+export const listPartitionInfo = query => {
+    return request({
+        url: '/partition/listPartitionInfo',
+        method: 'get',
+        params: query
+    });
+};
+
 // 邀请移除记录
 export const pageOperateRecord = query => {
     return request({

src/api/noblemanNew/noblemanNew.js

@@ -1,6 +1,15 @@
 import request from '@/utils/request';
 import { genQueryParam } from '@/utils/maintainer';
 
+// 分区接口
+export const listPartitionInfo = query => {
+    return request({
+        url: '/partition/listPartitionInfo',
+        method: 'get',
+        params: query
+    });
+};
+
 // 邀请移除记录
 export const pageOperateRecord = query => {
     return request({

src/views/guildOperationManagement/agencyDiamondFlow.vue

@@ -20,6 +20,17 @@
           :disabled="tableLoading"
         >
           <div class="search-line">
+            <el-form-item label="分区" prop="partitionId">
+              <el-select v-model="searchForm.partitionId" placeholder="请选择">
+                <el-option
+                  v-for="item in partitionArr"
+                  :key="item.id"
+                  :label="item.desc"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="公会ID" prop="agencyId">
               <el-input
                 v-model.trim="searchForm.agencyId"
@@ -66,6 +77,7 @@
                             {{ regionType(scope.row.region) }}
                         </template>
                     </el-table-column> -->
+          <el-table-column align="center" prop="partitionDesc" label="分区"> </el-table-column>
           <el-table-column align="center" prop="agencyId" label="公会ID">
           </el-table-column>
           <el-table-column align="center" prop="agencyName" label="公会名称">
@@ -81,7 +93,11 @@
           </el-table-column>
           <el-table-column align="center" prop="energyValue" label="总钻石流水">
             <template v-slot="scope">
-              {{ scope.row.energyValue ? scope.row.energyValue.toLocaleString() : "null"}}
+              {{
+                scope.row.energyValue
+                  ? scope.row.energyValue.toLocaleString()
+                  : "null"
+              }}
             </template>
           </el-table-column>
           <el-table-column
@@ -109,7 +125,7 @@
 </template>
 
 <script lang=js>
-import { getDateCycleList, getAgencyDiamondFlow, agencyDiamondFlowExport } from '@/api/relAgency/relAgency.js';
+import { getDateCycleList, getAgencyDiamondFlow, agencyDiamondFlowExport,listPartitionInfo } from '@/api/relAgency/relAgency.js';
 import TablePagination from '@/components/common/TablePagination';
 import { formatDate, formatDateYMD } from '@/utils/relDate';
 // @ts-ignore
@@ -125,6 +141,7 @@ export default {
     components: { TablePagination },
     data() {
         return {
+            partitionArr: [],
             dateCycleList: [],
             btnLoading: false, // 导出弹出框(dialog)的确认按钮
             tableLoading: false, // 表格是否加载中
@@ -140,7 +157,8 @@ export default {
                 agencyOwnerId: null,
                 agencyId: null,
                 dateCycle: null,
-                region: null
+                region: null,
+                partitionId: "",
             },
             searchRule: {
                 startTime: [
@@ -173,6 +191,9 @@ export default {
         };
     },
     created() {
+      listPartitionInfo().then((res) => {
+      this.partitionArr = res.data;
+    });
         this.getDateCycleList();
     },
     methods: {

src/views/guildOperationManagement/agentSendSalary.vue

@@ -69,18 +69,14 @@
           @header-click="headerCopy"
           style="width: 100%"
         >
+          <el-table-column align="center" prop="partitionDesc" label="分区">
+          </el-table-column>
           <el-table-column
             align="center"
             prop="receiveErbano"
             label="充值代理ID"
           >
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="x"
-            label="分区"
-          >
-          </el-table-column>
           <el-table-column
             align="center"
             prop="receiveNick"

src/views/guildOperationManagement/anchorSalaryOperate.vue

@@ -10,6 +10,17 @@
           :disabled="tableLoading"
         >
           <div class="search-line">
+            <el-form-item label="分区" prop="partitionId">
+              <el-select v-model="searchForm.partitionId" placeholder="请选择">
+                <el-option
+                  v-for="item in partitionArr"
+                  :key="item.id"
+                  :label="item.desc"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="主播ID" prop="erbanNo">
               <el-input
                 v-model.trim="searchForm.erbanNo"
@@ -59,6 +70,7 @@
                             {{ dateCycleType(scope.row.dateCycle) }}
                         </template>
                     </el-table-column> -->
+          <el-table-column align="center" prop="partitionDesc" label="分区" />
           <el-table-column align="center" prop="erbano" label="主播ID">
           </el-table-column>
           <el-table-column align="center" prop="nick" label="主播昵称">
@@ -313,6 +325,7 @@ import {
   getDateCycleList,
   getAnchorSalaryBill,
   anchorSalaryBillDetail,
+  listPartitionInfo,
 } from "@/api/relAgency/relAgency.js";
 import TablePagination from "@/components/common/TablePagination";
 import { formatDate, formatDateYMD } from "@/utils/relDate";
@@ -340,7 +353,9 @@ export default {
         agencyId: null,
         dateCycle: null,
         erbanNo: null,
+        partitionId: null,
       },
+      partitionArr:[],
       searchRule: {
         startTime: [
           {
@@ -384,6 +399,9 @@ export default {
   },
   created() {
     this.getDateCycleList();
+    listPartitionInfo().then((res) => {
+      this.partitionArr = res.data;
+    });
   },
   methods: {
     getDateCycleList() {

src/views/guildOperationManagement/diamondFlow.vue

@@ -1,6 +1,23 @@
 <template>
   <div class="box">
     <!-- 查询 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">分区</span>
+        <el-select
+          v-model="inquire.partitionId"
+          style="width: 75%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in inquire.partitionArr"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
     <div class="inquire">
       <span>公会ID</span>
       <el-input
@@ -86,6 +103,7 @@
       style="width: 100%; margin-top: 25px"
     >
       <el-table-column type="index" width="100" align="center" label="序号" />
+      <el-table-column prop="partitionDesc" align="center" label="分区" />
       <el-table-column prop="guildId" align="center" label="公会ID" />
       <el-table-column prop="guildName" align="center" label="公会昵称" />
       <el-table-column prop="ownerErbanNo" align="center" label="公会长ID" />
@@ -110,6 +128,7 @@
 import {
   diamondStatistics,
   diamondStatisticsExport,
+  listPartitionInfo,
 } from "@/api/relAgency/relAgency";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
@@ -125,6 +144,8 @@ export default {
         guildId: "",
         guildBoosId: "",
         time: [],
+        partitionId: "",
+        partitionArr: [],
       },
       // 表格
       tableData: [],
@@ -138,6 +159,9 @@ export default {
   },
   created() {
     // this.getData();
+    listPartitionInfo().then((res) => {
+      this.inquire.partitionArr = res.data;
+    });
   },
   methods: {
     // 查询接口
@@ -157,6 +181,7 @@ export default {
       diamondStatistics({
         guildId: this.inquire.guildId,
         ownerErbanNo: this.inquire.guildBoosId,
+        partitionId: this.inquire.partitionId,
         startTime: startTime,
         endTime: endTime,
         pageNo: this.currentPage,

src/views/guildOperationManagement/guildInfo.vue

@@ -3,9 +3,28 @@
     <!-- 查询 -->
     <div class="inquire">
       <span>ID</span>
-      <el-input v-model="inquire.userId"
+      <el-input
+        v-model="inquire.userId"
         placeholder=""
-                class="input"></el-input>
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">分区</span>
+        <el-select
+          v-model="inquire.partitionId"
+          style="width: 75%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in inquire.partitionArr"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
     </div>
     <!-- <div class="inquire">
       <span>推荐人</span>
@@ -30,78 +49,72 @@
       </div>
     </div> -->
     <!-- 查询按钮 -->
-    <el-button class="primary"
+    <el-button class="primary" type="primary" @click="getData()"
-               type="primary"
+      >查询</el-button
-               @click="getData()">查询</el-button>
+    >
-    <el-button class="primary"
+    <el-button class="primary" type="primary" @click="addDialog = true"
-               type="primary"
+      >添加</el-button
-               @click="addDialog = true">添加</el-button>
+    >
-    <el-button class="primary"
+    <el-button class="primary" type="primary" @click="exportInfoFun()"
-               type="primary"
+      >导出</el-button
-               @click="exportInfoFun()">导出</el-button>
+    >
 
     <!-- 表格 -->
-    <el-table v-loading="loading"
+    <el-table
+      v-loading="loading"
       :data="tableData"
       border
-              style="width: 100%; margin-top: 25px">
+      style="width: 100%; margin-top: 25px"
-      <el-table-column prop="id"
+    >
-                       align="center"
+      <el-table-column prop="id" align="center" label="公会ID" />
-                       label="公会ID" />
       <!-- <el-table-column prop="referrer" align="center" label="推荐人" /> -->
-      <el-table-column prop="ownerErbanNo"
+      <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="会长ID" />
+        label="会长分区"
-      <el-table-column prop="ownerNick"
+      />
-                       align="center"
+      <el-table-column prop="name" align="center" label="公会昵称" />
-                       label="会长昵称" />
+      <el-table-column align="center" prop="giftInfo" label="公会头像">
-      <el-table-column prop="ownerPartitionName"
-                       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 style="width: 100px; height: 100px"
+          <el-image
+            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"
+      <el-table-column align="center" prop="giftInfo" label="公会背景图">
-                       prop="giftInfo"
-                       label="公会背景图">
         <template v-slot="scope">
-          <el-image style="width: 100px; height: 100px"
+          <el-image
+            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"
+      <el-table-column prop="createTime" align="center" label="创建日期" />
-                       align="center"
-                       label="创建日期" />
       <!-- <el-table-column prop="memberNum" align="center" label="成员数量" /> -->
-      <el-table-column align="center"
+      <el-table-column align="center" label="成员数量/上限">
-                       label="成员数量/上限">
         <template v-slot="scope">
-          <el-button @click="memberDialogFun(scope.row)"
+          <el-button
+            @click="memberDialogFun(scope.row)"
             type="text"
-                     size="default">{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button>
+            size="default"
+            >{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button
+          >
         </template>
       </el-table-column>
-      <el-table-column prop="adminName"
+      <el-table-column prop="adminName" align="center" label="操作人" />
-                       align="center"
-                       label="操作人" />
       <!-- <el-table-column align="center" label="收款账户" width="300">
         <template v-slot="scope">
           <el-button
@@ -140,37 +153,43 @@
       <!-- <el-table-column prop="goldIncome" align="center" label="金币总收入" />
       <el-table-column prop="diamondRemain" align="center" label="钻石总收入" /> -->
 
-      <el-table-column align="center"
+      <el-table-column align="center" label="操作" width="300">
-                       label="操作"
-                       width="300">
         <template v-slot="scope">
-          <el-button @click="ediClick(scope)"
+          <el-button
+            @click="ediClick(scope)"
             class="primary"
             type="primary"
             size="default"
-                     :disabled="!scope.row.enable">编辑</el-button>
+            :disabled="!scope.row.enable"
-          <el-button @click="
+            >编辑</el-button
+          >
+          <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">{{ scope.row.enable ? "移除" : "已解散" }}</el-button>
+            :disabled="!scope.row.enable"
+            >{{ scope.row.enable ? "移除" : "已解散" }}</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
     <!-- 新增弹窗 -->
-    <el-dialog v-model="addDialog"
+    <el-dialog v-model="addDialog" title="新增" width="28%" center>
-               title="新增"
-               width="28%"
-               center>
       <div style="margin-bottom: 25px">
-        <span style="display: inline-block; margin-right: 20px; width: 100px"
+        <span
-              class="col-sm-2 control-label">会长ID</span>
+          style="display: inline-block; margin-right: 20px; width: 100px"
-        <el-input v-model="resource.id"
+          class="col-sm-2 control-label"
+          >会长ID</span
+        >
+        <el-input
+          v-model="resource.id"
           style="width: 75%"
-                  class="input"></el-input>
+          class="input"
+        ></el-input>
       </div>
       <!-- <div style="margin-bottom: 25px">
         <span
@@ -199,13 +218,13 @@
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="addDialog = false">取消</el-button>
-          <el-button type="primary"
+          <el-button type="primary" @click="add()"> 确认 </el-button>
-                     @click="add()"> 确认 </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 分页 -->
-    <el-pagination style="margin-top: 10px"
+    <el-pagination
+      style="margin-top: 10px"
       class="paginationClass"
       v-model:current-page="currentPage"
       v-model:page-size="pageSize"
@@ -213,46 +232,64 @@
       layout="sizes, prev, pager, next"
       :total="total"
       @size-change="handleSizeChange"
-                   @current-change="handleCurrentChange" />
+      @current-change="handleCurrentChange"
+    />
     <!-- 编辑弹窗 -->
-    <el-dialog v-model="editDialog"
+    <el-dialog v-model="editDialog" title="编辑" width="28%" center>
-               title="编辑"
-               width="28%"
-               center>
       <!-- 公会ID -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
+        <span
-              class="col-sm-2 control-label">公会ID</span>
+          style="display: inline-block; margin-right: 20px"
-        <el-input v-model="ediObj.id"
+          class="col-sm-2 control-label"
+          >公会ID</span
+        >
+        <el-input
+          v-model="ediObj.id"
           style="width: 75%"
           class="input"
-                  disabled></el-input>
+          disabled
+        ></el-input>
       </div>
       <!-- 会长ID -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
+        <span
-              class="col-sm-2 control-label">会长ID</span>
+          style="display: inline-block; margin-right: 20px"
-        <el-input v-model="ediObj.leaderId"
+          class="col-sm-2 control-label"
+          >会长ID</span
+        >
+        <el-input
+          v-model="ediObj.leaderId"
           style="width: 75%"
           class="input"
-                  disabled></el-input>
+          disabled
+        ></el-input>
       </div>
       <!-- 会长昵称 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
+        <span
-              class="col-sm-2 control-label">会长昵称</span>
+          style="display: inline-block; margin-right: 20px"
-        <el-input v-model="ediObj.leaderNick"
+          class="col-sm-2 control-label"
+          >会长昵称</span
+        >
+        <el-input
+          v-model="ediObj.leaderNick"
           style="width: 75%"
           class="input"
-                  disabled></el-input>
+          disabled
+        ></el-input>
       </div>
       <!-- 公会昵称 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
+        <span
-              class="col-sm-2 control-label">公会昵称</span>
+          style="display: inline-block; margin-right: 20px"
-        <el-input v-model="ediObj.guildNick"
+          class="col-sm-2 control-label"
+          >公会昵称</span
+        >
+        <el-input
+          v-model="ediObj.guildNick"
           style="width: 75%"
-                  class="input"></el-input>
+          class="input"
+        ></el-input>
       </div>
       <!-- 公会头像 -->
       <div class="selectBox selectBoxImg">
@@ -272,116 +309,129 @@
       </div>
       <!-- 公会背景图 -->
       <div class="selectBox selectBoxImg">
-        <span class="left"
+        <span class="left" style="margin-right: 20px">公会背景图</span>
-              style="margin-right: 20px">公会背景图</span>
         <!-- action="/admin/tencent/cos/upload/file" -->
-        <el-upload class="avatar-uploader"
+        <el-upload
+          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"
+        >
-               :src="ediObj.imageUrl1"
+          <img v-if="ediObj.imageUrl1" :src="ediObj.imageUrl1" class="avatar" />
-               class="avatar" />
+          <el-icon v-else class="avatar-uploader-icon">
-          <el-icon v-else
-                   class="avatar-uploader-icon">
             <Plus />
           </el-icon>
         </el-upload>
       </div>
       <!-- 成员数量上限 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
+        <span
-              class="col-sm-2 control-label">成员数量上限</span>
+          style="display: inline-block; margin-right: 20px"
-        <el-input v-model="ediObj.guildNumber"
+          class="col-sm-2 control-label"
+          >成员数量上限</span
+        >
+        <el-input
+          v-model="ediObj.guildNumber"
           style="width: 75%"
-                  class="input"></el-input>
+          class="input"
+        ></el-input>
       </div>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="editDialog = false">取消</el-button>
-          <el-button type="primary"
+          <el-button type="primary" @click="editDialogClick()">
-                     @click="editDialogClick()">
             确认
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 二次确认删除弹窗 -->
-    <el-dialog v-model="delDialog"
+    <el-dialog v-model="delDialog" title="提示" width="30%" center>
-               title="提示"
-               width="30%"
-               center>
       <span> 确定要解散该公会吗?</span>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="delDialog = false">取消</el-button>
-          <el-button type="primary"
+          <el-button type="primary" @click="delClick()"> 确认 </el-button>
-                     @click="delClick()"> 确认 </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 编辑收款账户弹窗 -->
-    <el-dialog v-model="payAccountDialog"
+    <el-dialog
+      v-model="payAccountDialog"
       :title="payAccountTitle"
       width="28%"
-               center>
+      center
+    >
       <!-- Payoneer -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
+        <span
-              class="col-sm-2 control-label">Payoneer</span>
+          style="display: inline-block; margin-right: 20px"
-        <el-input v-model="payAccount.payoneer"
+          class="col-sm-2 control-label"
+          >Payoneer</span
+        >
+        <el-input
+          v-model="payAccount.payoneer"
           style="width: 75%"
-                  class="input"></el-input>
+          class="input"
+        ></el-input>
       </div>
       <!-- USDT-ERC20 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
+        <span
-              class="col-sm-2 control-label">USDT-ERC20</span>
+          style="display: inline-block; margin-right: 20px"
-        <el-input v-model="payAccount.usdt"
+          class="col-sm-2 control-label"
+          >USDT-ERC20</span
+        >
+        <el-input
+          v-model="payAccount.usdt"
           style="width: 75%"
-                  class="input"></el-input>
+          class="input"
+        ></el-input>
       </div>
       <!-- PayPal -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span style="display: inline-block; margin-right: 20px"
+        <span
-              class="col-sm-2 control-label">PayPal</span>
+          style="display: inline-block; margin-right: 20px"
-        <el-input v-model="payAccount.payPal"
+          class="col-sm-2 control-label"
+          >PayPal</span
+        >
+        <el-input
+          v-model="payAccount.payPal"
           style="width: 75%"
-                  class="input"></el-input>
+          class="input"
+        ></el-input>
       </div>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="payAccountDialog = false">取消</el-button>
-          <el-button type="primary"
+          <el-button type="primary" @click="payAccountClick()">
-                     @click="payAccountClick()">
             保存
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 编辑成员弹窗 -->
-    <el-dialog v-model="memberDialog"
+    <el-dialog v-model="memberDialog" :title="memberTitle" width="36%" center>
-               :title="memberTitle"
-               width="36%"
-               center>
       <!-- 新增用户 -->
       <div class="inquire">
         <span>平台ID</span>
-        <el-input v-model="member.userID"
+        <el-input
+          v-model="member.userID"
           placeholder="请输入新增平台id"
-                  class="input"></el-input>
+          class="input"
-        <el-button type="primary"
+        ></el-input>
-                   @click="addMemberFun()"> 新增 </el-button>
+        <el-button type="primary" @click="addMemberFun()"> 新增 </el-button>
       </div>
       <!-- 内嵌表格 -->
-      <el-table v-loading="loading"
+      <el-table
+        v-loading="loading"
         :data="member.tableData"
         border
-                style="width: 100%; margin-top: 25px">
+        style="width: 100%; margin-top: 25px"
-        <el-table-column align="center"
+      >
-                         label="用户平台ID">
+        <el-table-column align="center" label="用户平台ID">
           <template v-slot="scope">
             {{ scope.row.erbanNo
             }}{{
@@ -394,61 +444,54 @@
             {{ scope.row.enable == false ? "(已离开)" : "" }}
           </template>
         </el-table-column>
-        <el-table-column prop="nick"
+        <el-table-column prop="nick" align="center" label="用户昵称" />
-                         align="center"
+        <el-table-column prop="createTime" align="center" label="加入时间" />
-                         label="用户昵称" />
+        <el-table-column prop="adminName" align="center" label="操作人" />
-        <el-table-column prop="createTime"
+        <el-table-column align="center" label="操作" width="300">
-                         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 @click="setMemberFun(scope.row)"
+            <el-button
+              @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">删除</el-button>
+              :disabled="scope.row.roleType == 1 ? true : false"
+              >删除</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
       <template #footer>
         <span class="dialog-footer">
-          <el-button type="primary"
+          <el-button type="primary" @click="memberDialog = false">
-                     @click="memberDialog = false">
             关闭
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 二次确认删除弹窗 -->
-    <el-dialog v-model="memberRemoveDialog"
+    <el-dialog v-model="memberRemoveDialog" title="提示" width="30%" center>
-               title="提示"
-               width="30%"
-               center>
       <span> 确定要删除该成员吗?</span>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="memberRemoveDialog = false">取消</el-button>
-          <el-button type="primary"
+          <el-button type="primary" @click="delmemberRemoveClick()">
-                     @click="delmemberRemoveClick()">
             确认
           </el-button>
         </span>
@@ -468,6 +511,7 @@ import {
   addMember,
   setManager,
   removeMember,
+  listPartitionInfo
 } from "@/api/noblemanNew/noblemanNew";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
@@ -534,6 +578,9 @@ export default {
     };
   },
   created() {
+    listPartitionInfo().then((res) => {
+      this.inquire.partitionArr = res.data;
+    });
     this.getData();
   },
   methods: {

src/views/guildOperationManagement/officialWithdrawRecord.vue

@@ -20,6 +20,17 @@
           :disabled="tableLoading"
         >
           <div class="search-line">
+            <el-form-item label="分区" prop="partitionId">
+              <el-select v-model="searchForm.partitionId" placeholder="请选择">
+                <el-option
+                  v-for="item in partitionArr"
+                  :key="item.id"
+                  :label="item.desc"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="MoliStar ID" prop="agencyOwnerErbanNo">
               <el-input
                 v-model.trim="searchForm.agencyOwnerErbanNo"
@@ -107,6 +118,7 @@
         >
           <el-table-column type="selection"> </el-table-column>
           <el-table-column align="center" prop="erbanNo" label="MoliStar ID" />
+          <el-table-column align="center" prop="partitionDesc" label="分区" />
           <el-table-column align="center" prop="nick" label="昵称" />
           <el-table-column align="center" prop="accountCountry" label="国家" />
           <el-table-column
@@ -244,6 +256,7 @@ import {
   agencyWithdrawBatchSet,
   batchReject,
   adminCountry,
+  listPartitionInfo,
 } from "@/api/relAgency/relAgency.js";
 import TablePagination from "@/components/common/TablePagination";
 import { formatDate, formatDateYMD } from "@/utils/relDate";
@@ -282,7 +295,9 @@ export default {
         endTime: null,
         adminCountry: null,
         country: null,
+        partitionId: null,
       },
+      partitionArr:[],
       adminCountryArr: [],
       searchRule: {
         startTime: [
@@ -336,6 +351,9 @@ export default {
       this.adminCountryArr = res.data;
       this.getData();
     });
+    listPartitionInfo().then((res) => {
+      this.partitionArr = res.data;
+    });
   },
   methods: {
     getData() {