diff --git a/apps/web-antd/src/views/erp/purchase/in/data.ts b/apps/web-antd/src/views/erp/purchase/in/data.ts
index e7d5ecc59..6d1d33d5a 100644
--- a/apps/web-antd/src/views/erp/purchase/in/data.ts
+++ b/apps/web-antd/src/views/erp/purchase/in/data.ts
@@ -189,7 +189,6 @@ export function useFormSchema(formType: string): VbenFormSchema[] {
component: 'ApiSelect',
componentProps: {
placeholder: '请选择结算账户',
- disabled: true,
allowClear: true,
showSearch: true,
api: getAccountSimpleList,
@@ -414,6 +413,21 @@ export function useGridFormSchema(): VbenFormSchema[] {
allowClear: true,
},
},
+ {
+ fieldName: 'accountId',
+ label: '结算账户',
+ component: 'ApiSelect',
+ componentProps: {
+ placeholder: '请选择结算账户',
+ allowClear: true,
+ showSearch: true,
+ api: getAccountSimpleList,
+ fieldNames: {
+ label: 'name',
+ value: 'id',
+ },
+ },
+ },
{
fieldName: 'paymentStatus',
label: '付款状态',
diff --git a/apps/web-antd/src/views/erp/purchase/in/index.vue b/apps/web-antd/src/views/erp/purchase/in/index.vue
index 77d1eebbe..2b4e3487a 100644
--- a/apps/web-antd/src/views/erp/purchase/in/index.vue
+++ b/apps/web-antd/src/views/erp/purchase/in/index.vue
@@ -66,7 +66,10 @@ async function handleDelete(ids: number[]) {
}
/** 审批/反审批操作 */
-async function handleUpdateStatus(row: ErpPurchaseInApi.PurchaseIn, status: number) {
+async function handleUpdateStatus(
+ row: ErpPurchaseInApi.PurchaseIn,
+ status: number,
+) {
const hideLoading = message.loading({
content: `确定${status === 20 ? '审批' : '反审批'}该订单吗?`,
duration: 0,
diff --git a/apps/web-antd/src/views/erp/purchase/in/modules/form.vue b/apps/web-antd/src/views/erp/purchase/in/modules/form.vue
index 382f520e2..029092f83 100644
--- a/apps/web-antd/src/views/erp/purchase/in/modules/form.vue
+++ b/apps/web-antd/src/views/erp/purchase/in/modules/form.vue
@@ -10,6 +10,7 @@ import { $t } from '@vben/locales';
import { message } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
+import { getAccountSimpleList } from '#/api/erp/finance/account';
import {
createPurchaseIn,
getPurchaseIn,
@@ -178,6 +179,12 @@ const [Modal, modalApi] = useVbenModal({
formApi.setDisabled(formType.value === 'detail');
formApi.updateSchema(useFormSchema(formType.value));
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();
@@ -220,4 +227,4 @@ const [Modal, modalApi] = useVbenModal({
-
\ No newline at end of file
+
diff --git a/apps/web-antd/src/views/erp/purchase/in/modules/purchase-order-select-grid.vue b/apps/web-antd/src/views/erp/purchase/in/modules/purchase-order-select-grid.vue
deleted file mode 100644
index 25fdd9fb4..000000000
--- a/apps/web-antd/src/views/erp/purchase/in/modules/purchase-order-select-grid.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
diff --git a/apps/web-antd/src/views/erp/purchase/in/modules/purchase-order-select.vue b/apps/web-antd/src/views/erp/purchase/in/modules/purchase-order-select.vue
index 88ddf8c5c..45b0ec65b 100644
--- a/apps/web-antd/src/views/erp/purchase/in/modules/purchase-order-select.vue
+++ b/apps/web-antd/src/views/erp/purchase/in/modules/purchase-order-select.vue
@@ -1,4 +1,5 @@