新增 - 主播游戏薪资操作/游戏薪资官方提现记录/游戏薪资官方提现配置/游戏薪资明细/充值代理收入转赠游戏薪资，增加后台操作游戏薪资

src/api/relAgency/relAgency.js

@@ -272,3 +272,108 @@ export const exportRoomHourDiamondList = query => {
         responseType: 'blob'
     });
 };
+// 主播游戏薪资操作(不用分区)
+export const getAnchorGameSalaryBill = query => {
+    return request({
+        url: '/anchorGameSalaryBill/anchorSummary/list',
+        method: 'get',
+        params: query
+    });
+};
+// salaryType 1钻石兑换薪资明细 2 薪资转赠充值代理 明细 3薪资转增公会长明细 4官方提现 6 薪资兑换金币明细
+export const anchorGameSalaryBillDetail = query => {
+    return request({
+        url: '/anchorGameSalaryBill/detail/list',
+        method: 'get',
+        params: query
+    });
+};
+
+// 游戏薪资官方提现记录 列表
+export const gameUsdWithdrawExamineList = query => {
+    return request({
+        url: '/gameUsdWithdrawExamine/list',
+        method: 'get',
+        params: query
+    });
+};
+// 游戏薪资官方提现记录 导出
+export const gameUsdWithdrawExamineExport = query => {
+    return request({
+        url: `/gameUsdWithdrawExamine/export`,
+        method: 'post',
+        params: query,
+        responseType: 'blob'
+    });
+};
+
+// 游戏薪资官方提现记录 结算
+export const gameUsdWithdrawExamineSet = query => {
+    return request({
+        url: '/gameUsdWithdrawExamine/batchSettle',
+        method: 'post',
+        params: query
+    });
+};
+// 游戏薪资官方提现记录 批量驳回
+export const batchGameUsdWithdrawExamineReject = query => {
+    return request({
+        url: '/gameUsdWithdrawExamine/batchReject',
+        method: 'post',
+        params: query
+    });
+};
+// 充值代理转增游戏薪资 
+export const chargeGameAgentList = query => {
+    return request({
+        url: '/anchorGameSalaryBill/chargeAgent/list',
+        method: 'get',
+        params: query
+    });
+};
+// 充值代理转增薪资 总值
+export const chargeGameAgentSum = query => {
+    return request({
+        url: '/anchorGameSalaryBill/chargeAgent/sum',
+        method: 'get',
+        params: query
+    });
+};
+//  充值代理转增薪资导出
+export const chargeGameAgentExport = query => {
+    window.location.href = `/anchorGameSalaryBill/chargeAgent/export?${genQueryParam(query)}`;
+    return;
+};
+
+// 游戏薪资明细
+export const getGameUsdList = query => {
+    return request({
+        url: '/gameUsd/detail',
+        method: 'get',
+        params: query
+    });
+};
+// 游戏薪资官方提现方式配置渠道 列表
+export const getGamelistAccountType = query => {
+    return request({
+        url: '/admin/gameUsdWithdrawAccountConfig/listAccountType',
+        method: 'get',
+        params: query
+    });
+};
+// 游戏薪资官方提现方式配置 列表
+export const getGameAccountConfigList = query => {
+    return request({
+        url: '/admin/gameUsdWithdrawAccountConfig/page',
+        method: 'get',
+        params: query
+    });
+};
+// 游戏薪资官方提现方式配置 编辑
+export const saveGameAccountConfig = query => {
+    return request({
+        url: '/admin/gameUsdWithdrawAccountConfig/save',
+        method: 'get',
+        params: query
+    });
+};

src/views/guildOperationManagement/agentSendGameSalary.vue

