diff --git a/apps/web-antd/src/views/erp/finance/payment/data.ts b/apps/web-antd/src/views/erp/finance/payment/data.ts index cd8e32712..771fd0c31 100644 --- a/apps/web-antd/src/views/erp/finance/payment/data.ts +++ b/apps/web-antd/src/views/erp/finance/payment/data.ts @@ -10,8 +10,11 @@ import { getSupplierSimpleList } from '#/api/erp/purchase/supplier'; import { getSimpleUserList } from '#/api/system/user'; import { getRangePickerDefaultProps } from '#/utils'; +/** 表单类型 */ +export type FormType = 'create' | 'detail' | 'edit'; + /** 表单的配置项 */ -export function useFormSchema(formType: string): VbenFormSchema[] { +export function useFormSchema(formType: FormType): VbenFormSchema[] { return [ { fieldName: 'id', diff --git a/apps/web-antd/src/views/erp/finance/payment/index.vue b/apps/web-antd/src/views/erp/finance/payment/index.vue index 03c88b777..d44b11be0 100644 --- a/apps/web-antd/src/views/erp/finance/payment/index.vue +++ b/apps/web-antd/src/views/erp/finance/payment/index.vue @@ -42,12 +42,12 @@ async function handleExport() { /** 新增付款单 */ function handleCreate() { - formModalApi.setData({ type: 'create' }).open(); + formModalApi.setData({ formType: 'create' }).open(); } /** 编辑付款单 */ function handleEdit(row: ErpFinancePaymentApi.FinancePayment) { - formModalApi.setData({ type: 'edit', id: row.id }).open(); + formModalApi.setData({ formType: 'edit', id: row.id }).open(); } /** 删除付款单 */ @@ -94,7 +94,7 @@ function handleRowCheckboxChange({ /** 查看详情 */ function handleDetail(row: ErpFinancePaymentApi.FinancePayment) { - formModalApi.setData({ type: 'detail', id: row.id }).open(); + formModalApi.setData({ formType: 'detail', id: row.id }).open(); } const [Grid, gridApi] = useVbenVxeGrid({ diff --git a/apps/web-antd/src/views/erp/finance/payment/modules/form.vue b/apps/web-antd/src/views/erp/finance/payment/modules/form.vue index 767bd13b2..25caa7b05 100644 --- a/apps/web-antd/src/views/erp/finance/payment/modules/form.vue +++ b/apps/web-antd/src/views/erp/finance/payment/modules/form.vue @@ -1,4 +1,6 @@ diff --git a/apps/web-antd/src/views/mes/md/item/modules/product-sop-form.vue b/apps/web-antd/src/views/mes/md/item/modules/product-sop-form.vue index 93a73a9b3..a9bb4f5b3 100644 --- a/apps/web-antd/src/views/mes/md/item/modules/product-sop-form.vue +++ b/apps/web-antd/src/views/mes/md/item/modules/product-sop-form.vue @@ -1,8 +1,10 @@ diff --git a/apps/web-antd/src/views/mes/md/vendor/data.ts b/apps/web-antd/src/views/mes/md/vendor/data.ts index 5f31bcf79..d40db4eac 100644 --- a/apps/web-antd/src/views/mes/md/vendor/data.ts +++ b/apps/web-antd/src/views/mes/md/vendor/data.ts @@ -13,6 +13,9 @@ import { z } from '#/adapter/form'; import { generateAutoCode } from '#/api/mes/md/autocode/record'; import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants'; +/** 表单类型 */ +export type FormType = 'create' | 'detail' | 'update'; + /** 新增/修改供应商的表单 */ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] { return [ diff --git a/apps/web-antd/src/views/mes/md/vendor/index.vue b/apps/web-antd/src/views/mes/md/vendor/index.vue index e33be1f86..97afba8b7 100644 --- a/apps/web-antd/src/views/mes/md/vendor/index.vue +++ b/apps/web-antd/src/views/mes/md/vendor/index.vue @@ -32,17 +32,17 @@ function handleRefresh() { /** 创建供应商 */ function handleCreate() { - formModalApi.setData({ type: 'create' }).open(); + formModalApi.setData({ formType: 'create' }).open(); } /** 查看供应商 */ function handleDetail(row: MesMdVendorApi.Vendor) { - formModalApi.setData({ id: row.id, type: 'detail' }).open(); + formModalApi.setData({ id: row.id, formType: 'detail' }).open(); } /** 编辑供应商 */ function handleEdit(row: MesMdVendorApi.Vendor) { - formModalApi.setData({ id: row.id, type: 'update' }).open(); + formModalApi.setData({ id: row.id, formType: 'update' }).open(); } /** 删除供应商 */ diff --git a/apps/web-antd/src/views/mes/md/vendor/modules/form.vue b/apps/web-antd/src/views/mes/md/vendor/modules/form.vue index b45af94bb..f12e7c206 100644 --- a/apps/web-antd/src/views/mes/md/vendor/modules/form.vue +++ b/apps/web-antd/src/views/mes/md/vendor/modules/form.vue @@ -1,4 +1,6 @@ diff --git a/apps/web-ele/src/views/mes/md/item/modules/product-sop-form.vue b/apps/web-ele/src/views/mes/md/item/modules/product-sop-form.vue index 93a73a9b3..a9bb4f5b3 100644 --- a/apps/web-ele/src/views/mes/md/item/modules/product-sop-form.vue +++ b/apps/web-ele/src/views/mes/md/item/modules/product-sop-form.vue @@ -1,8 +1,10 @@ diff --git a/apps/web-ele/src/views/mes/md/vendor/data.ts b/apps/web-ele/src/views/mes/md/vendor/data.ts index 205db9cbf..8e9a3aea3 100644 --- a/apps/web-ele/src/views/mes/md/vendor/data.ts +++ b/apps/web-ele/src/views/mes/md/vendor/data.ts @@ -13,6 +13,9 @@ import { z } from '#/adapter/form'; import { generateAutoCode } from '#/api/mes/md/autocode/record'; import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants'; +/** 表单类型 */ +export type FormType = 'create' | 'detail' | 'update'; + /** 新增/修改供应商的表单 */ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] { return [ diff --git a/apps/web-ele/src/views/mes/md/vendor/index.vue b/apps/web-ele/src/views/mes/md/vendor/index.vue index 53e593583..10c5e4c1a 100644 --- a/apps/web-ele/src/views/mes/md/vendor/index.vue +++ b/apps/web-ele/src/views/mes/md/vendor/index.vue @@ -32,17 +32,17 @@ function handleRefresh() { /** 创建供应商 */ function handleCreate() { - formModalApi.setData({ type: 'create' }).open(); + formModalApi.setData({ formType: 'create' }).open(); } /** 查看供应商 */ function handleDetail(row: MesMdVendorApi.Vendor) { - formModalApi.setData({ id: row.id, type: 'detail' }).open(); + formModalApi.setData({ id: row.id, formType: 'detail' }).open(); } /** 编辑供应商 */ function handleEdit(row: MesMdVendorApi.Vendor) { - formModalApi.setData({ id: row.id, type: 'update' }).open(); + formModalApi.setData({ id: row.id, formType: 'update' }).open(); } /** 删除供应商 */ diff --git a/apps/web-ele/src/views/mes/md/vendor/modules/form.vue b/apps/web-ele/src/views/mes/md/vendor/modules/form.vue index 6d10830f5..433e7f8dc 100644 --- a/apps/web-ele/src/views/mes/md/vendor/modules/form.vue +++ b/apps/web-ele/src/views/mes/md/vendor/modules/form.vue @@ -1,4 +1,6 @@