diff --git a/apps/web-antd/src/views/erp/sale/order/data.ts b/apps/web-antd/src/views/erp/sale/order/data.ts index 2586ac5ea..fd547890f 100644 --- a/apps/web-antd/src/views/erp/sale/order/data.ts +++ b/apps/web-antd/src/views/erp/sale/order/data.ts @@ -330,7 +330,15 @@ export function useGridFormSchema(): VbenFormSchema[] { allowClear: true, }, }, - // TODO @AI:备注缺少;/Users/yunai/Java/yudao-ui-admin-vue3/src/views/erp/sale/order/index.vue + { + fieldName: 'remark', + label: '备注', + component: 'Input', + componentProps: { + placeholder: '请输入备注', + allowClear: true, + }, + }, { fieldName: 'outStatus', label: '出库状态', diff --git a/apps/web-antd/src/views/erp/sale/order/index.vue b/apps/web-antd/src/views/erp/sale/order/index.vue index 605030898..ef69bcd72 100644 --- a/apps/web-antd/src/views/erp/sale/order/index.vue +++ b/apps/web-antd/src/views/erp/sale/order/index.vue @@ -66,20 +66,21 @@ async function handleDelete(ids: number[]) { } /** 审批/反审批操作 */ -function handleUpdateStatus(row: ErpSaleOrderApi.SaleOrder, status: number) { +async function handleUpdateStatus( + row: ErpSaleOrderApi.SaleOrder, + status: number, +) { const hideLoading = message.loading({ content: `确定${status === 20 ? '审批' : '反审批'}该订单吗?`, duration: 0, }); - // TODO @AI:改成 await 写法 - updateSaleOrderStatus(row.id!, status) - .then(() => { - message.success(`${status === 20 ? '审批' : '反审批'}成功`); - handleRefresh(); - }) - .finally(() => { - hideLoading(); - }); + try { + await updateSaleOrderStatus(row.id!, status); + message.success(`${status === 20 ? '审批' : '反审批'}成功`); + handleRefresh(); + } finally { + hideLoading(); + } } const checkedIds = ref([]); diff --git a/apps/web-antd/src/views/erp/sale/order/modules/form.vue b/apps/web-antd/src/views/erp/sale/order/modules/form.vue index 3145fd2f8..636e94c1f 100644 --- a/apps/web-antd/src/views/erp/sale/order/modules/form.vue +++ b/apps/web-antd/src/views/erp/sale/order/modules/form.vue @@ -17,6 +17,7 @@ import { $t } from '#/locales'; import { useFormSchema } from '../data'; import ItemForm from './item-form.vue'; +import {getAccountSimpleList} from '#/api/erp/finance/account'; const emit = defineEmits(['success']); const formData = ref(); @@ -38,7 +39,6 @@ const [Form, formApi] = useVbenForm({ class: 'w-full', }, labelWidth: 120, - // disabled: !['create', 'edit'].includes(formType.value), // TODO @芋艿:这里晚点处理下; }, wrapperClass: 'grid-cols-3', layout: 'vertical', @@ -116,7 +116,14 @@ const [Modal, modalApi] = useVbenModal({ // 加载数据 const data = modalApi.getData<{ id?: number; type: string }>(); formType.value = data.type; + formApi.setDisabled(formType.value === 'detail'); if (!data || !data.id) { + // 新增时,默认选中账户 + const accountList = await getAccountSimpleList(); + const defaultAccount = accountList.find((item) => item.defaultStatus); + if (defaultAccount) { + await formApi.setValues({ accountId: defaultAccount.id }); + } return; } modalApi.lock(); @@ -124,7 +131,6 @@ const [Modal, modalApi] = useVbenModal({ formData.value = await getSaleOrder(data.id); // 设置到 values await formApi.setValues(formData.value); - // TODO @AI:默认账户;缺少; } finally { modalApi.unlock(); } @@ -134,19 +140,14 @@ const [Modal, modalApi] = useVbenModal({