@@ -0,0 +1,318 @@
+<template>
+  <div class="agent-send-salary">
+    <div class="container">
+      <div class="handle-box">
+        <el-form
+          ref="searchForm"
+          :model="searchForm"
+          :rules="searchRule"
+          label-width="90px"
+          :disabled="tableLoading"
+        >
+          <div class="search-line">
+            <el-form-item label="分区" prop="partitionId">
+              <partition-select v-model:partition-id="searchForm.partitionId"
+                                v-model:partition-infos="partitionArr"
+                                v-model:after-init="getData"
+              />
+            </el-form-item>
+            <el-form-item label="充值代理ID" prop="chargeAgentErbanNo">
+              <el-input
+                v-model.trim="searchForm.chargeAgentErbanNo"
+                placeholder="请输入"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="主播ID" prop="erbanNo">
+              <el-input
+                v-model.trim="searchForm.erbanNo"
+                placeholder="请输入"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="时间" class="large">
+              <el-form-item prop="startTime">
+                <el-date-picker
+                  type="datetime"
+                  placeholder="选择开始时间"
+                  v-model="searchForm.startTime"
+                ></el-date-picker>
+              </el-form-item>
+              <el-col :span="2" align="center">-</el-col>
+              <el-form-item prop="endTime">
+                <el-date-picker
+                  type="datetime"
+                  placeholder="选择结束时间"
+                  v-model="searchForm.endTime"
+                ></el-date-picker>
+              </el-form-item>
+            </el-form-item>
+            <div class='title'>统计时间按照东八区统计。东三区时间筛选需要增加5小时！！！！！</div> 
+
+            <el-form-item label-width="40px">
+              <el-button type="primary" @click="handSearch">搜索</el-button>
+              <el-button plain @click="resetSearchForm">重置搜索</el-button>
+              <el-button type="primary" @click="chargeGameAgentExportFun"
+                >导出</el-button
+              >
+            </el-form-item>
+          </div>
+        </el-form>
+        <el-button type="text" class="total"
+          >转增薪资总额:{{ total ? total.toLocaleString() : "0" }}</el-button
+        >
+      </div>
+      <div class="table">
+        <el-table
+          :data="tableData"
+          border
+          v-loading="tableLoading"
+          @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="receiveNick"
+            label="充值代理昵称"
+          >
+          </el-table-column>
+          <!-- <el-table-column
+            align="center"
+            prop="receiveAbbr"
+            label="充值代理国家"
+          >
+          </el-table-column> -->
+          <el-table-column align="center" prop="erbano" label="主播ID">
+          </el-table-column>
+          <el-table-column align="center" prop="nick" label="主播昵称">
+          </el-table-column>
+          <!-- <el-table-column align="center" prop="abbr" label="主播国家">
+          </el-table-column> -->
+          <el-table-column align="center" prop="tradeUsb" label="转增游戏薪资">
+          </el-table-column>
+          <el-table-column align="center" prop="gold" label="对应金币数">
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="createTimeStr"
+            label="创建时间"
+            width="160"
+          >
+          </el-table-column>
+        </el-table>
+      </div>
+      <table-pagination
+        :pageParams="pageParams"
+        :pageTotal="pageTotal"
+        :page-sizes="[10, 20, 100, 200]"
+        @handleSizeChange="handleSizeChange"
+        @handlePageChange="handlePageChange"
+      ></table-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  chargeGameAgentList,
+  chargeGameAgentSum,
+  chargeGameAgentExport,
+} from "@/api/relAgency/relAgency.js";
+import TablePagination from "@/components/common/TablePagination";
+import { formatDate, formatDateYMD } from "@/utils/relDate";
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+import { ref } from "vue";
+import PartitionSelect from "@/views/common/partitionSelect.vue";
+export default {
+  name: "agentSendGameSalary",
+  components: {PartitionSelect, TablePagination },
+  data() {
+    return {
+      total: 0,
+      btnLoading: false, // 导出弹出框(dialog)的确认按钮
+      tableLoading: false, // 表格是否加载中
+
+      tableData: [], // 接口返回的表格数据
+      pageTotal: 0, // 接口返回的表格总条数
+      pageParams: {
+        pageNo: 1,
+        pageSize: 20,
+      },
+      // 搜索表单相关
+      searchForm: {
+        erbanNo: null,
+        chargeAgentErbanNo: null,
+        startTime: null,
+        endTime: null,
+        partitionId: undefined,
+      },
+      partitionArr: [],
+      searchRule: {
+        startTime: [
+          {
+            validator: (rule, value, callback) => {
+              this.$refs["searchForm"].validateField("endTime");
+              callback();
+            },
+            trigger: "change",
+          },
+        ],
+        endTime: [
+          {
+            validator: (rule, value, callback) => {
+              const { startTime } = this.searchForm;
+              if (startTime !== null && startTime !== "" && value) {
+                if (value <= startTime) {
+                  callback(new Error("须晚于开始时间"));
+                } else {
+                  callback();
+                }
+              } else {
+                callback();
+              }
+            },
+            trigger: "change",
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    getData() {
+      this.tableLoading = true;
+
+      let { pageParams, searchForm } = this;
+      console.log(searchForm);
+      searchForm.startTime = searchForm.startTime
+        ? dateFormat(searchForm.startTime, "yyyy-MM-dd hh:mm:ss")
+        : null;
+      searchForm.endTime = searchForm.endTime
+        ? dateFormat(searchForm.endTime, "yyyy-MM-dd hh:mm:ss")
+        : null;
+      searchForm = JSON.parse(JSON.stringify(searchForm));
+      pageParams = JSON.parse(JSON.stringify(pageParams));
+      Object.keys(searchForm).forEach((item) => {
+        if (
+          !searchForm[item] ||
+          (searchForm[item] !== undefined && searchForm[item] === "")
+        ) {
+          delete searchForm[item];
+        }
+      });
+      Object.assign(pageParams, searchForm);
+      console.log(pageParams);
+
+      chargeGameAgentList(pageParams).then((res) => {
+        this.tableLoading = false;
+        if (res.code == 200) {
+          let data = res.data;
+          this.tableData = data.records;
+          this.pageTotal = data.total;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+      chargeGameAgentSum(pageParams).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 导出
+    chargeGameAgentExportFun() {
+
+      let { pageParams, searchForm } = this;
+      console.log(searchForm);
+      searchForm.startTime = searchForm.startTime
+        ? dateFormat(searchForm.startTime, "yyyy-MM-dd hh:mm:ss")
+        : null;
+      searchForm.endTime = searchForm.endTime
+        ? dateFormat(searchForm.endTime, "yyyy-MM-dd hh:mm:ss")
+        : null;
+      searchForm = JSON.parse(JSON.stringify(searchForm));
+      pageParams = JSON.parse(JSON.stringify(pageParams));
+      Object.keys(searchForm).forEach((item) => {
+        if (
+          !searchForm[item] ||
+          (searchForm[item] !== undefined && searchForm[item] === "")
+        ) {
+          delete searchForm[item];
+        }
+      });
+      Object.assign(pageParams, searchForm);
+      console.log(pageParams);
+
+      chargeGameAgentExport(pageParams).then((res) => {});
+    },
+    // 点击搜索
+    handSearch() {
+      this.$refs["searchForm"].validate((valid) => {
+        if (valid) {
+          this.pageParams.pageNo = 1;
+          this.getData();
+        }
+      });
+    },
+    // 重置搜索表单
+    resetSearchForm() {
+      this.$refs["searchForm"].resetFields();
+      this.pageParams.pageNo = 1;
+      this.getData();
+    },
+
+    // 分页导航
+    handleSizeChange(val) {
+      // this.$set(this.pageParams, 'pageSize', val);
+      this.pageParams.pageSize = val;
+      this.getData();
+    },
+    handlePageChange(val) {
+      // this.$set(this.pageParams, 'pageNo', val);
+      this.pageParams.pageNo = val;
+      this.getData();
+    },
+    headerCopy(column, e) {
+      this.$copy(column.label);
+    },
+  }
+};
+</script>
+
+<style scope>
+.exportBtn {
+  margin-bottom: 20px;
+}
+.total {
+  font-size: 18px;
+}
+.container {
+  width: 100%;
+}
+.search-line {
+  width: 38%;
+}
+.title{
+  color: red;
+  font-size: 16px;
+  margin-bottom: 18px;
+  margin-left:40px;
+}
+</style>

src/views/guildOperationManagement/anchorGameSalaryOperation.vue

@@ -0,0 +1,657 @@
+<template>
+  <div class="anchor-salary-operate">
+    <div class="container">
+      <div class="handle-box">
+        <el-form
+          ref="searchForm"
+          :model="searchForm"
+          :rules="searchRule"
+          label-width="90px"
+          :disabled="tableLoading"
+        >
+          <div class="search-line">
+            <el-form-item label="分区" prop="partitionId">
+              <partition-select
+                v-model:partition-id="searchForm.partitionId"
+                v-model:partition-infos="partitionArr"
+                v-model:after-init="getData"
+              />
+            </el-form-item>
+            <el-form-item label="主播ID" prop="erbanNo">
+              <el-input
+                v-model.trim="searchForm.erbanNo"
+                placeholder="请输入"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="公会ID" prop="agencyId">
+              <el-input
+                v-model.trim="searchForm.agencyId"
+                placeholder="请输入"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="公会长ID" prop="agencyOwnerId">
+              <el-input
+                v-model.trim="searchForm.agencyOwnerId"
+                placeholder="请输入"
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="周期" prop="dateCycle">
+              <el-select placeholder="请选择" v-model="searchForm.dateCycle">
+                <el-option
+                  v-for="(item, i) in dateCycleList"
+                  :key="i"
+                  :label="item.startDateStr + '~' + item.endDateStr"
+                  :value="item.dateCycle"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label-width="40px">
+              <el-button type="primary" @click="handSearch">搜索</el-button>
+              <el-button plain @click="resetSearchForm">重置搜索</el-button>
+            </el-form-item>
+          </div>
+        </el-form>
+      </div>
+      <div class="table">
+        <el-table
+          :data="tableData"
+          border
+          v-loading="tableLoading"
+          @header-click="headerCopy"
+          style="width: 100%"
+        >
+          <!-- <el-table-column align="center" prop="dateCycle" label="周期" width="105">
+                        <template v-slot="scope">
+                            {{ 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="主播昵称">
+          </el-table-column>
+          <el-table-column align="center" prop="agencyId" label="公会ID">
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="agencyOwnerErbanNo"
+            label="公会长ID"
+          >
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="agencyOwnerRegionDesc"
+            label="公会长地区"
+          >
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="gameUsd"
+            label="本周起获得游戏薪资"
+          >
+            <template v-slot="scope">
+              <el-button type="text" @click="handleOpen(0, scope.row)">
+                {{ scope.row.gameUsd + "us" }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="receiveUsd"
+            label="本周期已领取的薪资"
+          >
+            <template v-slot="scope">
+              <el-button type="text" @click="handleOpen(1, scope.row)">
+                {{ scope.row.receiveUsd + "us" }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="usbToAgent"
+            label="薪资转增代理"
+          >
+            <template v-slot="scope">
+              <el-button type="text" @click="handleOpen(3, scope.row)">
+                {{ scope.row.usbToAgent + "us" }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="usbToOwner"
+            label="薪资转增公会长"
+          >
+            <template v-slot="scope">
+              <el-button type="text" @click="handleOpen(4, scope.row)">
+                {{ scope.row.usbToOwner + "us" }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="officialWithdram"
+            label="官方提现"
+          >
+            <template v-slot="scope">
+              <el-button type="text" @click="handleOpen(5, scope.row)">
+                {{ scope.row.officialWithdram + "us" }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="platformOperationUsb"
+            label="官方操作"
+          >
+            <template v-slot="scope">
+              <el-button type="text" @click="handleOpen(9, scope.row)">
+                {{ scope.row.platformOperationUsb + "us" }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" prop="usb" label="剩余薪资">
+          </el-table-column>
+        </el-table>
+      </div>
+      <table-pagination
+        :pageParams="pageParams"
+        :pageTotal="pageTotal"
+        :page-sizes="[10, 20, 100, 200]"
+        @handleSizeChange="handleSizeChange"
+        @handlePageChange="handlePageChange"
+      ></table-pagination>
+    </div>
+
+    <!-- 弹出框 -->
+    <el-dialog :title="dialogTitle" v-model="dialogVisible" width="60%">
+      <el-table
+        :data="dialogData"
+        border
+        class="received-table"
+        v-loading="dialogLoading"
+      >
+        <el-table-column prop="createTime" label="日期" align="center">
+          <template v-slot="scope">{{
+            convertTimestamp(scope.row.createTime)
+          }}</template>
+        </el-table-column>
+        <el-table-column
+          prop="nick"
+          label="主播昵称"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="erbano"
+          label="主播ID"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          align="center"
+          prop="playGameNum"
+          label="完成次数"
+          v-if="dialogType == 0"
+        >
+          <template v-slot="scope">
+            {{ scope.row.playGameNum }}
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          align="center"
+          prop="gameUsd"
+          label="获得薪资"
+          v-if="dialogType == 0"
+        >
+          <template v-slot="scope">
+            {{ scope.row.gameUsd }}
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          align="center"
+          prop="tradeUsb"
+          label="领取薪资"
+          v-if="dialogType == 1"
+        >
+          <template v-slot="scope">
+            {{ scope.row.tradeUsb }}
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          align="center"
+          prop="receiveStatDate"
+          label="薪资产生时间"
+          v-if="dialogType == 1"
+        >
+          <template v-slot="scope">
+            {{ scope.row.receiveStatDate }}
+          </template>
+        </el-table-column>
+        <!-- 薪资兑换金币6 -->
+        <el-table-column
+          v-if="dialogType == 6"
+          prop="gold"
+          label="兑换金币数量"
+          align="center"
+        >
+          <template v-slot="scope">
+            {{ scope.row.gold ? scope.row.gold.toLocaleString() : "0" }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="dialogType == 6"
+          prop="tradeUsb"
+          label="兑换薪资数"
+          align="center"
+        >
+          <template v-slot="scope">
+            {{ scope.row.tradeUsb + "us" }}
+          </template>
+        </el-table-column>
+        <!-- 薪资转增代理2 -->
+        <el-table-column
+          v-if="dialogType == 2"
+          prop="receiveErbano"
+          label="充值代理ID"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          v-if="dialogType == 2"
+          prop="receiveNick"
+          label="充值代理名称"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          v-if="dialogType == 2"
+          prop="beforeUsb"
+          label="当前薪资"
+          align="center"
+        >
+          <template v-slot="scope">
+            {{ scope.row.beforeUsb + "us" }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="dialogType == 2"
+          prop="tradeUsb"
+          label="转增代理"
+          align="center"
+        >
+          <template v-slot="scope">
+            {{ scope.row.tradeUsb + "us" }}
+          </template>
+        </el-table-column>
+        <!-- 薪资转增公会长3 -->
+        <el-table-column
+          v-if="dialogType == 3 || dialogType == 4 || dialogType == 9"
+          prop="receiveNick"
+          label="公会长昵称"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          v-if="dialogType == 3 || dialogType == 4 || dialogType == 9"
+          prop="receiveErbano"
+          label="公会长ID"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          v-if="dialogType == 3"
+          prop="tradeUsb"
+          label="转增公会长"
+          align="center"
+        >
+          <template v-slot="scope">
+            {{ scope.row.tradeUsb + "us" }}
+          </template>
+        </el-table-column>
+        <!-- 官方提现4 -->
+        <el-table-column
+          v-if="dialogType == 4"
+          prop="tradeUsb"
+          label="官方提现"
+          align="center"
+        >
+          <template v-slot="scope">
+            {{ scope.row.tradeUsb + "us" }}
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          v-if="dialogType == 9"
+          align="center"
+          prop="type"
+          label="赠送方式"
+        >
+          <template v-slot="scope">
+            {{
+              scope.row.type == "9" ? "官方增加游戏薪资" : "官方减少游戏薪资"
+            }}
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          v-if="dialogType == 9"
+          align="center"
+          prop="tradeUsb"
+          label="操作数量"
+        >
+          <template v-slot="scope">
+            {{ scope.row.tradeUsb + "us" }}
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          v-if="dialogType == 9"
+          align="center"
+          prop="remark"
+          label="备注"
+        >
+        </el-table-column>
+
+        <el-table-column
+          align="center"
+          prop="afterUsb"
+          label="剩余薪资"
+          v-if="dialogType != 0"
+        >
+          <template v-slot="scope">
+            {{ scope.row.afterUsb + "us" }}
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <table-pagination
+        :pageParams="pageParams1"
+        :pageTotal="pageTotal1"
+        :page-sizes="[5, 10, 20]"
+        @handleSizeChange="handleSizeChange1"
+        @handlePageChange="handlePageChange1"
+      ></table-pagination>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getDateCycleList,
+  getAnchorGameSalaryBill,
+  anchorGameSalaryBillDetail,
+} from "@/api/relAgency/relAgency.js";
+import TablePagination from "@/components/common/TablePagination";
+import { formatDate, formatDateYMD } from "@/utils/relDate";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+import PartitionSelect from "@/views/common/partitionSelect.vue";
+
+export default {
+  name: "anchorGameSalaryOperation",
+  components: { PartitionSelect, TablePagination },
+  data() {
+    return {
+      dateCycleList: [],
+      btnLoading: false, // 导出弹出框(dialog)的确认按钮
+      tableLoading: false, // 表格是否加载中
+
+      tableData: [], // 接口返回的表格数据
+      pageTotal: 0, // 接口返回的表格总条数
+      pageParams: {
+        pageNo: 1,
+        pageSize: 20,
+      },
+      // 搜索表单相关
+      searchForm: {
+        agencyOwnerId: null,
+        agencyId: null,
+        dateCycle: null,
+        erbanNo: null,
+        partitionId: undefined,
+      },
+      partitionArr: [],
+      searchRule: {
+        startTime: [
+          {
+            validator: (rule, value, callback) => {
+              this.$refs["searchForm"].validateField("endTime");
+              callback();
+            },
+            trigger: "change",
+          },
+        ],
+        endTime: [
+          {
+            validator: (rule, value, callback) => {
+              const { startTime } = this.searchForm;
+              if (startTime !== null && startTime !== "" && value) {
+                if (value <= startTime) {
+                  callback(new Error("须晚于开始时间"));
+                } else {
+                  callback();
+                }
+              } else {
+                callback();
+              }
+            },
+            trigger: "change",
+          },
+        ],
+      },
+      dialogData: [], //弹窗表格数据
+      dialogVisible: false,
+      dialogLoading: false,
+      pageTotal1: 0, // 接口返回的表格总条数
+      pageParams1: {
+        pageNo: 1,
+        pageSize: 10,
+      },
+      dialogParams: {},
+      dialogTitle: "钻石兑换薪资",
+      dialogType: 1,
+    };
+  },
+  created() {
+    this.getDateCycleList();
+  },
+  methods: {
+    getDateCycleList() {
+      getDateCycleList({ month: 3 }).then((res) => {
+        this.dateCycleList = res.data || [];
+        this.searchForm.dateCycle = res.data
+          ? res.data[0].dateCycle
+          : undefined;
+      });
+    },
+    getData() {
+      if (this.searchForm.dateCycle == undefined) {
+        return;
+      }
+
+      this.tableLoading = true;
+
+      let { pageParams, searchForm } = this;
+      searchForm = JSON.parse(JSON.stringify(searchForm));
+      pageParams = JSON.parse(JSON.stringify(pageParams));
+      Object.keys(searchForm).forEach((item) => {
+        if (
+          !searchForm[item] ||
+          (searchForm[item] !== undefined && searchForm[item] === "")
+        ) {
+          delete searchForm[item];
+        }
+      });
+      Object.assign(pageParams, searchForm);
+
+      getAnchorGameSalaryBill(pageParams).then((res) => {
+        this.tableLoading = false;
+        if (res.code == 200) {
+          let data = res.data;
+          this.tableData = data.records;
+          this.pageTotal = data.total;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 弹窗
+    handleOpen(index, row) {
+      console.log(index, "----------");
+      switch (index) {
+        case 0:
+          this.dialogTitle = "本周起获得游戏薪资";
+          this.dialogType = 0;
+          break;
+        case 1:
+          this.dialogTitle = "本周期已领取的薪资";
+          this.dialogType = 1;
+          break;
+        case 3:
+          this.dialogTitle = "薪资转增代理";
+          this.dialogType = 2;
+          break;
+        case 4:
+          this.dialogTitle = "薪资转增公会长";
+          this.dialogType = 3;
+          break;
+        case 5:
+          this.dialogTitle = "官方提现";
+          this.dialogType = 4;
+          break;
+        case 2:
+          this.dialogTitle = "薪资兑换金币";
+          this.dialogType = 6;
+          break;
+        case 9:
+          this.dialogTitle = "官方操作";
+          this.dialogType = 9;
+          break;
+        default:
+          break;
+      }
+      this.dialogParams = {
+        salaryType: String(index),
+        dateCycle: this.searchForm.dateCycle,
+        uid: row.uid,
+        hallId: row.hallId,
+      };
+      this.pageParams1 = {
+        pageNo: 1,
+        pageSize: 10,
+      };
+      console.log(this.dialogParams);
+
+      this.getDetail();
+    },
+    getDetail() {
+      let { pageParams1, dialogParams } = this;
+      pageParams1 = JSON.parse(JSON.stringify(pageParams1));
+      dialogParams = JSON.parse(JSON.stringify(dialogParams));
+      Object.keys(dialogParams).forEach((item) => {
+        if (
+          !dialogParams[item] ||
+          (dialogParams[item] !== undefined && dialogParams[item] === "")
+        ) {
+          delete dialogParams[item];
+        }
+      });
+      Object.assign(pageParams1, dialogParams);
+      this.dialogVisible = true;
+      this.dialogLoading = true;
+      anchorGameSalaryBillDetail(pageParams1).then((res) => {
+        if (res.success === true) {
+          let data = res.data;
+          this.dialogData = data.records;
+          this.pageTotal1 = data.total;
+        }
+        this.dialogLoading = false;
+      });
+    },
+    // 点击搜索
+    handSearch() {
+      this.$refs["searchForm"].validate((valid) => {
+        if (valid) {
+          this.pageParams.pageNo = 1;
+          this.getData();
+        }
+      });
+    },
+    // 重置搜索表单
+    resetSearchForm() {
+      this.$refs["searchForm"].resetFields();
+      this.pageParams.pageNo = 1;
+      this.tableData = [];
+      this.getData();
+    },
+    // 分页导航
+    handleSizeChange(val) {
+      this.pageParams.pageSize = val;
+      this.getData();
+    },
+    handlePageChange(val) {
+      this.pageParams.pageNo = val;
+      this.getData();
+    },
+    // 弹窗分页导航
+    handleSizeChange1(val) {
+      this.pageParams1.pageSize = val;
+      this.getDetail();
+    },
+    handlePageChange1(val) {
+      this.pageParams1.pageNo = val;
+      this.getDetail();
+    },
+
+    headerCopy(column, e) {
+      this.$copy(column.label);
+    },
+  },
+  computed: {
+    convertTimestamp1() {
+      return function (time) {
+        let date = new Date(time);
+        return formatDateYMD(date);
+      };
+    },
+    convertTimestamp() {
+      return function (time) {
+        let date = new Date(time);
+        return formatDate(date);
+      };
+    },
+    dateCycleType() {
+      const { dateCycleList } = this;
+      return function (value) {
+        for (let item of dateCycleList) {
+          if (item.dateCycle === value) {
+            return (
+              this.convertTimestamp1(item.startDate) +
+              "~" +
+              this.convertTimestamp1(item.endDate)
+            );
+          }
+        }
+        return "";
+      };
+    },
+  },
+};
+</script>
+
+<style scope>
+.el-button--text {
+  font-size: 16px;
+  text-decoration: underline;
+}
+
+.container {
+  width: 100%;
+}
+.search-line {
+  width: 38%;
+}
+</style>

src/views/guildOperationManagement/gameSalaryDetails.vue

@@ -0,0 +1,181 @@
+<template>
+  <div class="box">
+    <div class="inquire">
+      <span>分区</span>
+      <partition-select v-model:partition-id="formData.partitionId" />
+    </div>
+    <div class="inquire">
+      <span>用户ID</span>
+      <el-input
+        v-model="formData.erbanNo"
+        placeholder="请输入用户ID"
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <span>公会ID</span>
+      <el-input
+        v-model="formData.guildId"
+        placeholder="请输入用户ID"
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <span>公会长ID</span>
+      <el-input
+        v-model="formData.ownerErbanNo"
+        placeholder="请输入用户ID"
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <span>周期</span>
+      <el-select v-model="formData.cycleDate" placeholder="请选择">
+        <el-option
+          v-for="(item,index) in dateCycleArr"
+          :key="index"
+          :label="item.startDateStr + '~' + item.endDateStr"
+          :value="item.dateCycle"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <el-button style="" type="primary" @click="getData()">查询</el-button>
+    <!-- 表格数据 -->
+    <el-table
+      v-loading="tableData.loading"
+      :data="tableData.data"
+      ref="multipleTable"
+      @selection-change="handleSelectionChange"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="partitionDesc" align="center" label="分区" />
+      <el-table-column prop="statDate" align="center" label="日期" />
+      <el-table-column prop="erbanNo" align="center" label="用户ID" />
+      <el-table-column prop="nick" align="center" label="用户昵称" />
+      <el-table-column prop="guildId" align="center" label="公会ID" />
+      <el-table-column prop="guildName" align="center" label="公会昵称" />
+      <el-table-column prop="diamondNum" align="center" label="投入钻石" />
+      <el-table-column prop="playGameNum" align="center" label="游戏次数" />
+      <el-table-column prop="gameUsd" align="center" label="游戏薪资" />
+      <el-table-column prop="purseUsd" align="center" label="剩余薪资" />
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      :current-page="formData.pageNo"
+      :page-size="formData.pageSize"
+      :page-sizes="[10, 20, 50, 100, 200]"
+      layout="sizes, prev, pager, next"
+      :total="tableData.total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+
+<script>
+import PartitionSelect from "../common/partitionSelect.vue";
+export default {
+  name: "gameSalaryDetails",
+  components: { PartitionSelect },
+};
+</script>
+<script setup>
+import { ref, onMounted, reactive, computed } from "vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+import { getDateCycleList ,getGameUsdList} from "@/api/relAgency/relAgency.js";
+const formData = reactive({
+  partitionId: undefined,
+  pageNo: 1,
+  pageSize: 10,
+  erbanNo: "",
+  guildId: "",
+  ownerErbanNo: "",
+  cycleDate: "",
+});
+const dateCycleArr = ref([]);
+const tableData = reactive({
+  data: [],
+  total: 0,
+  loading: false,
+});
+// 查询
+const getData = () => {
+  tableData.loading = true;
+  getGameUsdList(formData).then((res) => {
+    if (res.code == 200) {
+      tableData.data = res.data.rows;
+      tableData.loading = false;
+      tableData.total = res.data.total;
+    } else {
+      tableData.loading = false;
+      ElMessage.error(res.message);
+    }
+  });
+};
+// const dateFormat = (row) => {
+//   const date = new Date(row);
+//   return date.format("yyyy-MM-dd hh:mm:ss");
+// }
+const handleSizeChange = (val) => {
+  formData.pageSize = val;
+  getData();
+};
+const handleCurrentChange = (val) => {
+  formData.pageNo = val;
+  getData();
+};
+onMounted(() => {
+
+  getDateCycleList({ month: 3 }).then((res) => {
+    if (res.code == 200) {
+      dateCycleArr.value = res.data || [];
+    } else {
+      ElMessage({
+        showClose: true,
+        message: res.message,
+        type: "error",
+      });
+    }
+  });
+});
+</script>
+
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+
+    span {
+      margin-right: 10px;
+    }
+
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+</style>

src/views/guildOperationManagement/officialGameSalaryWithdrawalRecord.vue

@@ -0,0 +1,651 @@
+<template>
+  <div class="official-withdraw-record">
+    <div class="container">
+      <div class="region-box">
+        <el-radio-group v-model="region">
+          <el-radio v-for="(item, index) in userAreaRegion"
+                    :key="index"
+                    :label="item.value">{{ item.name }}</el-radio>
+        </el-radio-group>
+      </div>
+      <div class="handle-box">
+        <el-form ref="searchForm"
+                 :model="searchForm"
+                 :rules="searchRule"
+                 label-width="90px"
+                 :disabled="tableLoading">
+          <div class="search-line">
+            <el-form-item label="分区"
+                          prop="partitionId">
+              <partition-select v-model:partition-id="searchForm.partitionId"
+                                v-model:partition-infos="partitionArr"
+                                v-model:handle-change="getlistByPartitionId"
+                                v-model:after-init="getData" />
+            </el-form-item>
+            <el-form-item label="MoliStar ID"
+                          prop="agencyOwnerErbanNo">
+              <el-input v-model.trim="searchForm.agencyOwnerErbanNo"
+                        placeholder="请输入"></el-input>
+            </el-form-item>
+            <el-form-item label="提现状态"
+                          prop="status">
+              <el-select v-model="searchForm.status">
+                <el-option label="审核中"
+                           value="0"></el-option>
+                <el-option label="审核通过"
+                           value="1"></el-option>
+                <el-option label="未通过"
+                           value="2"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="提现账户"
+                          prop="accountType">
+              <el-select v-model="searchForm.accountType">
+                <el-option label="Vodafone"
+                           value="VODAFONE"></el-option>
+                <el-option label="Payonner"
+                           value="PAYONNER"></el-option>
+                <el-option label="USD"
+                           value="USDT"></el-option>
+                <el-option label="Bank"
+                           value="BANK"></el-option>
+                <el-option label="Other"
+                           value="OTHER"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="国家"
+                          prop="country">
+              <el-select v-model="searchForm.country">
+                <el-option v-for="(item, index) in adminCountryArr"
+                           :key="index"
+                           :label="item.label"
+                           :value="item.value"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="时间"
+                          class="large">
+              <el-form-item prop="startTime">
+                <el-date-picker type="datetime"
+                                placeholder="选择开始时间"
+                                v-model="searchForm.startTime"></el-date-picker>
+              </el-form-item>
+              <el-col :span="2"
+                      align="center">-</el-col>
+              <el-form-item prop="endTime">
+                <el-date-picker type="datetime"
+                                placeholder="选择结束时间"
+                                v-model="searchForm.endTime"></el-date-picker>
+              </el-form-item>
+            </el-form-item>
+
+            <el-form-item label-width="40px">
+              <el-button type="primary"
+                         @click="handSearch">搜索</el-button>
+              <el-button type="primary"
+                         plain
+                         @click="resetSearchForm">重置搜索</el-button>
+              <el-button type="primary"
+                         class="exportBtn"
+                         @click="confirmExport2Excel">导出</el-button>
+              <el-button @click="handleChangeAll()"
+                         type="info"
+                         plain>批量发放</el-button>
+              <el-button @click="
+                  centerDialogVisible = true;
+                  centerDialogVisibleType = 1;
+                "
+                         type="info"
+                         plain>批量驳回</el-button>
+            </el-form-item>
+          </div>
+        </el-form>
+      </div>
+      <!-- 表格 -->
+      <div class="table">
+        <el-table :data="tableData"
+                  border
+                  v-loading="tableLoading"
+                  @header-click="headerCopy"
+                  @selection-change="handleSelectionChange"
+                  style="width: 100%; overflow-x: auto">
+          <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="guildId"
+                           label="公会id" />
+          <el-table-column align="center"
+                           prop="roleTypeDesc"
+                           label="角色" />
+          <el-table-column align="center"
+                           prop="guildOwnerErbanNo"
+                           label="公会长id" />
+          <el-table-column align="center"
+                           prop="accountCountry"
+                           label="国家" />
+          <el-table-column align="center"
+                           prop="blocked"
+                           label="用户当前账户状态">
+            <template v-slot="scope">
+              {{ scope.row.blocked ? "封禁" : "正常" }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="status"
+                           label="申请状态">
+            <template v-slot="scope">
+              {{
+                scope.row.status == 0
+                  ? "审核中"
+                  : scope.row.status == 1
+                  ? "通过"
+                  : "未通过"
+              }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="createTime"
+                           label="申请时间" />
+          <el-table-column align="center"
+                           prop="accountType"
+                           label="提现类型  " />
+          <el-table-column align="center"
+                           prop="guildUsdNum"
+                           label="提现薪资US" />
+          <el-table-column align="center"
+                           prop="currency"
+                           label="发放币种" />
+          <el-table-column align="center"
+                           prop="currencyNum"
+                           label="发放金额" />
+          <el-table-column align="center"
+                           prop="withdrawRate"
+                           label="手续费" />
+          <el-table-column align="center"
+                           prop="withdrawNum"
+                           label="核销薪资" />
+                           <el-table-column align="center"
+                           prop="operator"
+                           label="操作人" />
+                           <el-table-column align="center"
+                           prop="updateTime"
+                           label="操作时间" />
+          <el-table-column align="center"
+                           prop="remark"
+                           label="驳回理由">
+            <template v-slot="scope">
+              {{ scope.row.remark ? scope.row.remark : "/" }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="hallSalary"
+                           label="操作"
+                           width="150">
+            <template v-slot="scope">
+              <div v-if="scope.row.status == 0">
+                <el-button @click="handleChange(scope.row)"
+                           type="text"
+                           size="mini">
+                  发放
+                </el-button>
+                <el-button @click="
+                    centerDialogVisible = true;
+                    centerDialogVisibleType = 2;
+                    centerDialogVisibleID = scope.row.id;
+                  "
+                           type="text"
+                           size="mini">
+                  驳回
+                </el-button>
+              </div>
+              <div>
+                <el-button @click="accountInfosFun(scope.row)"
+                           type="text"
+                           size="mini">
+                  查看详情
+                </el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 分页 -->
+      <table-pagination :pageParams="pageParams"
+                        :pageTotal="pageTotal"
+                        :page-sizes="[10, 20, 100, 200]"
+                        @handleSizeChange="handleSizeChange"
+                        @handlePageChange="handlePageChange"></table-pagination>
+      <!-- 驳回弹窗 -->
+      <el-dialog v-model="centerDialogVisible"
+                 title="提示"
+                 width="30%"
+                 center>
+        <span> 请选择驳回理由:</span>
+        <div class="boxs">
+          <el-radio class="radios"
+                    v-model="radio"
+                    label="用户消息提供不足">用户消息提供不足</el-radio>
+        </div>
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="centerDialogVisible = false">取消</el-button>
+            <el-button type="primary"
+                       @click="dialogClick()"> 确认 </el-button>
+          </span>
+        </template>
+      </el-dialog>
+      <!-- 提现详情弹窗 -->
+      <el-dialog v-model="centerDialogVisible2"
+                 title="提现详情">
+        <div class="boxs2">
+          <div>申请提现时间：{{ accountDetails.createTime }}</div>
+          <div>申请ID：{{ accountDetails.erbanNo }}</div>
+          <div>country：{{ accountDetails.country }}</div>
+          <div>payeeAccount：{{ accountDetails.bank_account }}</div>
+          <div>Bank Name：{{ accountDetails.bank_name }}</div>
+          <div>SWIFT Code：{{ accountDetails.swift_code }}</div>
+          <div>payeeName:：{{ accountDetails.full_name }}</div>
+          <div>address：{{ accountDetails.address }}</div>
+          <div>提现薪资US：{{ accountDetails.guildUsdNum }}</div>
+          <div>
+            发放金额：{{ accountDetails.currency }}
+            {{ accountDetails.currencyNum }}
+          </div>
+          <div>提现手续费：{{ accountDetails.withdrawRate }}</div>
+          <div>核销薪资：{{ accountDetails.withdrawNum }}</div>
+        </div>
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="centerDialogVisible2 = false">确认</el-button>
+          </span>
+        </template>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  gameUsdWithdrawExamineList,
+  gameUsdWithdrawExamineExport,
+  gameUsdWithdrawExamineSet,
+  batchGameUsdWithdrawExamineReject,
+  adminCountry,
+} from "@/api/relAgency/relAgency.js";
+import TablePagination from "@/components/common/TablePagination";
+import { formatDate, formatDateYMD } from "@/utils/relDate";
+import { dateFormat } from "@/utils/system-helper";
+import { ElMessage } from "element-plus";
+import { ElMessageBox } from "element-plus";
+import PartitionSelect from "@/views/common/partitionSelect.vue"; // 正确引入 ElM
+// 混入
+
+export default {
+  name: "officialGameSalaryWithdrawalRecord",
+  // mixins: [Mixin],
+  components: { PartitionSelect, TablePagination },
+  data () {
+    return {
+      dateCycleList: [],
+      btnLoading: false, // 导出弹出框(dialog)的确认按钮
+      tableLoading: false, // 表格是否加载中
+
+      tableData: [], // 接口  返回的表格数据
+      pageTotal: 0, // 接口返回的表格总条数
+      pageParams: {
+        pageNo: 1,
+        pageSize: 20,
+      },
+      centerDialogVisible: false, //驳回弹窗
+      centerDialogVisibleType: null, //驳回弹窗
+      centerDialogVisibleID: null, //驳回弹窗
+      centerDialogVisible2: false, //操作弹窗
+      radio: "用户消息提供不足", //驳回原因
+      // 搜索表单相关
+      searchForm: {
+        agencyOwnerErbanNo: null,
+        status: null,
+        startTime: null,
+        endTime: null,
+        adminCountry: null,
+        country: null,
+        partitionId: null,
+      },
+      partitionArr: [],
+      adminCountryArr: [],
+      searchRule: {
+        startTime: [
+          {
+            validator: (rule, value, callback) => {
+              this.$refs["searchForm"].validateField("endTime");
+              callback();
+            },
+            trigger: "change",
+          },
+        ],
+        endTime: [
+          {
+            validator: (rule, value, callback) => {
+              const { startTime } = this.searchForm;
+              if (startTime !== null && startTime !== "" && value) {
+                if (value <= startTime) {
+                  callback(new Error("须晚于开始时间"));
+                } else {
+                  callback();
+                }
+              } else {
+                callback();
+              }
+            },
+            trigger: "change",
+          },
+        ],
+      },
+      idStr: [], //批量删除ID
+      // 查看薪资弹窗数据存储
+      accountDetails: {
+        createTime: null,
+        erbanNo: null,
+        country: null,
+        bank_account: null,
+        bank_name: null,
+        swift_code: null,
+        full_name: null,
+        address: null,
+        guildUsdNum: null,
+        currency: null,
+        currencyNum: null,
+        withdrawRate: null,
+        withdrawNum: null,
+      },
+    };
+  },
+  methods: {
+    getlistByPartitionId () {
+      adminCountry({ partitionId: this.searchForm.partitionId }).then((res) => {
+        if (res.code == 200) {
+          this.adminCountryArr = res.data;
+          this.searchForm.country = ''
+        }
+      });
+    },
+    getData () {
+      this.tableLoading = true;
+
+      let { pageParams, searchForm } = this;
+      searchForm.startTime = searchForm.startTime
+        ? dateFormat(searchForm.startTime, "yyyy-MM-dd hh:mm:ss")
+        : "";
+      searchForm.endTime = searchForm.endTime
+        ? dateFormat(searchForm.endTime, "yyyy-MM-dd hh:mm:ss")
+        : "";
+      searchForm = JSON.parse(JSON.stringify(searchForm));
+      pageParams = JSON.parse(JSON.stringify(pageParams));
+      Object.keys(searchForm).forEach((item) => {
+        if (
+          (searchForm[item] !== undefined && searchForm[item] === "")
+        ) {
+          delete searchForm[item];
+        }
+      });
+      Object.assign(pageParams, searchForm);
+      console.log(pageParams);
+      console.log(searchForm);
+        gameUsdWithdrawExamineList(pageParams).then((res) => {
+        this.tableLoading = false;
+        if (res.code == 200) {
+          let data = res.data;
+          this.tableData = data.records;
+          this.pageTotal = data.total;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    handleSelectionChange (rows) {
+      this.idStr = null;
+      this.idStr = rows.map((obj) => obj.id).join(",");
+    },
+    handleChangeAll () {
+      ElMessageBox.confirm("确定要结算吗", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          gameUsdWithdrawExamineSet({ ids: this.idStr }).then((res) => {
+            if (res.success === true) {
+              ElMessage({
+                type: "success",
+                message: "操作成功!",
+              });
+              this.getData();
+              this.idStr = null;
+            }
+          });
+        })
+        .catch(() => {
+          ElMessage({
+            type: "warning ",
+            message: "已取消",
+          });
+        });
+    },
+    // 查看详情处理函数
+    accountInfosFun (res) {
+      var obj = JSON.parse(res.accountInfos);
+      console.log(obj);
+      this.accountDetails.createTime = res.createTime ? res.createTime : "-";
+      this.accountDetails.erbanNo = res.erbanNo ? res.erbanNo : "-";
+      this.accountDetails.country = obj.country ? obj.country : "-";
+      this.accountDetails.bank_account = obj.bank_account
+        ? obj.bank_account
+        : "-";
+      this.accountDetails.bank_name = obj.bank_name ? obj.bank_name : "-";
+      this.accountDetails.swift_code = obj.swift_code ? obj.swift_code : "-";
+      this.accountDetails.full_name = obj.full_name ? obj.full_name : "-";
+      this.accountDetails.address = obj.address ? obj.address : "-";
+      this.accountDetails.guildUsdNum = res.guildUsdNum ? res.guildUsdNum : "-";
+      this.accountDetails.currency = res.currency ? res.currency : "-";
+      this.accountDetails.currencyNum = res.currencyNum ? res.currencyNum : "-";
+      this.accountDetails.withdrawRate = res.withdrawRate
+        ? res.withdrawRate
+        : "-";
+      this.accountDetails.withdrawNum = res.withdrawNum ? res.withdrawNum : "-";
+      this.centerDialogVisible2 = true;
+    },
+    // 批量驳回
+    dialogClick () {
+      batchGameUsdWithdrawExamineReject({
+        ids:
+          this.centerDialogVisibleType == 1
+            ? this.idStr
+            : this.centerDialogVisibleID,
+        remark: this.radio,
+      })
+        .then((res) => {
+          if (res.code == 200) {
+            ElMessage({
+              type: "success",
+              message: "操作成功!",
+            });
+            this.getData();
+            this.centerDialogVisible = false;
+            this.idStr = null;
+          } else {
+            ElMessage({
+              type: "error",
+              message: res.message,
+            });
+          }
+        })
+        .catch(() => {
+          ElMessage({
+            type: "warning ",
+            message: "已取消",
+          });
+        });
+    },
+    handleChange (row) {
+      ElMessageBox.confirm("确定要结算吗", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          gameUsdWithdrawExamineSet({ ids: row.id }).then((res) => {
+            if (res.success === true) {
+              ElMessage({
+                type: "success",
+                message: "操作成功!",
+              });
+              this.getData();
+              this.idStr = null;
+            }
+          });
+        })
+        .catch(() => {
+          ElMessage({
+            type: "warning ",
+            message: "已取消",
+          });
+        });
+    },
+    // 点击搜索
+    handSearch () {
+      this.$refs["searchForm"].validate((valid) => {
+        if (valid) {
+          this.pageParams.pageNo = 1;
+          this.getData();
+        }
+      });
+    },
+    // 重置搜索表单
+    resetSearchForm () {
+      this.$refs["searchForm"].resetFields();
+      this.pageParams.pageNo = 1;
+      this.getData();
+    },
+    // 确认导出
+    confirmExport2Excel () {
+      ElMessageBox.confirm("确定以当前筛选条件导出Excel吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.btnLoading = true;
+          let { searchForm } = this;
+          searchForm = JSON.parse(JSON.stringify(searchForm));
+          Object.keys(searchForm).forEach((item) => {
+            if (
+              !searchForm[item] ||
+              (searchForm[item] !== undefined && searchForm[item] === "")
+            ) {
+              delete searchForm[item];
+            }
+          });
+          Object.assign(searchForm, { pageSize: -1, pageNo: 1 });
+
+          gameUsdWithdrawExamineExport(searchForm)
+            .then((res) => {
+              if (res) {
+                this.exportVisible = false;
+                this.btnLoading = false;
+                let time = formatDate(new Date());
+                let alink = document.createElement("a");
+                alink.download = `官方提现记录${time}.xls`;
+                alink.style.display = "none";
+                const blob = new Blob([res]);
+                alink.href = URL.createObjectURL(blob);
+                document.body.appendChild(alink);
+                alink.click();
+                URL.revokeObjectURL(alink.href);
+              }
+            })
+            .catch((err) => {
+              console.error(err); // 打印错误信息
+              ElMessage.error("导出失败");
+            });
+        })
+        .catch(() => {
+          ElMessage({
+            type: "info",
+            message: "取消",
+          });
+        });
+    },
+    // 分页导航
+    handleSizeChange (val) {
+      this.pageParams.pageSize = val;
+      this.getData();
+    },
+    handlePageChange (val) {
+      this.pageParams.pageNo = val;
+      this.getData();
+    },
+    headerCopy (column, e) {
+      this.$copy(column.label);
+    },
+  },
+  computed: {
+    convertTimestamp1 () {
+      return function (time) {
+        let date = new Date(time);
+        return formatDateYMD(date);
+      };
+    },
+    convertTimestamp () {
+      return function (time) {
+        let date = new Date(time);
+        return formatDate(date);
+      };
+    },
+  },
+};
+</script>
+
+<style scope>
+.exportBtn {
+  margin-bottom: 0;
+}
+.text {
+  margin-left: 20px;
+}
+.container {
+  width: 100%;
+}
+.search-line {
+  width: 38%;
+}
+.boxs {
+  margin-top: 10px;
+  width: 100%;
+  word-wrap: break-word; /* 允许在单词内换行 */
+  overflow-wrap: break-word; /* 同上，现代浏览器推荐使用 */
+  white-space: normal; /* 允许换行 */
+}
+.radios {
+  display: block !important;
+  width: 100% !important;
+  word-wrap: break-word !important; /* 允许在单词内换行 */
+  overflow-wrap: break-word !important; /* 同上，现代浏览器推荐使用 */
+  white-space: normal !important; /* 允许换行 */
+  height: auto !important;
+}
+.boxs2 div {
+  margin-bottom: 10px;
+  font-size: 16px;
+}
+</style>

src/views/guildOperationManagement/officialWithdrawalGameMethodConfiguration.vue

@@ -0,0 +1,330 @@
+<template>
+  <div class="box">
+    <div class="inquire">
+      <span>分区</span>
+      <partition-select
+        v-model:partition-id="formData.partitionId"
+        @update:partitionId="getlistByPartition"
+        v-model:delete-id="deleteId"
+        :needAll="true"
+        :needAllPartition="true"
+      />
+    </div>
+    <div class="inquire">
+      <span>渠道</span>
+      <el-select
+        v-model="formData.accountType"
+        placeholder="请选择"
+        @change="getAdminCountryArr"
+        clearable
+      >
+        <el-option
+          v-for="item in accountTypeArr"
+          :key="item.value"
+          :label="item.name"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <div class="inquire">
+      <span>国家</span>
+      <el-select v-model="formData.country" placeholder="请选择" clearable>
+        <el-option
+          v-for="item in adminCountryArr"
+          :key="item"
+          :label="item"
+          :value="item"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <el-button style="" type="primary" @click="getData()">查询</el-button>
+    <el-table
+      v-loading="tableData.loading"
+      :data="tableData.data"
+      ref="multipleTable"
+      @selection-change="handleSelectionChange"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="partitionDesc" align="center" label="分区" />
+      <el-table-column prop="accountTypeDesc" align="center" label="渠道" />
+      <el-table-column prop="country" align="center" label="国家" />
+      <el-table-column prop="currency" align="center" label="货币" />
+      <el-table-column prop="usdRatio" align="center" label="汇率" />
+      <el-table-column prop="updateTime" align="center" label="更新时间" />
+      <el-table-column prop="enable" align="center" label="是否展示">
+        <template v-slot="scope">
+          {{ scope.row.enable ? "是" : "否" }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="feeRate" align="center" label="手续费" />
+      <el-table-column prop="seq" align="center" label="排序" />
+      <el-table-column align="center" label="操作" width="300">
+        <template v-slot="scope">
+          <el-button
+            class="primary"
+            type="primary"
+            @click="detailPageFun(scope.row)"
+            size="default"
+            >编辑</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      :current-page="formData.pageNo"
+      :page-size="formData.pageSize"
+      :page-sizes="[10, 20, 50, 100, 200]"
+      layout="sizes, prev, pager, next"
+      :total="tableData.total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+    <el-dialog v-model="editDialog" title="编辑" width="28%" center>
+      <div style="margin-bottom: 25px">
+        <span
+          style="display: inline-block; margin-right: 20px; width: 100px"
+          class="col-sm-2 control-label"
+          >分区</span
+        >{{ editFormData.partitionDesc }}
+      </div>
+      <div style="margin-bottom: 25px">
+        <span
+          style="display: inline-block; margin-right: 20px; width: 100px"
+          class="col-sm-2 control-label"
+          >国家</span
+        >{{ editFormData.country }}
+      </div>
+      <div style="margin-bottom: 25px">
+        <span
+          style="display: inline-block; margin-right: 20px; width: 100px"
+          class="col-sm-2 control-label"
+          >货币</span
+        >{{ editFormData.currency }}
+      </div>
+      <div style="margin-bottom: 25px">
+        <span
+          style="display: inline-block; margin-right: 20px; width: 100px"
+          class="col-sm-2 control-label"
+          >汇率</span
+        >
+        <el-input
+          v-model="editFormData.usdRatio"
+          style="width: 50%"
+          class="input"
+        ></el-input>
+      </div>
+      <div style="margin-bottom: 25px">
+        <span
+          style="display: inline-block; margin-right: 20px; width: 100px"
+          class="col-sm-2 control-label"
+          >手续费</span
+        >
+        <el-input
+          v-model="editFormData.feeRate"
+          style="width: 50%"
+          class="input"
+        ></el-input>
+      </div>
+      <div style="margin-bottom: 25px">
+        <span
+          style="display: inline-block; margin-right: 20px; width: 100px"
+          class="col-sm-2 control-label"
+          >排序</span
+        >
+        <el-input
+          v-model="editFormData.seq"
+          style="width: 50%"
+          class="input"
+        ></el-input>
+      </div>
+      <div style="margin-bottom: 25px">
+        <span
+          style="display: inline-block; margin-right: 20px; width: 100px"
+          class="col-sm-2 control-label"
+          >是否展示</span
+        >
+        <el-select v-model="editFormData.enable" placeholder="请选择" >
+          <el-option label="是" :value="true"></el-option>
+          <el-option label="否" :value="false"></el-option>
+        </el-select>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="editDialog = false">取消</el-button>
+          <el-button type="primary" @click="editDialogClick()"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { ref, onMounted, reactive, computed } from "vue";
+import PartitionSelect from "@/views/common/partitionSelect.vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+import {
+  getGamelistAccountType,
+  getGameAccountConfigList,
+  saveGameAccountConfig
+} from "@/api/relAgency/relAgency";
+export default {
+  name: "officialWithdrawalGameMethodConfiguration",
+  components: {
+    PartitionSelect,
+  },
+  setup() {
+    const formData = reactive({
+      partitionId: undefined,
+      pageNo: 1,
+      pageSize: 10,
+      country: "",
+      accountType: "",
+    });
+    const tableData = reactive({
+      data: [],
+      total: 0,
+      loading: false,
+    });
+    const deleteId = ref(4);
+    const accountTypeArr = ref([]);
+    const accountTypeAllArr = ref([]);
+    const adminCountryArr = ref([]);
+    const editFormData = reactive({});
+    const editDialog = ref(false);
+    // 选择分区
+    const getlistByPartition = (e) => {
+      console.log(e);
+      if (e) {
+        formData.partitionId = e;
+        const matchedItems = accountTypeAllArr.value.filter(
+          (item) => (item.partitionFlag & formData.partitionId) != 0
+        );
+        accountTypeArr.value = matchedItems;
+      } else {
+        formData.partitionId = undefined;
+        accountTypeArr.value = accountTypeAllArr.value;
+      }
+      formData.accountType = "";
+      formData.country = "";
+    };
+    // 选择渠道
+    const getAdminCountryArr = (e) => {
+      const arr = accountTypeAllArr.value.filter((item) => item.value == e);
+      formData.country = "";
+      adminCountryArr.value = arr[0].country;
+    };
+    // 查询
+    const getData = () => {
+      tableData.loading = true;
+      getGameAccountConfigList(formData).then((res) => {
+        if (res.code == 200) {
+          tableData.data = res.data.records;
+          tableData.total = res.data.total;
+          tableData.loading = false;
+        } else {
+          tableData.loading = false;
+          ElMessage.error(res.message);
+        }
+      });
+    };
+    // 编辑
+    const detailPageFun = (row) => {
+      editDialog.value = true;
+      Object.assign(editFormData, row);
+    };
+    const editDialogClick = () => { 
+        let obj = {
+            accountType : editFormData.accountType,
+            country : editFormData.country,
+            partitionId  : editFormData.partitionId,
+            seq  : editFormData.seq,
+            usdRatio  : editFormData.usdRatio,
+            withdrawRate : editFormData.feeRate,
+            enable:editFormData.enable
+        }
+        saveGameAccountConfig(obj).then((res) => { 
+            if (res.code == 200) {
+                ElMessage.success(res.message);
+                editDialog.value = false;
+                getData();
+            } else {
+                ElMessage.error(res.message);
+            }
+        });
+    };
+    onMounted(() => {
+      getGamelistAccountType().then((res) => {
+        if (res.code == 200) {
+          accountTypeAllArr.value = res.data;
+          // const matchedItems = accountTypeAllArr.value.filter(item=>
+          //     (item.partitionFlag & 1) != 0
+          // )
+          accountTypeArr.value = res.data;
+        } else {
+          ElMessage.error(res.message);
+        }
+      });
+    });
+    const handleSizeChange = (val) => {
+      formData.pageSize = val;
+      getData();
+    };
+    const handleCurrentChange = (val) => {
+      formData.pageNo = val;
+      getData();
+    };
+    return {
+      formData,
+      adminCountryArr,
+      getlistByPartition,
+      tableData,
+      getData,
+      editDialog,
+      editFormData,
+      deleteId,
+      accountTypeArr,
+      accountTypeAllArr,
+      getAdminCountryArr,
+      handleSizeChange,
+      handleCurrentChange,
+      detailPageFun,
+      editDialogClick
+    };
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+
+    span {
+      margin-right: 10px;
+    }
+
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+</style>

src/views/record/OfficialGoldBusTypeView.vue

@@ -20,6 +20,8 @@
                                 <option value="17">活动奖励钻石</option>
                                 <option value="20">公款充值钻石</option>
                                 <option value="51">官方钻石消除</option>
+                                <option value="65">官方消除游戏薪资</option>
+                                    <option value="66">官方赠送游戏薪资</option>
                                 <option value="63">官方消除薪资</option>
                                 <option value="64">官方赠送薪资</option>
                             </select>
@@ -67,6 +69,8 @@
                                     <option value="17">活动奖励钻石</option>
                                     <option value="20">公款充值钻石</option>
                                     <option value="51">官方钻石消除</option>
+                                    <option value="65">官方消除游戏薪资</option>
+                                    <option value="66">官方赠送游戏薪资</option>
                                     <option value="63">官方消除薪资</option>
                                 <option value="64">官方赠送薪资</option>
                                 </select>
@@ -134,6 +138,8 @@ export default {
                                 if (val == 17) { return "活动奖励钻石" }
                                 if (val == 20) { return "公款充值钻石" }
                                 if (val == 51) { return "官方钻石消除" }
+                                if (val == 65) { return "官方消除游戏薪资" }
+                                if (val == 66) { return "官方赠送游戏薪资" }
                                 if (val == 63) { return "官方消除薪资" }
                                 if (val == 64) { return "官方赠送薪资" }
                                 return val;

src/views/record/OfficicalGoldView.vue

@@ -441,6 +441,7 @@ function initUserInfoTable () {
       { field: 'goldNum', title: '钻石', align: 'center', width: '5%', valign: 'middle' },
       { field: 'radishNum', title: '水晶', align: 'center', width: '5%', valign: 'middle' },
       { field: 'diamondsNum', title: '金币', align: 'center', width: '5%', valign: 'middle' },
+      { field: 'gameUsdNum', title: '游戏薪资', align: 'center', width: '5%', valign: 'middle' },
       { field: 'guildUsdNum', title: '薪资', align: 'center', width: '5%', valign: 'middle' }
     ],
     cache: false,
@@ -503,7 +504,8 @@ function initGoldRecordTable () {
         formatter: function (val, row, index) {
           // 根据条件判断显示哪个字段
           // 示例：根据typeCn字段的值来决定显示什么
-          if (row.currencyType == 0 || row.currencyType == 4) {
+          if (row.currencyType == 0 || row.currencyType == 4 || row.currencyType == 5) {
+
             if(row.currencyType == 0 && row.diamondNum  == null){
             return row.goldNum 
             }else{

src/views/refund/goldDiamondOperationRecord.vue

@@ -97,6 +97,14 @@
           }}
         </template>
       </el-table-column>
+       <el-table-column prop="erbanNo" align="center" label="用户ID" />
+      <el-table-column prop="nick" align="center" label="用户昵称" />
+      <el-table-column prop="partitionDesc" align="center" label="区域" />
+      <el-table-column prop="operationNum" align="center" label="操作数量" />
+      <el-table-column prop="actualAmount" align="center" label="打款金额" />
+      <el-table-column prop="typeDesc" align="center" label="赠送类型" />
+      <el-table-column prop="currencyTypeDesc" align="center" label="赠送分类" />
+      <el-table-column prop="remark" align="center" label="备注" />
       <el-table-column prop="operatorName" align="center" label="操作人" />
     </el-table>
     <!-- 分页 -->
@@ -147,6 +155,8 @@ export default {
           { desc: "官方金币消除", id: "OFFICAL_REDUCE_DIAMONDS" },
           { desc: "官方赠送钻石", id: "OFFICAL_GOLD" },
           { desc: "用户钻石清除", id: "CLEAR_USER_GOLD" },
+          { desc: "官方消除游戏薪资", id: "OFFICAL_MINUS_GAME_USD" },
+          { desc: "官方赠送游戏薪资", id: "OFFICAL_PLUS_GAME_USD" },
           { desc: "官方消除薪资", id: "OFFICAL_MINUS_GUILD_USD" },
           { desc: "官方赠送薪资", id: "OFFICAL_PLUS_GUILD_USD" },
         ],