From 94d0550ecccd4aad92fdf6c62df6472cc35fa765 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 9 Oct 2025 22:18:57 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90mall=20=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E3=80=91=E5=88=86=E9=94=80=E7=94=A8=E6=88=B7=E7=9A=84=20update?=
 =?UTF-8?q?=20=E8=BF=81=E7=A7=BB=EF=BC=88antd=2050%=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mall/trade/brokerage/user/data.ts   |  12 ++
 .../views/mall/trade/brokerage/user/index.vue |  14 +-
 .../brokerage/user/modules/update-form.vue    | 145 +++++++++++++++
 .../user/modules/user-create-form.vue         | 167 ------------------
 .../user/modules/user-update-form.vue         | 131 --------------
 5 files changed, 164 insertions(+), 305 deletions(-)
 create mode 100644 apps/web-antd/src/views/mall/trade/brokerage/user/modules/update-form.vue
 delete mode 100644 apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-create-form.vue
 delete mode 100644 apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-update-form.vue

diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/data.ts b/apps/web-antd/src/views/mall/trade/brokerage/user/data.ts
index 82c0c2853..e6f60dd46 100644
--- a/apps/web-antd/src/views/mall/trade/brokerage/user/data.ts
+++ b/apps/web-antd/src/views/mall/trade/brokerage/user/data.ts
@@ -168,3 +168,15 @@ export function useCreateFormSchema(): VbenFormSchema[] {
     },
   ];
 }
