diff --git a/src/api/profit/model/index.ts b/src/api/profit/model/index.ts index 008bc07..e200365 100644 --- a/src/api/profit/model/index.ts +++ b/src/api/profit/model/index.ts @@ -37,4 +37,5 @@ export interface ProfitParam extends PageParam { beginDate?: string; endDate?: string; scene?: number; + beneficiaryName?:string;//收益人 } diff --git a/src/views/yunxinwei/profit/index.vue b/src/views/yunxinwei/profit/index.vue index 1d18686..a587a8d 100644 --- a/src/views/yunxinwei/profit/index.vue +++ b/src/views/yunxinwei/profit/index.vue @@ -51,7 +51,9 @@

@@ -73,26 +74,37 @@ where.orderUserName = undefined; where.merchantCode=undefined; where.keywords =undefined; + where.beneficiaryName = undefined; } if (type.value == 'orderUserName') { where.orderUserName = searchText.value; where.merchantCode=undefined; where.orderNo =undefined; where.keywords =undefined; + where.beneficiaryName = undefined; } if (type.value == 'merchantCode') { where.merchantCode = searchText.value; where.orderUserName = undefined; where.orderNo =undefined; where.keywords =undefined; + where.beneficiaryName = undefined; } if (type.value == 'keywords') { where.keywords = searchText.value; where.merchantCode=undefined; where.orderNo =undefined; where.orderUserName = undefined; + where.beneficiaryName = undefined; } - emit('search', { + if (type.value == 'beneficiaryName'){ + where.beneficiaryName = searchText.value; + where.keywords = undefined; + where.merchantCode=undefined; + where.orderNo =undefined; + where.orderUserName = undefined; + } + emit('search', { ...where, beginDate: d1, endDate: d2