From 0df2922abb7ac2729ff8443c27f60a4ab40c60b1 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 30 Jul 2024 17:13:28 +0800 Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../systemSetting/accountcalendar/index.vue | 18 ++++++++++++------ .../systemSetting/currencyexchange/index.vue | 18 ++++++++++++------ .../systemSetting/systemcalendar/index.vue | 18 ++++++++++++------ .../productionMain/productionMain.data.ts | 10 ++++++++++ .../productionMainAssemble.data.ts | 10 ++++++++++ 5 files changed, 56 insertions(+), 18 deletions(-) diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue index 4aa24e494..10989ddfb 100644 --- a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue @@ -163,12 +163,18 @@ const formsSuccess = async (formType,data) => { } if(data.activeTime==0)data.activeTime = null; if(data.expireTime==0)data.expireTime = null; - if (formType === 'create') { - await AccountcalendarApi.createAccountcalendar(data) - message.success(t('common.createSuccess')) - } else { - await AccountcalendarApi.updateAccountcalendar(data) - message.success(t('common.updateSuccess')) + + basicFormRef.value.formLoading = true + try { + if (formType === 'create') { + await AccountcalendarApi.createAccountcalendar(data) + message.success(t('common.createSuccess')) + } else { + await AccountcalendarApi.updateAccountcalendar(data) + message.success(t('common.updateSuccess')) + } + } finally { + basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false getList() diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue index c36f414ae..4ef2e5be9 100644 --- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue @@ -164,12 +164,18 @@ const formsSuccess = async (formType,data) => { } if(data.activeTime==0)data.activeTime = null; if(data.expireTime==0)data.expireTime = null; - if (formType === 'create') { - await CurrencyexchangeApi.createCurrencyexchange(data) - message.success(t('common.createSuccess')) - } else { - await CurrencyexchangeApi.updateCurrencyexchange(data) - message.success(t('common.updateSuccess')) + + basicFormRef.value.formLoading = true + try { + if (formType === 'create') { + await CurrencyexchangeApi.createCurrencyexchange(data) + message.success(t('common.createSuccess')) + } else { + await CurrencyexchangeApi.updateCurrencyexchange(data) + message.success(t('common.updateSuccess')) + } + } finally { + basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false getList() diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue index 79700098a..9181412d6 100644 --- a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue @@ -163,12 +163,18 @@ const formsSuccess = async (formType,data) => { } if(data.activeTime==0)data.activeTime = null; if(data.expireTime==0)data.expireTime = null; - if (formType === 'create') { - await SystemcalendarApi.createSystemcalendar(data) - message.success(t('common.createSuccess')) - } else { - await SystemcalendarApi.updateSystemcalendar(data) - message.success(t('common.updateSuccess')) + + basicFormRef.value.formLoading = true + try { + if (formType === 'create') { + await SystemcalendarApi.createSystemcalendar(data) + message.success(t('common.createSuccess')) + } else { + await SystemcalendarApi.updateSystemcalendar(data) + message.success(t('common.updateSuccess')) + } + } finally { + basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false getList() diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index 7a6ee49d1..fb50dea45 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -730,6 +730,11 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 150 }, + form:{ + componentProps:{ + disabled: true + } + } }, { label: 'Bom版本', @@ -843,6 +848,11 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 150 }, + form:{ + componentProps:{ + disabled: true + } + }, tableForm:{ type: 'Select', disabled: true, diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index 32159d869..b66a906aa 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -729,6 +729,11 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 150 }, + form:{ + componentProps:{ + disabled: true + } + }, }, { label: 'Bom版本', @@ -842,6 +847,11 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 150 }, + form:{ + componentProps:{ + disabled: true + } + }, tableForm:{ type: 'Select' }