Просмотр исходного кода

feat: 添加用户姓名、电话和地址字段到订单列表API,更新相关表单组件以支持清除功能

laiqi 6 месяцев назад
Родитель
Сommit
01380b7323
29 измененных файлов с 160 добавлено и 108 удалено
  1. 15 0
      apps/web-ele/src/api/orders/index.ts
  2. 1 1
      apps/web-ele/src/views/coupon-manage/form.vue
  3. 1 1
      apps/web-ele/src/views/coupon-manage/index.vue
  4. 4 4
      apps/web-ele/src/views/customer-manage/buyer-index.vue
  5. 16 16
      apps/web-ele/src/views/customer-manage/form.vue
  6. 4 4
      apps/web-ele/src/views/customer-manage/seller-index.vue
  7. 6 6
      apps/web-ele/src/views/examine-manage/examine-coupon/form.vue
  8. 3 3
      apps/web-ele/src/views/examine-manage/examine-subsidy/form.vue
  9. 1 1
      apps/web-ele/src/views/examine-manage/examine-subsidy/index.vue
  10. 11 11
      apps/web-ele/src/views/order-manage/form.vue
  11. 32 5
      apps/web-ele/src/views/order-manage/index.vue
  12. 10 10
      apps/web-ele/src/views/product-manage/form.vue
  13. 6 6
      apps/web-ele/src/views/scqy-manage/form.vue
  14. 1 1
      apps/web-ele/src/views/scqy-manage/index.vue
  15. 3 3
      apps/web-ele/src/views/subsidy-manage/form.vue
  16. 1 1
      apps/web-ele/src/views/subsidy-manage/index.vue
  17. 3 3
      apps/web-ele/src/views/system-manage/data-dictionary/index.vue
  18. 3 3
      apps/web-ele/src/views/system-manage/menu-manage/index.vue
  19. 11 11
      apps/web-ele/src/views/system-manage/operation-logs/form.vue
  20. 3 3
      apps/web-ele/src/views/system-manage/operation-logs/index.vue
  21. 2 2
      apps/web-ele/src/views/system-manage/role-manage/index.vue
  22. 2 2
      apps/web-ele/src/views/system-manage/user-manage/index.vue
  23. 2 2
      apps/web-ele/src/views/system-manage/worker-manage/index.vue
  24. 1 1
      packages/@core/ui-kit/shadcn-ui/src/components/button/button.ts
  25. 2 2
      packages/@core/ui-kit/shadcn-ui/src/components/button/check-button-group.vue
  26. 3 3
      packages/@core/ui-kit/shadcn-ui/src/components/select/select.vue
  27. 2 2
      packages/@core/ui-kit/shadcn-ui/src/ui/tree/tree.vue
  28. 1 1
      packages/@core/ui-kit/shadcn-ui/src/ui/tree/types.ts
  29. 10 0
      packages/effects/request/src/request-client/preset-interceptors.ts

+ 15 - 0
apps/web-ele/src/api/orders/index.ts

@@ -23,6 +23,9 @@ export async function getOrdersListApi(params: any) {
     ordersuserid1,
     ordersuserid1,
     ordersorderdate,
     ordersorderdate,
     pageindex,
     pageindex,
+    usersname,
+    usersphone,
+    usersaddress,
     rows,
     rows,
   } = params;
   } = params;
 
 
@@ -39,6 +42,18 @@ export async function getOrdersListApi(params: any) {
     queryParams['ordersproductname.like'] = ordersproductname;
     queryParams['ordersproductname.like'] = ordersproductname;
   }
   }
 
 
+  if (usersname) {
+    queryParams['usersname.value'] = usersname;
+  }
+
+  if (usersphone) {
+    queryParams['usersphone.value'] = usersphone;
+  }
+
+  if (usersaddress) {
+    queryParams['usersaddress.like'] = usersaddress;
+  }
+
   if (ordersuserid1) {
   if (ordersuserid1) {
     queryParams['ordersuserid1.value'] = ordersuserid1;
     queryParams['ordersuserid1.value'] = ordersuserid1;
   }
   }

+ 1 - 1
apps/web-ele/src/views/coupon-manage/form.vue

@@ -70,7 +70,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '名称',
       label: '名称',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入优惠券名称' }),
       rules: z.string().min(1, { message: '请输入优惠券名称' }),
     },
     },

+ 1 - 1
apps/web-ele/src/views/coupon-manage/index.vue

@@ -28,7 +28,7 @@ const formOptions: VbenFormProps = {
       label: '优惠券名称',
       label: '优惠券名称',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
   ],
   ],

+ 4 - 4
apps/web-ele/src/views/customer-manage/buyer-index.vue

