From cafd3771ddcb7cdce3df6fab50cd47df56dae2a6 Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Fri, 26 Apr 2024 10:00:36 +0800
Subject: [PATCH] edit
---
src/api/merchant.js | 6 +
src/views/merchant/application/index.vue | 2 +-
src/views/merchant/application/merInfo.vue | 7 +-
src/views/merchant/deposit/index.vue | 150 ++++++++++++++++--
.../merchant/list/handle/merEditForm.vue | 13 +-
src/views/merchant/list/index.vue | 23 ++-
6 files changed, 176 insertions(+), 25 deletions(-)
diff --git a/src/api/merchant.js b/src/api/merchant.js
index b296d1d..1324bac 100644
--- a/src/api/merchant.js
+++ b/src/api/merchant.js
@@ -397,6 +397,12 @@ export function marginRefundInfo(id) {
export function marginDeductionRecord(id, data) {
return request.get(`margin/list/${id}`, data)
}
+/**
+ * @description 转账记录 -- 记录列表
+ */
+export function marginofflineLstRecord(id, data) {
+ return request.get(`margin/offline_lst/${id}`, data)
+}
/**
* @description 退回保证金 -- 保证金扣费
*/
diff --git a/src/views/merchant/application/index.vue b/src/views/merchant/application/index.vue
index 721862b..3f5a0de 100644
--- a/src/views/merchant/application/index.vue
+++ b/src/views/merchant/application/index.vue
@@ -107,7 +107,7 @@
-
+
+
+
+
+
+ {{ scope.$index+(tableOffFrom.page - 1) * tableOffFrom.limit + 1 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -506,6 +590,7 @@ import {
getMerCateApi,
marginRefundInfo,
marginDeductionRecord,
+ marginofflineLstRecord
} from "@/api/merchant";
import timeOptions from '@/utils/timeOptions';
import { fromList } from "@/libs/constants.js";
@@ -518,6 +603,7 @@ export default {
fromList: fromList,
roterPre: roterPre,
isChecked: false,
+ offRecord: false,
listLoading: true,
recordLoading: true,
merCateList: [],
@@ -526,7 +612,15 @@ export default {
modalRecord: false,
formValidate: {},
isReturn: false,
- type: "1",
+ type: "10",
+ tableOffFrom: {
+ page: 1,
+ limit: 20
+ },
+ tableOffData: {
+ total: 0,
+ data: []
+ },
headeNum: [
{
count: "",
@@ -545,17 +639,17 @@ export default {
// },
{
count: "",
- type: "1",
+ type: "10",
title: "缴存保证金",
},
{
count: "",
- type: "5",
+ type: "30",
title: "缴存服务费",
},
{
count: "",
- type: "6",
+ type: "40",
title: "缴存上架费",
},
{
@@ -634,11 +728,19 @@ export default {
this.$message.error(res.message);
});
},
+ handleOffSizeChange(val) {
+ this.tableFrom.limit = val
+ this.getOffRecordList()
+ },
+ pageOffChange(page) {
+ this.tableFrom.page = page
+ this.getOffRecordList()
+ },
// 列表
getList(num) {
this.listLoading = true;
this.tableFrom.page = num ? num : this.tableFrom.page;
- this.type == 1
+ this.type == 10
? marginLstApi(this.tableFrom) //缴存
.then((res) => {
this.tableData.data = res.data.list;
@@ -679,7 +781,7 @@ export default {
this.listLoading = false;
this.$message.error(res.message);
})
- : this.type == 5 ? marginServiceLstApi(this.tableFrom) //缴存服务费
+ : this.type == 30 ? marginServiceLstApi(this.tableFrom) //缴存服务费
.then((res) => {
this.tableData.data = res.data.list;
this.tableData.total = res.data.count;
@@ -689,7 +791,7 @@ export default {
this.listLoading = false;
this.$message.error(res.message);
})
- : this.type == 6 ? marginGoodsLstApi(this.tableFrom) //缴存上架费
+ : this.type == 40 ? marginGoodsLstApi(this.tableFrom) //缴存上架费
.then((res) => {
this.tableData.data = res.data.list;
this.tableData.total = res.data.count;
@@ -741,6 +843,26 @@ export default {
this.$message.error(res.message);
});
},
+ // 查看记录
+ viewOffRecords(id) {
+ this.tableOffFrom.page = 1
+ this.tableOffFrom.type = this.type
+ this.offRecord = true
+ this.getOffRecordList(id)
+ },
+ // 记录列表
+ getOffRecordList(id) {
+ const that = this
+ that.loading = true
+ marginofflineLstRecord(id,that.tableOffFrom).then(async(res) => {
+ that.tableOffData.data = res.data.list
+ that.tableOffData.total = res.data.count
+ that.loading = false
+ }).catch((res) => {
+ that.loading = false
+ that.$message.error(res.message)
+ })
+ },
// 审核
handleAudit(id) {
this.$modalForm(marginRefundStatus(id)).then(() => this.getList(""));
diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index 85e95ed..3ebb208 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -217,16 +217,17 @@
无
- 有
+ 有
+ 有
-
+
元,
-
+
额度
- {{merData.is_margin != 0?(merData.ot_margin<+merData.margin)?merData.margin:(merData.ot_margin-merData.margin):'0'}}
+ {{merData.ot_margin-merData.margin}}
- {{merData.is_service != 0?(merData.ot_service_cost<+merData.service_cost)?merData.service_cost:(merData.ot_service_cost-merData.service_cost):'0'}}
+ {{merData.ot_service_cost-merData.service_cost}}
- {{merData.is_goods != 0?(merData.ot_goods_cost<+merData.goods_cost)?merData.goods_cost:(merData.ot_goods_cost-merData.goods_cost):'0'}}
+ {{merData.ot_goods_cost-merData.goods_cost}}
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index fc6303b..df492cc 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -176,12 +176,21 @@
-
+
- {{scope.row.is_margin == 1 ? '未支付' : scope.row.is_margin == 0 ? '无' : '已支付'}}
-
+ {{getNumber(scope.row,'margin')}}
+
+
+
+
+ {{getNumber(scope.row,'service')}}
+
+
+
+
+ {{getNumber(scope.row,'goods')}}
@@ -309,6 +318,14 @@ export default {
this.getList("");
},
methods: {
+ getNumber(row,name){
+ if(name=='margin'){
+ return row[`is_${name}`] == 0?'无':row[`ot_${name}`]-row[`${name}`]>0 ? '待缴' : '已缴'
+ }else{
+ return row[`is_${name}`] == 0?'无':row[`ot_${name}_cost`]-row[`${name}_cost`]>0 ? '待缴' : '已缴'
+ }
+
+ },
handleCascader(){
this.tableFrom.city = this.$refs["cascader"]?.getCheckedNodes()[0]?.label
this.getList(1)