公会钻石薪资流水 - 调整传参，接口链接，表头新增公会有效主播

src/api/relAgency/relAgency.js

@@ -44,7 +44,7 @@ export const familyMemberWeekLevelRewardExport = query => {
 // 获取 公会钻石薪资流水统计 列表
 export const getAgencyDiamondFlow = query => {
     return request({
-        url: '/agency/diamond/flow/list',
+        url: '/agency/diamond/flow/page',
         method: 'get',
         params: query
     });

src/views/guildOperationManagement/agencyDiamondFlow.vue

@@ -27,13 +27,13 @@
                                        v-model:after-init="getData" />
             </el-form-item>
             <el-form-item label="公会ID"
-                          prop="agencyId">
+                          prop="guildId">
-              <el-input v-model.trim="searchForm.agencyId"
+              <el-input v-model.trim="searchForm.guildId"
                         placeholder="请输入"></el-input>
             </el-form-item>
             <el-form-item label="公会长ID"
-                          prop="agencyOwnerId">
+                          prop="guildOwnerErbanNo">
-              <el-input v-model.trim="searchForm.agencyOwnerId"
+              <el-input v-model.trim="searchForm.guildOwnerErbanNo"
                         placeholder="请输入"></el-input>
             </el-form-item>
             <el-form-item label="周期"
@@ -74,44 +74,48 @@
                            prop="partitionDesc"
                            label="分区"> </el-table-column>
           <el-table-column align="center"
-                           prop="agencyId"
+                           prop="guildId"
                            label="公会ID">
           </el-table-column>
           <el-table-column align="center"
-                           prop="agencyName"
+                           prop="guildName"
                            label="公会名称">
           </el-table-column>
           <el-table-column align="center"
-                           prop="hallMemberCount"
+                           prop="memberCount"
                            label="主播人数">
           </el-table-column>
           <!-- <el-table-column align="center" prop="agencyAbbr" label="公会国家"> </el-table-column> -->
           <el-table-column align="center"
-                           prop="agencyErbanNo"
+                           prop="guildOwnerUid"
                            label="公会长ID">
           </el-table-column>
           <el-table-column align="center"
-                           prop="agencyRegionName"
+                           prop="guildOwnerRegionId"
                            label="公会长地区">
           </el-table-column>
           <el-table-column align="center"
-                           prop="energyValue"
+                           prop="diamondNum"
                            label="总钻石流水">
             <template v-slot="scope">
               {{
-                scope.row.energyValue
+                scope.row.diamondNum
               }}
             </template>
           </el-table-column>
           <el-table-column align="center"
-                           prop="salaryRate"
+                           prop="activeMemberCount"
+                           label="公会有效主播">
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="baseSalaryRatio"
                            label="公会长薪资比例">
             <template v-slot="scope">
-              {{ scope.row.salaryRate ? scope.row.salaryRate + "%" : "0%" }}
+              {{ scope.row.baseSalaryRatio ? scope.row.baseSalaryRatio + "%" : "0%" }}
             </template>
           </el-table-column>
           <el-table-column align="center"
-                           prop="hallSalary"
+                           prop="totalSalary"
                            label="公会长薪资">
           </el-table-column>
         </el-table>
@@ -154,8 +158,8 @@ export default {
             },
             // 搜索表单相关
             searchForm: {
-                agencyOwnerId: null,
+                guildOwnerErbanNo: null,
-                agencyId: null,
+                guildId: null,
                 dateCycle: null,
                 region: null,
                 partitionId: undefined,