主播公会申请-新增分区 金币转赠明细-新增分区 充值明细-新增国家

src/views/nobleman/AnchorQuitApply.vue

@@ -5,6 +5,9 @@
       <el-form-item label="ID" prop="erbanNo">
         <el-input v-model="searchForm.erbanNo" placeholder="" class="input"></el-input>
       </el-form-item>
+      <el-form-item label="分区" prop="partitionId">
+        <partition-select v-model:partition-id="searchForm.partitionId" />
+      </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="searchForm.status" placeholder="请选择">
           <el-option label="全部" :value="-1"></el-option>
@@ -29,6 +32,7 @@
     <el-table v-loading="loading" :data="tableData" border style="width: 100%; margin-top: 25px">
       <el-table-column prop="erbanNo" align="center" label="用户ID" />
       <el-table-column prop="targetErbanNo" align="center" label="UID" />
+      <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="createTime" align="center" label="申请时间" />
@@ -57,8 +61,11 @@ import { guildManageQuitList, guildManageOptQuit } from "@/api/nobleman/nobleman
 import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
 import { ElMessageBox, ElMessage } from "element-plus"; // 正确引入 ElM
+import PartitionSelect from "../common/partitionSelect.vue";
+
 export default {
   name: "AnchorQuitApply",
+  components: {PartitionSelect},
   data() {
     return {
       loading: false,
@@ -67,6 +74,7 @@ export default {
         erbanNo: "",
         status: "",
         time: "",
+        partitionId:undefined
       },
       // 查询规则
       searchRules: {
@@ -101,6 +109,7 @@ export default {
         endDate: endTime,
         pageNum: this.currentPage,
         pageSize: this.pageSize,
+        partitionId:this.searchForm.partitionId
       }).then((res) => {
         this.total = res.data.total;
         this.tableData = res.data.rows;

src/views/recharge/RechargeDiamondGiveDetailView.vue

@@ -27,6 +27,7 @@
                   id="fromErBanNo"
                 />
               </div>
+              
               <label for="toErBanNo" class="col-sm-2 control-label"
                 >收入人id:</label
               >
@@ -74,6 +75,14 @@
                 />
               </div>
             </div>
+            <div class="col-sm-12">
+              <label for="fromErBanNo" class="col-sm-2 control-label"
+                >转出人所属分区:</label
+              >
+              <div class="col-sm-2">
+                 <partition-select v-model:partition-id="partitionId" />
+              </div>
+            </div>
           </form>
           <div id="mapObjHtml" style="display:none">
             <span style="
@@ -98,7 +107,7 @@
                 font-size: 18px;
                 color: #ee0101;
               ">
-              转赠子代理金币总和: <b class="b2"></b>
+              转赠子代理金币总和: <b class="b3"></b>
             </span>
           </div>
           <button id="btnSearch" class="btn btn-default">
@@ -115,11 +124,23 @@
 
 <script>
 import TableHelper from "@/utils/bootstrap-table-helper";
-
+import PartitionSelect from "../common/partitionSelect.vue";
+import { ref ,watch} from 'vue';
 export default {
   name: "RechargeDiamondGiveDetailView",
+  components: {PartitionSelect},
   setup() {
-    return {};
+    const partitionId = ref(undefined);
+     // 监听 partitionId 的变化
+     watch(partitionId, (newValue) => {
+      console.log("partitionId changed to:", newValue);
+      // 将 partitionId 的值传递给 jQuery 代码
+      window.partitionIdValue = newValue;
+    });
+
+    return {
+      partitionId
+    };
   },
   created() {
     this.$nextTick(function () {
@@ -128,6 +149,7 @@ export default {
   },
   methods: {
     initData() {
+      // const partitionId = partitionId.value; 
       $(function () {
         userRegion();
         $("#table").bootstrapTable("destroy");
@@ -156,8 +178,8 @@ export default {
         });
 
         // 查询刷新
-        $("#btnSearch").on("click", function () {
-          
+        $("#btnSearch").on("click",  ()=> {
+          // console.log(partitionId)
         $("#table").bootstrapTable({
           columns: [
             {
@@ -204,6 +226,12 @@ export default {
                 return value;
               },
             },
+            {
+              field: "partitionDesc",
+              title: "转出人的分区",
+              align: "center",
+              width: "5%",
+            },
             {
               field: "toErBanNo",
               title: "收入人peko id",
@@ -222,6 +250,12 @@ export default {
               align: "center",
               width: "5%",
             },
+            {
+              field: "toPartitionDesc",
+              title: "收入人的分区",
+              align: "center",
+              width: "5%",
+            },
             {
               field: "inviteCode",
               title: "收入人填写的邀请码",
@@ -246,7 +280,7 @@ export default {
           //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
           //设置为limit可以获取limit, offset, search, sort, order
           queryParamsType: "undefined",
-          queryParams: function queryParams(params) {
+          queryParams:  (params) =>{
             //设置查询参数
             var param = {
               page: params.pageNumber,
@@ -256,19 +290,20 @@ export default {
               toRegion: $("#toRegion").val(),
               startTime: $("#startTime").val(),
               endTime: $("#endTime").val(),
+              partitionId:window.partitionIdValue
             };
             return param;
           },
           toolbar: "#toolbar",
           url: "/admin/recharge/user/give/dayDetailPage",
-          onLoadSuccess: function (res) {
+          onLoadSuccess:  (res)=> {
             //加载成功时执行
             console.log();
             $("#mapObjHtml .b1").text(res.totalMap.totalDiamondNum);
             $("#mapObjHtml .b2").text(res.totalMap.totalDiamondNum4Normal);
             $("#mapObjHtml .b3").text(res.totalMap.totalDiamondNum4Sub);
           },
-          onLoadError: function () {
+          onLoadError:  ()=> {
             //加载失败时执行
             console.log("load fail");
           },

src/views/record/ChargeRecordView.vue

@@ -13,6 +13,7 @@
           <input type="hidden" name="status" id="exportStatus" />
           <input type="hidden" name="newUser" id="exportNewUser" />
           <input type="hidden" name="appChannel" id="exportAppChannel" />
+          <input type="hidden" name="appChannel" id="exportRegionId" />
         </form>
         <section class="content">
           <div id="toolbar">
@@ -51,6 +52,10 @@
                 <label for="qChannel">app渠道</label>
                 <input type="text" class="form-control" name="appChannel" id="qAppChannel" />
               </div>
+              <div class="form-group">
+                <label for="regionId" >国家：</label>
+                <select name="regionId" id="regionId" class="form-control"></select>
+              </div>
             </form>
             <div id="mapObjHtml"></div>
             <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
@@ -66,15 +71,21 @@
 
 <script>
 import TableHelper from "@/utils/bootstrap-table-helper";
+import { buildSelectOption } from '@/utils/system-helper';
+import {
+  regionInfoList,
+} from "@/api/refund/refund";
 export default {
   name: "ChargeRecordView",
   created() {
     this.$nextTick(function () {
       this.initData();
+      this.initRegionInfoList();
     });
   },
   methods: {
     initData() {
+      $("#qStatus").val(2)
       $(".datetime").datetimepicker({
         format: "yyyy-mm-dd hh:ii:00",
         autoclose: true,
@@ -92,6 +103,12 @@ export default {
             align: "center",
             width: "5%",
           },
+          {
+            field: "regionName",
+            title: "国家",
+            align: "center",
+            width: "5%",
+          },
           {
             field: "createTime",
             title: "创建时间",
@@ -174,6 +191,7 @@ export default {
           status: $("#qStatus").val(),
           newUser: $("#qNewUser").val(),
           appChannel: $("#qAppChannel").val(),
+          regionId: $("#regionId").val(),
         };
 
         // 手动加载数据
@@ -253,10 +271,25 @@ export default {
         $("#exportStatus").val($("#qStatus").val());
         $("#exportNewUser").val($("#qNewUser").val());
         $("#exportAppChannel").val($("#qAppChannel").val());
-
+        $("#exportRegionId").val($("#regionId").val());
         form.submit();
       });
     },
+    initRegionInfoList() {
+      regionInfoList().then(res => {
+                let data = res.data;
+                buildSelectOption(
+                    "#regionId",
+                    null,
+                    data.map((v) => {
+                    return {
+                        value: v.id,
+                        text: v.regionDesc,
+                    };
+                    })
+                );
+            });
+        },
   },
 };
 </script>