From e9ef3b2f271710c52a3a796b65f8e9062e3daae9 Mon Sep 17 00:00:00 2001
From: tanzhisong <minjingtzs@163.com>
Date: Thu, 6 Mar 2025 16:16:44 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BA=A7=E5=93=81=E5=88=86=E7=B1=BB=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=EF=BC=8C=E6=9B=B4=E6=94=B9=E4=BA=A7=E5=93=81=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=88=86=E7=B1=BB=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/miniapp/order/AppOrder.data.ts     | 18 ++++++++++++++++++
 src/views/miniapp/product/AppProduct.data.ts |  1 -
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/views/miniapp/order/AppOrder.data.ts b/src/views/miniapp/order/AppOrder.data.ts
index 18d8360..4ba3e0e 100644
--- a/src/views/miniapp/order/AppOrder.data.ts
+++ b/src/views/miniapp/order/AppOrder.data.ts
@@ -4,6 +4,7 @@ import { rules } from '/@/utils/helper/validator';
 import { render } from '/@/utils/common/renderUtils';
 import { JVxeTypes, JVxeColumn } from '/@/components/jeecg/JVxeTable/types';
 import { getWeekMonthQuarterYear } from '/@/utils';
+import {allProductCagegoryList} from "@/views/miniapp/productCategory/AppCategory.api";
 //列表数据
 export const columns: BasicColumn[] = [
   {
@@ -41,6 +42,11 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'productName',
   },
+  {
+    title: '产品类别',
+    align: 'center',
+    dataIndex: 'productType',
+  },
   {
     title: '产品服务年限',
     align: 'center',
@@ -140,6 +146,18 @@ export const searchFormSchema: FormSchema[] = [
     field: 'productName',
     component: 'JInput',
   },
+  {
+    label: '产品类别',
+    field: 'productType',
+    component: 'ApiSelect',
+    componentProps: {
+      api: allProductCagegoryList,
+      numberToString: true,
+      labelField: 'categoryName',
+      valueField: 'categoryName',
+      immediate: false,
+    },
+  },
   {
     label: '经销商',
     field: 'storeName',
diff --git a/src/views/miniapp/product/AppProduct.data.ts b/src/views/miniapp/product/AppProduct.data.ts
index 248370e..44afbd5 100644
--- a/src/views/miniapp/product/AppProduct.data.ts
+++ b/src/views/miniapp/product/AppProduct.data.ts
@@ -66,7 +66,6 @@ export const formSchema: FormSchema[] = [
     field: 'categoryId',
     component: 'ApiSelect',
     componentProps: {
-      mode: 'multiple',
       api: allProductCagegoryList,
       numberToString: true,
       labelField: 'categoryName',