2024.10.25-代金券申请记录、提现列表添加提现类型

src/api/business.js

@@ -280,7 +280,6 @@ export function getWithdrawalApplicationList(data) {
 }
 
 // 审核
-
 export function examineWithdrawalApplication(data) {
   return request({
     url: "/shop-vouchers-withdrawal-qualification/auditWithdrawalQualification",
@@ -288,3 +287,13 @@ export function examineWithdrawalApplication(data) {
     method: "post"
   })
 }
+
+
+// 代金券提现记录
+export function getWithdrawalRecortAllApi(data) {
+  return request({
+    url: "/shop-vouchers-withdrawal-qualification/getWithdrawalRecortAll",
+    data,
+    method: "post"
+  })
+}

src/views/business/withdrawalRecord/index.vue

@@ -0,0 +1,149 @@
+<template>
+  <div class="app-container">
+    <!-- 查询和其他操作 -->
+    <!-- <div class="filter-container">
+      <el-input v-model="listQuery.shopName" clearable size="mini" class="filter-item" style="width: 200px; margin-left: 10px" placeholder="请输入商家名称" />
+      <el-button size="mini" class="filter-item" type="primary" icon="el-icon-search" style="margin-left: 10px" @click="handleSearch">查找</el-button>
+      <br />
+      <el-button size="mini" type="primary" icon="el-icon-plus" @click="$refs.EditModal && $refs.EditModal.handleOpen({ shopId: '' })">添加</el-button>
+    </div> -->
+
+    <!-- 查询结果 -->
+    <div v-tableHeight>
+      <el-table v-loading="listLoading" height="100%" element-loading-text="正在查询中。。。" :data="list" v-bind="{ stripe: true, size: 'small', border: true, fit: true, highlightCurrentRow: true }">
+        <el-table-column align="center" label="#" type="index" width="50"></el-table-column>
+        <el-table-column align="center" prop="shopId" label="商家ID" width="70" />
+        <el-table-column align="center" prop="vouchersNumber" label="代金券提现数量" width="120" />
+        <el-table-column align="center" prop="amount" label="实际提现金额" width="120" />
+        <el-table-column align="center" prop="type" label="代金券提现类型" width="120">
+          <template slot-scope="{ row }">
+            <el-tag v-if="row.type === 1">充值</el-tag>
+            <el-tag v-if="row.type === 2">兑换</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="ratio" label="代金券提现比例" width="120">
+          <template slot-scope="{ row }">
+            <el-tag type="success">{{ parseInt(row.ratio * 100) + '%' }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="handleSn" label="对应提现单号" width="200" />
+        <el-table-column align="center" prop="entryAccountSn" label="入账单号集合">
+          <template slot-scope="{ row }">
+            <el-popover placement="right" width="400" trigger="click">
+              <ul class="popover-list">
+                <li class="popover-list-li" v-for="(item, index) in row.entryAccountSn.split(',')" :key="item + index">{{ item }}</li>
+              </ul>
+              <el-button slot="reference" type="primary" size="mini">查看</el-button>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="outgoingAccountSn" label="出账单号集合">
+          <template slot-scope="{ row }">
+            <el-popover placement="right" width="400" trigger="click">
+              <ul class="popover-list">
+                <li class="popover-list-li" v-for="(item, index) in row.outgoingAccountSn.split(',')" :key="item + index">{{ item }}</li>
+              </ul>
+              <el-button slot="reference" type="primary" size="mini">查看</el-button>
+            </el-popover>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="createTime" label="创建时间"></el-table-column>
+      </el-table>
+    </div>
+
+    <div style="padding-top: 10px">
+      <el-pagination
+        :current-page="listQuery.page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="listQuery.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+        @size-change="(val) => (listQuery.pageSize = val) && getList()"
+        @current-change="(val) => (listQuery.page = val) && getList()"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { getWithdrawalRecortAllApi } from '@/api/business'
+
+export default {
+  name: 'withdrawalRecord',
+  data() {
+    return {
+      list: [],
+      total: 0,
+      listLoading: true,
+      listQuery: {
+        page: 1,
+        pageSize: 20
+      }
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    async getList() {
+      this.listLoading = true
+      try {
+        const res = await getWithdrawalRecortAllApi(this.listQuery)
+        this.list = res.data.list
+        this.total = res.data.total
+      } finally {
+        this.listLoading = false
+      }
+    },
+    handleSearch() {
+      this.listQuery.page = 1
+      this.getList()
+    },
+    handleDetail(row) {
+      this.$refs.examineRef && this.$refs.examineRef.open(row)
+    },
+    refresh() {
+      this.listQuery.page = 1
+      this.getList()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.popover-list {
+  height: 300px;
+  overflow-y: auto;
+
+  &::-webkit-scrollbar {
+    background-color: transparent;
+    width: 10px;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background-color: #e9e9e9;
+    border-radius: 5px;
+    width: 10px;
+  }
+
+  .popover-list-li {
+    height: 30px;
+    line-height: 30px;
+    padding-left: 20px;
+    position: relative;
+
+    &::after {
+      content: '';
+      position: absolute;
+      display: block;
+      width: 10px;
+      height: 10px;
+      border-radius: 50%;
+      background-color: #409eff;
+      top: 50%;
+      left: 0;
+      transform: translateY(-50%);
+    }
+  }
+}
+</style>

src/views/finance/withdrawal/index.vue

@@ -1,187 +1,166 @@
-<!--  -->
-<template>
-  <div class="app-container">
-    <!-- 查询和其他操作 -->
-    <div class="filter-container">
-      <el-input
-        v-model="listQuery.shopName" clearable size="mini" class="filter-item"
-        style="width: 200px;"
-        placeholder="请输入店铺名称"
-      />
-      <el-input
-        v-model="listQuery.shopCode" clearable size="mini" class="filter-item"
-        style="width: 200px;margin-left: 10px;" placeholder="请输入店铺编码"
-      />
-      <el-date-picker
-        v-model="listQuery.startTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"
-        size="mini" class="filter-item" style="width: 200px;margin-left: 10px;"
-      />
-      <el-select
-        v-model="listQuery.state" clearable size="mini" class="filter-item"
-        style="width: 200px;margin-left: 10px;" placeholder="请选择处理状态"
-      >
-        <el-option label="待处理" value="0" />
-        <el-option label="已处理" value="1" />
-        <el-option label="通过" value="2" />
-        <el-option label="拒绝" value="3" />
-        <el-option label="待确认" value="4" />
-      </el-select>
-      <el-button
-        size="mini" class="filter-item" type="primary" icon="el-icon-search"
-        style="margin-left: 10px;"
-        @click="handleSearch"
-      >
-        查找
-      </el-button>
-      <el-button size="mini" type="info" class="filter-item" @click="handleReset">
-        重置
-      </el-button>
-    </div>
-
-    <!-- 查询结果 -->
-    <div v-tableHeight>
-      <el-table
-        v-loading="listLoading" height="100%" element-loading-text="正在查询中。。。" :data="list"
-        v-bind="{ stripe: true, size: 'small', border: true, fit: true, highlightCurrentRow: true }"
-      >
-        <el-table-column align="center" width="150" label="店铺名称" prop="shopName" show-overflow-tooltip />
-        <el-table-column align="center" min-width="150" label="店铺编码" prop="shopCode" show-overflow-tooltip />
-        <el-table-column align="center" width="120" label="提现金额" prop="withdrawalMoney" show-overflow-tooltip />
-        <el-table-column align="center" label="处理状态" prop="state">
-          <template slot-scope="{ row }">
-            <el-tag v-if="row.state === 0" effect="plain" type="info">待处理</el-tag>
-            <el-tag v-else-if="row.state === 1" effect="plain" type="success">已处理</el-tag>
-            <el-tag v-else-if="row.state === 2" effect="plain">通过</el-tag>
-            <el-tag v-else-if="row.state === 3" effect="plain" type="warning">拒绝</el-tag>
-            <el-tag v-else-if="row.state === 4" effect="plain" type="danger">待确认</el-tag>
-            <span v-else>--</span>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" width="150" label="备注" prop="cause" show-overflow-tooltip />
-        <el-table-column label="操作" width="180" fixed="right" class-name="small-padding fixed-width">
-          <template slot-scope="{ row }">
-            <el-button type="warning" size="mini" @click="handleDetail(row)">
-              详情
-            </el-button>
-            <el-button v-if="(row.state == 0) || (row.state == 2)" size="mini" @click="handleResolve(row)">
-              处理
-            </el-button>
-            <el-button v-if="row.state == 4" type="text" @click="handleConfirmTong(row)">
-              通联确认
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-
-    <div>
-      <el-pagination
-        :current-page="listQuery.page" :page-sizes="[10, 20, 50, 100]" :page-size="listQuery.pageSize"
-        layout="total, sizes, prev, pager, next, jumper" :total="total"
-        @size-change="(val) => ((listQuery.pageSize = val) && getList())"
-        @current-change="(val) => ((listQuery.page = val) && getList())"
-      />
-    </div>
-
-    <!-- 提现处理 -->
-    <WithdrawalProcessing ref="WithdrawalProcessing" @success="getList" />
-    <!-- 查看详情 -->
-    <DetailModal ref="DetailModal" />
-  </div>
-</template>
-
-<script>
-
-import WithdrawalProcessing from './components/WithdrawalProcessing'
-import DetailModal from './components/DetailModal'
-import { withdrawalGetAll, updateWithdrawalByAllinpay } from '@/api/withdrawal'
-export default {
-  name: 'Withdrawal',
-  components: {
-    WithdrawalProcessing,
-    DetailModal
-  },
-  data() {
-    return {
-      listQuery: {
-        shopName: '', // 店铺名称
-        shopCode: '', // 店铺编号
-        startTime: '', // 申请时间数组
-        state: '', // 处理状态 1-已处理 0-未处理
-        page: 1,
-        pageSize: 10
-      },
-      list: [],
-      total: 0,
-      listLoading: true
-    }
-  },
-  mounted() {
-    this.getList()
-  },
-  methods: {
-    async getList() {
-      this.listLoading = true
-      try {
-        const res = await withdrawalGetAll(this.listQuery)
-        this.list = res.data.list
-        this.total = res.data.total
-      } finally {
-        this.listLoading = false
-      }
-    },
-    handleSearch() {
-      this.listQuery.page = 1
-      this.getList()
-    },
-    handleReset() {
-      this.listQuery = { shopName: '', shopCode: '', dates: [], state: '', page: 1, pageSize: 10 }
-      this.getList()
-    },
-    handleDetail(row) {
-      this.$refs.DetailModal && this.$refs.DetailModal.handleOpen(row)
-    },
-    handleResolve(row) {
-      this.$refs.WithdrawalProcessing && this.$refs.WithdrawalProcessing.handleOpen(row)
-    },
-    handleConfirmTong(row) {
-      this.$confirm('确定此项通联确认？')
-        .then(async () => {
-          await updateWithdrawalByAllinpay({ handleSn: row.handleSn, withdrawalId: row.withdrawalId })
-          this.$message({ message: '操作成功！', type: 'success' })
-          this.handleSearch()
-        })
-        .catch(() => {})
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.app-container {
-	padding: 20px;
-	display: flex;
-	flex-direction: column;
-
-	.filter-container {
-		.filter-item {
-			display: inline-block;
-			vertical-align: middle;
-			margin-bottom: 10px;
-		}
-	}
-
-	.small-padding {
-		.cell {
-			padding-left: 5px;
-			padding-right: 5px;
-		}
-	}
-
-	.fixed-width {
-		.el-button--mini {
-			padding: 7px 10px;
-		}
-	}
-}
-</style>
+<!--  -->
+<template>
+  <div class="app-container">
+    <!-- 查询和其他操作 -->
+    <div class="filter-container">
+      <el-input v-model="listQuery.shopName" clearable size="mini" class="filter-item" style="width: 200px" placeholder="请输入店铺名称" />
+      <el-input v-model="listQuery.shopCode" clearable size="mini" class="filter-item" style="width: 200px; margin-left: 10px" placeholder="请输入店铺编码" />
+      <el-date-picker v-model="listQuery.startTime" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" size="mini" class="filter-item" style="width: 200px; margin-left: 10px" />
+      <el-select v-model="listQuery.state" clearable size="mini" class="filter-item" style="width: 200px; margin-left: 10px" placeholder="请选择处理状态">
+        <el-option label="待处理" value="0" />
+        <el-option label="已处理" value="1" />
+        <el-option label="通过" value="2" />
+        <el-option label="拒绝" value="3" />
+        <el-option label="待确认" value="4" />
+      </el-select>
+      <el-button size="mini" class="filter-item" type="primary" icon="el-icon-search" style="margin-left: 10px" @click="handleSearch">查找</el-button>
+      <el-button size="mini" type="info" class="filter-item" @click="handleReset">重置</el-button>
+    </div>
+
+    <!-- 查询结果 -->
+    <div v-tableHeight>
+      <el-table v-loading="listLoading" height="100%" element-loading-text="正在查询中。。。" :data="list" v-bind="{ stripe: true, size: 'small', border: true, fit: true, highlightCurrentRow: true }">
+        <el-table-column align="center" width="150" label="店铺名称" prop="shopName" show-overflow-tooltip />
+        <el-table-column align="center" min-width="150" label="店铺编码" prop="shopCode" show-overflow-tooltip />
+        <el-table-column align="center" min-width="150" label="提现类型" prop="withdrawalType">
+          <template slot-scope="{ row }">
+            <el-tag v-if="row.withdrawalType === 1" effect="plain" type="info">普通订单</el-tag>
+            <el-tag v-else-if="row.withdrawalType === 2" effect="plain" type="success">交易金</el-tag>
+            <el-tag v-else-if="row.withdrawalType === 3" effect="plain">代金券</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" width="120" label="提现金额" prop="withdrawalMoney" show-overflow-tooltip />
+        <el-table-column align="center" label="处理状态" prop="state">
+          <template slot-scope="{ row }">
+            <el-tag v-if="row.state === 0" effect="plain" type="info">待处理</el-tag>
+            <el-tag v-else-if="row.state === 1" effect="plain" type="success">已处理</el-tag>
+            <el-tag v-else-if="row.state === 2" effect="plain">通过</el-tag>
+            <el-tag v-else-if="row.state === 3" effect="plain" type="warning">拒绝</el-tag>
+            <el-tag v-else-if="row.state === 4" effect="plain" type="danger">待确认</el-tag>
+            <span v-else>--</span>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" width="150" label="备注" prop="cause" show-overflow-tooltip />
+        <el-table-column label="操作" width="180" fixed="right" class-name="small-padding fixed-width">
+          <template slot-scope="{ row }">
+            <el-button type="warning" size="mini" @click="handleDetail(row)">详情</el-button>
+            <el-button v-if="row.state == 0 || row.state == 2" size="mini" @click="handleResolve(row)">处理</el-button>
+            <el-button v-if="row.state == 4" type="text" @click="handleConfirmTong(row)">通联确认</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <div>
+      <el-pagination
+        :current-page="listQuery.page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="listQuery.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+        @size-change="(val) => (listQuery.pageSize = val) && getList()"
+        @current-change="(val) => (listQuery.page = val) && getList()"
+      />
+    </div>
+
+    <!-- 提现处理 -->
+    <WithdrawalProcessing ref="WithdrawalProcessing" @success="getList" />
+    <!-- 查看详情 -->
+    <DetailModal ref="DetailModal" />
+  </div>
+</template>
+
+<script>
+import WithdrawalProcessing from './components/WithdrawalProcessing'
+import DetailModal from './components/DetailModal'
+import { withdrawalGetAll, updateWithdrawalByAllinpay } from '@/api/withdrawal'
+export default {
+  name: 'Withdrawal',
+  components: {
+    WithdrawalProcessing,
+    DetailModal
+  },
+  data() {
+    return {
+      listQuery: {
+        shopName: '', // 店铺名称
+        shopCode: '', // 店铺编号
+        startTime: '', // 申请时间数组
+        state: '', // 处理状态 1-已处理 0-未处理
+        page: 1,
+        pageSize: 10
+      },
+      list: [],
+      total: 0,
+      listLoading: true
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    async getList() {
+      this.listLoading = true
+      try {
+        const res = await withdrawalGetAll(this.listQuery)
+        this.list = res.data.list
+        this.total = res.data.total
+      } finally {
+        this.listLoading = false
+      }
+    },
+    handleSearch() {
+      this.listQuery.page = 1
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery = { shopName: '', shopCode: '', dates: [], state: '', page: 1, pageSize: 10 }
+      this.getList()
+    },
+    handleDetail(row) {
+      this.$refs.DetailModal && this.$refs.DetailModal.handleOpen(row)
+    },
+    handleResolve(row) {
+      this.$refs.WithdrawalProcessing && this.$refs.WithdrawalProcessing.handleOpen(row)
+    },
+    handleConfirmTong(row) {
+      this.$confirm('确定此项通联确认？')
+        .then(async () => {
+          await updateWithdrawalByAllinpay({ handleSn: row.handleSn, withdrawalId: row.withdrawalId })
+          this.$message({ message: '操作成功！', type: 'success' })
+          this.handleSearch()
+        })
+        .catch(() => {})
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  padding: 20px;
+  display: flex;
+  flex-direction: column;
+
+  .filter-container {
+    .filter-item {
+      display: inline-block;
+      vertical-align: middle;
+      margin-bottom: 10px;
+    }
+  }
+
+  .small-padding {
+    .cell {
+      padding-left: 5px;
+      padding-right: 5px;
+    }
+  }
+
+  .fixed-width {
+    .el-button--mini {
+      padding: 7px 10px;
+    }
+  }
+}
+</style>