diff --git a/src/views/wms/agvManage/agvLocationrelation/index.vue b/src/views/wms/agvManage/agvLocationrelation/index.vue index 1a35d6065..0119205df 100644 --- a/src/views/wms/agvManage/agvLocationrelation/index.vue +++ b/src/views/wms/agvManage/agvLocationrelation/index.vue @@ -128,7 +128,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -202,7 +208,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -220,7 +230,7 @@ const handleDelete = async (id: number) => { await AgvLocationrelationApi.deleteAgvLocationrelation(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/customerManage/customer/index.vue b/src/views/wms/basicDataManage/customerManage/customer/index.vue index a2a85341c..fc31bf8a3 100644 --- a/src/views/wms/basicDataManage/customerManage/customer/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customer/index.vue @@ -195,7 +195,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -215,7 +219,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue index bff35210f..04deb10e1 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue @@ -198,7 +198,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -230,7 +234,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue index 1888b081a..18b1c7b29 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue @@ -204,7 +204,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } const onEnter = async (field,value)=>{ console.log(field,value) @@ -254,7 +258,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/customerManage/project/index.vue b/src/views/wms/basicDataManage/customerManage/project/index.vue index 1f7f8010a..17a7ce28e 100644 --- a/src/views/wms/basicDataManage/customerManage/project/index.vue +++ b/src/views/wms/basicDataManage/customerManage/project/index.vue @@ -195,7 +195,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -224,7 +228,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue index 29b1ac834..f5ea4d21e 100644 --- a/src/views/wms/basicDataManage/customerManage/saleprice/index.vue +++ b/src/views/wms/basicDataManage/customerManage/saleprice/index.vue @@ -199,7 +199,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -228,7 +232,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue index dd394b284..b5ddadaa5 100644 --- a/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/businesstype/index.vue @@ -287,7 +287,7 @@ const formsSuccess = async (formType, submitData) => { .then(async () => { message.success(t('common.updateSuccess')) basicFormRef.value.dialogVisible = false - await getList() + buttonBaseClick('refresh',null) }) .catch(() => { data.itemTypes = data.itemTypes.split(',') @@ -352,7 +352,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue index 7cbb2c584..0d2e5e767 100644 --- a/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/index.vue @@ -176,7 +176,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -196,7 +200,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue index c96f041dc..9132137cb 100644 --- a/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/jobsetting/index.vue @@ -176,7 +176,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -196,7 +200,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue index b71de84b7..48405deac 100644 --- a/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/plansetting/index.vue @@ -177,7 +177,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -197,7 +201,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue index 4b0dac5c4..ecce4f292 100644 --- a/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/recordsetting/index.vue @@ -177,7 +177,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -197,7 +201,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue index 9cb8b0297..34bb3745b 100644 --- a/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/index.vue @@ -177,7 +177,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -197,7 +201,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/documentSetting/switch/index.vue b/src/views/wms/basicDataManage/documentSetting/switch/index.vue index 100d91892..66339989c 100644 --- a/src/views/wms/basicDataManage/documentSetting/switch/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/switch/index.vue @@ -176,7 +176,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -225,7 +225,7 @@ const success = async (formType, data) => { const res = await SwitchApi.updateSwitch(data) if(true===res){ message.success(t('common.updateSuccess')) - getList() + buttonBaseClick('refresh',null) }else{ message.error('修改失败') } diff --git a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue index c9c74251a..cdd17db2f 100644 --- a/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/transactiontype/index.vue @@ -178,7 +178,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -198,7 +202,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue index 2e2135bc6..6be85ba6b 100644 --- a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue @@ -201,7 +201,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -230,7 +234,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue index 25e09d46c..9adc80970 100644 --- a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue @@ -230,7 +230,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 删除按钮操作 */ @@ -244,7 +248,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/location/index.vue b/src/views/wms/basicDataManage/factoryModeling/location/index.vue index 195c1bbee..98f0c1283 100644 --- a/src/views/wms/basicDataManage/factoryModeling/location/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/location/index.vue @@ -219,7 +219,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -248,7 +252,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue index 7af3ab2f0..db65ec6f0 100644 --- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue @@ -200,7 +200,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -229,7 +233,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/process/index.vue b/src/views/wms/basicDataManage/factoryModeling/process/index.vue index a076365ef..b112d1837 100644 --- a/src/views/wms/basicDataManage/factoryModeling/process/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/process/index.vue @@ -207,7 +207,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -236,7 +240,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue index 1da242abe..b1a2b22cd 100644 --- a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue @@ -200,7 +200,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -229,7 +233,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue index c176cd9f1..bc20bb421 100644 --- a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue @@ -189,7 +189,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -209,7 +213,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue index 10a23c941..f086a1428 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/workshop/index.vue @@ -191,7 +191,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -211,7 +215,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue index 0415294f6..5c963542e 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue @@ -209,7 +209,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -238,7 +242,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/itemManage/bom/index.vue b/src/views/wms/basicDataManage/itemManage/bom/index.vue index 7f21ff7b8..2b97a0628 100644 --- a/src/views/wms/basicDataManage/itemManage/bom/index.vue +++ b/src/views/wms/basicDataManage/itemManage/bom/index.vue @@ -206,7 +206,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -241,7 +245,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index 787bbce56..eb9f347ae 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -323,7 +323,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -380,7 +380,11 @@ const submitForm = async (formType, data) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue index 2a331987c..e91e4dfc3 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itembasic/index.vue @@ -248,7 +248,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } const detailRef = ref() @@ -268,7 +272,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue index 41db7ca3e..aff7fc3ad 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue @@ -235,7 +235,11 @@ const formsSuccess = async (formType, data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } const onEnter = async (field,value)=>{ console.log('onEnter',field,value) @@ -304,7 +308,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue index 5904d8b09..0a3f2ff1b 100644 --- a/src/views/wms/basicDataManage/itemManage/packageunit/index.vue +++ b/src/views/wms/basicDataManage/itemManage/packageunit/index.vue @@ -128,7 +128,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -224,7 +230,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -242,7 +252,7 @@ const handleDelete = async (id: number) => { await PackageunitApi.deletePackageunit(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue index ca030de9f..984683424 100644 --- a/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue +++ b/src/views/wms/basicDataManage/itemManage/productionitemcodeSpareitemcode/index.vue @@ -124,7 +124,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -198,7 +204,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -216,7 +226,7 @@ const handleDelete = async (id: number) => { await ProductionitemcodeSpareitemcodeApi.deleteProductionitemcodeSpareitemcode(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue index a04119f7e..938528ba7 100644 --- a/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue +++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/index.vue @@ -199,7 +199,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -228,7 +232,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue index 48e5c9bae..d312c53c9 100644 --- a/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue +++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/index.vue @@ -192,8 +192,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.dialogVisible = false basicFormRef.value.formLoading = false - - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -222,7 +225,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/labelManage/barcode/index.vue b/src/views/wms/basicDataManage/labelManage/barcode/index.vue index 231a58889..91ea8cbab 100644 --- a/src/views/wms/basicDataManage/labelManage/barcode/index.vue +++ b/src/views/wms/basicDataManage/labelManage/barcode/index.vue @@ -181,7 +181,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -201,7 +205,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue index 74d8dd474..0350c674a 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue @@ -183,7 +183,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else if (val=='selection_point'){//批量打印 handleSelectionPoint() @@ -249,7 +255,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -267,7 +277,7 @@ const handleDelete = async (id: number) => { await CallmaterialsApi.deleteCallmaterials(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue index ec20b19ba..458599ffc 100644 --- a/src/views/wms/basicDataManage/labelManage/labeltype/index.vue +++ b/src/views/wms/basicDataManage/labelManage/labeltype/index.vue @@ -183,7 +183,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -212,7 +216,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue index b9607c6ff..b39ba8e44 100644 --- a/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue +++ b/src/views/wms/basicDataManage/labelManage/locationLabel/index.vue @@ -164,7 +164,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue index 1abf79216..6aa6e2db1 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue @@ -233,7 +233,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -302,7 +302,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 导入 */ diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index 14ddbd0ed..c13cfd8d5 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -234,7 +234,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -298,7 +298,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 导入 */ diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue index 90eaa3478..bf41d8eac 100644 --- a/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/index.vue @@ -216,7 +216,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/orderManage/carrier/index.vue b/src/views/wms/basicDataManage/orderManage/carrier/index.vue index dcd05eb8b..6e087650c 100644 --- a/src/views/wms/basicDataManage/orderManage/carrier/index.vue +++ b/src/views/wms/basicDataManage/orderManage/carrier/index.vue @@ -196,7 +196,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -216,7 +220,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/orderManage/owner/index.vue b/src/views/wms/basicDataManage/orderManage/owner/index.vue index 32c90fb63..8c999e712 100644 --- a/src/views/wms/basicDataManage/orderManage/owner/index.vue +++ b/src/views/wms/basicDataManage/orderManage/owner/index.vue @@ -197,7 +197,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -217,7 +221,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/orderManage/shift/index.vue b/src/views/wms/basicDataManage/orderManage/shift/index.vue index 4ba329af0..8e18c295d 100644 --- a/src/views/wms/basicDataManage/orderManage/shift/index.vue +++ b/src/views/wms/basicDataManage/orderManage/shift/index.vue @@ -203,7 +203,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -223,7 +227,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/orderManage/team/index.vue b/src/views/wms/basicDataManage/orderManage/team/index.vue index 01b077a75..36770fa22 100644 --- a/src/views/wms/basicDataManage/orderManage/team/index.vue +++ b/src/views/wms/basicDataManage/orderManage/team/index.vue @@ -188,7 +188,11 @@ const formsSuccess = async (formType,data) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } const getData = async() => { getList(); @@ -211,7 +215,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/strategySetting/rule/index.vue b/src/views/wms/basicDataManage/strategySetting/rule/index.vue index de47835d7..e79792b66 100644 --- a/src/views/wms/basicDataManage/strategySetting/rule/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/rule/index.vue @@ -176,7 +176,11 @@ const formsSuccess = async (formType, data) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -196,7 +200,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue index 1b306e0a9..7df989b6a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/index.vue @@ -106,7 +106,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue index e1a580c7d..bc85162de 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue @@ -106,7 +106,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue index 730760adb..cdf7fcb76 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue @@ -108,7 +108,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue index 77b078fe9..dd7fa9f1a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue @@ -107,7 +107,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue index 3444efabc..c2c9c958c 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue @@ -107,7 +107,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue index 4d0f74dd4..fa3ad01de 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/index.vue @@ -106,7 +106,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue index b6b18e322..0d8c6776a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue @@ -107,7 +107,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue index e4d5a6c92..690f7fd36 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue @@ -108,7 +108,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue index ccc2777aa..bcddf5f6a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue @@ -106,7 +106,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue index 88d59eab1..c8d4a5005 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/index.vue @@ -107,7 +107,7 @@ const handleDelete = async (id: number) => { await RuleApi.deleteRule(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } // 列表头部按钮 diff --git a/src/views/wms/basicDataManage/subject/mstr/index.vue b/src/views/wms/basicDataManage/subject/mstr/index.vue index ca220e13a..56634a966 100644 --- a/src/views/wms/basicDataManage/subject/mstr/index.vue +++ b/src/views/wms/basicDataManage/subject/mstr/index.vue @@ -124,7 +124,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -171,7 +177,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -189,7 +199,7 @@ const handleDelete = async (id: number) => { await MstrApi.deleteMstr(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue b/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue index d0b0f19c9..87b6a5273 100644 --- a/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue +++ b/src/views/wms/basicDataManage/subject/qadCostcentre/index.vue @@ -124,7 +124,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -180,7 +186,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -198,7 +208,7 @@ const handleDelete = async (id: number) => { await QadCostcentreApi.deleteQadCostcentre(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/subject/qadProject/index.vue b/src/views/wms/basicDataManage/subject/qadProject/index.vue index f34285ac2..0658d4d47 100644 --- a/src/views/wms/basicDataManage/subject/qadProject/index.vue +++ b/src/views/wms/basicDataManage/subject/qadProject/index.vue @@ -124,7 +124,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -180,7 +186,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue index 96ceefbac..cb5cc5ac0 100644 --- a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue +++ b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue @@ -133,7 +133,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -189,7 +195,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -207,7 +217,7 @@ const handleDelete = async (id: number) => { await SubjectAccountApi.deleteSubjectAccount(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue index aebe21773..3c89f73ad 100644 --- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue @@ -199,7 +199,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -228,7 +232,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue index 410f5ab11..1b276f79d 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue @@ -191,7 +191,11 @@ const formsSuccess = async (formType, data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ const detailRef = ref() @@ -210,7 +214,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue index a439b6bbf..24c8f9c64 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue @@ -210,7 +210,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 查询页面返回 @@ -243,7 +247,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue index 10989ddfb..c1b7af032 100644 --- a/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/index.vue @@ -177,7 +177,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -197,7 +201,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue index 4ef2e5be9..69e50046b 100644 --- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/index.vue @@ -178,7 +178,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -198,7 +202,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue index 9181412d6..d9830e769 100644 --- a/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue +++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/index.vue @@ -177,7 +177,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -197,7 +201,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/buttMesManage/mesBarCode/index.vue b/src/views/wms/buttMesManage/mesBarCode/index.vue index 5d441845d..7d4cda97d 100644 --- a/src/views/wms/buttMesManage/mesBarCode/index.vue +++ b/src/views/wms/buttMesManage/mesBarCode/index.vue @@ -136,7 +136,13 @@ const buttonBaseClick = (val, item) => { } else if (val == 'export') { // 导出 handleExport() } else if (val == 'refresh') { // 刷新 - getList() + if (tableObject.params.filters && tableObject.params.filters.length > 0 ) { + searchFormClick({ + filters: tableObject.params.filters + }) + } else { + getList() + } } else if (val == 'filtrate') { // 筛选 } else { // 其他按钮 console.log('其他按钮', item) @@ -182,7 +188,11 @@ const formsSuccess = async (formType,data) => { } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -200,7 +210,7 @@ const handleDelete = async (id: number) => { await MesBarCodeApi.deleteMesBarCode(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index 8551bc8a0..ecdd102b5 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -221,7 +221,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -260,7 +260,11 @@ const formsSuccess = async (formType,data) => { basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } // 标签打印 // const handlePoint = async (row) => {