From e4cbd9cc35b2e8b025ff936881bb893aee547f3e Mon Sep 17 00:00:00 2001
From: dragon <3013557874@qq.com>
Date: Thu, 1 Aug 2024 17:42:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BC=9A=E9=95=BFid=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E5=AF=BC=E5=87=BA-=E5=AE=B6=E6=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/nobleman/nobleman.js      | 14 +++++-
 src/views/nobleman/GoldWater.vue  | 82 ++++++++++++++++++++++++++++---
 src/views/nobleman/WagesCount.vue | 73 ++++++++++++++++++++++++---
 3 files changed, 155 insertions(+), 14 deletions(-)

diff --git a/src/api/nobleman/nobleman.js b/src/api/nobleman/nobleman.js
index 63fe96c..b4665e0 100644
--- a/src/api/nobleman/nobleman.js
+++ b/src/api/nobleman/nobleman.js
@@ -188,6 +188,16 @@ export const exportFamilyMemberDaily = query => {
     window.location.href = `/admin/family/wage/stat/exportFamilyMemberDaily?${genQueryParam(query)}`;
     return;
 };
+// 工会统计-导出公会工资统计
+export const statExportFamily = query => {
+    window.location.href = `/admin/family/wage/stat/exportFamily?${genQueryParam(query)}`;
+    return;
+};
+// 工会统计-导出家族流水
+export const incomeExportFamilys = query => {
+    window.location.href = `/admin/family/income/exportFamily?${genQueryParam(query)}`;
+    return;
+};
 // 金币流水-列表
 export const incomePageFamily = query => {
     return request({
@@ -204,9 +214,9 @@ export const incomeListFamilyMember = query => {
         params: query
     });
 };
-// 金币流水-导出
+// 金币流水-导出成员流水信息
 export const incomeExportFamily = query => {
-    window.location.href = `/admin/family/income/exportFamily?${genQueryParam(query)}`;
+    window.location.href = `/admin/family/income/exportFamilyMember?${genQueryParam(query)}`;
     return;
 };
 // 成员信息-弹窗详情
diff --git a/src/views/nobleman/GoldWater.vue b/src/views/nobleman/GoldWater.vue
index 93fee60..2d25359 100644
--- a/src/views/nobleman/GoldWater.vue
+++ b/src/views/nobleman/GoldWater.vue
@@ -6,18 +6,34 @@
         <span class="demonstration">日期</span>
         <el-date-picker
           v-model="inquire.time"
-          type="datetimerange"
+          type="daterange"
           range-separator="至"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-          :default-time="['00:00:00', '23:59:59']"
         >
         </el-date-picker>
       </div>
     </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.inquireonInfos"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
     <!-- 公会ID -->
     <div class="inquire">
-      <span>公会ID</span>
+      <span>会长ID</span>
       <el-input v-model="inquire.id" placeholder="" class="input"></el-input>
     </div>
     <!-- 公会 -->
@@ -33,6 +49,10 @@
     <el-button class="primary" type="primary" @click="getData()"
       >查询</el-button
     >
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="deriveFun()"
+      >导出</el-button
+    >
 
     <!-- 表格 -->
     <el-table
@@ -41,8 +61,13 @@
       border
       style="width: 100%; margin-top: 25px"
     >
-      <el-table-column prop="ownerErbanNo" align="center" label="公会ID" />
+      <el-table-column prop="ownerErbanNo" align="center" label="会长ID" />
       <el-table-column prop="name" align="center" label="公会名称" />
+      <el-table-column
+        prop="ownerPartitionName"
+        align="center"
+        label="会长分区"
+      />
       <el-table-column prop="memberNum" align="center" label="成员数" />
       <el-table-column
         prop="goldIncome"
@@ -60,6 +85,9 @@
           <el-button @click="ediClick(scope.row)" type="text" size="default"
             >查看详情</el-button
           >
+          <el-button @click="deriveFun2(scope.row)" type="text" size="default"
+            >导出</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -121,6 +149,7 @@ import {
   incomePageFamily,
   incomeListFamilyMember,
   incomeExportFamily,
+  incomeExportFamilys,
 } from "@/api/nobleman/nobleman";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
@@ -136,6 +165,12 @@ export default {
         time: this.calculateLastSevenDays(),
         id: "",
         nick: "",
+        partitionId: 2,
+        inquireonInfos: [
+          { desc: "英语区", id: 1 },
+          { desc: "阿拉伯区", id: 2 },
+          { desc: "华语区", id: 4 },
+        ],
       },
       // 表格
       tableData: [],
@@ -147,6 +182,7 @@ export default {
       detailsDialog: false,
       detailsTitle: "",
       tableDataDetails: [],
+      familyIdEx: "",
     };
   },
   created() {
@@ -166,6 +202,7 @@ export default {
       incomePageFamily({
         erbanNo: this.inquire.id,
         familyName: this.inquire.nick,
+        partitionId: this.inquire.partitionId,
         startDate: startTime,
         endDate: endTime,
         pageNum: this.currentPage,
@@ -176,6 +213,39 @@ export default {
         this.loading = false;
       });
     },
+    // 导出总外列表
+    deriveFun(val) {
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
+      incomeExportFamilys({
+        startDate: startTime,
+        endDate: endTime,
+        erbanNo: this.inquire.id,
+        familyName: this.inquire.nick,
+        partitionId: this.inquire.partitionId,
+      }).then((res) => {});
+    },
+    // 导出列表最外层
+    deriveFun2(val) {
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
+      incomeExportFamily({
+        familyId: val.id,
+        startDate: startTime,
+        endDate: endTime,
+      }).then((res) => {});
+      this.detailsDialog = false;
+    },
     // 默认七天
     calculateLastSevenDays() {
       const end = new Date();
@@ -193,6 +263,7 @@ export default {
         startDate = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
         endDate = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
       }
+      this.familyIdEx = val.id;
       incomeListFamilyMember({
         endDate,
         startDate,
@@ -212,8 +283,7 @@ export default {
         endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
       }
       incomeExportFamily({
-        erbanNo: this.inquire.id,
-        familyName: this.inquire.nick,
+        familyId: this.familyIdEx,
         startDate: startTime,
         endDate: endTime,
       }).then((res) => {});
diff --git a/src/views/nobleman/WagesCount.vue b/src/views/nobleman/WagesCount.vue
index 565a330..a1aa70b 100644
--- a/src/views/nobleman/WagesCount.vue
+++ b/src/views/nobleman/WagesCount.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="box">
     <!-- 时间选择器 -->
-
     <div class="inquire">
       <div class="block">
         <span class="demonstration">日期</span>
@@ -15,15 +14,37 @@
         ></el-config-provider>
       </div>
     </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.inquireonInfos"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
+
     <!-- 公会 -->
     <div class="inquire">
-      <span>公会ID</span>
+      <span>会长ID</span>
       <el-input v-model="inquire.nick" placeholder="" class="input"></el-input>
     </div>
     <!-- 查询按钮 -->
     <el-button class="primary" type="primary" @click="getData()"
       >查询</el-button
     >
+    <!-- 导出 -->
+    <el-button class="primary" type="primary" @click="deriveFun()"
+      >导出</el-button
+    >
 
     <!-- 表格 -->
     <el-table
@@ -32,8 +53,13 @@
       border
       style="width: 100%; margin-top: 25px"
     >
-      <el-table-column prop="id" align="center" label="公会ID" />
+      <el-table-column prop="ownerErbanNo" align="center" label="会长ID" />
       <el-table-column prop="name" align="center" label="公会名称" />
+      <el-table-column
+        prop="ownerPartitionName"
+        align="center"
+        label="会长分区"
+      />
       <el-table-column prop="memberNum" align="center" label="成员数" />
       <el-table-column
         prop="goldIncome"
@@ -43,9 +69,9 @@
       <el-table-column prop="goldWage" align="center" label="金币工资" />
       <el-table-column prop="agentWage" align="center" label="代理工资" />
       <el-table-column prop="diamondRemain" align="center" label="当前钻石余额">
-        <template v-slot="scope">{{scope.row.diamondRemain}}</template>
+        <template v-slot="scope">{{ scope.row.diamondRemain }}</template>
       </el-table-column>
-      <el-table-column align="center" label="操作">
+      <el-table-column align="center" label="操作" width="260">
         <template v-slot="scope">
           <el-button
             @click="ediClick(scope.row)"
@@ -54,6 +80,13 @@
             size="default"
             >查看详情</el-button
           >
+          <el-button
+            @click="deriveFun2(scope.row)"
+            class="primary"
+            type="primary"
+            size="default"
+            >导出</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -196,6 +229,7 @@ import {
   statExportFamilyMember,
   listFamilyMemberDaily,
   exportFamilyMemberDaily,
+  statExportFamily,
 } from "@/api/nobleman/nobleman";
 // @ts-ignore
 import { dateFormat } from "@/utils/system-helper";
@@ -211,6 +245,12 @@ export default {
       inquire: {
         time: "",
         nick: "",
+        partitionId: 2,
+        inquireonInfos: [
+          { desc: "英语区", id: 1 },
+          { desc: "阿拉伯区", id: 2 },
+          { desc: "华语区", id: 4 },
+        ],
       },
       // 表格
       tableData: [],
@@ -243,6 +283,7 @@ export default {
       }
       statPageFamily({
         erbanNo: this.inquire.nick,
+        partitionId: this.inquire.partitionId,
         month: time,
         pageNum: this.currentPage,
         pageSize: this.pageSize,
@@ -252,7 +293,27 @@ export default {
         this.loading = false;
       });
     },
-    // 最外层查看详情按钮
+    // 导出总外列表
+    deriveFun(val) {
+      let time = this.inquire.time;
+      if (time) {
+        time = dateFormat(this.inquire.time, "yyyy-MM");
+      }
+      statExportFamily({
+        erbanNo: this.inquire.nick,
+        month: time,
+        partitionId: this.inquire.partitionId,
+      }).then((res) => {});
+    },
+    // 导出列表最外层
+    deriveFun2(val) {
+      statExportFamilyMember({
+        familyId: val.id,
+        month: dateFormat(this.inquire.time, "yyyy-MM"),
+      });
+      this.detailsDialog = false;
+    },
+    // 1层查看详情按钮
     ediClick(val) {
       console.log(val);
       var than = this;