优化

src/pages/BusinessList/recommend.tsx

@@ -169,27 +169,30 @@ const TableList: React.FC = () => {
     },
     {
       title: '商户名称',
-      dataIndex: 'pbcBusinessName'
+      dataIndex: 'pbcBusinessName',
     },
     {
       title: '联系人',
       width: 100,
-      dataIndex: 'pbcBusinessContact'
+      dataIndex: 'pbcBusinessContact',
+      search: false,
     },
     {
       title: '商户手机号',
       width: 110,
-      dataIndex: 'pbcBusinessContactMobile'
+      dataIndex: 'pbcBusinessContactMobile',
     },
     {
       title: '主营品类',
       dataIndex: 'pbcBusinessMainCategory',
-      ellipsis: true
+      ellipsis: true,
+      search: false,
     },
     {
       title: '商户等级',
       width: 80,
-      dataIndex: 'pbcBusinessLevel'
+      dataIndex: 'pbcBusinessLevel',
+      search: false,
     }
   ];
 
@@ -269,10 +272,19 @@ const TableList: React.FC = () => {
       >
         <ProTable<API.PbcRecommendBusiness_>
           columns={addColumns}
-          request={async () => {
+          request={async (params) => {
             const res = await getUnRecommendBusinessListUsingGet();
+            let data = res.data || [];
+            if (params.pbcBusinessName) {
+              data = data.filter((item) => item.pbcBusinessName?.includes(params.pbcBusinessName!));
+            }
+            if (params.pbcBusinessContactMobile) {
+              data = data.filter((item) =>
+                item.pbcBusinessContactMobile?.includes(params.pbcBusinessContactMobile!),
+              );
+            }
             return {
-              data: res.data || [],
+              data,
               success: !!res.retcode,
             };
           }}
@@ -280,7 +292,6 @@ const TableList: React.FC = () => {
           rowKey="pbcId"
           size="small"
           bordered
-          search={false}
           options={false}
           pagination={false}
           rowSelection={{

src/pages/FashionTrend/components/LinkProductModal.tsx

@@ -1,3 +1,5 @@
+import Constants from '@/constants';
+import { getPbcBusinessListUsingPost } from '@/services/pop-b2b2c/pbcBusinessController';
 import { listAdminTreeUsingGet } from '@/services/pop-b2b2c/pbcCategoryController';
 import {
   addOrUpdateFashionTrendUsingPost,
@@ -123,6 +125,47 @@ const LinkProductModal: React.FC<LinkProductModalProps> = ({
       title: '款号',
       dataIndex: 'pbcProductCode',
     },
+    {
+      title: '价格',
+      dataIndex: 'pbcProductPrice',
+      search: false,
+    },
+    {
+      title: '所属商户',
+      dataIndex: 'pbcBusinessName',
+      search: false,
+    },
+    {
+      title: '所属商户',
+      dataIndex: 'pbcBusinessId',
+      hideInTable: true,
+      search: !access.isBusiness,
+      valueType: 'select',
+      fieldProps: {
+        showSearch: true,
+        fieldNames: { label: 'pbcBusinessName', value: 'pbcId' },
+      },
+      request: async () => {
+        const msg = await getPbcBusinessListUsingPost();
+        if (msg.retcode && msg.data) {
+          return msg.data;
+        }
+        return [];
+      },
+    },
+    {
+      title: '产品类型',
+      dataIndex: 'pbcProductType',
+      valueType: 'select',
+      valueEnum: Constants.pbcProductTypeList,
+      search: false
+    },
+    {
+      title: '状态',
+      dataIndex: 'pbcState',
+      valueType: 'select',
+      valueEnum: Constants.pbcProductState,
+    },
   ];
 
   return (