+
+/** 修改分销用户表单配置 */
+export function useUpdateFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'bindUserId',
+      label: '上级推广员编号',
+      component: 'InputSearch',
+      rules: 'required',
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/index.vue b/apps/web-antd/src/views/mall/trade/brokerage/user/index.vue
index 7a96dac79..68f123899 100644
--- a/apps/web-antd/src/views/mall/trade/brokerage/user/index.vue
+++ b/apps/web-antd/src/views/mall/trade/brokerage/user/index.vue
@@ -17,8 +17,8 @@ import {
 import { useGridColumns, useGridFormSchema } from './data';
 import CreateForm from './modules/create-form.vue';
 import BrokerageOrderListModal from './modules/order-list-modal.vue';
+import UpdateForm from './modules/update-form.vue';
 import BrokerageUserListModal from './modules/user-list-modal.vue';
-import BrokerageUserUpdateForm from './modules/user-update-form.vue';
 
 defineOptions({ name: 'TradeBrokerageUser' });
 
@@ -27,8 +27,8 @@ const [CreateFormModal, createFormModalApi] = useVbenModal({
   destroyOnClose: true,
 });
 
-const [UserUpdateModal, userUpdateModalApi] = useVbenModal({
-  connectedComponent: BrokerageUserUpdateForm,
+const [UpdateFormModal, updateModalApi] = useVbenModal({
+  connectedComponent: UpdateForm,
   destroyOnClose: true,
 });
 
@@ -53,8 +53,8 @@ function handleCreate() {
 }
 
 /** 修改分销员 */
-function handleOpenUpdateForm(row: MallBrokerageUserApi.BrokerageUser) {
-  userUpdateModalApi.setData(row).open();
+function handleUpdateForm(row: MallBrokerageUserApi.BrokerageUser) {
+  updateModalApi.setData(row).open();
 }
 
 /** 打开推广人列表 */
@@ -156,7 +156,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     <!-- 创建分销员 -->
     <CreateFormModal @success="handleRefresh" />
     <!-- 修改分销员 -->
-    <UserUpdateModal @success="handleRefresh" />
+    <UpdateFormModal @success="handleRefresh" />
     <!-- 推广人列表 -->
     <UserListModal />
     <!-- 推广订单列表 -->
@@ -194,7 +194,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
               label: '修改上级推广人',
               type: 'link',
               auth: ['trade:brokerage-user:update-bind-user'],
-              onClick: handleOpenUpdateForm.bind(null, row),
+              onClick: handleUpdateForm.bind(null, row),
             },
             {
               label: '清除上级推广人',
diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/update-form.vue b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/update-form.vue
new file mode 100644
index 000000000..7dbd2f902
--- /dev/null
+++ b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/update-form.vue
@@ -0,0 +1,145 @@
+<script lang="ts" setup>
+import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
+
+import { ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { $t } from '@vben/locales';
+import { formatDate, isEmpty } from '@vben/utils';
+
+import {
+  Avatar,
+  Descriptions,
+  DescriptionsItem,
+  Divider,
+  InputSearch,
+  message,
+  Tag,
+} from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  getBrokerageUser,
+  updateBindUser,
+} from '#/api/mall/trade/brokerage/user';
+
+import { useUpdateFormSchema } from '../data';
+
+defineOptions({ name: 'BrokerageUserUpdateForm' });
+
+const emit = defineEmits(['success']);
+
+const formData = ref<any>({
+  id: undefined,
+  bindUserId: undefined,
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: useUpdateFormSchema(),
+  showDefaultActions: false,
+});
+
+const [Modal, modalApi] = useVbenModal({
+  async onConfirm() {
+    await formApi.setValues(formData.value);
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      await updateBindUser(formData.value);
+      // 关闭并提示
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  onOpenChange: async (isOpen: boolean) => {
+    if (!isOpen) {
+      return;
+    }
+    const data = modalApi.getData<MallBrokerageUserApi.BrokerageUser>();
+    if (!data || !data.id) {
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = {
+        id: data.id,
+        bindUserId: data.bindUserId,
+      };
+      await formApi.setValues(formData.value);
+      if (data.bindUserId) {
+        await handleSearchUser(data.bindUserId, '上级分销员');
+      }
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+
+/** 绑定用户信息 */
+const bindUser = ref<MallBrokerageUserApi.BrokerageUser | undefined>();
+
+/** 查询分销员 */
+async function handleSearchUser(id: number, userType: string) {
+  if (isEmpty(id)) {
+    message.warning(`请先输入${userType}编号后重试！！！`);
+    return;
+  }
+  if (formData.value?.bindUserId === formData.value?.id) {
+    message.error('不能绑定自己为推广人');
+    return;
+  }
+
+  const userData = await getBrokerageUser(id);
+  if (!userData) {
+    message.warning(`${userType}不存在`);
+    return;
+  }
+  bindUser.value = userData as MallBrokerageUserApi.BrokerageUser;
+}
+</script>
+
+<template>
+  <Modal title="修改上级推广人" class="w-1/3">
+    <Form>
+      <template #bindUserId>
+        <InputSearch
+          v-model:value="formData.bindUserId"
+          placeholder="请输入上级分销员编号"
+          @search="handleSearchUser(formData.bindUserId, '上级分销员')"
+        />
+      </template>
+    </Form>
+
+    <!-- 上级推广员信息展示 -->
+    <Divider v-if="bindUser" />
+    <Descriptions v-if="bindUser" title="上级推广员信息" :column="1" bordered>
+      <DescriptionsItem label="头像">
+        <Avatar :src="bindUser?.avatar" />
+      </DescriptionsItem>
+      <DescriptionsItem label="昵称">
+        {{ bindUser?.nickname }}
+      </DescriptionsItem>
+      <DescriptionsItem label="分销资格">
+        <Tag v-if="bindUser?.brokerageEnabled" color="success"> 有 </Tag>
+        <Tag v-else>无</Tag>
+      </DescriptionsItem>
+      <DescriptionsItem label="成为分销员的时间">
+        {{ formatDate(bindUser?.brokerageTime) }}
+      </DescriptionsItem>
+    </Descriptions>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-create-form.vue b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-create-form.vue
deleted file mode 100644
index 0f13afc96..000000000
--- a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-create-form.vue
+++ /dev/null
@@ -1,167 +0,0 @@
-<script lang="ts" setup>
-import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
-
-import { reactive, ref } from 'vue';
-
-import { useVbenModal } from '@vben/common-ui';
-import { $t } from '@vben/locales';
-import { formatDate, isEmpty } from '@vben/utils';
-
-import {
-  Avatar,
-  Descriptions,
-  DescriptionsItem,
-  InputSearch,
-  message,
-  Tag,
-} from 'ant-design-vue';
-
-import {
-  createBrokerageUser,
-  getBrokerageUser,
-} from '#/api/mall/trade/brokerage/user';
-import { getUser } from '#/api/member/user';
-
-defineOptions({ name: 'BrokerageUserCreateForm' });
-
-const emit = defineEmits(['success']);
-
-const formData = ref<any>({
-  userId: undefined,
-  bindUserId: undefined,
-});
-
-const [Modal, modalApi] = useVbenModal({
-  async onConfirm() {
-    if (!formData.value) {
-      return;
-    }
-    modalApi.lock();
-    // 提交表单
-    try {
-      await createBrokerageUser(formData.value);
-      // 关闭并提示
-      await modalApi.close();
-      emit('success');
-      message.success($t('ui.actionMessage.operationSuccess'));
-    } finally {
-      modalApi.unlock();
-    }
-  },
-  onOpenChange: async (isOpen: boolean) => {
-    if (!isOpen) {
-      return;
-    }
-    formData.value = {
-      userId: undefined,
-      bindUserId: undefined,
-    };
-  },
-});
-
-/** 用户信息 */
-const userInfo = reactive<{
-  bindUser: MallBrokerageUserApi.BrokerageUser | undefined;
-  user: MallBrokerageUserApi.BrokerageUser | undefined;
-}>({
-  bindUser: undefined,
-  user: undefined,
-});
-
-/** 查询推广员和分销员 */
-async function handleGetUser(id: any, userType: string) {
-  if (isEmpty(id)) {
-    message.warning(`请先输入${userType}编号后重试！！！`);
-    return;
-  }
-  if (
-    userType === '推广员' &&
-    formData.value?.bindUserId === formData.value?.userId
-  ) {
-    message.error('不能绑定自己为推广人');
-    return;
-  }
-
-  try {
-    const user =
-      userType === '推广员' ? await getBrokerageUser(id) : await getUser(id);
-    if (userType === '推广员') {
-      userInfo.bindUser = user as MallBrokerageUserApi.BrokerageUser;
-    } else {
-      userInfo.user = user as MallBrokerageUserApi.BrokerageUser;
-    }
-
-    if (!user) {
-      message.warning(`${userType}不存在`);
-    }
-  } catch {
-    message.warning(`${userType}不存在`);
-  }
-}
-</script>
-
-<template>
-  <Modal title="创建分销员" class="w-2/5">
-    <!-- TODO @霖：宽度不够，label 会折行 -->
-    <div class="mr-2 flex items-center">
-      分销员编号：
-      <InputSearch
-        v-model:value="formData.userId"
-        placeholder="请输入推广员编号"
-        enter-button
-        class="mx-2 w-52"
-        @search="handleGetUser(formData?.userId, '分销员')"
-      />
-      上级推广人编号：
-      <InputSearch
-        v-model:value="formData.bindUserId"
-        placeholder="请输入推广员编号"
-        enter-button
-        class="mx-2 w-52"
-        @search="handleGetUser(formData?.bindUserId, '推广员')"
-      />
-    </div>
-
-    <div class="mt-4">
-      <!-- 展示分销员的信息 -->
-      <Descriptions
-        title="分销员信息"
-        class="mt-4"
-        v-if="userInfo.user"
-        :column="1"
-        bordered
-      >
-        <DescriptionsItem label="头像">
-          <Avatar :src="userInfo.user?.avatar" />
-        </DescriptionsItem>
-        <DescriptionsItem label="昵称">
-          {{ userInfo.user?.nickname }}
-        </DescriptionsItem>
-      </Descriptions>
-      <!-- 展示上级推广人的信息 -->
-      <Descriptions
-        title="上级推广人信息"
-        class="mt-4"
-        v-if="userInfo.bindUser"
-        :column="1"
-        bordered
-      >
-        <DescriptionsItem label="头像">
-          <Avatar :src="userInfo.bindUser?.avatar" />
-        </DescriptionsItem>
-        <DescriptionsItem label="昵称">
-          {{ userInfo.bindUser?.nickname }}
-        </DescriptionsItem>
-        <DescriptionsItem label="推广资格">
-          <Tag v-if="userInfo.bindUser?.brokerageEnabled" color="success">
-            有
-          </Tag>
-          <Tag v-else>无</Tag>
-        </DescriptionsItem>
-        <DescriptionsItem label="成为推广员的时间">
-          {{ formatDate(userInfo.bindUser?.brokerageTime) }}
-        </DescriptionsItem>
-      </Descriptions>
-    </div>
-  </Modal>
-</template>
diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-update-form.vue b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-update-form.vue
deleted file mode 100644
index 4f2fe59e8..000000000
--- a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-update-form.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<script lang="ts" setup>
-import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
-
-import { ref } from 'vue';
-
-import { useVbenModal } from '@vben/common-ui';
-import { $t } from '@vben/locales';
-import { formatDate } from '@vben/utils';
-
-import {
-  Avatar,
-  Descriptions,
-  DescriptionsItem,
-  InputSearch,
-  message,
-  Tag,
-} from 'ant-design-vue';
-
-import {
-  getBrokerageUser,
-  updateBindUser,
-} from '#/api/mall/trade/brokerage/user';
-
-/** 修改分销用户 */
-defineOptions({ name: 'BrokerageUserUpdateForm' });
-
-const emit = defineEmits(['success']);
-
-const formData = ref<any>();
-
-const [Modal, modalApi] = useVbenModal({
-  async onConfirm() {
-    if (!formData.value) {
-      return;
-    }
-    // 未查找到合适的上级
-    if (!bindUser.value) {
-      message.error('请先查询并确认推广人');
-      return;
-    }
-    modalApi.lock();
-    try {
-      await updateBindUser(formData.value);
-      // 关闭并提示
-      await modalApi.close();
-      emit('success');
-      message.success($t('ui.actionMessage.operationSuccess'));
-    } finally {
-      modalApi.unlock();
-    }
-  },
-  onOpenChange: async (isOpen: boolean) => {
-    if (!isOpen) {
-      formData.value = {
-        id: 0,
-        bindUserId: 0,
-      };
-      return;
-    }
-    const data = modalApi.getData<MallBrokerageUserApi.BrokerageUser>();
-    if (!data || !data.id) {
-      return;
-    }
-    modalApi.lock();
-    try {
-      formData.value = {
-        id: data.id,
-        bindUserId: data.bindUserId,
-      };
-      if (data.bindUserId) {
-        await handleGetUser();
-      }
-    } finally {
-      modalApi.unlock();
-    }
-  },
-});
-
-const bindUser = ref<MallBrokerageUserApi.BrokerageUser>();
-
-/** 查询推广员 */
-async function handleGetUser() {
-  if (!formData.value) {
-    return;
-  }
-  if (formData.value.bindUserId === formData.value.id) {
-    message.error('不能绑定自己为推广人');
-    return;
-  }
-  try {
-    bindUser.value = await getBrokerageUser(formData.value.bindUserId);
-    if (!bindUser.value) {
-      message.warning('推广员不存在');
-    }
-  } catch {
-    message.warning('推广员不存在');
-  }
-}
-</script>
-
-<template>
-  <Modal title="修改上级推广人" class="w-2/5">
-    <div class="mr-2 flex items-center">
-      推广员编号：
-      <InputSearch
-        v-model:value="formData.bindUserId"
-        placeholder="请输入推广员编号"
-        enter-button
-        class="mx-2 w-52"
-        @search="handleGetUser"
-      />
-    </div>
-
-    <!-- 展示上级推广人的信息 -->
-    <Descriptions class="mt-4" v-if="bindUser" :column="1" bordered>
-      <DescriptionsItem label="头像">
-        <Avatar :src="bindUser.avatar" />
-      </DescriptionsItem>
-      <DescriptionsItem label="昵称">
-        {{ bindUser.nickname }}
-      </DescriptionsItem>
-      <DescriptionsItem label="推广资格">
-        <Tag v-if="bindUser.brokerageEnabled" color="success">有</Tag>
-        <Tag v-else>无</Tag>
-      </DescriptionsItem>
-      <DescriptionsItem label="成为推广员的时间">
-        {{ formatDate(bindUser.brokerageTime) }}
-      </DescriptionsItem>
-    </Descriptions>
-  </Modal>
-</template>