账户管理

src/api/menduner/system/account/enterprise/index.ts

@@ -0,0 +1,6 @@
+import request from '@/config/axios'
+
+// 获取用户积分分页
+export const getEnterpriseAccountPage = async (params) => {
+  return await request.get({ url: `/menduner/system/enterprise-account/page`, params })
+}

src/api/menduner/reward/userPoints/index.ts → src/api/menduner/system/account/user/index.ts

@@ -7,8 +7,8 @@ export interface UserPointsVO {
 }
 
 // 获取用户积分分页
-export const getUserPointsPage = async (params) => {
-  return await request.get({ url: `/menduner/reward/user-point/page`, params })
+export const getUserAccountPage = async (params) => {
+  return await request.get({ url: `/menduner/system/user-account/page`, params })
 }
 
 // 获取用户积分详情

src/views/menduner/system/account/enterprise/index.vue

@@ -0,0 +1,132 @@
+<!-- 会员积分 -->
+<template>
+  <ContentWrap v-hasPermi="['menduner:system:enterprise-account:query']">
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="账户余额" prop="balance">
+        <el-input
+          v-model="queryParams.balance"
+          placeholder="请输入账户余额"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="积分数量" prop="point">
+        <el-input
+          v-model="queryParams.point"
+          placeholder="请输入积分数量"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="获得时间" prop="createDate">
+        <el-date-picker
+          v-model="queryParams.createDate"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon icon="ep:search" class="mr-5px" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon icon="ep:refresh" class="mr-5px" />
+          重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="企业" align="center" prop="enterpriseId" />
+      <el-table-column label="用户" align="center" prop="userId" />
+      <el-table-column label="剩余金额" align="center" prop="balance" />
+      <el-table-column label="积分数量" align="center" prop="point" width="100">
+        <template #default="scope">
+          <el-tag v-if="scope.row.point && scope.row.point > 0" class="ml-2" type="success" effect="dark">
+            +{{ scope.row.point }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="获得时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+      />
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+</template>
+
+<script lang="ts" setup>
+import { dateFormatter } from '@/utils/formatTime'
+import * as EnterpriseAccountApi from '@/api/menduner/system/account/enterprise'
+
+defineOptions({ name: 'AccountEnterprise' })
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  balance: null,
+  point: null,
+  createDate: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await EnterpriseAccountApi.getEnterpriseAccountPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
+

src/views/menduner/reward/userPoints/UserPointsForm.vue → src/views/menduner/system/account/user/UserPointsForm.vue

@@ -42,19 +42,13 @@ const formRules = reactive({
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (type: string, id: number, userId: string) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   resetForm()
   // 修改时，设置数据
   if (id) {
-    formLoading.value = true
-    try {
-      const data = await UserPointsApi.getUserPointsDetails(id)
-      formData.value.userId = data.userId
-    } finally {
-      formLoading.value = false
-    }
+    formData.value.userId = userId
   }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗

src/views/menduner/reward/userPoints/index.vue → src/views/menduner/system/account/user/index.vue

@@ -1,6 +1,6 @@
 <!-- 会员积分 -->
 <template>
-  <ContentWrap v-hasPermi="['menduner:reward:user-point:query']">
+  <ContentWrap v-hasPermi="['menduner:system:user-account:query']">
     <!-- 搜索工作栏 -->
     <el-form
       class="-mb-15px"
@@ -9,6 +9,24 @@
       :inline="true"
       label-width="68px"
     >
+      <el-form-item label="账户余额" prop="balance">
+        <el-input
+          v-model="queryParams.balance"
+          placeholder="请输入账户余额"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="积分数量" prop="point">
+        <el-input
+          v-model="queryParams.point"
+          placeholder="请输入积分数量"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
       <el-form-item label="获得时间" prop="createDate">
         <el-date-picker
           v-model="queryParams.createDate"
@@ -40,11 +58,12 @@
       <el-table-column
         label="获得时间"
         align="center"
-        prop="updateTime"
+        prop="createTime"
         :formatter="dateFormatter"
       />
       <el-table-column label="用户" align="center" prop="userId" />
-      <el-table-column label="获得积分" align="center" prop="point" width="100">
+      <el-table-column label="剩余金额" align="center" prop="balance" />
+      <el-table-column label="积分数量" align="center" prop="point" width="100">
         <template #default="scope">
           <el-tag v-if="scope.row.point && scope.row.point > 0" class="ml-2" type="success" effect="dark">
             +{{ scope.row.point }}
@@ -55,7 +74,7 @@
         <template #default="scope">
           <el-button
             link
-            @click="openForm('update', scope.row.id)"
+            @click="openForm('update', scope.row.id, scope.row.userId)"
             type="primary"
             v-hasPermi="['menduner:reward:user-point:update']"
           >
@@ -78,12 +97,11 @@
 </template>
 
 <script lang="ts" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import UserPointsForm from './UserPointsForm.vue'
-import * as UserPointsApi from '@/api/menduner/reward/userPoints'
+import * as UserAccountApi from '@/api/menduner/system/account/user'
 
-defineOptions({ name: 'MemberUserPoints' })
+defineOptions({ name: 'AccountUser' })
 
 const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
@@ -91,7 +109,8 @@ const list = ref([]) // 列表的数据
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  tagIds: [],
+  balance: null,
+  point: null,
   createDate: []
 })
 const queryFormRef = ref() // 搜索的表单
@@ -100,7 +119,7 @@ const queryFormRef = ref() // 搜索的表单
 const getList = async () => {
   loading.value = true
   try {
-    const data = await UserPointsApi.getUserPointsPage(queryParams)
+    const data = await UserAccountApi.getUserAccountPage(queryParams)
     list.value = data.list
     total.value = data.total
   } finally {
@@ -110,8 +129,8 @@ const getList = async () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+const openForm = (type: string, id: number, userId: string) => {
+  formRef.value.open(type, id, userId)
 }
 
 /** 搜索按钮操作 */