feat:受益列表增加实名字段(目前隐藏)
fix:修复搜索问题
This commit is contained in:
@@ -20,6 +20,7 @@ export interface Profit {
|
|||||||
merchantName?: string;
|
merchantName?: string;
|
||||||
equipmentCode?: string;
|
equipmentCode?: string;
|
||||||
orderUserName?: string;
|
orderUserName?: string;
|
||||||
|
orderRealName?: string;//用户实名
|
||||||
createTime?: string;
|
createTime?: string;
|
||||||
updateTime?: string;
|
updateTime?: string;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -144,6 +144,12 @@
|
|||||||
dataIndex: 'orderUserName',
|
dataIndex: 'orderUserName',
|
||||||
key: 'orderUserName'
|
key: 'orderUserName'
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: '用户实名',
|
||||||
|
dataIndex: 'orderRealName',
|
||||||
|
key: 'orderRealName',
|
||||||
|
hideInTable:true //FIXME 先隐藏起来,用户是想将orderUserName改成实名,但是实名可能为空
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: '门店',
|
title: '门店',
|
||||||
dataIndex: 'merchantName',
|
dataIndex: 'merchantName',
|
||||||
|
|||||||
@@ -70,15 +70,27 @@
|
|||||||
const [d1, d2] = dateRange.value ?? [];
|
const [d1, d2] = dateRange.value ?? [];
|
||||||
if (type.value == 'orderNo') {
|
if (type.value == 'orderNo') {
|
||||||
where.orderNo = searchText.value;
|
where.orderNo = searchText.value;
|
||||||
|
where.orderUserName = undefined;
|
||||||
|
where.merchantCode=undefined;
|
||||||
|
where.keywords =undefined;
|
||||||
}
|
}
|
||||||
if (type.value == 'orderUserName') {
|
if (type.value == 'orderUserName') {
|
||||||
where.orderUserName = searchText.value;
|
where.orderUserName = searchText.value;
|
||||||
|
where.merchantCode=undefined;
|
||||||
|
where.orderNo =undefined;
|
||||||
|
where.keywords =undefined;
|
||||||
}
|
}
|
||||||
if (type.value == 'merchantCode') {
|
if (type.value == 'merchantCode') {
|
||||||
where.merchantCode = searchText.value;
|
where.merchantCode = searchText.value;
|
||||||
|
where.orderUserName = undefined;
|
||||||
|
where.orderNo =undefined;
|
||||||
|
where.keywords =undefined;
|
||||||
}
|
}
|
||||||
if (type.value == 'keywords') {
|
if (type.value == 'keywords') {
|
||||||
where.keywords = searchText.value;
|
where.keywords = searchText.value;
|
||||||
|
where.merchantCode=undefined;
|
||||||
|
where.orderNo =undefined;
|
||||||
|
where.orderUserName = undefined;
|
||||||
}
|
}
|
||||||
emit('search', {
|
emit('search', {
|
||||||
...where,
|
...where,
|
||||||
|
|||||||
Reference in New Issue
Block a user