feat：【antd】【erp 系统】sale/order 部分代码优化(form 少量）

apps/web-antd/src/views/erp/sale/order/modules/form.vue

@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-/* eslint-disable unicorn/no-nested-ternary */
 import type { ErpSaleOrderApi } from '#/api/erp/sale/order';
 
 import { computed, nextTick, ref } from 'vue';
@@ -21,9 +20,10 @@ import SaleOrderItemForm from './sale-order-item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<ErpSaleOrderApi.SaleOrder>();
-const formType = ref('');
+const formType = ref(''); // 表单类型：'create' | 'update' | 'detail'
-const itemFormRef = ref();
+const itemFormRef = ref<InstanceType<typeof SaleOrderItemForm>>();
 
+/* eslint-disable unicorn/no-nested-ternary */
 const getTitle = computed(() =>
   formType.value === 'create'
     ? $t('ui.actionTitle.create', ['销售订单'])
@@ -38,7 +38,7 @@ const [Form, formApi] = useVbenForm({
       class: 'w-full',
     },
     labelWidth: 120,
-    disabled: !['create', 'update'].includes(formType.value),
+    // disabled: !['create', 'update'].includes(formType.value), // TODO @芋艿：这里晚点处理下；
   },
   wrapperClass: 'grid-cols-3',
   layout: 'vertical',
@@ -83,45 +83,23 @@ const [Modal, modalApi] = useVbenModal({
     if (!valid) {
       return;
     }
-    await nextTick();
-
     const itemFormInstance = Array.isArray(itemFormRef.value)
       ? itemFormRef.value[0]
       : itemFormRef.value;
-    if (itemFormInstance && typeof itemFormInstance.validate === 'function') {
+    try {
-      try {
+      const isValid = await itemFormInstance.validate();
-        const isValid = await itemFormInstance.validate();
+      if (!isValid) {
-        if (!isValid) {
-          message.error('子表单验证失败');
-          return;
-        }
-      } catch (error: any) {
-        message.error(error.message || '子表单验证失败');
         return;
       }
-    } else {
+    } catch (error: any) {
-      message.error('子表单验证方法不存在');
+      message.error(error.message || '子表单验证失败');
-      return;
-    }
-
-    // 验证产品清单不能为空
-    if (!formData.value?.items || formData.value.items.length === 0) {
-      message.error('产品清单不能为空，请至少添加一个产品');
       return;
     }
 
     modalApi.lock();
     // 提交表单
     const data = (await formApi.getValues()) as ErpSaleOrderApi.SaleOrder;
-    data.items = formData.value?.items?.map((item) => ({
+    data.items = formData.value?.items;
-      ...item,
-      // 解决新增销售订单报错
-      id: undefined,
-    }));
-    // 将文件数组转换为字符串
-    if (data.fileUrl && Array.isArray(data.fileUrl)) {
-      data.fileUrl = data.fileUrl.length > 0 ? data.fileUrl[0] : '';
-    }
     try {
       await (formType.value === 'create'
         ? createSaleOrder(data)
@@ -141,37 +119,16 @@ const [Modal, modalApi] = useVbenModal({
     }
     // 加载数据
     const data = modalApi.getData<{ id?: number; type: string }>();
-    if (!data) {
-      return;
-    }
     formType.value = data.type;
-
+    if (!data || !data.id) {
-    if (!data.id) {
-      // 初始化空的表单数据
-      formData.value = { items: [] } as unknown as ErpSaleOrderApi.SaleOrder;
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init([]);
-      }
       return;
     }
-
     modalApi.lock();
     try {
       formData.value = await getSaleOrder(data.id);
       // 设置到 values
       await formApi.setValues(formData.value);
-      // 初始化子表单
+      // TODO @AI：默认账户；缺少；
-      await nextTick();
-      const itemFormInstance = Array.isArray(itemFormRef.value)
-        ? itemFormRef.value[0]
-        : itemFormRef.value;
-      if (itemFormInstance && typeof itemFormInstance.init === 'function') {
-        itemFormInstance.init(formData.value.items || []);
-      }
     } finally {
       modalApi.unlock();
     }

apps/web-antd/src/views/erp/sale/order/modules/sale-order-item-form.vue

@@ -49,7 +49,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     minHeight: 250,
     keepSource: true,
     rowConfig: {
-      keyField: 'id',
+      keyField: 'row_id',
     },
     pagerConfig: {
       enabled: false,
@@ -70,7 +70,7 @@ watch(
     await nextTick();
     tableData.value = [...items];
     await nextTick();
-    gridApi.grid.reloadData(tableData.value);
+    await gridApi.grid.reloadData(tableData.value);
   },
   {
     immediate: true,
@@ -224,35 +224,8 @@ const validate = async (): Promise<boolean> => {
   }
 };
 
-const getData = (): ErpSaleOrderApi.SaleOrderItem[] => tableData.value;
-const init = (items: ErpSaleOrderApi.SaleOrderItem[] | undefined): void => {
-  tableData.value =
-    items && items.length > 0
-      ? items.map((item) => {
-          const newItem = { ...item };
-          if (newItem.productPrice && newItem.count) {
-            newItem.totalProductPrice =
-              erpPriceMultiply(newItem.productPrice, newItem.count) ?? 0;
-            newItem.taxPrice =
-              erpPriceMultiply(
-                newItem.totalProductPrice,
-                (newItem.taxPercent || 0) / 100,
-              ) ?? 0;
-            newItem.totalPrice = newItem.totalProductPrice + newItem.taxPrice;
-          }
-          return newItem;
-        })
-      : [];
-  // TODO @XuZhiqiang：使用 await 风格哈；
-  nextTick(() => {
-    gridApi.grid.reloadData(tableData.value);
-  });
-};
-
 defineExpose({
   validate,
-  getData,
-  init,
 });
 </script>