diff --git a/src/api/profit/model/index.ts b/src/api/profit/model/index.ts index f5a22c5..008bc07 100644 --- a/src/api/profit/model/index.ts +++ b/src/api/profit/model/index.ts @@ -20,6 +20,7 @@ export interface Profit { merchantName?: string; equipmentCode?: string; orderUserName?: string; + orderRealName?: string;//用户实名 createTime?: string; updateTime?: string; } diff --git a/src/views/yunxinwei/profit/index.vue b/src/views/yunxinwei/profit/index.vue index 9a7fa85..1d18686 100644 --- a/src/views/yunxinwei/profit/index.vue +++ b/src/views/yunxinwei/profit/index.vue @@ -144,6 +144,12 @@ dataIndex: 'orderUserName', key: 'orderUserName' }, + { + title: '用户实名', + dataIndex: 'orderRealName', + key: 'orderRealName', + hideInTable:true //FIXME 先隐藏起来,用户是想将orderUserName改成实名,但是实名可能为空 + }, { title: '门店', dataIndex: 'merchantName', diff --git a/src/views/yunxinwei/profit/search.vue b/src/views/yunxinwei/profit/search.vue index 9b2fde9..d5f8ddc 100644 --- a/src/views/yunxinwei/profit/search.vue +++ b/src/views/yunxinwei/profit/search.vue @@ -70,15 +70,27 @@ const [d1, d2] = dateRange.value ?? []; if (type.value == 'orderNo') { where.orderNo = searchText.value; + where.orderUserName = undefined; + where.merchantCode=undefined; + where.keywords =undefined; } if (type.value == 'orderUserName') { where.orderUserName = searchText.value; + where.merchantCode=undefined; + where.orderNo =undefined; + where.keywords =undefined; } if (type.value == 'merchantCode') { where.merchantCode = searchText.value; + where.orderUserName = undefined; + where.orderNo =undefined; + where.keywords =undefined; } if (type.value == 'keywords') { where.keywords = searchText.value; + where.merchantCode=undefined; + where.orderNo =undefined; + where.orderUserName = undefined; } emit('search', { ...where,