From d4a378ad9052e05cded7eac9c3c6f02ca30cb87f Mon Sep 17 00:00:00 2001
From: yangqingyuan <yangqingyuan@163.com>
Date: Fri, 9 Aug 2024 16:18:05 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=8F=97=E7=9B=8A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=94=B6=E7=9B=8A=E4=BA=BA=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/profit/model/index.ts         |  1 +
 src/views/yunxinwei/profit/index.vue  |  4 +++-
 src/views/yunxinwei/profit/search.vue | 14 +++++++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

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 @@
                 </span></p>
             </template>
             <template v-if="column.key === 'comments'">
-              {{ record.comments }}
+              <span :style="{'white-space':'pre-line'}">
+                {{ record.comments }}
+              </span>
             </template>
             <template v-if="column.key === 'status'">
               <a-tag v-if="record.status === '0'" color="green">正常</a-tag>
diff --git a/src/views/yunxinwei/profit/search.vue b/src/views/yunxinwei/profit/search.vue
index d5f8ddc..456dc92 100644
--- a/src/views/yunxinwei/profit/search.vue
+++ b/src/views/yunxinwei/profit/search.vue
@@ -27,6 +27,7 @@
           <a-select-option value="orderNo">订单号</a-select-option>
           <a-select-option value="merchantCode">门店编号</a-select-option>
           <a-select-option value="orderUserName">用户名</a-select-option>
+          <a-select-option value="beneficiaryName">收益人</a-select-option><!--收益人信息存储在comments中 -->
         </a-select>
       </template>
     </a-input-search>
@@ -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