细节优化

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
+  })
+}
 

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);
+        }
       }
     }
   },

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 {

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]
+  }
+}

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;
       }

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 {

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;
     },

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>