From 99dfe74b2661399a127eb12a20e3c8182d936665 Mon Sep 17 00:00:00 2001
From: cuiyouliang <799699717@qq.com>
Date: Thu, 26 Jun 2025 16:55:37 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=8F=90=E7=8E=B0=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts                           |   4 +-
 src/views/oms/aftersale/index.vue             |   2 +-
 src/views/oms/aftersaleItem/index.vue         |   2 +-
 src/views/oms/orderItem/index.vue             |  15 +-
 src/views/oms/orderOperateHistory/index.vue   |   2 +-
 src/views/oms/wechatPaymentHistory/index.vue  |   2 +-
 src/views/pms/productCategory/index.vue       |   4 +-
 src/views/pms/sku/index.vue                   |   2 +-
 src/views/ums/member/index.vue                |   5 +-
 .../member/{withdraw.vue => userWithdraw.vue} |   6 +-
 src/views/ums/memberAddress/index.vue         |   2 +-
 src/views/ums/withdrawManage/index.vue        | 267 ++++++++++++++++++
 12 files changed, 291 insertions(+), 22 deletions(-)
 rename src/views/ums/member/{withdraw.vue => userWithdraw.vue} (97%)
 create mode 100644 src/views/ums/withdrawManage/index.vue

diff --git a/src/router/index.ts b/src/router/index.ts
index 421cc65..46e9fa9 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -194,8 +194,8 @@ export const dynamicRoutes: RouteRecordRaw[] = [
     permissions: ['oms:aftersale:query'],
     children: [
       {
-        path: 'withdraw',
-        component: () => import('@/views/ums/member/withdraw.vue'),
+        path: 'userWithdraw',
+        component: () => import('@/views/ums/member/userWithdraw.vue'),
         name: 'witdhdrawDetail',
         meta: { title: '提现记录' }
       }
diff --git a/src/views/oms/aftersale/index.vue b/src/views/oms/aftersale/index.vue
index 4b0e36c..cd5fe5e 100644
--- a/src/views/oms/aftersale/index.vue
+++ b/src/views/oms/aftersale/index.vue
@@ -38,7 +38,7 @@
           <el-button icon="Refresh" @click="resetQuery">重置</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="loading" :data="omsAftersaleList" @selection-change="handleSelectionChange" border>
+      <el-table v-loading="loading" border :data="omsAftersaleList" @selection-change="handleSelectionChange">
         <!--      <el-table-column type="selection" width="55" align="center" />-->
         <el-table-column label="售后单号" prop="id" width="160" />
         <el-table-column label="申请状态" prop="aftersaleStatus" width="80">
diff --git a/src/views/oms/aftersaleItem/index.vue b/src/views/oms/aftersaleItem/index.vue
index e76e7e5..ce83c96 100644
--- a/src/views/oms/aftersaleItem/index.vue
+++ b/src/views/oms/aftersaleItem/index.vue
@@ -28,7 +28,7 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="omsAftersaleItemList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="omsAftersaleItemList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="MEMBER_ID" align="center" prop="memberId" />
       <el-table-column label="订单id" align="center" prop="orderId" />
diff --git a/src/views/oms/orderItem/index.vue b/src/views/oms/orderItem/index.vue
index 4c97123..5bc7475 100644
--- a/src/views/oms/orderItem/index.vue
+++ b/src/views/oms/orderItem/index.vue
@@ -4,9 +4,9 @@
       <el-form-item label="订单id" prop="orderId">
         <el-input v-model="queryParams.orderId" placeholder="请输入订单id" clearable @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="PRODUCT_ID" prop="productId">
+      <!--      <el-form-item label="PRODUCT_ID" prop="productId">
         <el-input v-model="queryParams.productId" placeholder="请输入PRODUCT_ID" clearable @keyup.enter="handleQuery" />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="商品编码" prop="outProductId">
         <el-input v-model="queryParams.outProductId" placeholder="请输入商品编码" clearable @keyup.enter="handleQuery" />
       </el-form-item>
@@ -26,8 +26,8 @@
         <el-form-item label="展示图片" prop="pic">
           <el-input v-model="queryParams.pic" placeholder="请输入展示图片" clearable @keyup.enter="handleQuery" />
         </el-form-item>
-        <el-form-item label="PRODUCT_NAME" prop="productName">
-          <el-input v-model="queryParams.productName" placeholder="请输入PRODUCT_NAME" clearable @keyup.enter="handleQuery" />
+        <el-form-item label="商品名称" prop="productName">
+          <el-input v-model="queryParams.productName" placeholder="请输入商品名称" clearable @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item label="销售价格" prop="salePrice">
           <el-input v-model="queryParams.salePrice" placeholder="请输入销售价格" clearable @keyup.enter="handleQuery" />
@@ -57,17 +57,16 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="omsOrderItemList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" border :data="omsOrderItemList" @selection-change="handleSelectionChange">
       <el-table-column label="订单id" align="center" prop="orderId" />
-      <el-table-column label="PRODUCT_ID" align="center" prop="productId" />
+      <!--      <el-table-column label="PRODUCT_ID" align="center" prop="productId" />-->
       <el-table-column label="商品编码" align="center" prop="outProductId" />
       <el-table-column label="商品sku id" align="center" prop="skuId" />
       <el-table-column label="sku编码" align="center" prop="outSkuId" />
       <el-table-column label="商品快照id" align="center" prop="productSnapshotId" />
       <el-table-column label="sku快照id" align="center" prop="skuSnapshotId" />
       <el-table-column label="展示图片" align="center" prop="pic" />
-      <el-table-column label="PRODUCT_NAME" align="center" prop="productName" />
+      <el-table-column label="商品名称" align="center" prop="productName" />
       <el-table-column label="销售价格" align="center" prop="salePrice" />
       <el-table-column label="采购价" align="center" prop="purchasePrice" />
       <el-table-column label="购买数量" align="center" prop="quantity" />
diff --git a/src/views/oms/orderOperateHistory/index.vue b/src/views/oms/orderOperateHistory/index.vue
index abc8d0f..2f84ea8 100644
--- a/src/views/oms/orderOperateHistory/index.vue
+++ b/src/views/oms/orderOperateHistory/index.vue
@@ -13,7 +13,7 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="omsOrderOperateHistoryList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="omsOrderOperateHistoryList" @selection-change="handleSelectionChange">
       <!--      <el-table-column type="selection" width="55" align="center" />-->
       <el-table-column label="订单号" align="center" prop="orderSn" />
       <el-table-column label="订单状态" align="center" prop="orderStatus">
diff --git a/src/views/oms/wechatPaymentHistory/index.vue b/src/views/oms/wechatPaymentHistory/index.vue
index e563790..0c7a3a0 100644
--- a/src/views/oms/wechatPaymentHistory/index.vue
+++ b/src/views/oms/wechatPaymentHistory/index.vue
@@ -52,7 +52,7 @@
       </el-col>
     </el-row>
 
-    <el-table v-loading="loading" :data="omsWechatPaymentHistoryList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" border :data="omsWechatPaymentHistoryList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="payment_id" align="center" prop="paymentId" />
       <el-table-column label="用户 ID" align="center" prop="memberId" />
diff --git a/src/views/pms/productCategory/index.vue b/src/views/pms/productCategory/index.vue
index 13f284f..61bdc1c 100644
--- a/src/views/pms/productCategory/index.vue
+++ b/src/views/pms/productCategory/index.vue
@@ -122,7 +122,7 @@ export default {
         parentId: null,
         nameLike: null,
         level: null,
-        showStatus: null,
+        showStatus: '',
         sort: null
       },
       // 表单参数
@@ -163,7 +163,7 @@ export default {
         parentId: null,
         name: null,
         level: null,
-        showStatus: 0,
+        showStatus: '',
         sort: null,
         icon: null,
         createBy: null,
diff --git a/src/views/pms/sku/index.vue b/src/views/pms/sku/index.vue
index 04f6027..c9a3331 100644
--- a/src/views/pms/sku/index.vue
+++ b/src/views/pms/sku/index.vue
@@ -39,7 +39,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="pmsSkuList" @selection-change="handleSelectionChange">
-      <el-table-column label="商品名称" align="center" prop="productId" />
+      <el-table-column label="商品名称" align="center" prop="productName" />
       <el-table-column label="sku编码" align="center" prop="outSkuId" />
       <el-table-column label="价格" align="center" prop="price" />
       <!--      <el-table-column label="展示图片" align="center" prop="pic" />-->
diff --git a/src/views/ums/member/index.vue b/src/views/ums/member/index.vue
index ee835ee..6f2af79 100644
--- a/src/views/ums/member/index.vue
+++ b/src/views/ums/member/index.vue
@@ -38,7 +38,7 @@
       </el-form>
 
       <el-table v-loading="loading" :data="umsMemberList" border empty-text="暂无数据">
-        <el-table-column label="会员ID" prop="id" width="180" />
+<!--        <el-table-column label="会员ID" prop="id" width="180" />-->
         <el-table-column label="昵称" prop="nickname" width="150" />
         <el-table-column label="手机号" prop="phoneHidden" width="150" />
         <el-table-column label="注册日期" prop="createTime" width="150" />
@@ -720,7 +720,6 @@ export default {
     };
   },
   async created() {
-    console.log('11111111111111111111111111111111111111');
     this.show = true;
     this.getList();
     const userSexMap = await this.getDictionaryByKey('sys_user_sex');
@@ -983,7 +982,7 @@ export default {
 
     goWithdrawInfoPage(row) {
       const id = row.id;
-      this.$router.push({ path: '/member/withdraw', query: { id } });
+      this.$router.push({ path: '/member/userWithdraw', query: { id } });
     },
     // 展示充值记录弹层
     showChargeInfoModal(record, isFirst) {
diff --git a/src/views/ums/member/withdraw.vue b/src/views/ums/member/userWithdraw.vue
similarity index 97%
rename from src/views/ums/member/withdraw.vue
rename to src/views/ums/member/userWithdraw.vue
index c879d99..3e3be0e 100644
--- a/src/views/ums/member/withdraw.vue
+++ b/src/views/ums/member/userWithdraw.vue
@@ -2,7 +2,11 @@
   <div>
     <el-card>
       <el-table v-loading="userWithdrawInfoTableLoading" :data="userWithdrawInfo.data" border empty-text="暂无数据">
-        <el-table-column label="申请人" prop="createBy" />
+        <el-table-column label="申请人" prop="createBy">
+          <template v-slot="scope">
+            {{ scope.row.member ? scope.row.member.nickname : '' }}
+          </template>
+        </el-table-column>
         <el-table-column label="申请时间" prop="createTime" />
         <el-table-column label="提现码" prop="code" />
         <el-table-column label="提现金额" prop="money">
diff --git a/src/views/ums/memberAddress/index.vue b/src/views/ums/memberAddress/index.vue
index 5525e3f..f3a1d06 100644
--- a/src/views/ums/memberAddress/index.vue
+++ b/src/views/ums/memberAddress/index.vue
@@ -47,7 +47,7 @@
     <!--      </el-col>-->
     <!--    </el-row>-->
 
-    <el-table v-loading="loading" :data="umsMemberAddressList">
+    <el-table v-loading="loading" border :data="umsMemberAddressList">
       <!--      <el-table-column type="selection" width="55" align="center" />-->
       <el-table-column label="收货人姓名" align="center" prop="name">
         <template v-slot="scope">
diff --git a/src/views/ums/withdrawManage/index.vue b/src/views/ums/withdrawManage/index.vue
new file mode 100644
index 0000000..90cbb85
--- /dev/null
+++ b/src/views/ums/withdrawManage/index.vue
@@ -0,0 +1,267 @@
+<template>
+  <div class="app-container">
+    <div>
+      <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="100px" size="default" class="ry_form">
+        <el-form-item label="提现单号" prop="code">
+          <el-input v-model.trim="queryParams.code" placeholder="请输入会员id" clearable />
+        </el-form-item>
+        <el-form-item label="昵称" prop="nickname">
+          <el-input v-model.trim="queryParams.nickname" placeholder="请输入昵称" clearable />
+        </el-form-item>
+        <el-form-item label="提现人手机号" prop="phone">
+          <el-input v-model.trim="queryParams.phone" placeholder="请输入手机号码" clearable />
+        </el-form-item>
+        <el-form-item label="提现方式" prop="method">
+          <el-select v-model="queryParams.method">
+            <el-option v-for="item in userWithdrawMethodMap" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="提现类型" prop="type">
+          <el-select v-model="queryParams.type">
+            <el-option v-for="item in userWithdrawTypeMap" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审核状态" prop="auditStatus">
+          <el-select v-model="queryParams.auditStatus">
+            <el-option v-for="item in userWithdrawAuditMap" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="提现状态" prop="status">
+          <el-select v-model="queryParams.status">
+            <el-option v-for="item in userWithdrawStatusMap" :key="item.value" :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item class="flex_one tr">
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          <!--        <el-button :icon="showMoreCondition ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"  @click="showMoreCondition = !showMoreCondition">{{showMoreCondition ? '收起条件' : '展开条件'}}</el-button>-->
+        </el-form-item>
+      </el-form>
+
+      <el-table v-loading="userWithdrawInfoTableLoading" :data="userWithdrawInfo.data" border empty-text="暂无数据">
+        <el-table-column label="申请人" prop="createBy">
+          <template v-slot="scope">
+            {{ scope.row.member ? scope.row.member.nickname : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="申请时间" prop="createTime" />
+        <el-table-column label="提现码" prop="code" />
+        <el-table-column label="提现金额" prop="money">
+          <template v-slot="scope"> ￥ {{ scope.row.money || '0.00' }} </template>
+        </el-table-column>
+        <el-table-column label="手续费" prop="fee">
+          <template v-slot="scope"> ￥ {{ scope.row.fee || '0.00' }} </template>
+        </el-table-column>
+
+        <el-table-column label="实际到账金额" prop="actualMoney">
+          <template v-slot="scope"> ￥ {{ scope.row.actualMoney || '0.00' }} </template>
+        </el-table-column>
+
+        <el-table-column label="提现方式" prop="method">
+          <template v-slot="scope">
+            {{ getEmulistLabelById(scope.row.method, userWithdrawMethodMap) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="提现类型" prop="type">
+          <template v-slot="scope">
+            {{ getEmulistLabelById(scope.row.type, userWithdrawTypeMap) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="提现状态" prop="status">
+          <template v-slot="scope">
+            {{ getEmulistLabelById(scope.row.status, userWithdrawStatusMap) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审批状态" prop="auditStatus">
+          <template v-slot="scope">
+            {{ getEmulistLabelById(scope.row.auditStatus, userWithdrawAuditMap) }}
+            <el-tooltip v-if="scope.row.auditStatus == '2'" :content="scope.row.auditStatus == '2' ? scope.row.auditReason : null" placement="top">
+              <el-icon>
+                <question-filled />
+              </el-icon>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+        <el-table-column label="审核人" prop="auditBy" width="100" />
+        <el-table-column label="审核时间" prop="auditTime" width="100" />
+        <el-table-column label="操作" fixed="right" align="center" width="100">
+          <template v-slot="scope">
+            <el-button v-if="scope.row.auditStatus == '0'" text type="primary" @click="showAuditModal(scope.row)">审批</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-if="userWithdrawInfo.total"
+        :total="userWithdrawInfo.total"
+        v-model:page="withdrawDataParams.current"
+        v-model:limit="withdrawDataParams.size"
+        @pagination="getList"
+      />
+    </div>
+    <!-- 提现审核-->
+    <el-dialog title="提现审核" v-model="auditFormOpen" width="500px" append-to-body>
+      <el-row>
+        <el-col :span="4">审核结果</el-col>
+        <el-col :span="20">
+          <el-select v-model="auditStatus">
+            <el-option v-show="item.value != '0'" v-for="item in userWithdrawAuditMap" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-col>
+      </el-row>
+      <el-row v-if="auditStatus == '2'" class="mt2">
+        <el-col :span="4">拒绝原因</el-col>
+        <el-col :span="20">
+          <el-input v-model="auditReason" type="textarea" :rows="3"></el-input>
+        </el-col>
+      </el-row>
+      <el-row class="mt6">
+        <el-col :span="12"></el-col>
+        <el-col :span="12">
+          <el-button type="default" @click="resetAuditForm">取消</el-button>
+          <el-button type="primary" @click="confirmSubmitAudit">确认</el-button>
+        </el-col>
+      </el-row>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { getUserWithdrawList, listUmsMember, setWithdrawStatus } from '@/api/ums/member';
+import { useUserStore } from '@/store/modules/user';
+
+export default {
+  name: 'UmsMember',
+  data() {
+    return {
+      // 用户提现记录
+      userWithdrawInfo: {
+        total: 0,
+        data: [],
+        record: {}
+      },
+      // 查询参数
+      queryParams: {
+        current: 1,
+        size: 10,
+        nickname: null,
+        phone: null,
+        code: '',
+        method: undefined,
+        type: undefined,
+        auditStatus: undefined,
+        status: undefined
+      },
+      userWithdrawInfoModalVisible: false,
+      userWithdrawInfoTableLoading: false,
+      withdrawDataParams: {
+        current: 1,
+        size: 10
+      },
+      auditStatus: null,
+      auditReason: null,
+      auditFormOpen: false,
+      currentRecord: {},
+      userWithdrawMethodMap: [],
+      userWithdrawTypeMap: [],
+      userWithdrawStatusMap: [],
+      userWithdrawAuditMap: []
+    };
+  },
+  created() {
+    this.getList();
+    this.getWithdrawEmu();
+  },
+  methods: {
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        nickName: null,
+        phone: null,
+        code: '',
+        method: undefined,
+        type: undefined,
+        auditStatus: undefined,
+        status: undefined
+      };
+      this.resetForm('form');
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm');
+      this.handleQuery();
+    },
+
+    showAuditModal(record) {
+      this.currentRecord = record;
+      this.auditFormOpen = true;
+    },
+    resetAuditForm() {
+      this.currentRecord = {};
+      this.auditFormOpen = false;
+      this.auditStatus = null;
+      this.auditReason = null;
+    },
+    // 提交审核
+    confirmSubmitAudit() {
+      const { id, member = {} } = this.currentRecord;
+      const { id: memberId } = member;
+      if (!this.auditStatus) {
+        return this.$modal.msgWarning(`请选择审核结果!`);
+      }
+      const params = {
+        memberId: memberId,
+        id: id,
+        auditStatus: this.auditStatus,
+        auditReason: this.auditReason
+      };
+      setWithdrawStatus(params)
+        .then(() => {
+          this.$modal.msgSuccess('审核成功');
+          this.getList();
+          this.resetAuditForm();
+        })
+        .catch(() => {
+          this.$modal.msgError('审核失败');
+        });
+    },
+
+    /** 查询会员信息列表 */
+    getList() {
+      this.userWithdrawInfoTableLoading = true;
+      const { current: pageNum, size: pageSize } = this.queryParams;
+      const query = { ...this.queryParams, pageNum: undefined, pageSize: undefined };
+      const pageReq = { current: pageNum - 1, size: pageSize };
+      getUserWithdrawList(query, pageReq)
+        .then((response) => {
+          const { records = [], total = 0 } = response.data || {};
+          this.userWithdrawInfo = {
+            total: total,
+            data: records || []
+          };
+          this.userWithdrawInfoTableLoading = false;
+        })
+        .catch(() => {
+          this.userWithdrawInfoTableLoading = false;
+        });
+    },
+
+    async getWithdrawEmu() {
+      const userWithdrawMethodMap = await this.getDictionaryByKey('ums_withdraw_method');
+      const userWithdrawTypeMap = await this.getDictionaryByKey('ums_withdraw_type');
+      const userWithdrawStatusMap = await this.getDictionaryByKey('ums_withdraw_status');
+      const userWithdrawAuditMap = await this.getDictionaryByKey('sys_common_audit');
+
+      this.userWithdrawMethodMap = userWithdrawMethodMap;
+      this.userWithdrawTypeMap = userWithdrawTypeMap;
+      this.userWithdrawStatusMap = userWithdrawStatusMap;
+      this.userWithdrawAuditMap = userWithdrawAuditMap;
+    }
+  }
+};
+</script>