feat:受益列表增加收益人查询

This commit is contained in:
yangqingyuan
2024-08-09 16:18:05 +08:00
parent a8d6e883be
commit d4a378ad90
3 changed files with 17 additions and 2 deletions

View File

@@ -37,4 +37,5 @@ export interface ProfitParam extends PageParam {
beginDate?: string; beginDate?: string;
endDate?: string; endDate?: string;
scene?: number; scene?: number;
beneficiaryName?:string;//收益人
} }

View File

@@ -51,7 +51,9 @@
</span></p> </span></p>
</template> </template>
<template v-if="column.key === 'comments'"> <template v-if="column.key === 'comments'">
{{ record.comments }} <span :style="{'white-space':'pre-line'}">
{{ record.comments }}
</span>
</template> </template>
<template v-if="column.key === 'status'"> <template v-if="column.key === 'status'">
<a-tag v-if="record.status === '0'" color="green">正常</a-tag> <a-tag v-if="record.status === '0'" color="green">正常</a-tag>

View File

@@ -27,6 +27,7 @@
<a-select-option value="orderNo">订单号</a-select-option> <a-select-option value="orderNo">订单号</a-select-option>
<a-select-option value="merchantCode">门店编号</a-select-option> <a-select-option value="merchantCode">门店编号</a-select-option>
<a-select-option value="orderUserName">用户名</a-select-option> <a-select-option value="orderUserName">用户名</a-select-option>
<a-select-option value="beneficiaryName">收益人</a-select-option><!--收益人信息存储在comments中 -->
</a-select> </a-select>
</template> </template>
</a-input-search> </a-input-search>
@@ -73,26 +74,37 @@
where.orderUserName = undefined; where.orderUserName = undefined;
where.merchantCode=undefined; where.merchantCode=undefined;
where.keywords =undefined; where.keywords =undefined;
where.beneficiaryName = undefined;
} }
if (type.value == 'orderUserName') { if (type.value == 'orderUserName') {
where.orderUserName = searchText.value; where.orderUserName = searchText.value;
where.merchantCode=undefined; where.merchantCode=undefined;
where.orderNo =undefined; where.orderNo =undefined;
where.keywords =undefined; where.keywords =undefined;
where.beneficiaryName = undefined;
} }
if (type.value == 'merchantCode') { if (type.value == 'merchantCode') {
where.merchantCode = searchText.value; where.merchantCode = searchText.value;
where.orderUserName = undefined; where.orderUserName = undefined;
where.orderNo =undefined; where.orderNo =undefined;
where.keywords =undefined; where.keywords =undefined;
where.beneficiaryName = undefined;
} }
if (type.value == 'keywords') { if (type.value == 'keywords') {
where.keywords = searchText.value; where.keywords = searchText.value;
where.merchantCode=undefined; where.merchantCode=undefined;
where.orderNo =undefined; where.orderNo =undefined;
where.orderUserName = 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, ...where,
beginDate: d1, beginDate: d1,
endDate: d2 endDate: d2