From 237caa698a9318e2c66a99bd4b59b75abb628391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Sat, 31 Aug 2024 13:46:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ss/transfer/index.vue      |  7 ++++++-
 src/views/system/withdraw/detail.vue | 17 +++++++++++++++--
 src/views/system/withdraw/index.vue  | 21 ++++++++++++---------
 3 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/src/views/ss/transfer/index.vue b/src/views/ss/transfer/index.vue
index ba27ae9..3b44c27 100644
--- a/src/views/ss/transfer/index.vue
+++ b/src/views/ss/transfer/index.vue
@@ -150,7 +150,7 @@ import {
   refreshTransferStatus
 } from '@/api/ss/transfer'
 import { $showColumns, $view } from '@/utils/mixins'
-import { TransferStatus } from '@/utils/constants'
+import { TransferStatus, views } from '@/utils/constants'
 
 // 默认排序字段
 const defaultSort = {
@@ -267,6 +267,11 @@ export default {
     };
   },
   created() {
+    // 提现列表隐藏搜索
+    if (this.hasView(views.withdraw)) {
+      this.showSearch = false;
+    }
+
     this.queryParams = {
       ...this.queryParams,
       ...this.query
diff --git a/src/views/system/withdraw/detail.vue b/src/views/system/withdraw/detail.vue
index e3544d5..8dee8a8 100644
--- a/src/views/system/withdraw/detail.vue
+++ b/src/views/system/withdraw/detail.vue
@@ -8,12 +8,22 @@
               <el-descriptions :column="2">
                 <el-descriptions-item label="提现单号">{{detail.billNo | defaultValue}}</el-descriptions-item>
                 <el-descriptions-item label="申请用户">
+                  <dict-tag :value="detail.userType" :options="dict.type.user_type" size="mini"/>
                   <user-link :id="detail.userId" :name="detail.userName"/>
+                  <template v-if="detail.userIsReal">（{{detail.userRealName | defaultValue}}）</template>
                 </el-descriptions-item>
                 <el-descriptions-item label="申请时间">{{detail.createTime | defaultValue}}</el-descriptions-item>
                 <el-descriptions-item label="提现方式">
                   {{detail.channelName}}
                 </el-descriptions-item>
+                <el-descriptions-item label="推广人">
+                  <user-link :id="detail.referenceId" :name="detail.referenceName"/>
+                  <template v-if="detail.referenceIsReal">（{{detail.referenceIsReal | defaultValue}}）</template>
+                </el-descriptions-item>
+                <el-descriptions-item :label="`直属${FieldName.AGENT}`">
+                  <user-link :id="detail.agentId" :name="detail.agentName"/>
+                  <template v-if="detail.agentIsReal">（{{detail.agentRealName | defaultValue}}）</template>
+                </el-descriptions-item>
               </el-descriptions>
             </el-card>
 
@@ -105,14 +115,18 @@
 
 <script>
 import { getWithdraw, passWithDrawBill, rejectWithDrawBill } from '@/api/system/withdraw'
-import { AccountType, TransferBstType, views, WithdrawType } from '@/utils/constants'
+import { AccountType, FieldName, TransferBstType, views, WithdrawType } from '@/utils/constants'
 import { getUserAccountByType } from '@/api/ss/account'
 import UserLink from '@/components/Business/SmUser/UserLink.vue'
 import Transfer from '@/views/ss/transfer/index.vue'
 
 export default {
   name: 'Withdraw/:billId',
+  dicts: ['channel_type','withdraw_status', 'withdraw_type', 'user_type'],
   computed: {
+    FieldName() {
+      return FieldName
+    },
     views() {
       return views
     },
@@ -124,7 +138,6 @@ export default {
     }
   },
   components: { Transfer, UserLink },
-  dicts: ['channel_type','withdraw_status', 'withdraw_type'],
   data() {
     return {
       id: null,
diff --git a/src/views/system/withdraw/index.vue b/src/views/system/withdraw/index.vue
index 0b9ce28..5fd59bb 100644
--- a/src/views/system/withdraw/index.vue
+++ b/src/views/system/withdraw/index.vue
@@ -76,8 +76,16 @@
         <el-link slot-scope="d" @click="handleView(d.row)" type="primary">{{d.row.billNo}}</el-link>
       </el-table-column>
       <el-table-column label="申请时间" align="center" prop="createTime" width="180"/>
-      <el-table-column label="申请用户" align="center" prop="mchName" width="160">
-        <user-link slot-scope="d" :id="d.row.mchId" :name="d.row.mchName"/>
+      <el-table-column label="申请用户" align="center" prop="userName" width="160">
+        <template slot-scope="d">
+          <user-link :id="d.row.userId" :name="d.row.userName"/>
+          <div v-if="d.row.userIsReal">（{{d.row.userRealName | defaultValue}}）</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户角色" align="center">
+        <template slot-scope="d">
+          <dict-tag :value="d.row.userType" :options="dict.type.user_type"/>
+        </template>
       </el-table-column>
       <el-table-column label="提现金额" align="center" min-width="100">
         <template slot-scope="d">
@@ -102,11 +110,7 @@
         </template>
       </el-table-column>
       <el-table-column label="到账时间" align="center" prop="payTime" width="180"/>
-      <el-table-column label="提现方式" align="center" prop="channelName">
-<!--        <template slot-scope="d">-->
-<!--          <dict-tag :value="d.row.channelId" :options="dict.type.channel_type"/>-->
-<!--        </template>-->
-      </el-table-column>
+      <el-table-column label="提现方式" align="center" prop="channelName"/>
       <el-table-column label="打款方式" align="center">
         <template slot-scope="d">
           <dict-tag :value="d.row.withdrawType" :options="dict.type.withdraw_type"/>
@@ -175,7 +179,7 @@ import WithdrawDetail from '@/views/system/withdraw/detail.vue'
 export default {
   name: "Bill",
   components: { WithdrawDetail, UserLink },
-  dicts: ['withdraw_status', 'withdraw_type', 'channel_type'],
+  dicts: ['withdraw_status', 'withdraw_type', 'user_type'],
   data() {
     return {
       showDetail: false,
@@ -205,7 +209,6 @@ export default {
         userName: null,
         deviceName: null,
         mchName: null,
-        type: "2",  // 提现
         orderByColumn: "createTime",
         isAsc: "descending",
       },