From 82601ea74fbb134f435f474e60bb871cfd3235ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=81=E4=B8=83?= <2390744110@qq.com>
Date: Wed, 22 Jun 2022 10:21:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=E6=97=A5=E6=8A=A5&=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E6=AF=94=E4=BE=8B=E8=B5=A0=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/statistics.js                         | 564 ++++++++--------
 .../eashier/collectionList/collectionList.vue | 137 ++--
 .../statistics/storeDaily/storeDaily.vue      | 604 ++++++++----------
 3 files changed, 610 insertions(+), 695 deletions(-)

diff --git a/src/api/statistics.js b/src/api/statistics.js
index 47668ed..f8a9169 100644
--- a/src/api/statistics.js
+++ b/src/api/statistics.js
@@ -1,278 +1,286 @@
-import { service } from "../utils/service";
-import { localPath } from "./api.js";
-
-// 添加门店月度任务 门店端-门店月度任务-添加门店月度任务
-export function addMonthTask(params) {
-  return service({
-    url: "/demay/ssm/monthTask/add",
-    method: "post",
-    data: params
-  });
-}
-// 删除门店月度任务 门店端-门店月度任务-删除门店月度任务
-export function delMonthTask(params) {
-  return service({
-    url: "/demay/ssm/monthTask/delete",
-    method: "post",
-    data: params
-  });
-}
-// 分页查询门店月度任务 门店端-门店月度任务-分页查询门店月度任务
-export function monthTaskPage(params) {
-  return service({
-    url: "/demay/ssm/monthTask/page",
-    method: "post",
-    data: params
-  });
-}
-// 门店月度任务统计 门店端-门店月度任务-门店月度任务统计
-export function monthTaskStatistic(params) {
-  return service({
-    url: "/demay/ssm/monthTask/statistic",
-    method: "post",
-    data: params
-  });
-}
-// 修改门店月度任务 门店端-门店月度任务-修改门店月度任务
-export function editMonthTask(params) {
-  return service({
-    url: "/demay/ssm/monthTask/update",
-    method: "post",
-    data: params
-  });
-}
-// 门店月度任务状态修改 门店端-门店月度任务-门店月度任务状态修改
-export function editMonthTaskState(params) {
-  return service({
-    url: "/demay/ssm/monthTask/updateStates",
-    method: "post",
-    data: params
-  });
-}
-
-// 当日负卡金记录查询
-export function dayStatistic(params) {
-  return service({
-    url: "/demay/ssm/negativeCard/dayStatistic",
-    method: "post",
-    data: params
-  });
-}
-// 门店会员统计列表 门店端-门店统计-门店会员统计列表
-export function storeStatisticMemberList(params) {
-  return service({
-    url: "/demay/ssm/storeStatistic/memberList",
-    method: "post",
-    params: params
-  });
-}
-
-// 门店会员统计列表 门店端-门店统计-会员排行榜充值统计
-export function memberRecharge(params) {
-  return service({
-    url: "/demay/ssm/storeStatistic/memberRecharge",
-    method: "post",
-    data: params,
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded"
-    }
-  });
-}
-// 门店项目统计列表 门店端-门店统计-当日门店项目统计列表
-export function memberCourse(params) {
-  return service({
-    url: "/demay/ssm/storeStatistic/memberCourse",
-    method: "post",
-    data: params,
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded"
-    }
-  });
-}
-
-// 门店项目统计列表 门店端-门店统计-门店项目统计列表
-export function storeStatisticProjectList(params) {
-  return service({
-    url: "/demay/ssm/storeStatistic/projectList",
-    method: "post",
-    data: params
-  });
-}
-
-// 门店员工统计列表 门店端-门店统计-门店员工统计列表
-export function storeStatisticStaffMonthList(params) {
-  return service({
-    url: "/demay/ssm/storeStatistic/staffMonthList",
-    method: "post",
-    data: params
-  });
-}
-
-// 查询员工工资 门店端-统计报表-查询员工工资
-export function selectSalary(params) {
-  return service({
-    url: "/demay/ssm/salary/selectSalary",
-    method: "post",
-    data: params
-  });
-}
-
-// 添加员工工资 门店端-统计报表-添加员工工资
-export function addSalary(params) {
-  return service({
-    url: "/demay/ssm/salary/add",
-    method: "post",
-    data: params
-  });
-}
-
-// 删除员工工资 门店端-统计报表-删除员工工资
-export function delSalary(params) {
-  return service({
-    url: "/demay/ssm/salary/delete",
-    method: "post",
-    data: params
-  });
-}
-
-// 门店日报
-export function storeDaily(params) {
-  return service({
-    url: "/demay/ssm/storeStatistic/storeDaily",
-    method: "post",
-    data: params
-  });
-}
-
-// 门店项目统计列表 门店端-门店统计-月度门店项目统计列表
-export function projectMonthList(params) {
-  return service({
-    url: "/demay/ssm/storeStatistic/projectMonthList",
-    method: "post",
-    data: params
-  });
-}
-
-// 查询门店业绩分类统计表
-export function achiCommLists(params) {
-  return service({
-    url: "/demay/ssm/staff/achiCommLists",
-    method: "post",
-    data: params
-  });
-}
-export function achiCommListsgroup(params) {
-  return service({
-    url: "/demay/ssm/staff/achiCommListsgroup",
-    method: "post",
-    data: params
-  });
-}
-
-//导出
-export function exportachi(params) {
-  return service({
-    url: "/demay/ssm/staff////////achiCommListsgroup/exportachi",
-    method: "post",
-    data: params,
-    responseType: "blob"
-  });
-}
-// 查询门店业绩分类统计表
-export function achiCommClassifyLists(params) {
-  return service({
-    url: "/demay/ssm/staff/achiCommClassifyLists",
-    method: "post",
-    data: params
-  });
-}
-//明细导出
-export function acehioprtx(params) {
-  return service({
-    url: "/demay/ssm/staff//achiCommLists/exportachi",
-    method: "post",
-    responseType: "blob",
-    data: params
-  });
-}
-//导出员工工资单据明细
-export function exportachiwhole(params) {
-  return service({
-    url: "/demay/ssm/staff/achiCommLists/exportachiwhole",
-    method: "post",
-    data: params
-  });
-}
-//查询项目单品贡献率 selectType; 0=查全公司，1=查门店
-export function rateContribution(params) {
-  return service({
-    url: "/demay/ssm/staff/rateContribution",
-    method: "post",
-    data: params
-  });
-}
-//明细
-export function rateContributionMx(params) {
-  return service({
-    url: "/demay/ssm/staff/rateContributionMx",
-    method: "post",
-    data: params
-  });
-}
-//明细s
-export function rateContributionMxs(params) {
-  return service({
-    url: "/demay/ssm/staff/rateContributionMxs",
-    method: "post",
-    data: params
-  });
-}
-//明细order
-export function rateContributionMxOrder(params) {
-  return service({
-    url: "/demay/ssm/staff/rateContributionMxOrder",
-    method: "post",
-    data: params
-  });
-}
-
-//查询服务单品贡献率 selectType; 0=查全公司，1=查门店
-export function selectCashRateContribution(params) {
-  return service({
-    url: "/demay/ssm/staff/selectCashRateContribution",
-    method: "post",
-    data: params
-  });
-}
-//明细
-export function selectCashRateContributionMx(params) {
-  return service({
-    url: "/demay/ssm/staff/selectCashRateContributionMx",
-    method: "post",
-    data: params
-  });
-}
-//明细s
-export function selectCashRateContributionMxs(params) {
-  return service({
-    url: "/demay/ssm/staff/selectCashRateContributionMxs",
-    method: "post",
-    data: params
-  });
-}
-//明细order
-export function selectCashRateContributionMxOrder(params) {
-  return service({
-    url: "/demay/ssm/staff/selectCashRateContributionMxOrder",
-    method: "post",
-    data: params
-  });
-}
-//换房
-export function roomChange(params) {
-  return service({
-    url: "/demay/ssm/storeSettlement/roomChange",
-    method: "post",
-    data: params
-  });
-}
+import { service } from "../utils/service";
+import { localPath } from "./api.js";
+
+// 添加门店月度任务 门店端-门店月度任务-添加门店月度任务
+export function addMonthTask(params) {
+  return service({
+    url: "/demay/ssm/monthTask/add",
+    method: "post",
+    data: params
+  });
+}
+// 删除门店月度任务 门店端-门店月度任务-删除门店月度任务
+export function delMonthTask(params) {
+  return service({
+    url: "/demay/ssm/monthTask/delete",
+    method: "post",
+    data: params
+  });
+}
+// 分页查询门店月度任务 门店端-门店月度任务-分页查询门店月度任务
+export function monthTaskPage(params) {
+  return service({
+    url: "/demay/ssm/monthTask/page",
+    method: "post",
+    data: params
+  });
+}
+// 门店月度任务统计 门店端-门店月度任务-门店月度任务统计
+export function monthTaskStatistic(params) {
+  return service({
+    url: "/demay/ssm/monthTask/statistic",
+    method: "post",
+    data: params
+  });
+}
+// 修改门店月度任务 门店端-门店月度任务-修改门店月度任务
+export function editMonthTask(params) {
+  return service({
+    url: "/demay/ssm/monthTask/update",
+    method: "post",
+    data: params
+  });
+}
+// 门店月度任务状态修改 门店端-门店月度任务-门店月度任务状态修改
+export function editMonthTaskState(params) {
+  return service({
+    url: "/demay/ssm/monthTask/updateStates",
+    method: "post",
+    data: params
+  });
+}
+
+// 当日负卡金记录查询
+export function dayStatistic(params) {
+  return service({
+    url: "/demay/ssm/negativeCard/dayStatistic",
+    method: "post",
+    data: params
+  });
+}
+// 门店会员统计列表 门店端-门店统计-门店会员统计列表
+export function storeStatisticMemberList(params) {
+  return service({
+    url: "/demay/ssm/storeStatistic/memberList",
+    method: "post",
+    params: params
+  });
+}
+
+// 门店会员统计列表 门店端-门店统计-会员排行榜充值统计
+export function memberRecharge(params) {
+  return service({
+    url: "/demay/ssm/storeStatistic/memberRecharge",
+    method: "post",
+    data: params,
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded"
+    }
+  });
+}
+// 门店项目统计列表 门店端-门店统计-当日门店项目统计列表
+export function memberCourse(params) {
+  return service({
+    url: "/demay/ssm/storeStatistic/memberCourse",
+    method: "post",
+    data: params,
+    headers: {
+      "Content-Type": "application/x-www-form-urlencoded"
+    }
+  });
+}
+
+// 门店项目统计列表 门店端-门店统计-门店项目统计列表
+export function storeStatisticProjectList(params) {
+  return service({
+    url: "/demay/ssm/storeStatistic/projectList",
+    method: "post",
+    data: params
+  });
+}
+
+// 门店员工统计列表 门店端-门店统计-门店员工统计列表
+export function storeStatisticStaffMonthList(params) {
+  return service({
+    url: "/demay/ssm/storeStatistic/staffMonthList",
+    method: "post",
+    data: params
+  });
+}
+
+// 查询员工工资 门店端-统计报表-查询员工工资
+export function selectSalary(params) {
+  return service({
+    url: "/demay/ssm/salary/selectSalary",
+    method: "post",
+    data: params
+  });
+}
+
+// 添加员工工资 门店端-统计报表-添加员工工资
+export function addSalary(params) {
+  return service({
+    url: "/demay/ssm/salary/add",
+    method: "post",
+    data: params
+  });
+}
+
+// 删除员工工资 门店端-统计报表-删除员工工资
+export function delSalary(params) {
+  return service({
+    url: "/demay/ssm/salary/delete",
+    method: "post",
+    data: params
+  });
+}
+
+// 门店日报
+export function storeDaily(params) {
+  return service({
+    url: "/demay/ssm/storeStatistic/storeDaily",
+    method: "post",
+    data: params
+  });
+}
+//多日期的门店日报
+export function storeDailys(params) {
+  return service({
+    url: "/demay/ssm/storeStatistic/storeDailys",
+    method: "post",
+    data: params
+  });
+}
+
+// 门店项目统计列表 门店端-门店统计-月度门店项目统计列表
+export function projectMonthList(params) {
+  return service({
+    url: "/demay/ssm/storeStatistic/projectMonthList",
+    method: "post",
+    data: params
+  });
+}
+
+// 查询门店业绩分类统计表
+export function achiCommLists(params) {
+  return service({
+    url: "/demay/ssm/staff/achiCommLists",
+    method: "post",
+    data: params
+  });
+}
+export function achiCommListsgroup(params) {
+  return service({
+    url: "/demay/ssm/staff/achiCommListsgroup",
+    method: "post",
+    data: params
+  });
+}
+
+//导出
+export function exportachi(params) {
+  return service({
+    url: "/demay/ssm/staff////////achiCommListsgroup/exportachi",
+    method: "post",
+    data: params,
+    responseType: "blob"
+  });
+}
+// 查询门店业绩分类统计表
+export function achiCommClassifyLists(params) {
+  return service({
+    url: "/demay/ssm/staff/achiCommClassifyLists",
+    method: "post",
+    data: params
+  });
+}
+//明细导出
+export function acehioprtx(params) {
+  return service({
+    url: "/demay/ssm/staff//achiCommLists/exportachi",
+    method: "post",
+    responseType: "blob",
+    data: params
+  });
+}
+//导出员工工资单据明细
+export function exportachiwhole(params) {
+  return service({
+    url: "/demay/ssm/staff/achiCommLists/exportachiwhole",
+    method: "post",
+    data: params
+  });
+}
+//查询项目单品贡献率 selectType; 0=查全公司，1=查门店
+export function rateContribution(params) {
+  return service({
+    url: "/demay/ssm/staff/rateContribution",
+    method: "post",
+    data: params
+  });
+}
+//明细
+export function rateContributionMx(params) {
+  return service({
+    url: "/demay/ssm/staff/rateContributionMx",
+    method: "post",
+    data: params
+  });
+}
+//明细s
+export function rateContributionMxs(params) {
+  return service({
+    url: "/demay/ssm/staff/rateContributionMxs",
+    method: "post",
+    data: params
+  });
+}
+//明细order
+export function rateContributionMxOrder(params) {
+  return service({
+    url: "/demay/ssm/staff/rateContributionMxOrder",
+    method: "post",
+    data: params
+  });
+}
+
+//查询服务单品贡献率 selectType; 0=查全公司，1=查门店
+export function selectCashRateContribution(params) {
+  return service({
+    url: "/demay/ssm/staff/selectCashRateContribution",
+    method: "post",
+    data: params
+  });
+}
+//明细
+export function selectCashRateContributionMx(params) {
+  return service({
+    url: "/demay/ssm/staff/selectCashRateContributionMx",
+    method: "post",
+    data: params
+  });
+}
+//明细s
+export function selectCashRateContributionMxs(params) {
+  return service({
+    url: "/demay/ssm/staff/selectCashRateContributionMxs",
+    method: "post",
+    data: params
+  });
+}
+//明细order
+export function selectCashRateContributionMxOrder(params) {
+  return service({
+    url: "/demay/ssm/staff/selectCashRateContributionMxOrder",
+    method: "post",
+    data: params
+  });
+}
+//换房
+export function roomChange(params) {
+  return service({
+    url: "/demay/ssm/storeSettlement/roomChange",
+    method: "post",
+    data: params
+  });
+}
diff --git a/src/pages/eashier/collectionList/collectionList.vue b/src/pages/eashier/collectionList/collectionList.vue
index 72dbc51..f6b9c74 100644
--- a/src/pages/eashier/collectionList/collectionList.vue
+++ b/src/pages/eashier/collectionList/collectionList.vue
@@ -107,7 +107,7 @@
           </el-form-item>
           <el-form-item label="充后赠送:">
             <div class="form-width-ms">
