From 1ee4de0760c37157580d37d79a9152117c9b39ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Wed, 28 Aug 2024 17:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon.ico                            | Bin 16958 -> 16958 bytes
 src/api/system/dashboard.js                   |   8 ++++
 src/assets/logo/logo.png                      | Bin 4248 -> 9663 bytes
 .../Business/Dept/DeptTreeSelect.vue          |   5 +-
 src/layout/components/Sidebar/Logo.vue        |   1 +
 src/utils/constants.js                        |  17 +++++++
 .../smUser/components/userRechargeReport.vue  |  29 ++++++------
 src/views/system/smUser/detail.vue            |  31 +++++++-----
 src/views/system/smUser/index.vue             |  44 +++++++++++++-----
 src/views/system/withdraw/detail.vue          |   6 +--
 10 files changed, 99 insertions(+), 42 deletions(-)

diff --git a/public/favicon.ico b/public/favicon.ico
index 1b1cddbd2fe49a80e8c6ad2aafc8b2efdbc5f262..76e4ef49ed97c38248e03573c10f661cc2010e2c 100644
GIT binary patch
literal 16958
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

literal 16958
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

diff --git a/src/api/system/dashboard.js b/src/api/system/dashboard.js
index 2b1dcc5..9065fb1 100644
--- a/src/api/system/dashboard.js
+++ b/src/api/system/dashboard.js
@@ -36,4 +36,12 @@ export function getTodoList() {
   })
 }
 
+// 分成月报表
+export function bonusMonthAmount(query) {
+  return request({
+    url: '/system/dashboard/bonusMonthAmount',
+    method: 'get',
+    params: query
+  })
+}
 
diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
index f0698f48150de48acf0b4c7ece48574ece61d272..96b851000ca90cef58f6cf7069c69b834e76bb91 100644
GIT binary patch
literal 9663
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%0DmB6MpexO4
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
KwockS;(q|fwQdIh

literal 4248
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

diff --git a/src/components/Business/Dept/DeptTreeSelect.vue b/src/components/Business/Dept/DeptTreeSelect.vue
index 82fb2ef..772c6e6 100644
--- a/src/components/Business/Dept/DeptTreeSelect.vue
+++ b/src/components/Business/Dept/DeptTreeSelect.vue
@@ -12,6 +12,7 @@
 import {listDept} from "@/api/system/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { isDeepEqual } from '@/utils'
 
 export default {
   name: "DeptTreeSelect",
@@ -38,7 +39,9 @@ export default {
       },
       set(val) {
         this.$emit('input', val);
-        this.$emit('change', val);
+        if (!isDeepEqual(val, this.value)) {
+          this.$emit('change', val);
+        }
       }
     }
   },
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index a6b5664..5b7c546 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -72,6 +72,7 @@ export default {
       height: 32px;
       vertical-align: middle;
       margin-right: 12px;
+      border-radius: 16px;
     }
 
     & .sidebar-title {
diff --git a/src/utils/constants.js b/src/utils/constants.js
index 71f5e6e..992d527 100644
--- a/src/utils/constants.js
+++ b/src/utils/constants.js
@@ -125,3 +125,20 @@ export const RecordBalanceSubjectType = {
   USER: "1",  // 用户
   DEPT: "2",  // 运营商
 }
+
+export const BonusArrivalType = {
+  PLATFORM: "1",  // 平台
+  COMPANY: "2",  // 公司
+  DISTRIBUTOR: "3",  // 分销商
+  SALESMAN: "4",  // 业务员
+  INVESTOR: "5",  // 投资人
+  STORE: "6",  // 经营场所
+  // 用户表
+  userList() {
+    return [this.DISTRIBUTOR, this.SALESMAN, this.INVESTOR, this.STORE]
+  },
+  // 部门表
+  deptList() {
+    return [this.COMPANY, this.PLATFORM]
+  }
+}
diff --git a/src/views/system/smUser/components/userRechargeReport.vue b/src/views/system/smUser/components/userRechargeReport.vue
index 6948c16..8607ad0 100644
--- a/src/views/system/smUser/components/userRechargeReport.vue
+++ b/src/views/system/smUser/components/userRechargeReport.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <el-row type="flex">
-      <el-tabs v-model="queryParams.groupBy" style="width: 100%">
-        <el-tab-pane label="月报表" name="create_month">
-          <range-picker v-model="queryParams.year" @change="onChangeYear" suffix="年"/>
+      <el-tabs style="width: 100%">
+        <el-tab-pane label="月报表">
+          <range-picker v-model="queryParams.payTimeYear" @change="onChangeYear" suffix="年"/>
         </el-tab-pane>
       </el-tabs>
     </el-row>
@@ -15,6 +15,8 @@
 import SingleLineChart from "@/components/SingleLineChart/index.vue";
 import RangePicker from "@/components/RangePicker/index.vue";
 import {countBill, listBill} from "@/api/system/recharge";
+import { BonusArrivalType } from '@/utils/constants'
+import { bonusMonthAmount } from '@/api/system/dashboard'
 
 export default {
   name: 'userRechargeReport',
@@ -31,11 +33,9 @@ export default {
       labels: ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'], // x轴
       chartData: [],  // 报表数据
       queryParams: {
-        type: 1,
-        year: new Date().getFullYear(),
-        status: "2",
-        groupBy: "create_month",
-        mchId: this.mchId,
+        payTimeYear: new Date().getFullYear(),
+        arrivalId: this.mchId,
+        arrivalTypes: BonusArrivalType.userList(),
       },
       loading: false,
     }
@@ -48,23 +48,24 @@ export default {
   methods: {
     // 当年份发生变化
     onChangeYear(year) {
-      this.queryParams.year = year;
+      this.queryParams.payTimeYear = year;
       this.getReportData(this.mchId);
     },
     // 获取到账人的报表
     getReportData(mchId) {
       this.loading = true;
-      this.queryParams.mchId = mchId | this.mchId;
-      countBill(this.queryParams).then(response => {
+      this.queryParams.arrivalId = mchId | this.mchId;
+      bonusMonthAmount(this.queryParams).then(response => {
         let data = response.data;
         // 按月统计数据
         let list = [];
         if (data != null) {
           for (let i = 1; i <= this.getReportMonth(); i ++) {
-            let monthData = data.find(item => item.createMonth === i);
-            list[i - 1] = monthData == null ? 0 : monthData.recharge;
+            let monthData = data.find(item => item.month === i);
+            list[i - 1] = monthData == null ? 0 : monthData.amount;
           }
         }
+        console.log('chartData', list)
         this.chartData = list;
       }).finally(() => {
         this.loading = false;
@@ -74,7 +75,7 @@ export default {
     getReportMonth() {
       let now = new Date();
       let nowYear = new Date().getFullYear()
-      let paramYear = this.queryParams.year;
+      let paramYear = this.queryParams.payTimeYear;
       if (paramYear < nowYear) {
         return 12;
       }
diff --git a/src/views/system/smUser/detail.vue b/src/views/system/smUser/detail.vue
index da8a371..cae560f 100644
--- a/src/views/system/smUser/detail.vue
+++ b/src/views/system/smUser/detail.vue
@@ -21,24 +21,31 @@
                   <el-descriptions-item label="实名认证">
                     <el-tag :type="userData.isReal ? 'success' : 'danger'" size="mini">{{userData.isReal ? '已实名' : '未实名'}}</el-tag>
                   </el-descriptions-item>
-                  <el-descriptions-item label="推广人">
+                  <el-descriptions-item label="推广人" v-if="![SmUserType.NORMAL, SmUserType.BUSINESS_PLACE].includes(userData.type)">
                     <user-link :id="userData.referenceId" :name="userData.referenceName"/>
                   </el-descriptions-item>
-                  <el-descriptions-item label="直属代理">
+                  <el-descriptions-item label="直属代理" v-if="![SmUserType.NORMAL, SmUserType.BUSINESS_PLACE].includes(userData.type)">
                     <user-link :id="userData.agentId" :name="userData.agentName"/>
                   </el-descriptions-item>
-                  <el-descriptions-item label="运营商">
-                    {{userData.deptName | defaultValue}}
-                  </el-descriptions-item>
 <!--                  <el-descriptions-item label="微信OpenId" :span="3">{{userData.wxOpenId | defaultValue}}</el-descriptions-item>-->
-                  <el-descriptions-item label="分成比例" v-if="[SmUserType.BUSINESS_PLACE, SmUserType.NORMAL].includes(userData.type)">
+                  <el-descriptions-item label="分成比例" v-if="![SmUserType.BUSINESS_PLACE, SmUserType.NORMAL].includes(userData.type)">
                     {{userData.point | money | defaultValue}} %
                   </el-descriptions-item>
-                  <el-descriptions-item label="代理数">{{userData.agentCount | defaultValue}} 人</el-descriptions-item>
-                  <el-descriptions-item label="业务员数">{{userData.bizManCount | defaultValue}} 人</el-descriptions-item>
-                  <el-descriptions-item label="投资人数">{{userData.investorCount | defaultValue}} 人</el-descriptions-item>
-                  <el-descriptions-item label="经营场所数">{{userData.storeCount | defaultValue}} 家</el-descriptions-item>
-                  <el-descriptions-item label="设备数">{{userData.deviceCount | defaultValue}} 台</el-descriptions-item>
+                  <el-descriptions-item label="代理数" v-if="[SmUserType.SALE].includes(userData.type)">
+                    {{userData.agentCount | defaultValue}} 人
+                  </el-descriptions-item>
+                  <el-descriptions-item label="业务员数" v-if="[SmUserType.SALE, SmUserType.BIZ].includes(userData.type)">
+                    {{userData.bizManCount | defaultValue}} 人
+                  </el-descriptions-item>
+                  <el-descriptions-item label="投资人数" v-if="[SmUserType.SALE, SmUserType.BIZ].includes(userData.type)">
+                    {{userData.investorCount | defaultValue}} 人
+                  </el-descriptions-item>
+                  <el-descriptions-item label="经营场所数">
+                    {{userData.storeCount | defaultValue}} 家
+                  </el-descriptions-item>
+                  <el-descriptions-item label="设备数" v-if="[SmUserType.SALE, SmUserType.BIZ, SmUserType.INVESTOR].includes(userData.type)">
+                    {{userData.deviceCount | defaultValue}} 台
+                  </el-descriptions-item>
                   <el-descriptions-item label="账户余额">{{userData.balance | money | defaultValue}} 元</el-descriptions-item>
                   <el-descriptions-item label="总收入">{{userData.totalIncome | money | defaultValue}} 元</el-descriptions-item>
                   <el-descriptions-item label="总充值">{{userData.rechargeAmount | money | defaultValue}} 元</el-descriptions-item>
@@ -206,7 +213,7 @@ export default {
 .user-detail {
   position: relative;
   display: flex;
-  height: fit-content;
+  height: 320px;
   flex-direction: column;
 }
 .user-detail .user-description {
diff --git a/src/views/system/smUser/index.vue b/src/views/system/smUser/index.vue
index 85c18c0..c153676 100644
--- a/src/views/system/smUser/index.vue
+++ b/src/views/system/smUser/index.vue
@@ -198,11 +198,11 @@
               />
             </el-select>
           </form-col>
-          <form-col :span="span" label="运营商" prop="deptId" v-if="form.type === SmUserType.SALE">
-            <dept-tree-select v-model="form.deptId"/>
+          <form-col :span="span" label="运营商" prop="deptId">
+            <dept-tree-select v-model="form.deptId" @change="onChangeDept"/>
           </form-col>
           <form-col :span="span" label="推广人" prop="referenceId" v-if="![SmUserType.NORMAL, SmUserType.BUSINESS_PLACE].includes(form.type)">
-            <user-input v-model="form.referenceId" @change="onChangeReference" show-type :query="referenceQuery" />
+            <user-input v-model="form.referenceId" @change="onChangeReference" show-type :query="referenceQuery" :before-open="beforeOpenReference"/>
           </form-col>
           <form-col :span="span" label="用户名" prop="userName">
             <el-input v-model="form.userName" placeholder="请输入用户名" />
@@ -269,13 +269,17 @@ export default {
     },
     // 推广人查询条件
     referenceQuery() {
+      let query = {
+        excludeId: this.form.userId,
+        deptId: this.form.deptId,
+      }
       if (this.type === SmUserType.SALE) {
-        return {type: SmUserType.SALE, excludeId: this.form.userId}
+        query.type = SmUserType.SALE;
       }
       if (this.type === SmUserType.BIZ) {
-        return {types: [SmUserType.SALE, SmUserType.BIZ], excludeId: this.form.userId}
+        query.types =  [SmUserType.SALE, SmUserType.BIZ]
       }
-      return {type: SmUserType.BIZ, excludeId: this.form.userId}
+      return query;
     },
     rules() {
       return {
@@ -291,6 +295,9 @@ export default {
         ],
         point: [
           { required: true, type: 'number', message: "分成比例不能为空", trigger: "blur" },
+        ],
+        type: [
+          { required: true, message: '请选择用户类型', trigger: 'blur' }
         ]
       }
     }
@@ -313,13 +320,13 @@ export default {
         {key: 'rechargeAmount', visible: true, label: '充值金额', align: 'center', minWidth: null, sortable: true, width: null},
         {key: 'withDrawlAmount', visible: true, label: '提现金额', align: 'center', minWidth: null, sortable: true, width: null},
         {key: 'balance', visible: true, label: '账户余额', align: 'center', minWidth: null, sortable: true, width: null},
-        {key: 'deviceAdmin', visible: false, label: '设备管理员', align: 'center', minWidth: null, sortable: false, width: null},
         {key: 'agentId', visible: true, label: '直属代理商', align: 'center', minWidth: null, sortable: false, width: null},
-        {key: 'investorCount', visible: true, label: '投资人数', align: 'center', minWidth: null, sortable: false, width: null},
-        {key: 'storeCount', visible: true, label: '经营场所数', align: 'center', minWidth: null, sortable: false, width: null},
-        {key: 'deviceCount', visible: true, label: '设备数', align: 'center', minWidth: null, sortable: false, width: null},
-        {key: 'billCount', visible: true, label: '订单数', align: 'center', minWidth: null, sortable: false, width: null},
-        {key: 'billAmount', visible: true, label: '订单总额', align: 'center', minWidth: null, sortable: false, width: null},
+        {key: 'investorCount', visible: false, label: '投资人数', align: 'center', minWidth: null, sortable: false, width: null},
+        {key: 'storeCount', visible: false, label: '经营场所数', align: 'center', minWidth: null, sortable: false, width: null},
+        {key: 'deviceCount', visible: false, label: '设备数', align: 'center', minWidth: null, sortable: false, width: null},
+        {key: 'billCount', visible: false, label: '订单数', align: 'center', minWidth: null, sortable: false, width: null},
+        {key: 'billAmount', visible: false, label: '订单总额', align: 'center', minWidth: null, sortable: false, width: null},
+        {key: 'deviceAdmin', visible: false, label: '是否设备管理员', align: 'center', minWidth: null, sortable: false, width: null},
       ],
       openServiceRate: false,
       // 遮罩层
@@ -380,6 +387,19 @@ export default {
     this.getList();
   },
   methods: {
+    onChangeDept(dept) {
+      if (this.form.referenceId != null) {
+        this.form.referenceId = null;
+        this.$message.info("更换运营商，请重新选择推广人")
+      }
+    },
+    beforeOpenReference() {
+      if (this.form.deptId == null) {
+        this.$message.warning("请先选择运营商");
+        return false;
+      }
+      return true;
+    },
     onChangeReference(user) {
       this.form.deptId = user.deptId;
     },
diff --git a/src/views/system/withdraw/detail.vue b/src/views/system/withdraw/detail.vue
index fa58f60..e3544d5 100644
--- a/src/views/system/withdraw/detail.vue
+++ b/src/views/system/withdraw/detail.vue
@@ -61,7 +61,7 @@
           </el-tabs>
         </el-card>
       </el-col>
-      <el-col v-show="isApproving" v-hasPermi="['system:bill:approval']" :span="12">
+      <el-col v-show="isApproving" v-hasPermi="['system:withdraw:approval']" :span="12">
         <el-card class="card-box" header="审核">
           <el-form ref="form" :model="detail" :rules="approvalRules" label-width="6em">
             <el-row>
@@ -91,8 +91,8 @@
             </el-form-item>
           </el-form>
           <el-row type="flex" style="justify-content: flex-end">
-            <el-button type="success" @click="pass" v-hasPermi="['system:bill:approval']" icon="el-icon-check">通过并打款</el-button>
-            <el-button type="danger" @click="reject" v-hasPermi="['system:bill:approval']" icon="el-icon-close">驳回</el-button>
+            <el-button type="success" @click="pass" v-hasPermi="['system:withdraw:approval']" icon="el-icon-check">通过并打款</el-button>
+            <el-button type="danger" @click="reject" v-hasPermi="['system:withdraw:approval']" icon="el-icon-close">驳回</el-button>
           </el-row>
         </el-card>
       </el-col>