@@ -75,7 +77,7 @@ const [Modal, modalApi] = useVbenModal({
diff --git a/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-list.vue b/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-list.vue
index d961f1707..0c63921c8 100644
--- a/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-list.vue
+++ b/apps/web-antd/src/views/mes/qc/batchtrace/modules/trace-list.vue
@@ -2,7 +2,7 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesWmBatchApi } from '#/api/mes/wm/batch';
-import { ref, watch } from 'vue';
+import { watch } from 'vue';
import { useVbenVxeGrid } from '#/adapter/vxe-table';
import {
@@ -17,13 +17,9 @@ const props = defineProps<{
direction: 'backward' | 'forward'; // 追溯方向:forward=向前,backward=向后
}>();
-const list = ref([]); // 追溯结果列表
-
-// TODO @AI:代码风格;
const [Grid, gridApi] = useVbenVxeGrid({
gridOptions: {
columns: useTraceGridColumns(),
- data: list.value,
minHeight: 240,
pagerConfig: { enabled: false },
rowConfig: { isHover: true, keyField: 'id' },
@@ -33,20 +29,18 @@ const [Grid, gridApi] = useVbenVxeGrid({
});
/** 加载追溯列表 */
-// TODO @AI:是不是可以在 useVbenVxeGrid 里面实现加载?
async function getList() {
if (!props.batchCode) {
- list.value = [];
- gridApi.setGridOptions({ data: list.value });
+ await gridApi.grid?.loadData([]);
return;
}
gridApi.setLoading(true);
try {
- list.value =
+ const list =
props.direction === 'forward'
? await getForwardBatchList(props.batchCode)
: await getBackwardBatchList(props.batchCode);
- gridApi.setGridOptions({ data: list.value });
+ await gridApi.grid?.loadData(list);
} finally {
gridApi.setLoading(false);
}
diff --git a/apps/web-antd/src/views/mes/qc/defect/data.ts b/apps/web-antd/src/views/mes/qc/defect/data.ts
index e9f717ce4..ed72e1cfb 100644
--- a/apps/web-antd/src/views/mes/qc/defect/data.ts
+++ b/apps/web-antd/src/views/mes/qc/defect/data.ts
@@ -37,14 +37,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.QC_DEFECT_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.QC_DEFECT_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '自动生成' },
diff --git a/apps/web-antd/src/views/mes/qc/indicator/data.ts b/apps/web-antd/src/views/mes/qc/indicator/data.ts
index 2a2c600bb..df350a4e5 100644
--- a/apps/web-antd/src/views/mes/qc/indicator/data.ts
+++ b/apps/web-antd/src/views/mes/qc/indicator/data.ts
@@ -42,14 +42,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.QC_INDICATOR_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.QC_INDICATOR_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '自动生成' },
diff --git a/apps/web-antd/src/views/mes/qc/indicatorresult/components/data.ts b/apps/web-antd/src/views/mes/qc/indicatorresult/components/data.ts
index 79340b115..38557a984 100644
--- a/apps/web-antd/src/views/mes/qc/indicatorresult/components/data.ts
+++ b/apps/web-antd/src/views/mes/qc/indicatorresult/components/data.ts
@@ -39,14 +39,10 @@ export function useQcIndicatorResultFormSchema(
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.QC_INDICATOR_RESULT_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.QC_INDICATOR_RESULT_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/qc/ipqc/data.ts b/apps/web-antd/src/views/mes/qc/ipqc/data.ts
index 73c19bc51..da7215475 100644
--- a/apps/web-antd/src/views/mes/qc/ipqc/data.ts
+++ b/apps/web-antd/src/views/mes/qc/ipqc/data.ts
@@ -41,7 +41,10 @@ function syncUnqualified(formApi?: VbenFormApi) {
}
/** 新增/修改的表单 */
-export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+export function useFormSchema(
+ formType: FormType,
+ formApi?: VbenFormApi,
+): VbenFormSchema[] {
return [
{
fieldName: 'id',
@@ -87,16 +90,13 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
h(
Button,
{
+ disabled: formType === 'detail',
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.QC_IPQC_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.QC_IPQC_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/qc/ipqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/ipqc/modules/form.vue
index 64b1d698a..87062e316 100644
--- a/apps/web-antd/src/views/mes/qc/ipqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/ipqc/modules/form.vue
@@ -151,7 +151,6 @@ const [Modal, modalApi] = useVbenModal({
originalSnapshot.value = '';
return;
}
- formApi.setState({ schema: useFormSchema(formApi) });
subTabsName.value = 'line';
// 加载数据
const data = modalApi.getData<{
@@ -160,6 +159,7 @@ const [Modal, modalApi] = useVbenModal({
prefill?: MesQcIpqcApi.Ipqc;
}>();
formType.value = data.formType;
+ formApi.setState({ schema: useFormSchema(formType.value, formApi) });
formApi.setDisabled(formType.value === 'detail');
modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
if (data?.id) {
diff --git a/apps/web-antd/src/views/mes/qc/iqc/data.ts b/apps/web-antd/src/views/mes/qc/iqc/data.ts
index 9919a2a83..226ad962a 100644
--- a/apps/web-antd/src/views/mes/qc/iqc/data.ts
+++ b/apps/web-antd/src/views/mes/qc/iqc/data.ts
@@ -21,7 +21,10 @@ import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
export type FormType = 'create' | 'detail' | 'update';
/** 新增/修改的表单 */
-export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+export function useFormSchema(
+ formType: FormType,
+ formApi?: VbenFormApi,
+): VbenFormSchema[] {
return [
{
fieldName: 'id',
@@ -67,16 +70,13 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
h(
Button,
{
+ disabled: formType === 'detail',
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.QC_IQC_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.QC_IQC_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
index ad3f767d9..fec8d932f 100644
--- a/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/iqc/modules/form.vue
@@ -156,7 +156,6 @@ const [Modal, modalApi] = useVbenModal({
originalSnapshot.value = '';
return;
}
- formApi.setState({ schema: useFormSchema(formApi) });
subTabsName.value = 'line';
// 加载数据
const data = modalApi.getData<{
@@ -165,6 +164,7 @@ const [Modal, modalApi] = useVbenModal({
prefill?: MesQcIqcApi.Iqc;
}>();
formType.value = data.formType;
+ formApi.setState({ schema: useFormSchema(formType.value, formApi) });
formApi.setDisabled(formType.value === 'detail');
modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
if (data?.id) {
diff --git a/apps/web-antd/src/views/mes/qc/oqc/data.ts b/apps/web-antd/src/views/mes/qc/oqc/data.ts
index 2c70c0a7f..41b79218d 100644
--- a/apps/web-antd/src/views/mes/qc/oqc/data.ts
+++ b/apps/web-antd/src/views/mes/qc/oqc/data.ts
@@ -20,7 +20,10 @@ import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
export type FormType = 'create' | 'detail' | 'update';
/** 新增/修改的表单 */
-export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+export function useFormSchema(
+ formType: FormType,
+ formApi?: VbenFormApi,
+): VbenFormSchema[] {
return [
{
fieldName: 'id',
@@ -66,16 +69,13 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
h(
Button,
{
+ disabled: formType === 'detail',
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.QC_OQC_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.QC_OQC_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
index 0d9d98e7f..05e6b749a 100644
--- a/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/oqc/modules/form.vue
@@ -150,7 +150,6 @@ const [Modal, modalApi] = useVbenModal({
originalSnapshot.value = '';
return;
}
- formApi.setState({ schema: useFormSchema(formApi) });
subTabsName.value = 'line';
// 加载数据
const data = modalApi.getData<{
@@ -159,6 +158,7 @@ const [Modal, modalApi] = useVbenModal({
prefill?: MesQcOqcApi.Oqc;
}>();
formType.value = data.formType;
+ formApi.setState({ schema: useFormSchema(formType.value, formApi) });
formApi.setDisabled(formType.value === 'detail');
modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
if (data?.id) {
diff --git a/apps/web-antd/src/views/mes/qc/rqc/data.ts b/apps/web-antd/src/views/mes/qc/rqc/data.ts
index c08aa23f8..ee765a373 100644
--- a/apps/web-antd/src/views/mes/qc/rqc/data.ts
+++ b/apps/web-antd/src/views/mes/qc/rqc/data.ts
@@ -33,7 +33,10 @@ function getRqcSourceDocTypeOptions() {
}
/** 新增/修改的表单 */
-export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+export function useFormSchema(
+ formType: FormType,
+ formApi?: VbenFormApi,
+): VbenFormSchema[] {
return [
{
fieldName: 'id',
@@ -79,16 +82,13 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
h(
Button,
{
+ disabled: formType === 'detail',
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.QC_RQC_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.QC_RQC_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue b/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
index 3876ceda2..db30062cf 100644
--- a/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
+++ b/apps/web-antd/src/views/mes/qc/rqc/modules/form.vue
@@ -150,7 +150,6 @@ const [Modal, modalApi] = useVbenModal({
originalSnapshot.value = '';
return;
}
- formApi.setState({ schema: useFormSchema(formApi) });
subTabsName.value = 'line';
// 加载数据
const data = modalApi.getData<{
@@ -159,6 +158,7 @@ const [Modal, modalApi] = useVbenModal({
prefill?: MesQcRqcApi.Rqc;
}>();
formType.value = data.formType;
+ formApi.setState({ schema: useFormSchema(formType.value, formApi) });
formApi.setDisabled(formType.value === 'detail');
modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
if (data?.id) {
diff --git a/apps/web-antd/src/views/mes/qc/template/data.ts b/apps/web-antd/src/views/mes/qc/template/data.ts
index ce5268ac7..69aff5072 100644
--- a/apps/web-antd/src/views/mes/qc/template/data.ts
+++ b/apps/web-antd/src/views/mes/qc/template/data.ts
@@ -46,14 +46,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.QC_TEMPLATE_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.QC_TEMPLATE_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '自动生成' },
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/area/data.ts b/apps/web-antd/src/views/mes/wm/warehouse/area/data.ts
index b18fb4981..60c70f580 100644
--- a/apps/web-antd/src/views/mes/wm/warehouse/area/data.ts
+++ b/apps/web-antd/src/views/mes/wm/warehouse/area/data.ts
@@ -80,14 +80,10 @@ export function useFormSchema(
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.WM_AREA_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.WM_AREA_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '自动生成' },
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/data.ts b/apps/web-antd/src/views/mes/wm/warehouse/data.ts
index 045e21177..2adc6f512 100644
--- a/apps/web-antd/src/views/mes/wm/warehouse/data.ts
+++ b/apps/web-antd/src/views/mes/wm/warehouse/data.ts
@@ -52,14 +52,10 @@ export function useFormSchema(
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.WM_WAREHOUSE_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.WM_WAREHOUSE_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '自动生成' },
diff --git a/apps/web-antd/src/views/mes/wm/warehouse/location/data.ts b/apps/web-antd/src/views/mes/wm/warehouse/location/data.ts
index c75c0639c..360102a58 100644
--- a/apps/web-antd/src/views/mes/wm/warehouse/location/data.ts
+++ b/apps/web-antd/src/views/mes/wm/warehouse/location/data.ts
@@ -49,14 +49,10 @@ export function useFormSchema(
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.WM_LOCATION_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.WM_LOCATION_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '自动生成' },
diff --git a/apps/web-ele/src/views/mes/cal/plan/data.ts b/apps/web-ele/src/views/mes/cal/plan/data.ts
index 66548df50..97bdb57de 100644
--- a/apps/web-ele/src/views/mes/cal/plan/data.ts
+++ b/apps/web-ele/src/views/mes/cal/plan/data.ts
@@ -55,12 +55,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(MesAutoCodeRuleCode.CAL_PLAN_CODE);
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(MesAutoCodeRuleCode.CAL_PLAN_CODE);
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/cal/team/data.ts b/apps/web-ele/src/views/mes/cal/team/data.ts
index 4d78d82d2..6f5544162 100644
--- a/apps/web-ele/src/views/mes/cal/team/data.ts
+++ b/apps/web-ele/src/views/mes/cal/team/data.ts
@@ -42,12 +42,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(MesAutoCodeRuleCode.CAL_TEAM_CODE);
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(MesAutoCodeRuleCode.CAL_TEAM_CODE);
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/dv/checkplan/data.ts b/apps/web-ele/src/views/mes/dv/checkplan/data.ts
index 9b34cc8d4..9094bd4d8 100644
--- a/apps/web-ele/src/views/mes/dv/checkplan/data.ts
+++ b/apps/web-ele/src/views/mes/dv/checkplan/data.ts
@@ -55,12 +55,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(MesAutoCodeRuleCode.DV_CHECK_PLAN_CODE);
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(MesAutoCodeRuleCode.DV_CHECK_PLAN_CODE);
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/dv/machinery/data.ts b/apps/web-ele/src/views/mes/dv/machinery/data.ts
index 735b30eca..be9568d44 100644
--- a/apps/web-ele/src/views/mes/dv/machinery/data.ts
+++ b/apps/web-ele/src/views/mes/dv/machinery/data.ts
@@ -48,12 +48,8 @@ export function useFormSchema(formType: FormType, formApi?: VbenFormApi): VbenFo
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(MesAutoCodeRuleCode.DV_MACHINERY_CODE);
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(MesAutoCodeRuleCode.DV_MACHINERY_CODE);
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/dv/machinery/type/data.ts b/apps/web-ele/src/views/mes/dv/machinery/type/data.ts
index b63b684a3..bc7b2e3f5 100644
--- a/apps/web-ele/src/views/mes/dv/machinery/type/data.ts
+++ b/apps/web-ele/src/views/mes/dv/machinery/type/data.ts
@@ -58,12 +58,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(MesAutoCodeRuleCode.DV_MACHINERY_TYPE_CODE);
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(MesAutoCodeRuleCode.DV_MACHINERY_TYPE_CODE);
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/dv/repair/data.ts b/apps/web-ele/src/views/mes/dv/repair/data.ts
index ce5db65da..f43cf83ec 100644
--- a/apps/web-ele/src/views/mes/dv/repair/data.ts
+++ b/apps/web-ele/src/views/mes/dv/repair/data.ts
@@ -55,12 +55,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(MesAutoCodeRuleCode.DV_REPAIR_CODE);
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(MesAutoCodeRuleCode.DV_REPAIR_CODE);
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/dv/subject/data.ts b/apps/web-ele/src/views/mes/dv/subject/data.ts
index 6d28f541d..4df64c1ed 100644
--- a/apps/web-ele/src/views/mes/dv/subject/data.ts
+++ b/apps/web-ele/src/views/mes/dv/subject/data.ts
@@ -41,12 +41,8 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(MesAutoCodeRuleCode.DV_SUBJECT_CODE);
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(MesAutoCodeRuleCode.DV_SUBJECT_CODE);
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/md/client/data.ts b/apps/web-ele/src/views/mes/md/client/data.ts
index 882c54ce8..2c8945d32 100644
--- a/apps/web-ele/src/views/mes/md/client/data.ts
+++ b/apps/web-ele/src/views/mes/md/client/data.ts
@@ -46,14 +46,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
ElButton,
{
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.MD_CLIENT_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.MD_CLIENT_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '自动生成' },
diff --git a/apps/web-ele/src/views/mes/md/item/data.ts b/apps/web-ele/src/views/mes/md/item/data.ts
index 1b2dd41af..b1143013b 100644
--- a/apps/web-ele/src/views/mes/md/item/data.ts
+++ b/apps/web-ele/src/views/mes/md/item/data.ts
@@ -45,14 +45,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.MD_ITEM_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.MD_ITEM_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/md/item/type/data.ts b/apps/web-ele/src/views/mes/md/item/type/data.ts
index 56b51cedc..7faad1956 100644
--- a/apps/web-ele/src/views/mes/md/item/type/data.ts
+++ b/apps/web-ele/src/views/mes/md/item/type/data.ts
@@ -69,14 +69,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.MD_ITEM_TYPE_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.MD_ITEM_TYPE_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '自动生成' },
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 8e9a3aea3..c612e8abf 100644
--- a/apps/web-ele/src/views/mes/md/vendor/data.ts
+++ b/apps/web-ele/src/views/mes/md/vendor/data.ts
@@ -46,14 +46,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
ElButton,
{
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.MD_VENDOR_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.MD_VENDOR_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '自动生成' },
diff --git a/apps/web-ele/src/views/mes/md/workstation/data.ts b/apps/web-ele/src/views/mes/md/workstation/data.ts
index c559d6e17..51ba029ec 100644
--- a/apps/web-ele/src/views/mes/md/workstation/data.ts
+++ b/apps/web-ele/src/views/mes/md/workstation/data.ts
@@ -52,14 +52,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
ElButton,
{
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.MD_WORKSTATION_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.MD_WORKSTATION_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/md/workstation/workshop/data.ts b/apps/web-ele/src/views/mes/md/workstation/workshop/data.ts
index be3d6f09f..9835ba25f 100644
--- a/apps/web-ele/src/views/mes/md/workstation/workshop/data.ts
+++ b/apps/web-ele/src/views/mes/md/workstation/workshop/data.ts
@@ -47,14 +47,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
ElButton,
{
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.MD_WORKSHOP_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.MD_WORKSHOP_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/pro/process/data.ts b/apps/web-ele/src/views/mes/pro/process/data.ts
index 1fc136c30..d58db63a5 100644
--- a/apps/web-ele/src/views/mes/pro/process/data.ts
+++ b/apps/web-ele/src/views/mes/pro/process/data.ts
@@ -43,14 +43,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.PRO_PROCESS_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.PRO_PROCESS_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/pro/route/data.ts b/apps/web-ele/src/views/mes/pro/route/data.ts
index 5b4a56612..bb1c8ab3d 100644
--- a/apps/web-ele/src/views/mes/pro/route/data.ts
+++ b/apps/web-ele/src/views/mes/pro/route/data.ts
@@ -48,14 +48,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
{
type: 'default',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.PRO_ROUTE_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.PRO_ROUTE_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/qc/defect/data.ts b/apps/web-ele/src/views/mes/qc/defect/data.ts
index 622753830..848e0b0ee 100644
--- a/apps/web-ele/src/views/mes/qc/defect/data.ts
+++ b/apps/web-ele/src/views/mes/qc/defect/data.ts
@@ -36,14 +36,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
ElButton,
{
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.QC_DEFECT_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.QC_DEFECT_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '自动生成' },
diff --git a/apps/web-ele/src/views/mes/qc/indicator/data.ts b/apps/web-ele/src/views/mes/qc/indicator/data.ts
index d227958c9..48819cef0 100644
--- a/apps/web-ele/src/views/mes/qc/indicator/data.ts
+++ b/apps/web-ele/src/views/mes/qc/indicator/data.ts
@@ -41,14 +41,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
ElButton,
{
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.QC_INDICATOR_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.QC_INDICATOR_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '自动生成' },
diff --git a/apps/web-ele/src/views/mes/qc/indicatorresult/components/data.ts b/apps/web-ele/src/views/mes/qc/indicatorresult/components/data.ts
index c1be4b795..7a6779885 100644
--- a/apps/web-ele/src/views/mes/qc/indicatorresult/components/data.ts
+++ b/apps/web-ele/src/views/mes/qc/indicatorresult/components/data.ts
@@ -38,14 +38,10 @@ export function useQcIndicatorResultFormSchema(
ElButton,
{
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.QC_INDICATOR_RESULT_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.QC_INDICATOR_RESULT_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/qc/ipqc/data.ts b/apps/web-ele/src/views/mes/qc/ipqc/data.ts
index 2ecd804ba..4f8f3b7e5 100644
--- a/apps/web-ele/src/views/mes/qc/ipqc/data.ts
+++ b/apps/web-ele/src/views/mes/qc/ipqc/data.ts
@@ -41,7 +41,10 @@ function syncUnqualified(formApi?: VbenFormApi) {
}
/** 新增/修改的表单 */
-export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+export function useFormSchema(
+ formType: FormType,
+ formApi?: VbenFormApi,
+): VbenFormSchema[] {
return [
{
fieldName: 'id',
@@ -87,15 +90,12 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
h(
ElButton,
{
+ disabled: formType === 'detail',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.QC_IPQC_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.QC_IPQC_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
index aff33a0ab..0bb0f75ca 100644
--- a/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/ipqc/modules/form.vue
@@ -157,7 +157,6 @@ const [Modal, modalApi] = useVbenModal({
originalSnapshot.value = '';
return;
}
- formApi.setState({ schema: useFormSchema(formApi) });
subTabsName.value = 'line';
// 加载数据
const data = modalApi.getData<{
@@ -166,6 +165,7 @@ const [Modal, modalApi] = useVbenModal({
prefill?: MesQcIpqcApi.Ipqc;
}>();
formType.value = data.formType;
+ formApi.setState({ schema: useFormSchema(formType.value, formApi) });
formApi.setDisabled(formType.value === 'detail');
modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
if (data?.id) {
diff --git a/apps/web-ele/src/views/mes/qc/iqc/data.ts b/apps/web-ele/src/views/mes/qc/iqc/data.ts
index 804ef7df4..c95250a6e 100644
--- a/apps/web-ele/src/views/mes/qc/iqc/data.ts
+++ b/apps/web-ele/src/views/mes/qc/iqc/data.ts
@@ -21,7 +21,10 @@ import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
export type FormType = 'create' | 'detail' | 'update';
/** 新增/修改的表单 */
-export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+export function useFormSchema(
+ formType: FormType,
+ formApi?: VbenFormApi,
+): VbenFormSchema[] {
return [
{
fieldName: 'id',
@@ -67,15 +70,12 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
h(
ElButton,
{
+ disabled: formType === 'detail',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.QC_IQC_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.QC_IQC_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue
index fdb4dcd8c..246a26cc7 100644
--- a/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/iqc/modules/form.vue
@@ -158,7 +158,6 @@ const [Modal, modalApi] = useVbenModal({
originalSnapshot.value = '';
return;
}
- formApi.setState({ schema: useFormSchema(formApi) });
subTabsName.value = 'line';
// 加载数据
const data = modalApi.getData<{
@@ -167,6 +166,7 @@ const [Modal, modalApi] = useVbenModal({
prefill?: MesQcIqcApi.Iqc;
}>();
formType.value = data.formType;
+ formApi.setState({ schema: useFormSchema(formType.value, formApi) });
formApi.setDisabled(formType.value === 'detail');
modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
if (data?.id) {
diff --git a/apps/web-ele/src/views/mes/qc/oqc/data.ts b/apps/web-ele/src/views/mes/qc/oqc/data.ts
index b5027d32b..25654bfbc 100644
--- a/apps/web-ele/src/views/mes/qc/oqc/data.ts
+++ b/apps/web-ele/src/views/mes/qc/oqc/data.ts
@@ -20,7 +20,10 @@ import { MesAutoCodeRuleCode } from '#/views/mes/utils/constants';
export type FormType = 'create' | 'detail' | 'update';
/** 新增/修改的表单 */
-export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+export function useFormSchema(
+ formType: FormType,
+ formApi?: VbenFormApi,
+): VbenFormSchema[] {
return [
{
fieldName: 'id',
@@ -66,15 +69,12 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
h(
ElButton,
{
+ disabled: formType === 'detail',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.QC_OQC_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.QC_OQC_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
index 831308c22..b61273f7d 100644
--- a/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/oqc/modules/form.vue
@@ -157,7 +157,6 @@ const [Modal, modalApi] = useVbenModal({
originalSnapshot.value = '';
return;
}
- formApi.setState({ schema: useFormSchema(formApi) });
subTabsName.value = 'line';
// 加载数据
const data = modalApi.getData<{
@@ -166,6 +165,7 @@ const [Modal, modalApi] = useVbenModal({
prefill?: MesQcOqcApi.Oqc;
}>();
formType.value = data.formType;
+ formApi.setState({ schema: useFormSchema(formType.value, formApi) });
formApi.setDisabled(formType.value === 'detail');
modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
if (data?.id) {
diff --git a/apps/web-ele/src/views/mes/qc/rqc/data.ts b/apps/web-ele/src/views/mes/qc/rqc/data.ts
index 1486090ec..7a7c6177e 100644
--- a/apps/web-ele/src/views/mes/qc/rqc/data.ts
+++ b/apps/web-ele/src/views/mes/qc/rqc/data.ts
@@ -33,7 +33,10 @@ function getRqcSourceDocTypeOptions() {
}
/** 新增/修改的表单 */
-export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
+export function useFormSchema(
+ formType: FormType,
+ formApi?: VbenFormApi,
+): VbenFormSchema[] {
return [
{
fieldName: 'id',
@@ -79,15 +82,12 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
h(
ElButton,
{
+ disabled: formType === 'detail',
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.QC_RQC_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.QC_RQC_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '生成' },
diff --git a/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue b/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
index 90bb852ec..84f383020 100644
--- a/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
+++ b/apps/web-ele/src/views/mes/qc/rqc/modules/form.vue
@@ -157,7 +157,6 @@ const [Modal, modalApi] = useVbenModal({
originalSnapshot.value = '';
return;
}
- formApi.setState({ schema: useFormSchema(formApi) });
subTabsName.value = 'line';
// 加载数据
const data = modalApi.getData<{
@@ -166,6 +165,7 @@ const [Modal, modalApi] = useVbenModal({
prefill?: MesQcRqcApi.Rqc;
}>();
formType.value = data.formType;
+ formApi.setState({ schema: useFormSchema(formType.value, formApi) });
formApi.setDisabled(formType.value === 'detail');
modalApi.setState({ showConfirmButton: formType.value !== 'detail' });
if (data?.id) {
diff --git a/apps/web-ele/src/views/mes/qc/template/data.ts b/apps/web-ele/src/views/mes/qc/template/data.ts
index 490231ac2..91b66d858 100644
--- a/apps/web-ele/src/views/mes/qc/template/data.ts
+++ b/apps/web-ele/src/views/mes/qc/template/data.ts
@@ -45,14 +45,10 @@ export function useFormSchema(formApi?: VbenFormApi): VbenFormSchema[] {
ElButton,
{
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.QC_TEMPLATE_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.QC_TEMPLATE_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '自动生成' },
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/area/data.ts b/apps/web-ele/src/views/mes/wm/warehouse/area/data.ts
index c6c676806..d787774c3 100644
--- a/apps/web-ele/src/views/mes/wm/warehouse/area/data.ts
+++ b/apps/web-ele/src/views/mes/wm/warehouse/area/data.ts
@@ -82,14 +82,10 @@ export function useFormSchema(
ElButton,
{
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.WM_AREA_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.WM_AREA_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '自动生成' },
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/data.ts b/apps/web-ele/src/views/mes/wm/warehouse/data.ts
index fafda94e7..5516a3ce4 100644
--- a/apps/web-ele/src/views/mes/wm/warehouse/data.ts
+++ b/apps/web-ele/src/views/mes/wm/warehouse/data.ts
@@ -51,14 +51,10 @@ export function useFormSchema(
ElButton,
{
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.WM_WAREHOUSE_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.WM_WAREHOUSE_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '自动生成' },
diff --git a/apps/web-ele/src/views/mes/wm/warehouse/location/data.ts b/apps/web-ele/src/views/mes/wm/warehouse/location/data.ts
index c3d00a1a3..dbba0d318 100644
--- a/apps/web-ele/src/views/mes/wm/warehouse/location/data.ts
+++ b/apps/web-ele/src/views/mes/wm/warehouse/location/data.ts
@@ -51,14 +51,10 @@ export function useFormSchema(
ElButton,
{
onClick: async () => {
- try {
- const code = await generateAutoCode(
- MesAutoCodeRuleCode.WM_LOCATION_CODE,
- );
- await formApi?.setFieldValue('code', code);
- } catch (error) {
- console.error(error);
- }
+ const code = await generateAutoCode(
+ MesAutoCodeRuleCode.WM_LOCATION_CODE,
+ );
+ await formApi?.setFieldValue('code', code);
},
},
{ default: () => '自动生成' },