-              <span class="text-red text-price">{{ form.giftAfterMoney }}</span>
+              <span class="text-red text-price" v-if="giftAfterShow">{{ form.giftAfterMoney }}</span>
             </div>
           </el-form-item>
           <el-form-item label="备注说明:">
@@ -122,7 +122,7 @@
         <br>
         <el-form-item label="充后赠送:" v-show="!sessionStorageData.recharge">
           <div class="form-width-ms">
-            <span class="text-red text-price">{{ form.giftAfterMoney }}</span>
+            <span class="text-red text-price" v-if="giftAfterShow">{{ form.giftAfterMoney }}</span>
           </div>
         </el-form-item>
         <el-form-item label="备注说明:" v-show="!sessionStorageData.recharge">
@@ -421,6 +421,7 @@ export default {
       pageInfo: {
         lists: [],
       },
+      giftAfterShow: true, //重新展示充值赠送后金额
       payLists: [], //现付列表
       staffLists: [{ brandNumber: "", staffName: "", ratio: 100 }],
       managerLists: [{ brandNumber: "", staffName: "", ratio: 100 }],
@@ -592,6 +593,8 @@ export default {
             this.form.rechargeTypeId = v.id;
             this.form.discount = v.discount;
             this.form.typeRatio = v.typeRatio;
+            this.form.donateType = v.donateType;
+            this.form.giftMoney = v.giftMoney;
             this.form.collectionAmount = 0;
             this.form.collectionCashAmount = 0;
             if (this.liftType == 0) {
@@ -654,10 +657,17 @@ export default {
               if (!this.form.giftBeforeMoney) {
                 this.form.giftBeforeMoney = 0;
               }
+              let giftMoney = 0;
+              if (v.donateType == 1) {
+                giftMoney =
+                  ((v.giftMoney * this.form.rechargeAmount) / 100).toFixed(2) *
+                  1;
+              } else {
+                giftMoney = v.giftMoney;
+              }
               this.form.giftAfterMoney =
-                this.form.giftBeforeMoney + v.giftMoney;
+                (this.form.giftBeforeMoney + giftMoney).toFixed(2) * 1;
             }
-            this.money = this.form.giftAfterMoney;
             if (this.sessionStorageData.recharge == true) {
               if (this.form.integralCheckbox == true) {
                 let list = JSON.parse(
@@ -692,14 +702,13 @@ export default {
             if (!v.giftMoney) {
               v.giftMoney = 0;
               this.form.giftAfterMoney =
-                this.form.giftBeforeMoney + v.giftMoney;
+                (this.form.giftBeforeMoney + v.giftMoney).toFixed(2) * 1;
             } else {
               this.form.giftAfterMoney =
-                this.form.giftBeforeMoney + v.giftMoney;
+                (this.form.giftBeforeMoney + v.giftMoney).toFixed(2) * 1;
             }
           }
         }
-        this.money = this.form.giftAfterMoney;
         let form = { ...this.form };
         this.form = {};
         this.form = form;
@@ -863,10 +872,14 @@ export default {
               if (this.typeList.giftMoney == null) {
                 this.typeList.giftMoney = 0;
                 this.form.giftAfterMoney =
-                  this.form.giftBeforeMoney + this.typeList.giftMoney;
+                  (this.form.giftBeforeMoney + this.typeList.giftMoney).toFixed(
+                    2
+                  ) * 1;
               } else {
                 this.form.giftAfterMoney =
-                  this.form.giftBeforeMoney + this.typeList.giftMoney;
+                  (this.form.giftBeforeMoney + this.typeList.giftMoney).toFixed(
+                    2
+                  ) * 1;
               }
               this.$alert("查询会员信息 : " + res.message, "提示", {
                 confirmButtonText: "确定",
@@ -938,66 +951,31 @@ export default {
       }
       this.form.afterMoney =
         this.form.collectionCashAmount + this.form.beforeMoney + integralMoney;
-      if (this.form.debtMoney != 0) {
-        this.form.giftAfterMoney = this.form.giftBeforeMoney;
-        if (
-          this.form.debtMoney * 1 >
-          (
-            (this.form.rechargeAmount *
-              this.sessionStorageData.recDebtRatio *
-              1) /
-            100
-          ).toFixed(2) *
-            1
-        ) {
-          this.$message.warning({
-            message:
-              "本次支付金额最多可以欠款 : " +
-              (
-                (this.form.rechargeAmount *
-                  this.sessionStorageData.recDebtRatio *
-                  1) /
-                100
-              ).toFixed(2) *
-                1,
-          });
-        }
-      } else {
-        this.form.giftAfterMoney = this.money;
+      if (
+        this.form.debtMoney * 1 >
+        (
+          (this.form.rechargeAmount *
+            this.sessionStorageData.recDebtRatio *
+            1) /
+          100
+        ).toFixed(2) *
+          1
+      ) {
+        this.$message.warning({
+          message:
+            "本次支付金额最多可以欠款 : " +
+            (
+              (this.form.rechargeAmount *
+                this.sessionStorageData.recDebtRatio *
+                1) /
+              100
+            ).toFixed(2) *
+              1,
+        });
       }
     },
 
     empty() {
-      //   this.form = {
-      //     mobilePhone: null,
-      //     memberName: null,
-      //     sex: null,
-      //     collectionCashAmount: null,
-      //     beforeMoney: 0,
-      //     afterMoney: 0,
-      //     description: null,
-      //     rechargeTypeName: null,
-      //     integralCheckbox: false,
-      //     debtMoney: null,
-      //     additionDate: null,
-      //     rechargeAmount: 0,
-      //     debtMoney: 0,
-      //     afterMoney: 0,
-      //     giftAfterMoney: 0,
-      //     giftBeforeMoney: 0,
-      //   };
-      //   this.debtMoneys = 0;
-      //   this.integral = 0;
-      //   this.integralMoney = 0;
-      //   this.consumeIntegral = 0;
-      //   this.payLists = [];
-      //   this.staffLists = [{ ratio: 100 }];
-      //   this.managerLists = [{ ratio: 100 }];
-      //   this.adminList = [{ ratio: 100 }];
-      //   this.activeName = ["员工"];
-      //   this.setStaffRatio();
-      //   this.getCtList();
-      // },
       Object.assign(this.$data, this.$options.data.call(this));
       this.setPage();
     },
@@ -1159,7 +1137,6 @@ export default {
             this.$message.success({
               message: res.message,
             });
-            this.money = 0;
           } else {
             this.$alert(res.message, "提示", {
               confirmButtonText: "确定",
@@ -1178,7 +1155,6 @@ export default {
             this.$message.success({
               message: res.message,
             });
-            this.money = 0;
           } else {
             this.$alert(res.message, "提示", {
               confirmButtonText: "确定",
@@ -1324,7 +1300,6 @@ export default {
             list.push(items);
           });
           this.payLists = list;
-          this.num();
         } else {
           this.$alert("现付列表" + res.message, "提示", {
             confirmButtonText: "确定",
@@ -1389,16 +1364,32 @@ export default {
     //求和
     num() {
       var num = 0;
+      var form = { ...this.form };
       this.payLists.forEach((item) => {
         num += item.payMoney * 1;
       });
-      this.form.collectionCashAmount = num;
-      if (this.form.integralCheckbox == true) {
-        this.form.collectionAmount =
-          this.form.collectionCashAmount + this.integralMoney;
+      form.collectionCashAmount = num;
+      if (form.integralCheckbox == true) {
+        form.collectionAmount = form.collectionCashAmount + this.integralMoney;
       } else {
-        this.form.collectionAmount = this.form.collectionCashAmount;
+        form.collectionAmount = form.collectionCashAmount;
       }
+      let giftMoney = 0;
+      if (form.donateType == 1) {
+        giftMoney =
+          ((form.giftMoney * form.collectionCashAmount) / 100).toFixed(2) * 1;
+      } else {
+        giftMoney = form.giftMoney;
+      }
+      form.giftAfterMoney = (form.giftBeforeMoney + giftMoney).toFixed(2) * 1;
+      console.log(form.giftBeforeMoney + giftMoney);
+      console.log(form.giftAfterMoney);
+      this.giftAfterShow = false;
+      this.form = {};
+      this.form = { ...form };
+      console.log(this.form);
+
+      this.giftAfterShow = true;
     },
     //分页方法
     handleSizeChange(val) {
diff --git a/src/pages/statistics/storeDaily/storeDaily.vue b/src/pages/statistics/storeDaily/storeDaily.vue
index 396782e..d68518b 100644
--- a/src/pages/statistics/storeDaily/storeDaily.vue
+++ b/src/pages/statistics/storeDaily/storeDaily.vue
@@ -1,344 +1,260 @@
-<template>
-  <!-- 员工工资 -->
-  <div>
-    <div class="staffRanking_header padding-bottom-xs">
-      <div>
-        当前年/月份{{ month }}
-        <el-button size="mini" @click="del" type="primary" v-role="6006001">删除</el-button>
-      </div>
-      <div class="block">
-        <span class="demonstration padding-left-xs">选择日</span>
-        <el-date-picker v-model="days" :picker-options="pickerOptions" @change="changeMonth" type="daterange" value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
-        </el-date-picker>
-      </div>
-    </div>
-    <el-table @row-dblclick="confirm" :data="tableDate" :header-cell-style="{
-        background: 'linear-gradient(#6cb3ff, #1873d4)',
-        color: '#eeeeee',
-      }" :summary-method="getSummaries" show-summary border max-height="700">
-      <el-table-column align="center" min-width="80" prop="datae" label="日期"></el-table-column>
-      <el-table-column align="center" min-width="80" prop="kedans" label="客单数">
-        <template slot-scope="scope">
-          {{scope.row.kedans?scope.row.kedans:'--'}}
-        </template>
-      </el-table-column>
-      <el-table-column align="center" min-width="80" prop="rechargeyj" label="充值金额">
-        <template slot-scope="scope">
-          {{scope.row.rechargeyj?scope.row.rechargeyj:'--'}}
-        </template>
-      </el-table-column>
-
-      <el-table-column align="center" min-width="80" prop="courseOfTreatmentYJ" label="充值人数">
-        <template slot-scope="scope">
-          {{scope.row.courseOfTreatmentYJ?scope.row.courseOfTreatmentYJ:'--'}}
-        </template>
-      </el-table-column>
-      <el-table-column align="center" min-width="80" prop="lcCardyj" label="服务金额">
-        <template slot-scope="scope">
-          {{scope.row.lcCardyj?scope.row.lcCardyj:'--'}}
-        </template>
-      </el-table-column>
-      <el-table-column align="center" min-width="80" prop="rechargeTurnCourseChia" label="男客">
-        <template slot-scope="scope">
-          {{scope.row.rechargeTurnCourseChia?scope.row.rechargeTurnCourseChia:'--'}}
-        </template>
-      </el-table-column>
-      <el-table-column align="center" min-width="80" prop="rechargeTurnCourseChia" label="女客">
-        <template slot-scope="scope">
-          {{scope.row.rechargeTurnCourseChia?scope.row.rechargeTurnCourseChia:'--'}}
-        </template>
-      </el-table-column>
-      <el-table-column align="center" min-width="80" prop="rechargeTurnCourseChia" label="还款金额">
-        <template slot-scope="scope">
-          {{scope.row.rechargeTurnCourseChia?scope.row.rechargeTurnCourseChia:'--'}}
-        </template>
-      </el-table-column>
-      <el-table-column align="center" min-width="80" prop="rechargeTurnCourseChia" label="退款金额">
-        <template slot-scope="scope">
-          {{scope.row.rechargeTurnCourseChia?scope.row.rechargeTurnCourseChia:'--'}}
-        </template>
-      </el-table-column>
-      <el-table-column align="center" min-width="80" prop="rechargeTurnCourseChia" label="新增会员">
-        <template slot-scope="scope">
-          {{scope.row.rechargeTurnCourseChia?scope.row.rechargeTurnCourseChia:'--'}}
-        </template>
-      </el-table-column>
-      <el-table-column align="center" min-width="80" prop="rechargeTurnCourseChia" label="启用会员">
-        <template slot-scope="scope">
-          {{scope.row.rechargeTurnCourseChia?scope.row.rechargeTurnCourseChia:'--'}}
-        </template>
-      </el-table-column>
-      <el-table-column align="center" min-width="80" prop="rechargeTurnCourseChia" label="会员总数">
-        <template slot-scope="scope">
-          {{scope.row.rechargeTurnCourseChia?scope.row.rechargeTurnCourseChia:'--'}}
-        </template>
-      </el-table-column>
-    </el-table>
-    <perform ref="perform"></perform>
-  </div>
-</template>
-
-<script>
-import {
-  selectSalary,
-  addSalary,
-  delSalary,
-  achiCommListsgroup,
-  exportachi,
-  exportachiwhole,
-} from "@/api/statistics.js";
-import { partten } from "../../../../partten/index";
-import perform from "./examine/index";
-export default {
-  components: { perform },
-  data() {
-    return {
-      days: "",
-      tableDate: [{}],
-      month: partten.months,
-      pickerOptions: {
-        //组件限制方法
-        onPick: ({ maxDate, minDate }) => {
-          this.choiceDate = minDate.getTime();
-          if (maxDate) {
-            this.choiceDate = "";
-          }
-        },
-        disabledDate: (time) => {
-          const self = this;
-          if (!!self.choiceDate) {
-            const startDay =
-              (new Date(self.choiceDate).getDate() - 1) * 24 * 3600 * 1000;
-            const endDay =
-              (new Date(
-                new Date(self.choiceDate).getFullYear(),
-                new Date(self.choiceDate).getMonth() + 1,
-                0
-              ).getDate() -
-                new Date(self.choiceDate).getDate()) *
-              24 *
-              3600 *
-              1000;
-            let minTime = self.choiceDate - startDay;
-            let maxTime = self.choiceDate + endDay;
-            return time.getTime() < minTime || time.getTime() > maxTime;
-          }
-        },
-      },
-    };
-  },
-  methods: {
-    //导出方法
-    exit() {
-      let date1 = this.formatTime(this.days[0], "YYYY-MM-DD 00:00:00");
-      let date2 = this.formatTime(this.days[1], "YYYY-MM-DD 23:59:59");
-      let form = { startDate: date1, endDate: date2 };
-      exportachi(form).then((res) => {
-        let blob = new Blob([res]);
-        var a = document.createElement("a");
-        var url = window.URL.createObjectURL(blob);
-        console.log(url);
-        a.href = url;
-        a.download = "员工业绩导出表.xlsx";
-        a.click();
-        window.URL.revokeObjectURL(url);
-      });
-    },
-    exits() {
-      let date1 = this.formatTime(this.days[0], "YYYY-MM-DD 00:00:00");
-      let date2 = this.formatTime(this.days[1], "YYYY-MM-DD 23:59:59");
-      let form = { startDate: date1, endDate: date2 };
-      exportachiwhole(form).then((res) => {
-        let blob = new Blob([res]);
-        var a = document.createElement("a");
-        var url = window.URL.createObjectURL(blob);
-        console.log(url);
-        a.href = url;
-        a.download = "员工工资明细导出表.xlsx";
-        a.click();
-        window.URL.revokeObjectURL(url);
-      });
-    },
-    handleStaffName(index) {
-      let tableDate = Array.from(this.tableDate);
-      tableDate[index].show = true;
-      this.tableDate = Array.from(tableDate);
-    },
-    del() {
-      this.$confirm("将之前保存数据库的数据进行删除 , 是否继续", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        cancelButtonClass: "cancelbtnFalses",
-        confirmButtonClass: "confirmbtnFalses",
-      }).then(() => {
-        delSalary({ type: 3 }).then((res) => {
-          if (res.code == "000000") {
-            this.$message.success({ message: res.message });
-          } else {
-            this.$alert(res.message, "提示", {
-              confirmButtonText: "确定",
-              confirmButtonClass: "confirmbtnFalses",
-              type: "warning",
-              center: true,
-              callback: (action) => {},
-            });
-          }
-        });
-      });
-    },
-    seve() {
-      this.$confirm("将当前数据保存到数据库备份 , 是否继续保存", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-        cancelButtonClass: "cancelbtnFalses",
-        confirmButtonClass: "confirmbtnFalses",
-      }).then(() => {
-        addSalary(this.tableDate).then((res) => {
-          if (res.code == "000000") {
-            this.$message.success({ message: res.message });
-          } else {
-            this.$alert(res.message, "提示", {
-              confirmButtonText: "确定",
-              confirmButtonClass: "confirmbtnFalses",
-              type: "warning",
-              center: true,
-              callback: (action) => {},
-            });
-          }
-        });
-      });
-    },
-    changeMonth(res) {
-      console.log(res);
-      let date = this.formatTime(res[1], "YYYY-MM-DD 23:59:59");
-      var form = { startDate: res[0], endDate: date };
-      let month = this.formatTime(this.month, "YYYY-MM");
-      achiCommListsgroup(form).then((res) => {
-        if (res.code == "000000") {
-          res.rows.forEach((item) => {
-            item.baseSalary = item.baseSalary == null ? 0 : item.baseSalary * 1;
-            item.commSalary = item.commSalary == null ? 0 : item.commSalary * 1;
-            item.sumNumber = (item.baseSalary + item.commSalary).toFixed(2) * 1;
-            item.startDate = form.startDate;
-            item.endDate = form.endDate;
-            console.log(item);
-          });
-
-          this.tableDate = res.rows;
-        } else {
-          this.$alert(res.message, "提示", {
-            confirmButtonText: "确定",
-            confirmButtonClass: "confirmbtnFalses",
-            type: "warning",
-            center: true,
-            callback: (action) => {},
-          });
-        }
-      });
-    },
-    achiCommListsgroup() {
-      let month = this.formatTime(new Date(), "YYYY-MM-DD hh:mm:ss");
-      let date1 = this.formatTime(new Date(), "YYYY-MM-DD 00:00:00");
-      let date2 = this.formatTime(new Date(), "YYYY-MM-DD 23:59:59");
-      let form = { startDate: date1, endDate: date2 };
-      achiCommListsgroup(form).then((res) => {
-        if (res.code == "000000") {
-          res.rows.forEach((item) => {
-            item.baseSalary = item.baseSalary == null ? 0 : item.baseSalary * 1;
-            item.commSalary = item.commSalary == null ? 0 : item.commSalary * 1;
-            item.sumNumber = (item.baseSalary + item.commSalary).toFixed(2) * 1;
-            item.startDate = form.startDate;
-            item.endDate = form.endDate;
-          });
-          this.tableDate = res.rows;
-        } else {
-          this.$alert(res.message, "提示", {
-            confirmButtonText: "确定",
-            confirmButtonClass: "confirmbtnFalses",
-            type: "warning",
-            center: true,
-            callback: (action) => {},
-          });
-        }
-      });
-    },
-    confirm(row) {
-      row.type = 3;
-      this.$refs.perform.show(row);
-    },
-    //指定列求和
-    //数组按对应字段合计返回方法
-    getSummaries(param) {
-      const { columns, data } = param;
-      const sums = [];
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = "合计";
-          return;
-        }
-
-        const values = data.map((item) => Number(item[column.property]));
-        if (column.property == "baseSalary") {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return (prev + curr).toFixed(2) * 1;
-            } else {
-              sums[index] = "--";
-            }
-          }, 0);
-          sums[index] += " ";
-        } else if (column.property == "zyj") {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return (prev + curr).toFixed(2) * 1;
-            } else {
-              sums[index] = "--";
-            }
-          }, 0);
-          sums[index] += " ";
-        } else if (column.property == "totalWages") {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return (prev + curr).toFixed(2) * 1;
-            } else {
-              sums[index] = "--";
-            }
-          }, 0);
-          sums[index] += " ";
-        } else if (column.property == "totaltc") {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return (prev + curr).toFixed(2) * 1;
-            } else {
-              sums[index] = "--";
-            }
-          }, 0);
-          sums[index] += " ";
-        } else {
-          sums[index] = "--";
-        }
-      });
-      return sums;
-    },
-  },
-  created() {
-    let sDate = this.formatTime(new Date(), "YYYY-MM-DD 00:00:00");
-    let eDate = this.formatTime(new Date(), "YYYY-MM-DD 23:59:59");
-    this.days = [sDate, eDate];
-    // this.achiCommListsgroup();
-  },
-};
-</script>
-
-<style>
-.staffRanking_header {
-  display: flex;
-  justify-content: space-between;
-}
-</style>
+<template>
+  <!-- 员工工资 -->
+  <div>
+    <div class="staffRanking_header padding-bottom-xs">
+      <div>
+        <span class="demonstration padding-left-xs">选择日</span>
+        <el-date-picker v-model="days" :picker-options="pickerOptions" @change="changeMonth" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+        </el-date-picker>
+      </div>
+      <div class="block">
+      </div>
+    </div>
+    <el-table @row-dblclick="confirm" :data="tableDate" :header-cell-style="{
+        background: 'linear-gradient(#6cb3ff, #1873d4)',
+        color: '#eeeeee',
+      }" :summary-method="getSummaries" show-summary border max-height="700">
+      <el-table-column align="center" min-width="80" prop="date" label="日期"></el-table-column>
+      <el-table-column align="center" min-width="80" prop="cashPeopleNum" label="客单数">
+        <template slot-scope="scope">
+          {{scope.row.cashPeopleNum?scope.row.cashPeopleNum:'--'}}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" min-width="80" prop="rechargeMoney" label="充值金额">
+        <template slot-scope="scope">
+          {{scope.row.rechargeMoney?scope.row.rechargeMoney:'--'}}
+        </template>
+      </el-table-column>
+
+      <el-table-column align="center" min-width="80" prop="rechargeOrderNum" label="充值人数">
+        <template slot-scope="scope">
+          {{scope.row.rechargeOrderNum?scope.row.rechargeOrderNum:'--'}}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" min-width="80" prop="cashMoney" label="服务金额">
+        <template slot-scope="scope">
+          {{scope.row.cashMoney?scope.row.cashMoney:'--'}}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" min-width="80" prop="man" label="男客">
+        <template slot-scope="scope">
+          {{scope.row.man?scope.row.man:'--'}}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" min-width="80" prop="woman" label="女客">
+        <template slot-scope="scope">
+          {{scope.row.woman?scope.row.woman:'--'}}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" min-width="80" prop="repayMoney" label="还款金额">
+        <template slot-scope="scope">
+          {{scope.row.repayMoney?scope.row.repayMoney:'--'}}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" min-width="80" prop="refundMoney" label="退款金额">
+        <template slot-scope="scope">
+          {{scope.row.refundMoney?scope.row.refundMoney:'--'}}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" min-width="80" prop="newMemberNum" label="新增会员">
+        <template slot-scope="scope">
+          {{scope.row.newMemberNum?scope.row.newMemberNum:'--'}}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" min-width="80" prop="startMemberNum" label="启用会员">
+        <template slot-scope="scope">
+          {{scope.row.startMemberNum?scope.row.startMemberNum:'--'}}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" min-width="80" prop="memberNum" label="会员总数">
+        <template slot-scope="scope">
+          {{scope.row.memberNum?scope.row.memberNum:'--'}}
+        </template>
+      </el-table-column>
+    </el-table>
+    <perform ref="perform"></perform>
+  </div>
+</template>
+
+<script>
+import { storeDailys, exportachi, exportachiwhole } from "@/api/statistics.js";
+import { partten } from "../../../../partten/index";
+import perform from "./examine/index";
+export default {
+  components: { perform },
+  data() {
+    return {
+      days: "",
+      tableDate: [{}],
+      month: partten.months,
+      queryForm: {},
+      pickerOptions: {
+        //组件限制方法
+        onPick: ({ maxDate, minDate }) => {
+          this.choiceDate = minDate.getTime();
+          if (maxDate) {
+            this.choiceDate = "";
+          }
+        },
+        disabledDate: (time) => {
+          const self = this;
+          if (!!self.choiceDate) {
+            const startDay =
+              (new Date(self.choiceDate).getDate() - 1) * 24 * 3600 * 1000;
+            const endDay =
+              (new Date(
+                new Date(self.choiceDate).getFullYear(),
+                new Date(self.choiceDate).getMonth() + 1,
+                0
+              ).getDate() -
+                new Date(self.choiceDate).getDate()) *
+              24 *
+              3600 *
+              1000;
+            let minTime = self.choiceDate - startDay;
+            let maxTime = self.choiceDate + endDay;
+            return time.getTime() < minTime || time.getTime() > maxTime;
+          }
+        },
+      },
+    };
+  },
+  methods: {
+    //导出方法
+    exit() {
+      let date1 = this.formatTime(this.days[0], "YYYY-MM-DD");
+      let date2 = this.formatTime(this.days[1], "YYYY-MM-DD");
+      let form = { startDate: date1, endDate: date2 };
+      exportachi(form).then((res) => {
+        let blob = new Blob([res]);
+        var a = document.createElement("a");
+        var url = window.URL.createObjectURL(blob);
+        console.log(url);
+        a.href = url;
+        a.download = "员工业绩导出表.xlsx";
+        a.click();
+        window.URL.revokeObjectURL(url);
+      });
+    },
+    exits() {
+      let date1 = this.formatTime(this.days[0], "YYYY-MM-DD");
+      let date2 = this.formatTime(this.days[1], "YYYY-MM-DD");
+      let form = { startDate: date1, endDate: date2 };
+      exportachiwhole(form).then((res) => {
+        let blob = new Blob([res]);
+        var a = document.createElement("a");
+        var url = window.URL.createObjectURL(blob);
+        console.log(url);
+        a.href = url;
+        a.download = "员工工资明细导出表.xlsx";
+        a.click();
+        window.URL.revokeObjectURL(url);
+      });
+    },
+
+    changeMonth(res) {
+      this.days = res;
+      this.getData();
+    },
+    getData() {
+      this.queryForm.startDate = this.days[0];
+      this.queryForm.endDate = this.days[1];
+      storeDailys(this.queryForm).then((res) => {
+        if (res.code == "000000") {
+          res.rows.forEach((item) => {
+            item.baseSalary = item.baseSalary == null ? 0 : item.baseSalary * 1;
+            item.commSalary = item.commSalary == null ? 0 : item.commSalary * 1;
+            item.sumNumber = (item.baseSalary + item.commSalary).toFixed(2) * 1;
+            item.startDate = form.startDate;
+            item.endDate = form.endDate;
+          });
+          this.tableDate = res.rows;
+        } else {
+          this.$alert(res.message, "提示", {
+            confirmButtonText: "确定",
+            confirmButtonClass: "confirmbtnFalses",
+            type: "warning",
+            center: true,
+            callback: (action) => {},
+          });
+        }
+      });
+    },
+    confirm(row) {
+      row.type = 3;
+      this.$refs.perform.show(row);
+    },
+    //指定列求和
+    //数组按对应字段合计返回方法
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+          return;
+        }
+
+        const values = data.map((item) => Number(item[column.property]));
+        if (column.property == "baseSalary") {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return (prev + curr).toFixed(2) * 1;
+            } else {
+              sums[index] = "--";
+            }
+          }, 0);
+          sums[index] += " ";
+        } else if (column.property == "zyj") {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return (prev + curr).toFixed(2) * 1;
+            } else {
+              sums[index] = "--";
+            }
+          }, 0);
+          sums[index] += " ";
+        } else if (column.property == "totalWages") {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return (prev + curr).toFixed(2) * 1;
+            } else {
+              sums[index] = "--";
+            }
+          }, 0);
+          sums[index] += " ";
+        } else if (column.property == "totaltc") {
+          sums[index] = values.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return (prev + curr).toFixed(2) * 1;
+            } else {
+              sums[index] = "--";
+            }
+          }, 0);
+          sums[index] += " ";
+        } else {
+          sums[index] = "--";
+        }
+      });
+      return sums;
+    },
+  },
+  created() {
+    let sDate = this.formatTime(new Date(), "YYYY-MM-DD");
+    let eDate = this.formatTime(new Date(), "YYYY-MM-DD");
+    this.days = [sDate, eDate];
+    this.getData();
+  },
+};
+</script>
+
+<style>
+.staffRanking_header {
+  display: flex;
+  justify-content: space-between;
+}
+</style>