@@ -33,7 +33,7 @@ const formOptions: VbenFormProps = {
       label: '用户名称',
       label: '用户名称',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
     // {
     // {
@@ -42,7 +42,7 @@ const formOptions: VbenFormProps = {
     //   label: '生产企业',
     //   label: '生产企业',
     //   componentProps: {
     //   componentProps: {
     //     placeholder: $t('ui.placeholder.input'),
     //     placeholder: $t('ui.placeholder.input'),
-    //     allowClear: true,
+    //     clearable: true,
     //   },
     //   },
     // },
     // },
     {
     {
@@ -51,7 +51,7 @@ const formOptions: VbenFormProps = {
       label: '用户手机号',
       label: '用户手机号',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
     // {
     // {
@@ -64,7 +64,7 @@ const formOptions: VbenFormProps = {
     //   disabled: userStore.isDLSNotAdmin,
     //   disabled: userStore.isDLSNotAdmin,
     //   componentProps: {
     //   componentProps: {
     //     placeholder: $t('ui.placeholder.select'),
     //     placeholder: $t('ui.placeholder.select'),
-    //     allowClear: true,
+    //     clearable: true,
     //     options: [
     //     options: [
     //       { label: '购机者', value: '购机者' },
     //       { label: '购机者', value: '购机者' },
     //       { label: '经销商', value: '经销商' },
     //       { label: '经销商', value: '经销商' },

+ 16 - 16
apps/web-ele/src/views/customer-manage/form.vue

@@ -91,7 +91,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '用户名称',
       label: '用户名称',
       componentProps: {
       componentProps: {
         placeholder: '请输入用户名称',
         placeholder: '请输入用户名称',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入用户名称' }),
       rules: z.string().min(1, { message: '请输入用户名称' }),
     },
     },
@@ -101,7 +101,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '用户性质',
       label: '用户性质',
       componentProps: {
       componentProps: {
         placeholder: '请选择用户性质',
         placeholder: '请选择用户性质',
-        allowClear: true,
+        clearable: true,
         options: [
         options: [
           { label: '购机者', value: '购机者' },
           { label: '购机者', value: '购机者' },
           { label: '经销商', value: '经销商' },
           { label: '经销商', value: '经销商' },
@@ -116,7 +116,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       defaultValue: '个人',
       defaultValue: '个人',
       componentProps: {
       componentProps: {
         placeholder: '请选择用户类型',
         placeholder: '请选择用户类型',
-        allowClear: true,
+        clearable: true,
         options: [
         options: [
           { label: '个人', value: '个人' },
           { label: '个人', value: '个人' },
           { label: '企业', value: '企业' },
           { label: '企业', value: '企业' },
@@ -131,7 +131,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '身份证号码',
       label: '身份证号码',
       componentProps: {
       componentProps: {
         placeholder: '请输入身份证号码',
         placeholder: '请输入身份证号码',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入身份证号码' }),
       rules: z.string().min(1, { message: '请输入身份证号码' }),
       dependencies: {
       dependencies: {
@@ -148,7 +148,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '统一社会信用代码',
       label: '统一社会信用代码',
       componentProps: {
       componentProps: {
         placeholder: '请输入统一社会信用代码',
         placeholder: '请输入统一社会信用代码',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入统一社会信用代码' }),
       rules: z.string().min(1, { message: '请输入统一社会信用代码' }),
       dependencies: {
       dependencies: {
@@ -164,7 +164,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '企业注册地',
       label: '企业注册地',
       componentProps: {
       componentProps: {
         placeholder: '请输入企业注册地',
         placeholder: '请输入企业注册地',
-        allowClear: true,
+        clearable: true,
       },
       },
       dependencies: {
       dependencies: {
         if(values) {
         if(values) {
@@ -179,7 +179,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '法人代表电话(座机)',
       label: '法人代表电话(座机)',
       componentProps: {
       componentProps: {
         placeholder: '请输入法人代表电话',
         placeholder: '请输入法人代表电话',
-        allowClear: true,
+        clearable: true,
       },
       },
       dependencies: {
       dependencies: {
         if(values) {
         if(values) {
@@ -194,7 +194,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '法人代表手机号',
       label: '法人代表手机号',
       componentProps: {
       componentProps: {
         placeholder: '请输入法人代表手机号',
         placeholder: '请输入法人代表手机号',
-        allowClear: true,
+        clearable: true,
       },
       },
       dependencies: {
       dependencies: {
         if(values) {
         if(values) {
@@ -210,7 +210,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '生产企业',
       label: '生产企业',
       componentProps: {
       componentProps: {
         placeholder: '请选择生产企业',
         placeholder: '请选择生产企业',
-        allowClear: true,
+        clearable: true,
         options: scqySelectOptions,
         options: scqySelectOptions,
       },
       },
       rules: z.string().min(1, { message: '请选择生产企业' }),
       rules: z.string().min(1, { message: '请选择生产企业' }),
@@ -228,7 +228,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '开户银行名称',
       label: '开户银行名称',
       componentProps: {
       componentProps: {
         placeholder: '请输入开户银行名称',
         placeholder: '请输入开户银行名称',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入开户银行名称' }),
       rules: z.string().min(1, { message: '请输入开户银行名称' }),
     },
     },
@@ -238,7 +238,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '开户银行账号',
       label: '开户银行账号',
       componentProps: {
       componentProps: {
         placeholder: '请输入开户银行账号',
         placeholder: '请输入开户银行账号',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入开户银行账号' }),
       rules: z.string().min(1, { message: '请输入开户银行账号' }),
     },
     },
@@ -248,7 +248,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '手机号',
       label: '手机号',
       componentProps: {
       componentProps: {
         placeholder: '请输入手机号',
         placeholder: '请输入手机号',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入手机号' }),
       rules: z.string().min(1, { message: '请输入手机号' }),
     },
     },
@@ -258,7 +258,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '邮箱',
       label: '邮箱',
       componentProps: {
       componentProps: {
         placeholder: '请输入邮箱',
         placeholder: '请输入邮箱',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().email({ message: '请输入正确的邮箱格式' }),
       rules: z.string().email({ message: '请输入正确的邮箱格式' }),
     },
     },
@@ -268,7 +268,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '地址',
       label: '地址',
       componentProps: {
       componentProps: {
         placeholder: '请输入地址',
         placeholder: '请输入地址',
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
     {
     {
@@ -277,7 +277,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '传真',
       label: '传真',
       componentProps: {
       componentProps: {
         placeholder: '请输入传真',
         placeholder: '请输入传真',
-        allowClear: true,
+        clearable: true,
       },
       },
       dependencies: {
       dependencies: {
         if(values) {
         if(values) {
@@ -292,7 +292,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '备注',
       label: '备注',
       componentProps: {
       componentProps: {
         placeholder: '请输入备注',
         placeholder: '请输入备注',
-        allowClear: true,
+        clearable: true,
         type: 'textarea',
         type: 'textarea',
         rows: 4,
         rows: 4,
       },
       },

+ 4 - 4
apps/web-ele/src/views/customer-manage/seller-index.vue

@@ -33,7 +33,7 @@ const formOptions: VbenFormProps = {
       label: '用户名称',
       label: '用户名称',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
     {
     {
@@ -42,7 +42,7 @@ const formOptions: VbenFormProps = {
       label: '生产企业',
       label: '生产企业',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
     {
     {
@@ -51,7 +51,7 @@ const formOptions: VbenFormProps = {
       label: '用户手机号',
       label: '用户手机号',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
     // {
     // {
@@ -64,7 +64,7 @@ const formOptions: VbenFormProps = {
     //   disabled: userStore.isDLSNotAdmin,
     //   disabled: userStore.isDLSNotAdmin,
     //   componentProps: {
     //   componentProps: {
     //     placeholder: $t('ui.placeholder.select'),
     //     placeholder: $t('ui.placeholder.select'),
-    //     allowClear: true,
+    //     clearable: true,
     //     options: [
     //     options: [
     //       { label: '购机者', value: '购机者' },
     //       { label: '购机者', value: '购机者' },
     //       { label: '经销商', value: '经销商' },
     //       { label: '经销商', value: '经销商' },

+ 6 - 6
apps/web-ele/src/views/examine-manage/examine-coupon/form.vue

@@ -45,7 +45,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '优惠券代码',
       label: '优惠券代码',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入优惠券代码' }),
       rules: z.string().min(1, { message: '请输入优惠券代码' }),
     },
     },
@@ -56,7 +56,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       defaultValue: dayjs().format('YYYY-MM-DD HH:mm:ss'),
       defaultValue: dayjs().format('YYYY-MM-DD HH:mm:ss'),
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.select'),
         placeholder: $t('ui.placeholder.select'),
-        allowClear: true,
+        clearable: true,
         type: 'datetime',
         type: 'datetime',
         valueFormat: 'YYYY-MM-DD HH:mm:ss',
         valueFormat: 'YYYY-MM-DD HH:mm:ss',
         style: { width: '100%' },
         style: { width: '100%' },
@@ -69,7 +69,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '优惠券状态',
       label: '优惠券状态',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.select'),
         placeholder: $t('ui.placeholder.select'),
-        allowClear: true,
+        clearable: true,
         options: [
         options: [
           { label: '申请中', value: 0 },
           { label: '申请中', value: 0 },
           { label: '审核通过', value: 1 },
           { label: '审核通过', value: 1 },
@@ -84,7 +84,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '使用状态',
       label: '使用状态',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.select'),
         placeholder: $t('ui.placeholder.select'),
-        allowClear: true,
+        clearable: true,
         options: [
         options: [
           { label: '未使用', value: 0 },
           { label: '未使用', value: 0 },
           { label: '已使用', value: 1 },
           { label: '已使用', value: 1 },
@@ -98,7 +98,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '可用产品',
       label: '可用产品',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入可用产品' }),
       rules: z.string().min(1, { message: '请输入可用产品' }),
     },
     },
@@ -108,7 +108,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '关联主券ID',
       label: '关联主券ID',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入关联主券ID' }),
       rules: z.string().min(1, { message: '请输入关联主券ID' }),
     },
     },

+ 3 - 3
apps/web-ele/src/views/examine-manage/examine-subsidy/form.vue

@@ -47,7 +47,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '经销商ID',
       label: '经销商ID',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入经销商ID' }),
       rules: z.string().min(1, { message: '请输入经销商ID' }),
     },
     },
@@ -57,7 +57,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '补贴金额',
       label: '补贴金额',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入补贴金额' }),
       rules: z.string().min(1, { message: '请输入补贴金额' }),
     },
     },
@@ -67,7 +67,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '审批状态',
       label: '审批状态',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入审批状态' }),
       rules: z.string().min(1, { message: '请输入审批状态' }),
     },
     },

+ 1 - 1
apps/web-ele/src/views/examine-manage/examine-subsidy/index.vue

@@ -26,7 +26,7 @@ const formOptions: VbenFormProps = {
       label: '经销商ID',
       label: '经销商ID',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
   ],
   ],

+ 11 - 11
apps/web-ele/src/views/order-manage/form.vue

@@ -40,7 +40,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '订单号',
       label: '订单号',
       componentProps: {
       componentProps: {
         placeholder: '请输入订单号',
         placeholder: '请输入订单号',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入订单号' }),
       rules: z.string().min(1, { message: '请输入订单号' }),
     },
     },
@@ -50,7 +50,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '订单关联用户id',
       label: '订单关联用户id',
       componentProps: {
       componentProps: {
         placeholder: '请输入订单关联用户id',
         placeholder: '请输入订单关联用户id',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入订单关联用户id' }),
       rules: z.string().min(1, { message: '请输入订单关联用户id' }),
     },
     },
@@ -60,7 +60,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '订单关联产品id',
       label: '订单关联产品id',
       componentProps: {
       componentProps: {
         placeholder: '请输入订单关联产品id',
         placeholder: '请输入订单关联产品id',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入订单关联产品id' }),
       rules: z.string().min(1, { message: '请输入订单关联产品id' }),
     },
     },
@@ -70,7 +70,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '产品名称',
       label: '产品名称',
       componentProps: {
       componentProps: {
         placeholder: '请输入产品名称',
         placeholder: '请输入产品名称',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入产品名称' }),
       rules: z.string().min(1, { message: '请输入产品名称' }),
     },
     },
@@ -80,7 +80,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '产品sn',
       label: '产品sn',
       componentProps: {
       componentProps: {
         placeholder: '请输入产品sn',
         placeholder: '请输入产品sn',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入产品sn' }),
       rules: z.string().min(1, { message: '请输入产品sn' }),
     },
     },
@@ -90,7 +90,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '产品型号',
       label: '产品型号',
       componentProps: {
       componentProps: {
         placeholder: '请输入产品型号',
         placeholder: '请输入产品型号',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入产品型号' }),
       rules: z.string().min(1, { message: '请输入产品型号' }),
     },
     },
@@ -100,7 +100,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '经销商',
       label: '经销商',
       componentProps: {
       componentProps: {
         placeholder: '请输入经销商',
         placeholder: '请输入经销商',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入经销商' }),
       rules: z.string().min(1, { message: '请输入经销商' }),
     },
     },
@@ -110,7 +110,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '订单总金额',
       label: '订单总金额',
       componentProps: {
       componentProps: {
         placeholder: '请输入订单总金额',
         placeholder: '请输入订单总金额',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.number().min(0, { message: '请输入有效的订单总金额' }),
       rules: z.number().min(0, { message: '请输入有效的订单总金额' }),
     },
     },
@@ -120,7 +120,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '订单优惠后金额',
       label: '订单优惠后金额',
       componentProps: {
       componentProps: {
         placeholder: '请输入订单优惠后金额',
         placeholder: '请输入订单优惠后金额',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.number().min(0, { message: '请输入有效的订单优惠后金额' }),
       rules: z.number().min(0, { message: '请输入有效的订单优惠后金额' }),
     },
     },
@@ -130,7 +130,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '优惠金额',
       label: '优惠金额',
       componentProps: {
       componentProps: {
         placeholder: '请输入优惠金额',
         placeholder: '请输入优惠金额',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.number().min(0, { message: '请输入有效的优惠金额' }),
       rules: z.number().min(0, { message: '请输入有效的优惠金额' }),
     },
     },
@@ -140,7 +140,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '优惠券id',
       label: '优惠券id',
       componentProps: {
       componentProps: {
         placeholder: '请输入优惠券id',
         placeholder: '请输入优惠券id',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入优惠券id' }),
       rules: z.string().min(1, { message: '请输入优惠券id' }),
     },
     },

+ 32 - 5
apps/web-ele/src/views/order-manage/index.vue

@@ -63,7 +63,34 @@ const formOptions: VbenFormProps = {
       label: '订单号',
       label: '订单号',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
+      },
+    },
+    {
+      component: 'Input',
+      fieldName: 'usersname',
+      label: '购机者姓名',
+      componentProps: {
+        placeholder: $t('ui.placeholder.input'),
+        clearable: true,
+      },
+    },
+    {
+      component: 'Input',
+      fieldName: 'usersphone',
+      label: '购机者电话',
+      componentProps: {
+        placeholder: $t('ui.placeholder.input'),
+        clearable: true,
+      },
+    },
+    {
+      component: 'Input',
+      fieldName: 'usersaddress',
+      label: '购机者地址',
+      componentProps: {
+        placeholder: $t('ui.placeholder.input'),
+        clearable: true,
       },
       },
     },
     },
     {
     {
@@ -72,7 +99,7 @@ const formOptions: VbenFormProps = {
       label: '产品名称',
       label: '产品名称',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
     {
     {
@@ -86,7 +113,7 @@ const formOptions: VbenFormProps = {
       componentProps: {
       componentProps: {
         options: dealerOptions,
         options: dealerOptions,
         placeholder: $t('ui.placeholder.select'),
         placeholder: $t('ui.placeholder.select'),
-        allowClear: true,
+        clearable: true,
         filterable: true,
         filterable: true,
         // 如果是代理商且非管理员,禁用该字段
         // 如果是代理商且非管理员,禁用该字段
         disabled: userStore.isDLSNotAdmin,
         disabled: userStore.isDLSNotAdmin,
@@ -101,7 +128,7 @@ const formOptions: VbenFormProps = {
         startPlaceholder: '开始日期',
         startPlaceholder: '开始日期',
         endPlaceholder: '结束日期',
         endPlaceholder: '结束日期',
         valueFormat: 'YYYY-MM-DD', // 根据后端接口调整日期格式
         valueFormat: 'YYYY-MM-DD', // 根据后端接口调整日期格式
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
   ],
   ],
@@ -144,7 +171,7 @@ const gridOptions: VxeGridProps<any> = {
 
 
   columns: [
   columns: [
     { title: '序号', type: 'seq', width: 50 },
     { title: '序号', type: 'seq', width: 50 },
-    // { title: '订单号', field: 'ordersnumber', sortable: true },
+    { title: '订单号', field: 'ordersnumber', sortable: true },
     // { title: '订单关联用户id', field: 'ordersuserid', sortable: true },
     // { title: '订单关联用户id', field: 'ordersuserid', sortable: true },
     // { title: '订单关联产品id', field: 'ordersproductid', sortable: true },
     // { title: '订单关联产品id', field: 'ordersproductid', sortable: true },
     { title: '产品名称', field: 'ordersproductname', sortable: true },
     { title: '产品名称', field: 'ordersproductname', sortable: true },

+ 10 - 10
apps/web-ele/src/views/product-manage/form.vue

@@ -146,7 +146,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '机具类型',
       label: '机具类型',
       componentProps: {
       componentProps: {
         placeholder: '请选择机具类型',
         placeholder: '请选择机具类型',
-        allowClear: true,
+        clearable: true,
         options: jjlxOptions,
         options: jjlxOptions,
       },
       },
       rules: z.string().min(1, { message: '请选择机具类型' }),
       rules: z.string().min(1, { message: '请选择机具类型' }),
@@ -157,7 +157,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '产品名称',
       label: '产品名称',
       componentProps: {
       componentProps: {
         placeholder: '请输入产品名称',
         placeholder: '请输入产品名称',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入产品名称' }),
       rules: z.string().min(1, { message: '请输入产品名称' }),
     },
     },
@@ -167,7 +167,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '产品类别',
       label: '产品类别',
       componentProps: {
       componentProps: {
         placeholder: '请选择产品类别',
         placeholder: '请选择产品类别',
-        allowClear: true,
+        clearable: true,
         options: cplbOptions,
         options: cplbOptions,
       },
       },
       rules: z.string().min(1, { message: '请选择产品类别' }),
       rules: z.string().min(1, { message: '请选择产品类别' }),
@@ -178,7 +178,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '一级分类',
       label: '一级分类',
       componentProps: {
       componentProps: {
         placeholder: '请选择一级分类',
         placeholder: '请选择一级分类',
-        allowClear: true,
+        clearable: true,
         options: cplbOptions,
         options: cplbOptions,
       },
       },
       rules: z.string().min(1, { message: '请输入一级分类' }),
       rules: z.string().min(1, { message: '请输入一级分类' }),
@@ -189,7 +189,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '产品型号',
       label: '产品型号',
       componentProps: {
       componentProps: {
         placeholder: '请输入产品型号',
         placeholder: '请输入产品型号',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入产品型号' }),
       rules: z.string().min(1, { message: '请输入产品型号' }),
     },
     },
@@ -199,7 +199,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
     //   label: '产品SN号',
     //   label: '产品SN号',
     //   componentProps: {
     //   componentProps: {
     //     placeholder: '请输入产品SN号',
     //     placeholder: '请输入产品SN号',
-    //     allowClear: true,
+    //     clearable: true,
     //   },
     //   },
     //   rules: z.string().min(1, { message: '请输入产品SN号' }),
     //   rules: z.string().min(1, { message: '请输入产品SN号' }),
     // },
     // },
@@ -209,7 +209,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
     //   label: '品目',
     //   label: '品目',
     //   componentProps: {
     //   componentProps: {
     //     placeholder: '请输入品目',
     //     placeholder: '请输入品目',
-    //     allowClear: true,
+    //     clearable: true,
     //   },
     //   },
     //   rules: z.string().min(1, { message: '请输入品目' }),
     //   rules: z.string().min(1, { message: '请输入品目' }),
     // },
     // },
@@ -257,7 +257,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
     //   label: '二级分类',
     //   label: '二级分类',
     //   componentProps: {
     //   componentProps: {
     //     placeholder: '请输入二级分类',
     //     placeholder: '请输入二级分类',
-    //     allowClear: true,
+    //     clearable: true,
     //   },
     //   },
     //   // rules: z.string().min(1, { message: '请输入二级分类' }),
     //   // rules: z.string().min(1, { message: '请输入二级分类' }),
     // },
     // },
@@ -267,7 +267,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
     //   label: '分档名称',
     //   label: '分档名称',
     //   componentProps: {
     //   componentProps: {
     //     placeholder: '请输入分档名称',
     //     placeholder: '请输入分档名称',
-    //     allowClear: true,
+    //     clearable: true,
     //   },
     //   },
     //   rules: z.string().min(1, { message: '请输入分档名称' }),
     //   rules: z.string().min(1, { message: '请输入分档名称' }),
     // },
     // },
@@ -277,7 +277,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
     //   label: '分档编号',
     //   label: '分档编号',
     //   componentProps: {
     //   componentProps: {
     //     placeholder: '请输入分档编号',
     //     placeholder: '请输入分档编号',
-    //     allowClear: true,
+    //     clearable: true,
     //   },
     //   },
     //   rules: z.string().min(1, { message: '请输入分档编号' }),
     //   rules: z.string().min(1, { message: '请输入分档编号' }),
     // },
     // },

+ 6 - 6
apps/web-ele/src/views/scqy-manage/form.vue

@@ -46,7 +46,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '企业名称',
       label: '企业名称',
       componentProps: {
       componentProps: {
         placeholder: '请输入生产企业名称',
         placeholder: '请输入生产企业名称',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入生产企业名称' }),
       rules: z.string().min(1, { message: '请输入生产企业名称' }),
     },
     },
@@ -56,7 +56,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '企业地址',
       label: '企业地址',
       componentProps: {
       componentProps: {
         placeholder: '请输入生产企业地址',
         placeholder: '请输入生产企业地址',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入生产企业地址' }),
       rules: z.string().min(1, { message: '请输入生产企业地址' }),
     },
     },
@@ -66,7 +66,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '法人姓名',
       label: '法人姓名',
       componentProps: {
       componentProps: {
         placeholder: '请输入生产企业法人姓名',
         placeholder: '请输入生产企业法人姓名',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入生产企业法人姓名' }),
       rules: z.string().min(1, { message: '请输入生产企业法人姓名' }),
     },
     },
@@ -76,7 +76,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '电子邮箱',
       label: '电子邮箱',
       componentProps: {
       componentProps: {
         placeholder: '请输入生产企业电子邮箱',
         placeholder: '请输入生产企业电子邮箱',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().email({ message: '请输入正确的电子邮箱格式' }),
       rules: z.string().email({ message: '请输入正确的电子邮箱格式' }),
     },
     },
@@ -86,7 +86,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '销售联系人',
       label: '销售联系人',
       componentProps: {
       componentProps: {
         placeholder: '请输入生产企业销售联系人',
         placeholder: '请输入生产企业销售联系人',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入生产企业销售联系人' }),
       rules: z.string().min(1, { message: '请输入生产企业销售联系人' }),
     },
     },
@@ -96,7 +96,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '销售联系手机号',
       label: '销售联系手机号',
       componentProps: {
       componentProps: {
         placeholder: '请输入生产企业销售联系手机号',
         placeholder: '请输入生产企业销售联系手机号',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z
       rules: z
         .string()
         .string()

+ 1 - 1
apps/web-ele/src/views/scqy-manage/index.vue

@@ -28,7 +28,7 @@ const formOptions: VbenFormProps = {
       label: '企业名称',
       label: '企业名称',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
   ],
   ],

+ 3 - 3
apps/web-ele/src/views/subsidy-manage/form.vue

@@ -47,7 +47,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '经销商ID',
       label: '经销商ID',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入经销商ID' }),
       rules: z.string().min(1, { message: '请输入经销商ID' }),
     },
     },
@@ -57,7 +57,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '补贴金额',
       label: '补贴金额',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入补贴金额' }),
       rules: z.string().min(1, { message: '请输入补贴金额' }),
     },
     },
@@ -67,7 +67,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '审批状态',
       label: '审批状态',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入审批状态' }),
       rules: z.string().min(1, { message: '请输入审批状态' }),
     },
     },

+ 1 - 1
apps/web-ele/src/views/subsidy-manage/index.vue

@@ -26,7 +26,7 @@ const formOptions: VbenFormProps = {
       label: '经销商ID',
       label: '经销商ID',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
   ],
   ],

+ 3 - 3
apps/web-ele/src/views/system-manage/data-dictionary/index.vue

@@ -30,7 +30,7 @@ const formOptions: VbenFormProps = {
       label: '配置名称',
       label: '配置名称',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
     {
     {
@@ -39,7 +39,7 @@ const formOptions: VbenFormProps = {
       label: '组名称',
       label: '组名称',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
     {
     {
@@ -48,7 +48,7 @@ const formOptions: VbenFormProps = {
       label: '状态',
       label: '状态',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.select'),
         placeholder: $t('ui.placeholder.select'),
-        allowClear: true,
+        clearable: true,
         options: [
         options: [
           { label: '可用', value: 1 },
           { label: '可用', value: 1 },
           { label: '不可用', value: 0 },
           { label: '不可用', value: 0 },

+ 3 - 3
apps/web-ele/src/views/system-manage/menu-manage/index.vue

@@ -31,7 +31,7 @@ const formOptions: VbenFormProps = {
       label: '菜单名称',
       label: '菜单名称',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
     // {
     // {
@@ -40,7 +40,7 @@ const formOptions: VbenFormProps = {
     //   label: '菜单分类',
     //   label: '菜单分类',
     //   componentProps: {
     //   componentProps: {
     //     placeholder: $t('ui.placeholder.input'),
     //     placeholder: $t('ui.placeholder.input'),
-    //     allowClear: true,
+    //     clearable: true,
     //   },
     //   },
     // },
     // },
     {
     {
@@ -49,7 +49,7 @@ const formOptions: VbenFormProps = {
       label: '菜单类型',
       label: '菜单类型',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.select'),
         placeholder: $t('ui.placeholder.select'),
-        allowClear: true,
+        clearable: true,
         clearable: true,
         clearable: true,
         options: [
         options: [
           { label: '目录', value: 1 },
           { label: '目录', value: 1 },

+ 11 - 11
apps/web-ele/src/views/system-manage/operation-logs/form.vue

@@ -38,7 +38,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '用户名称',
       label: '用户名称',
       componentProps: {
       componentProps: {
         placeholder: '请输入用户名称',
         placeholder: '请输入用户名称',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入用户名称' }),
       rules: z.string().min(1, { message: '请输入用户名称' }),
     },
     },
@@ -48,7 +48,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '用户性质',
       label: '用户性质',
       componentProps: {
       componentProps: {
         placeholder: '请输入用户性质',
         placeholder: '请输入用户性质',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.number().min(1, { message: '请输入用户性质' }),
       rules: z.number().min(1, { message: '请输入用户性质' }),
     },
     },
@@ -58,7 +58,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '用户证件号码',
       label: '用户证件号码',
       componentProps: {
       componentProps: {
         placeholder: '请输入用户证件号码',
         placeholder: '请输入用户证件号码',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入用户证件号码' }),
       rules: z.string().min(1, { message: '请输入用户证件号码' }),
     },
     },
@@ -68,7 +68,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '用户开户银行名称',
       label: '用户开户银行名称',
       componentProps: {
       componentProps: {
         placeholder: '请输入用户开户银行名称',
         placeholder: '请输入用户开户银行名称',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入用户开户银行名称' }),
       rules: z.string().min(1, { message: '请输入用户开户银行名称' }),
     },
     },
@@ -78,7 +78,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '用户开户银行账号',
       label: '用户开户银行账号',
       componentProps: {
       componentProps: {
         placeholder: '请输入用户开户银行账号',
         placeholder: '请输入用户开户银行账号',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入用户开户银行账号' }),
       rules: z.string().min(1, { message: '请输入用户开户银行账号' }),
     },
     },
@@ -88,7 +88,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '用户手机号',
       label: '用户手机号',
       componentProps: {
       componentProps: {
         placeholder: '请输入用户手机号',
         placeholder: '请输入用户手机号',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入用户手机号' }),
       rules: z.string().min(1, { message: '请输入用户手机号' }),
     },
     },
@@ -98,7 +98,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '用户邮箱',
       label: '用户邮箱',
       componentProps: {
       componentProps: {
         placeholder: '请输入用户邮箱',
         placeholder: '请输入用户邮箱',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入用户邮箱' }),
       rules: z.string().min(1, { message: '请输入用户邮箱' }),
     },
     },
@@ -108,7 +108,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '用户地址',
       label: '用户地址',
       componentProps: {
       componentProps: {
         placeholder: '请输入用户地址',
         placeholder: '请输入用户地址',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入用户地址' }),
       rules: z.string().min(1, { message: '请输入用户地址' }),
     },
     },
@@ -118,7 +118,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '用户联系手机号',
       label: '用户联系手机号',
       componentProps: {
       componentProps: {
         placeholder: '请输入用户联系手机号',
         placeholder: '请输入用户联系手机号',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入用户联系手机号' }),
       rules: z.string().min(1, { message: '请输入用户联系手机号' }),
     },
     },
@@ -128,7 +128,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '用户联系邮箱',
       label: '用户联系邮箱',
       componentProps: {
       componentProps: {
         placeholder: '请输入用户联系邮箱',
         placeholder: '请输入用户联系邮箱',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入用户联系邮箱' }),
       rules: z.string().min(1, { message: '请输入用户联系邮箱' }),
     },
     },
@@ -138,7 +138,7 @@ const [BaseForm, baseFormApi] = useVbenForm({
       label: '用户联系地址',
       label: '用户联系地址',
       componentProps: {
       componentProps: {
         placeholder: '请输入用户联系地址',
         placeholder: '请输入用户联系地址',
-        allowClear: true,
+        clearable: true,
       },
       },
       rules: z.string().min(1, { message: '请输入用户联系地址' }),
       rules: z.string().min(1, { message: '请输入用户联系地址' }),
     },
     },

+ 3 - 3
apps/web-ele/src/views/system-manage/operation-logs/index.vue

@@ -30,7 +30,7 @@ const formOptions: VbenFormProps = {
       label: '方法名',
       label: '方法名',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
     {
     {
@@ -39,7 +39,7 @@ const formOptions: VbenFormProps = {
       label: '终端',
       label: '终端',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
     {
     {
@@ -48,7 +48,7 @@ const formOptions: VbenFormProps = {
       label: '账号',
       label: '账号',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
     {
     {

+ 2 - 2
apps/web-ele/src/views/system-manage/role-manage/index.vue

@@ -32,7 +32,7 @@ const formOptions: VbenFormProps = {
       label: '角色名称',
       label: '角色名称',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
     {
     {
@@ -41,7 +41,7 @@ const formOptions: VbenFormProps = {
       label: '状态',
       label: '状态',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.select'),
         placeholder: $t('ui.placeholder.select'),
-        allowClear: true,
+        clearable: true,
         options: [
         options: [
           { label: '启用', value: 1 },
           { label: '启用', value: 1 },
           { label: '禁用', value: 0 },
           { label: '禁用', value: 0 },

+ 2 - 2
apps/web-ele/src/views/system-manage/user-manage/index.vue

@@ -42,7 +42,7 @@ const formOptions: VbenFormProps = {
       label: '账号',
       label: '账号',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
     {
     {
@@ -51,7 +51,7 @@ const formOptions: VbenFormProps = {
       label: '账号状态',
       label: '账号状态',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.select'),
         placeholder: $t('ui.placeholder.select'),
-        allowClear: true,
+        clearable: true,
         options: [
         options: [
           { label: '可用', value: 1 },
           { label: '可用', value: 1 },
           { label: '不可用', value: 0 },
           { label: '不可用', value: 0 },

+ 2 - 2
apps/web-ele/src/views/system-manage/worker-manage/index.vue

@@ -27,7 +27,7 @@ const formOptions: VbenFormProps = {
       label: '姓名',
       label: '姓名',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
     {
     {
@@ -36,7 +36,7 @@ const formOptions: VbenFormProps = {
       label: '联系电话',
       label: '联系电话',
       componentProps: {
       componentProps: {
         placeholder: $t('ui.placeholder.input'),
         placeholder: $t('ui.placeholder.input'),
-        allowClear: true,
+        clearable: true,
       },
       },
     },
     },
   ],
   ],

+ 1 - 1
packages/@core/ui-kit/shadcn-ui/src/components/button/button.ts

@@ -30,7 +30,7 @@ export type ValueType = boolean | number | string;
 export interface VbenButtonGroupProps
 export interface VbenButtonGroupProps
   extends Pick<VbenButtonProps, 'disabled'> {
   extends Pick<VbenButtonProps, 'disabled'> {
   /** 单选模式下允许清除选中 */
   /** 单选模式下允许清除选中 */
-  allowClear?: boolean;
+  clearable?: boolean;
   /** 值改变前的回调 */
   /** 值改变前的回调 */
   beforeChange?: (
   beforeChange?: (
     value: ValueType,
     value: ValueType,

+ 2 - 2
packages/@core/ui-kit/shadcn-ui/src/components/button/check-button-group.vue

@@ -19,7 +19,7 @@ const props = withDefaults(defineProps<VbenButtonGroupProps>(), {
   multiple: false,
   multiple: false,
   showIcon: true,
   showIcon: true,
   size: 'middle',
   size: 'middle',
-  allowClear: false,
+  clearable: false,
   maxCount: 0,
   maxCount: 0,
 });
 });
 const emit = defineEmits(['btnClick']);
 const emit = defineEmits(['btnClick']);
@@ -91,7 +91,7 @@ async function onBtnClick(value: ValueType) {
     }
     }
     modelValue.value = innerValue.value;
     modelValue.value = innerValue.value;
   } else {
   } else {
-    if (props.allowClear && innerValue.value.includes(value)) {
+    if (props.clearable && innerValue.value.includes(value)) {
       innerValue.value = [];
       innerValue.value = [];
       modelValue.value = undefined;
       modelValue.value = undefined;
       emit('btnClick', undefined);
       emit('btnClick', undefined);

+ 3 - 3
packages/@core/ui-kit/shadcn-ui/src/components/select/select.vue

@@ -10,14 +10,14 @@ import {
 } from '../../ui';
 } from '../../ui';
 
 
 interface Props {
 interface Props {
-  allowClear?: boolean;
+  clearable?: boolean;
   class?: any;
   class?: any;
   options?: Array<{ label: string; value: string }>;
   options?: Array<{ label: string; value: string }>;
   placeholder?: string;
   placeholder?: string;
 }
 }
 
 
 const props = withDefaults(defineProps<Props>(), {
 const props = withDefaults(defineProps<Props>(), {
-  allowClear: false,
+  clearable: false,
 });
 });
 
 
 const modelValue = defineModel<string>();
 const modelValue = defineModel<string>();
@@ -33,7 +33,7 @@ function handleClear() {
       <CircleX
       <CircleX
         @pointerdown.stop
         @pointerdown.stop
         @click.stop.prevent="handleClear"
         @click.stop.prevent="handleClear"
-        v-if="allowClear && modelValue"
+        v-if="clearable && modelValue"
         data-clear-button
         data-clear-button
         class="mr-1 size-4 cursor-pointer opacity-50 hover:opacity-100"
         class="mr-1 size-4 cursor-pointer opacity-50 hover:opacity-100"
       />
       />

+ 2 - 2
packages/@core/ui-kit/shadcn-ui/src/ui/tree/tree.vue

@@ -16,7 +16,7 @@ import { TreeItem, TreeRoot } from 'radix-vue';
 import { Checkbox } from '../checkbox';
 import { Checkbox } from '../checkbox';
 
 
 const props = withDefaults(defineProps<TreeProps>(), {
 const props = withDefaults(defineProps<TreeProps>(), {
-  allowClear: false,
+  clearable: false,
   autoCheckParent: true,
   autoCheckParent: true,
   bordered: false,
   bordered: false,
   checkStrictly: false,
   checkStrictly: false,
@@ -195,7 +195,7 @@ defineExpose({
     :propagate-select="!checkStrictly"
     :propagate-select="!checkStrictly"
     :multiple="multiple"
     :multiple="multiple"
     :disabled="disabled"
     :disabled="disabled"
-    :selection-behavior="allowClear || multiple ? 'toggle' : 'replace'"
+    :selection-behavior="clearable || multiple ? 'toggle' : 'replace'"
     @update:model-value="updateModelValue"
     @update:model-value="updateModelValue"
     v-slot="{ flattenItems }"
     v-slot="{ flattenItems }"
     :class="
     :class="

+ 1 - 1
packages/@core/ui-kit/shadcn-ui/src/ui/tree/types.ts

@@ -5,7 +5,7 @@ import type { Recordable } from '@vben-core/typings';
 
 
 export interface TreeProps {
 export interface TreeProps {
   /** 单选时允许取消已有选项 */
   /** 单选时允许取消已有选项 */
-  allowClear?: boolean;
+  clearable?: boolean;
   /** 非关联选择时,自动选中上级节点 */
   /** 非关联选择时,自动选中上级节点 */
   autoCheckParent?: boolean;
   autoCheckParent?: boolean;
   /** 显示边框 */
   /** 显示边框 */

+ 10 - 0
packages/effects/request/src/request-client/preset-interceptors.ts

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import type { RequestClient } from './request-client';
 import type { RequestClient } from './request-client';
 import type { MakeErrorMessageFn, ResponseInterceptorConfig } from './types';
 import type { MakeErrorMessageFn, ResponseInterceptorConfig } from './types';
 
 
@@ -49,6 +50,15 @@ export const defaultResponseInterceptor = ({
       // 解密后重新获取responseData
       // 解密后重新获取responseData
       const finalResponseData = response.data;
       const finalResponseData = response.data;
 
 
+      // 打印解密后的后端数据(仅开发环境)
+      if (!(config as any).skipDecrypt && import.meta.env.DEV) {
+        console.log('=== 解密后的后端数据 ===');
+        console.log('请求URL:', config.url);
+        console.log('请求方法:', config.method?.toUpperCase());
+        console.log('解密后数据:', finalResponseData);
+        console.log('======================');
+      }
+
       // 格式化请求数据
       // 格式化请求数据
       if ((config as any).formatData) {
       if ((config as any).formatData) {
         if (isFunction(dataField)) {
         if (isFunction(dataField)) {