diff --git a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue index 8753a492e..0a8ef27a1 100644 --- a/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/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.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -198,7 +208,7 @@ const handleDelete = async (id: number) => { await CustomerDeliveryForecastApi.deleteCustomerDeliveryForecast(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue index 84cc1d5d0..501d78c97 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/index.vue @@ -147,7 +147,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) @@ -193,7 +199,11 @@ const submitForm = async (formType,data) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -211,7 +221,7 @@ const handleDelete = async (id: number) => { await RelegateRecordMainApi.deleteRelegateRecordMain(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index c2f08f68a..7497dabc6 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -364,7 +364,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) @@ -417,7 +423,7 @@ const buttonTableClick = async (val, row) => { RelegateRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -428,7 +434,7 @@ const buttonTableClick = async (val, row) => { RelegateRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -439,7 +445,7 @@ const buttonTableClick = async (val, row) => { RelegateRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -450,7 +456,7 @@ const buttonTableClick = async (val, row) => { RelegateRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -461,7 +467,7 @@ const buttonTableClick = async (val, row) => { RelegateRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -485,7 +491,7 @@ const buttonTableClick = async (val, row) => { RelegateRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -630,7 +636,11 @@ const submitForm = async (formType, data) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } @@ -674,7 +684,7 @@ const handleDelete = async (id: number) => { await RelegateRequestMainApi.deleteRelegateRequestMain(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch { } } diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue index 4590adb4f..b09b17706 100644 --- a/src/views/wms/countManage/count/countJobMain/index.vue +++ b/src/views/wms/countManage/count/countJobMain/index.vue @@ -239,7 +239,7 @@ const buttonTableClick = async (val, row) => { tableObject.loading = true try { await CountJobMainApi.abandonCountJobMain(row.id) - await getList() + buttonBaseClick('refresh',null) } finally { tableObject.loading = false } @@ -249,7 +249,7 @@ const buttonTableClick = async (val, row) => { tableObject.loading = true try { await CountJobMainApi.acceptCountJobMain(row.id) - await getList() + buttonBaseClick('refresh',null) } finally { tableObject.loading = false } @@ -271,7 +271,7 @@ const handleClose = async (id: number) => { tableObject.loading = true await CountJobMainApi.closeCountJobMain(id) message.success(t('common.closeSuccess')) - await getList() + buttonBaseClick('refresh',null) } finally { tableObject.loading = false } @@ -282,7 +282,7 @@ const handleDone = async (id: number) => { await message.confirm('确认完成吗？') tableObject.loading = true await CountJobMainApi.doneCountJobMain(id) - await getList() + buttonBaseClick('refresh',null) } finally { tableObject.loading = false } diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue index 252a39a52..c911417c1 100644 --- a/src/views/wms/countManage/count/countPlanMain/index.vue +++ b/src/views/wms/countManage/count/countPlanMain/index.vue @@ -306,7 +306,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('打开成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -320,7 +320,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('关闭成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -333,7 +333,7 @@ const buttonTableClick = async (val, row) => { await CountPlanMainApi.submit(row.id) message.success(t('提交审批成功')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } else if (val == 'mainPlanTur') { // 驳回 await message.confirm('确认要驳回吗？') @@ -342,7 +342,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('驳回成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -356,7 +356,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('审批已通过')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -370,7 +370,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('发布成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -384,7 +384,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -606,7 +606,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } finally { tableObject.loading = false } @@ -689,7 +689,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/countManage/count/countRecordMain/index.vue b/src/views/wms/countManage/count/countRecordMain/index.vue index ab0a9db8b..830bf6e65 100644 --- a/src/views/wms/countManage/count/countRecordMain/index.vue +++ b/src/views/wms/countManage/count/countRecordMain/index.vue @@ -140,7 +140,7 @@ const buttonTableClick = async (val, row) => { CountRecordMainApi.generateCountRecordMain(row.id).then(()=>{ message.success(t('生成成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue index e1de90f2d..cd29c597c 100644 --- a/src/views/wms/countManage/count/countRequestMain/index.vue +++ b/src/views/wms/countManage/count/countRequestMain/index.vue @@ -183,7 +183,7 @@ const searchTableSuccessCount = (formField, searchField, val, type,row,count) => CountRequestMainApi.reCount(row).then((res)=>{ message.success('重盘成功') getLoading?.close() - getList() + buttonBaseClick('refresh',null) }).catch((err) => { getLoading?.close() }) @@ -198,7 +198,7 @@ const searchTableSuccessCount = (formField, searchField, val, type,row,count) => CountRequestMainApi.superviseCount(row).then((res)=>{ message.success('监盘成功') getLoading?.close() - getList() + buttonBaseClick('refresh',null) }).catch((err) => { getLoading?.close() }) @@ -322,7 +322,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('关闭成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -336,7 +336,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('添加成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -350,7 +350,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('提交审批成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -364,7 +364,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('驳回成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -378,7 +378,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('审批已通过')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -392,7 +392,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('处理成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -429,7 +429,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('已生成盘点调整申请')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -443,7 +443,7 @@ const buttonTableClick = async (val, row) => { .then(() => { message.success(t('解冻成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }) .catch((err) => { tableObject.loading = false @@ -486,7 +486,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } finally { tableObject.loading = false } @@ -545,7 +545,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/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue index ee5554732..3d5f41c6f 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue @@ -206,7 +206,7 @@ const buttonTableClick = async (val, row) => { CountadjustRequestMainApi.close(row.id).then(() => { message.success(t('关闭成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -217,7 +217,7 @@ const buttonTableClick = async (val, row) => { CountadjustRequestMainApi.reAdd(row.id).then(() => { message.success(t('添加成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -228,7 +228,7 @@ const buttonTableClick = async (val, row) => { CountadjustRequestMainApi.submit(row.id).then(() => { message.success(t('提交审批成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -239,7 +239,7 @@ const buttonTableClick = async (val, row) => { CountadjustRequestMainApi.refused(row.id).then(() => { message.success(t('驳回成功')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -250,7 +250,7 @@ const buttonTableClick = async (val, row) => { CountadjustRequestMainApi.agree(row.id).then(() => { message.success(t('审批已通过')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -266,7 +266,7 @@ const buttonTableClick = async (val, row) => { CountadjustRequestMainApi.handle(row.id).then(() => { message.success(t('处理成功')) getLoading?.close() - getList() + buttonBaseClick('refresh',null) }).catch(err => { getLoading?.close() console.log(err) @@ -306,7 +306,7 @@ const handleDelete = async (id: number) => { await CountadjustRequestMainApi.deleteCountadjustRequestMain(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } finally { tableObject.loading = false } @@ -365,7 +365,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/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue index 2cd3757d9..47b5b1aab 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/index.vue @@ -218,7 +218,7 @@ const buttonTableClick = async (val, row) => { CustomerreceiptRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -229,7 +229,7 @@ const buttonTableClick = async (val, row) => { CustomerreceiptRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -240,7 +240,7 @@ const buttonTableClick = async (val, row) => { CustomerreceiptRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -251,7 +251,7 @@ const buttonTableClick = async (val, row) => { CustomerreceiptRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -262,7 +262,7 @@ const buttonTableClick = async (val, row) => { CustomerreceiptRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -273,7 +273,7 @@ const buttonTableClick = async (val, row) => { CustomerreceiptRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -313,7 +313,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -374,7 +374,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue index a8dc7be9c..4a7a883b2 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/index.vue @@ -305,12 +305,12 @@ const buttonTableClick = async (val, row) => { handleHandle(aaa) } else if (val == 'mainJobAba') { // 放弃 await CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) // await message.confirm('确认要放弃吗？') // console.log('列表-操作按钮事件-放弃') // CustomerreturnJobMainApi.abandonCustomerreturnJobMain(row.masterId).then(() => { // message.success(t('common.updateSuccess')) - // getList() + // buttonBaseClick('refresh',null) // }).catch(err => { // console.log(err) // }) @@ -319,18 +319,18 @@ const buttonTableClick = async (val, row) => { console.log('列表-操作按钮事件-关闭') CustomerreturnJobMainApi.closeCustomerreturnJobMain(row.masterId).then(() => { message.success(t('common.updateSuccess')) - getList() + buttonBaseClick('refresh',null) }).catch(err => { console.log(err) }) } else if (val == 'mainJobAcc') { // 承接 await CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) // await message.confirm('确认要承接吗？') // console.log('列表-操作按钮事件-承接') // CustomerreturnJobMainApi.acceptCustomerreturnJobMain(row.masterId).then(() => { // message.success(t('common.updateSuccess')) - // getList() + // buttonBaseClick('refresh',null) // }).catch(err => { // console.log(err) // }) @@ -352,7 +352,7 @@ const handleHandle = async (data) => { await message.confirm(t('common.confirmHandle')) await CustomerreturnJobMainApi.executeCustomerreturnJobMain(data) message.success(t('common.handleSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index a65804247..b46e6663e 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -358,7 +358,7 @@ const buttonTableClick = async (val, row) => { CustomerreturnRequestMainApi.close(row.masterId).then(() => { tableObject.loading = false message.success(t('common.updateSuccess')) - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -368,7 +368,7 @@ const buttonTableClick = async (val, row) => { CustomerreturnRequestMainApi.reAdd(row.masterId).then(() => { tableObject.loading = false message.success(t('common.updateSuccess')) - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -379,7 +379,7 @@ const buttonTableClick = async (val, row) => { CustomerreturnRequestMainApi.submit(row.masterId).then(() => { tableObject.loading = false message.success(t('common.updateSuccess')) - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -390,7 +390,7 @@ const buttonTableClick = async (val, row) => { CustomerreturnRequestMainApi.refused(row.masterId).then(() => { tableObject.loading = false message.success(t('common.updateSuccess')) - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -401,7 +401,7 @@ const buttonTableClick = async (val, row) => { CustomerreturnRequestMainApi.agree(row.masterId).then(() => { tableObject.loading = false message.success(t('common.updateSuccess')) - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -412,7 +412,7 @@ const buttonTableClick = async (val, row) => { CustomerreturnRequestMainApi.handle(row.masterId).then(() => { tableObject.loading = false message.success(t('common.updateSuccess')) - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -625,7 +625,7 @@ const handleDelete = async (id: number) => { await CustomerreturnRequestMainApi.deleteCustomerreturnRequestMain(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -742,7 +742,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue index 83153f2cf..142ca8905 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue @@ -313,13 +313,13 @@ const buttonTableClick = async (val, row) => { console.log('列表-操作按钮事件-执行') } else if (val == 'mainJobAba') { // 放弃 await DeliverJobMainApi.abandonDeliverJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await DeliverJobMainApi.closeDeliverJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await DeliverJobMainApi.acceptDeliverJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 @@ -337,7 +337,7 @@ const handleHandle = async (data) => { await message.confirm(t('common.confirmHandle')) await DeliverJobMainApi.executeDeliverJobMain(data) message.success(t('common.handleSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index eab590c56..59a449b0c 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -313,7 +313,7 @@ const buttonTableClick = async (val, row) => { DeliverRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -324,7 +324,7 @@ const buttonTableClick = async (val, row) => { DeliverRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -335,7 +335,7 @@ const buttonTableClick = async (val, row) => { DeliverRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -346,7 +346,7 @@ const buttonTableClick = async (val, row) => { DeliverRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -357,7 +357,7 @@ const buttonTableClick = async (val, row) => { DeliverRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -368,7 +368,7 @@ const buttonTableClick = async (val, row) => { DeliverRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -461,7 +461,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -561,7 +561,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue index 72507bad8..031b80c78 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/index.vue @@ -318,7 +318,7 @@ const buttonTableClick = async (val, row) => { DeliverPlanMainApi.open(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -329,7 +329,7 @@ const buttonTableClick = async (val, row) => { DeliverPlanMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -340,7 +340,7 @@ const buttonTableClick = async (val, row) => { DeliverPlanMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -351,7 +351,7 @@ const buttonTableClick = async (val, row) => { DeliverPlanMainApi.reject(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -362,7 +362,7 @@ const buttonTableClick = async (val, row) => { DeliverPlanMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -373,7 +373,7 @@ const buttonTableClick = async (val, row) => { DeliverPlanMainApi.publish(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -384,7 +384,7 @@ const buttonTableClick = async (val, row) => { DeliverPlanMainApi.resetting(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -420,7 +420,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -527,7 +527,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue index 04aac908e..7bd7a29e7 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/index.vue @@ -240,7 +240,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -296,7 +296,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/deliversettlementManage/saleShipmentMainRecord/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue index 59d72454d..c59689fbf 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/index.vue @@ -127,7 +127,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) @@ -165,7 +171,11 @@ const formsSuccess = async (formType,data) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ @@ -183,7 +193,7 @@ const handleDelete = async (id: number) => { await SaleShipmentMainRecordApi.deleteSaleShipmentMainRecord(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index d5407b550..2ded90f16 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -258,7 +258,7 @@ const buttonTableClick = async (val, row) => { SaleShipmentMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -269,7 +269,7 @@ const buttonTableClick = async (val, row) => { SaleShipmentMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -280,7 +280,7 @@ const buttonTableClick = async (val, row) => { SaleShipmentMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -291,7 +291,7 @@ const buttonTableClick = async (val, row) => { SaleShipmentMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -302,7 +302,7 @@ const buttonTableClick = async (val, row) => { SaleShipmentMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -313,7 +313,7 @@ const buttonTableClick = async (val, row) => { SaleShipmentMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -324,7 +324,7 @@ const buttonTableClick = async (val, row) => { SaleShipmentMainApi.abort(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -385,7 +385,11 @@ const submitForm = async (formType, submitData) => { } basicFormRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } @@ -430,7 +434,7 @@ const handleDelete = async (id: number) => { await SaleShipmentMainApi.deleteSaleShipmentMain(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue index 3c0bd0bb5..0ab075f66 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/index.vue @@ -202,13 +202,13 @@ const buttonTableClick = async (val, row) => { handleHandle } else if (val == 'mainJobAba') { // 放弃 await StockupJobMainApi.abandonStockupMainJob(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await StockupJobMainApi.closeStockupMainJob(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await StockupJobMainApi.acceptStockupMainJob(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 @@ -226,7 +226,7 @@ const handleHandle = async (data) => { await message.confirm(t('common.confirmHandle')) await StockupJobMainApi.executeStockupMainJob(data) message.success(t('common.handleSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue index ef987afd1..7ea3de8f5 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue @@ -277,7 +277,7 @@ const buttonTableClick = async (val, row) => { StockupMainRequestApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -288,7 +288,7 @@ const buttonTableClick = async (val, row) => { StockupMainRequestApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -299,7 +299,7 @@ const buttonTableClick = async (val, row) => { StockupMainRequestApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -310,7 +310,7 @@ const buttonTableClick = async (val, row) => { StockupMainRequestApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -321,7 +321,7 @@ const buttonTableClick = async (val, row) => { StockupMainRequestApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -332,7 +332,7 @@ const buttonTableClick = async (val, row) => { StockupMainRequestApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -398,7 +398,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -486,7 +486,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index cb7edfa86..1d0d36a8b 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -285,7 +285,7 @@ const handleDelete = async (id: number) => { await BalanceApi.deleteBalance(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue index 94f4f18c6..acad54469 100644 --- a/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue @@ -208,7 +208,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -241,7 +241,11 @@ const submitForm = async (formType, data) => { } basicFormRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue index 9b60a6338..a24731e90 100644 --- a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue @@ -207,7 +207,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -240,7 +240,11 @@ const submitForm = async (formType, data) => { } basicFormRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue index dddc7cb22..5e637cf70 100644 --- a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue @@ -207,7 +207,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -240,7 +240,11 @@ const submitForm = async (formType, data) => { } basicFormRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } diff --git a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue index 036d0a32c..bf6823ad5 100644 --- a/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue @@ -193,7 +193,7 @@ const repairSubmit = async (id: number) => { await ContainerMainApi.repairSubmitContainerRequestMain(id) message.success(t('common.submitSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -205,7 +205,7 @@ const scrapSubmit = async (id: number) => { await ContainerMainApi.scrapSubmitContainerRequestMain(id) message.success(t('common.submitSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -259,7 +259,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -313,7 +313,11 @@ const formsSuccess = async (formType,data) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 初始化 **/ diff --git a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue index 80788bf96..8e995910d 100644 --- a/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue @@ -205,7 +205,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -238,7 +238,11 @@ const submitForm = async (formType, data) => { } basicFormRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } diff --git a/src/views/wms/inventoryManage/expectin/index.vue b/src/views/wms/inventoryManage/expectin/index.vue index 98e4ec8bd..79d3229be 100644 --- a/src/views/wms/inventoryManage/expectin/index.vue +++ b/src/views/wms/inventoryManage/expectin/index.vue @@ -170,7 +170,7 @@ const handleSelectionDelete = async ()=>{ message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - getList() + buttonBaseClick('refresh',null) } catch {} } @@ -213,7 +213,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryManage/expectout/index.vue b/src/views/wms/inventoryManage/expectout/index.vue index 973c12b43..b433d8ae1 100644 --- a/src/views/wms/inventoryManage/expectout/index.vue +++ b/src/views/wms/inventoryManage/expectout/index.vue @@ -170,7 +170,7 @@ const handleSelectionDelete = async ()=>{ message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - getList() + buttonBaseClick('refresh',null) } catch {} } // 列表-操作按钮 @@ -212,7 +212,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryManage/locationcapacity/index.vue b/src/views/wms/inventoryManage/locationcapacity/index.vue index 481e6799d..39d37e344 100644 --- a/src/views/wms/inventoryManage/locationcapacity/index.vue +++ b/src/views/wms/inventoryManage/locationcapacity/index.vue @@ -167,7 +167,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryManage/transaction/index.vue b/src/views/wms/inventoryManage/transaction/index.vue index e2a013804..d08aec392 100644 --- a/src/views/wms/inventoryManage/transaction/index.vue +++ b/src/views/wms/inventoryManage/transaction/index.vue @@ -168,7 +168,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryManage/transferlog/index.vue b/src/views/wms/inventoryManage/transferlog/index.vue index 1303b5ef2..a59a5d54b 100644 --- a/src/views/wms/inventoryManage/transferlog/index.vue +++ b/src/views/wms/inventoryManage/transferlog/index.vue @@ -167,7 +167,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index 011b6b43d..67102c45b 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -306,7 +306,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) @@ -348,7 +354,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -359,7 +365,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -370,7 +376,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -381,7 +387,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -392,7 +398,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -403,7 +409,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -477,7 +483,11 @@ const submitForm = async (formType,submitData) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } @@ -498,7 +508,7 @@ const handleDelete = async (id: number) => { await ContainerMainRequestApi.deleteContainerMainRequest(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue index f4dba5289..6c8da9a16 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue @@ -162,7 +162,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) @@ -215,7 +221,7 @@ const handleDelete = async (id: number) => { await ContainerRecordMainApi.deleteContainerRecordMain(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index 4563f3671..cdb1ec34a 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -268,7 +268,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) @@ -301,7 +307,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -312,7 +318,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -323,7 +329,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -334,7 +340,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -345,7 +351,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -356,7 +362,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -432,7 +438,11 @@ const submitForm = async (formType,submitData) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } @@ -453,7 +463,7 @@ const handleDelete = async (id: number) => { await ContainerMainRequestApi.deleteContainerMainRequest(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue index 34eb56e4c..dcf98de1c 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue @@ -290,7 +290,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) @@ -323,7 +329,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -334,7 +340,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -345,7 +351,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -356,7 +362,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -367,7 +373,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -378,7 +384,7 @@ const buttonTableClick = async (val, row) => { ContainerMainRequestApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -457,7 +463,11 @@ const submitForm = async (formType,submitData) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { basicFormRef.value.formLoading = false } @@ -478,7 +488,7 @@ const handleDelete = async (id: number) => { await ContainerMainRequestApi.deleteContainerMainRequest(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index 6d9ca8f17..90793b7ac 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -297,7 +297,7 @@ const handleClose = async (id: number) => { await InventoryinitRequestMainApi.closeInventoryinitRequestMain(id) message.success(t('common.closeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -310,7 +310,7 @@ const handleReAdd = async (id: number) => { await InventoryinitRequestMainApi.reAddInventoryinitRequestMain(id) message.success(t('common.reAddSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -323,7 +323,7 @@ const handleSubmit = async (id: number) => { await InventoryinitRequestMainApi.submitInventoryinitRequestMain(id) message.success(t('common.updateSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -336,7 +336,7 @@ const handleAgree = async (id: number) => { await InventoryinitRequestMainApi.agreeInventoryinitRequestMain(id) message.success(t('common.agreeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -348,7 +348,7 @@ const handleHandle = async (id: number) => { tableObject.loading = true await InventoryinitRequestMainApi.handleInventoryinitRequestMain(id) message.success(t('common.handleSuccess')) - await getList() + buttonBaseClick('refresh',null) } catch {} tableObject.loading = false } @@ -362,7 +362,7 @@ const handleRefused = async (id: number) => { await InventoryinitRequestMainApi.refusedInventoryinitRequestMain(id) message.success(t('common.refusedSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -392,7 +392,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { // await InventoryinitRequestMainApi.deleteInventoryinitRequestMain(id) // message.success(t('common.delSuccess')) // // 刷新列表 -// await getList() +// buttonBaseClick('refresh',null) // } catch {} // } @@ -453,7 +453,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue index 2f6f71de1..14ae005fc 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue @@ -132,7 +132,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) @@ -167,17 +173,17 @@ const buttonTableClick = async (val, row) => { await message.confirm('确认要关闭吗？') await PackageoverJobMainApi.closePackageoverJobMain(row.masterId) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) }else if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.masterId) } else if (val == 'mainJobAcc') { // 承接 await PackageoverJobMainApi.acceptPackageoverJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAba') { // 放弃 await PackageoverJobMainApi.abandonPackageoverJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } @@ -208,7 +214,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 { wsCache } = useCache() @@ -229,7 +239,7 @@ const handleDelete = async (id: number) => { await PackageoverJobMainApi.deletePackageoverJobMain(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue index 1ac4e1452..7edb981c1 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue @@ -257,7 +257,7 @@ const buttonTableClick = async (val, row) => { PackageoverRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -268,7 +268,7 @@ const buttonTableClick = async (val, row) => { PackageoverRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -279,7 +279,7 @@ const buttonTableClick = async (val, row) => { PackageoverRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -290,7 +290,7 @@ const buttonTableClick = async (val, row) => { PackageoverRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -301,7 +301,7 @@ const buttonTableClick = async (val, row) => { PackageoverRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -312,7 +312,7 @@ const buttonTableClick = async (val, row) => { PackageoverRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -354,7 +354,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -419,7 +419,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue index 80f672fb3..3f2ee68f7 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue @@ -126,7 +126,13 @@ const buttonBaseClick = (val, item) => { 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) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue index f7ddbe650..676beaacc 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/index.vue @@ -199,15 +199,15 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainJobAba') { // 放弃 console.log('列表-操作按钮事件-放弃') await ScrapJobMainApi.abandonScrapJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 console.log('列表-操作按钮事件-关闭') await ScrapJobMainApi.closeScrapJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 console.log('列表-操作按钮事件-承接') await ScrapJobMainApi.acceptScrapJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index 814dab997..20177ff95 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -291,7 +291,7 @@ const handleClose = async (id: number) => { await ScrapRequestMainApi.closeScrapRequestMain(id) message.success(t('common.closeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -303,7 +303,7 @@ const handleReAdd = async (id: number) => { await ScrapRequestMainApi.reAddScrapRequestMain(id) message.success(t('common.reAddSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -315,7 +315,7 @@ const handleSubmit = async (id: number) => { await ScrapRequestMainApi.submitScrapRequestMain(id) message.success(t('common.submitSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -327,7 +327,7 @@ const handleRefused = async (id: number) => { await ScrapRequestMainApi.refusedScrapRequestMain(id) message.success(t('common.refusedSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -339,7 +339,7 @@ const handleAgree = async (id: number) => { await ScrapRequestMainApi.agreeScrapRequestMain(id) message.success(t('common.agreeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -351,7 +351,7 @@ const handleHandle = async (id: number) => { await ScrapRequestMainApi.handleScrapRequestMain(id) message.success(t('common.handleSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -383,7 +383,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -461,7 +461,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue index 714ac4696..eb90f3cc6 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue @@ -199,15 +199,15 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainJobAba') { // 放弃 console.log('列表-操作按钮事件-放弃') await UnplannedissueJobMainApi.abandonUnplannedissueJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 console.log('列表-操作按钮事件-关闭') await UnplannedissueJobMainApi.closeUnplannedissueJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 console.log('列表-操作按钮事件-承接') await UnplannedissueJobMainApi.acceptUnplannedissueJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue index 19d7c0bb8..e53943ae3 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/index.vue @@ -199,15 +199,15 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainJobAba') { // 放弃 console.log('列表-操作按钮事件-放弃') await UnplannedissueJobMainApi.abandonUnplannedissueJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 console.log('列表-操作按钮事件-关闭') await UnplannedissueJobMainApi.closeUnplannedissueJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 console.log('列表-操作按钮事件-承接') await UnplannedissueJobMainApi.acceptUnplannedissueJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue index aa62f4d82..72eb5df3a 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue @@ -294,7 +294,7 @@ const handleHandle = async (id: number) => { await UnplannedissueRequestMainApi.handleUnplannedissueRequestMain(id) message.success(t('common.handleSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } /** 审批通过按钮操作 */ @@ -304,7 +304,7 @@ const handleAgree = async (id: number) => { await UnplannedissueRequestMainApi.agreeUnplannedissueRequestMain(id) message.success(t('common.agreeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } /** 审批驳回按钮操作 */ @@ -314,7 +314,7 @@ const handleRefused = async (id: number) => { await UnplannedissueRequestMainApi.refusedUnplannedissueRequestMain(id) message.success(t('common.refusedSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } /** 提交按钮操作 */ @@ -324,7 +324,7 @@ const handleSubmit = async (id: number) => { await UnplannedissueRequestMainApi.submitUnplannedissueRequestMain(id) message.success(t('common.submitSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } @@ -335,7 +335,7 @@ const handleClose = async (id: number) => { await UnplannedissueRequestMainApi.closeUnplannedissueRequestMain(id) message.success(t('common.closeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } /** 重新添加按钮操作 */ @@ -345,7 +345,7 @@ const handleReAdd = async (id: number) => { await UnplannedissueRequestMainApi.reAddUnplannedissueRequestMain(id) message.success(t('common.reAddSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) } /** 添加/修改操作 */ @@ -401,7 +401,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -481,7 +481,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue index 173434adf..34ba89d23 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue @@ -199,15 +199,15 @@ const buttonTableClick = async (val, row) => { } else if (val == 'mainJobAba') { // 放弃 console.log('列表-操作按钮事件-放弃') await UnplannedreceiptJobMainApi.abandonUnplannedreceiptJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 console.log('列表-操作按钮事件-关闭') await UnplannedreceiptJobMainApi.closeUnplannedreceiptJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 console.log('列表-操作按钮事件-承接') await UnplannedreceiptJobMainApi.acceptUnplannedreceiptJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index a77e37b73..596f9eaa7 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -513,7 +513,7 @@ const handleClose = async (id: number) => { await UnplannedreceiptRequestMainApi.closeUnplannedreceiptRequestMain(id) message.success(t('common.closeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{ tableObject.loading = false } @@ -527,7 +527,7 @@ const handleReAdd = async (id: number) => { await UnplannedreceiptRequestMainApi.reAddUnplannedreceiptRequestMain(id) message.success(t('common.reAddSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{ tableObject.loading = false } @@ -541,7 +541,7 @@ const handleSubmit = async (id: number) => { await UnplannedreceiptRequestMainApi.submitUnplannedreceiptRequestMain(id) message.success(t('common.submitSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{ tableObject.loading = false } @@ -555,7 +555,7 @@ const handleRefused = async (id: number) => { await UnplannedreceiptRequestMainApi.refusedUnplannedreceiptRequestMain(id) message.success(t('common.refusedSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{ tableObject.loading = false } @@ -569,7 +569,7 @@ const handleAgree = async (id: number) => { await UnplannedreceiptRequestMainApi.agreeUnplannedreceiptRequestMain(id) message.success(t('common.agreeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{ tableObject.loading = false } @@ -582,7 +582,7 @@ const handleHandle = async (id: number) => { try { await UnplannedreceiptRequestMainApi.handleUnplannedreceiptRequestMain(id) message.success(t('common.handleSuccess')) - await getList() + buttonBaseClick('refresh',null) } finally { tableObject.loading = false } @@ -654,7 +654,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -741,7 +741,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/issueManage/issue/issueJobMain/index.vue b/src/views/wms/issueManage/issue/issueJobMain/index.vue index a0fc82fce..5489eadbd 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/index.vue +++ b/src/views/wms/issueManage/issue/issueJobMain/index.vue @@ -269,16 +269,16 @@ const buttonTableClick = async (val, row) => { }] } await IssueJobMainApi.executeIssueMain(aaa) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAba') { // 放弃 await IssueJobMainApi.abandonIssueMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await IssueJobMainApi.closeIssueMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await IssueJobMainApi.acceptIssueMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/issueManage/issue/issueRequestMain/index.vue b/src/views/wms/issueManage/issue/issueRequestMain/index.vue index 43b0edb6f..2f8e7a6ab 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/index.vue +++ b/src/views/wms/issueManage/issue/issueRequestMain/index.vue @@ -317,7 +317,7 @@ const buttonTableClick = async (val, row) => { IssueRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -328,7 +328,7 @@ const buttonTableClick = async (val, row) => { IssueRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -339,7 +339,7 @@ const buttonTableClick = async (val, row) => { IssueRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -350,7 +350,7 @@ const buttonTableClick = async (val, row) => { IssueRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -361,7 +361,7 @@ const buttonTableClick = async (val, row) => { IssueRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -372,7 +372,7 @@ const buttonTableClick = async (val, row) => { IssueRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -430,7 +430,7 @@ const handleDelete = async (id: number) => { tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -519,7 +519,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue index 611dd428c..096a6dc78 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue @@ -272,13 +272,13 @@ const buttonTableClick = async (val, row) => { ProductionreceiptJobMainApi.executeIssueMain(aaa) } else if (val == 'mainJobAba') { // 放弃 await ProductionreceiptJobMainApi.abandonIssueMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await ProductionreceiptJobMainApi.closeIssueMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await ProductionreceiptJobMainApi.acceptIssueMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue index 2d64cb732..922094c35 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue @@ -244,13 +244,13 @@ const buttonTableClick = async (val, row) => { ProductionreturnJobMainApi.executeProductionreturnMain(aaa) } else if (val == 'mainJobAba') { // 放弃 await ProductionreturnJobMainApi.abandonProductionreturnMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await ProductionreturnJobMainApi.closeProductionreturnMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await ProductionreturnJobMainApi.acceptProductionreturnMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 62d1cd711..7ed0e0d69 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -363,7 +363,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -374,7 +374,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -385,7 +385,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -396,7 +396,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -407,7 +407,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -500,7 +500,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -594,7 +594,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -677,7 +677,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index 2ad072261..e7c223aea 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -344,7 +344,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainNoApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -355,7 +355,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainNoApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -366,7 +366,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainNoApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -377,7 +377,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainNoApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -388,7 +388,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainNoApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -481,7 +481,7 @@ const buttonTableClick = async (val, row) => { ProductionreturnRequestMainNoApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -538,7 +538,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -607,7 +607,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue index 3f8cae170..2e5272cea 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue @@ -363,7 +363,7 @@ const buttonTableClick = async (val, row) => { ProductionscrapRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -374,7 +374,7 @@ const buttonTableClick = async (val, row) => { ProductionscrapRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -385,7 +385,7 @@ const buttonTableClick = async (val, row) => { ProductionscrapRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -396,7 +396,7 @@ const buttonTableClick = async (val, row) => { ProductionscrapRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -407,7 +407,7 @@ const buttonTableClick = async (val, row) => { ProductionscrapRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -500,7 +500,7 @@ const buttonTableClick = async (val, row) => { ProductionscrapRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -594,7 +594,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -676,7 +676,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue index d780368bc..c7d0035a6 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue +++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/index.vue @@ -303,13 +303,13 @@ const buttonTableClick = async (val, row) => { RepleinshJobMainApi.executeRepleinshMain(aaa) } else if (val == 'mainJobAba') { // 放弃 await RepleinshJobMainApi.abandonRepleinshMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await RepleinshJobMainApi.closeRepleinshMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await RepleinshJobMainApi.acceptRepleinshMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue index 578d0b2ed..f3ee228f1 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/index.vue @@ -236,7 +236,7 @@ const buttonTableClick = async (val, row) => { RepleinshRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -247,7 +247,7 @@ const buttonTableClick = async (val, row) => { RepleinshRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -258,7 +258,7 @@ const buttonTableClick = async (val, row) => { RepleinshRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -269,7 +269,7 @@ const buttonTableClick = async (val, row) => { RepleinshRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -280,7 +280,7 @@ const buttonTableClick = async (val, row) => { RepleinshRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -291,7 +291,7 @@ const buttonTableClick = async (val, row) => { RepleinshRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -331,7 +331,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -404,7 +404,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index 3fd65259a..8aaab1ed4 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -297,7 +297,7 @@ const buttonTableClick = async (val, row) => { InventorychangeRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -308,7 +308,7 @@ const buttonTableClick = async (val, row) => { InventorychangeRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -319,7 +319,7 @@ const buttonTableClick = async (val, row) => { InventorychangeRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -330,7 +330,7 @@ const buttonTableClick = async (val, row) => { InventorychangeRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -341,7 +341,7 @@ const buttonTableClick = async (val, row) => { InventorychangeRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -352,7 +352,7 @@ const buttonTableClick = async (val, row) => { InventorychangeRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -392,7 +392,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -488,7 +488,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue index 582b7104b..496dd016e 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/index.vue @@ -272,13 +272,13 @@ const buttonTableClick = async (val, row) => { InventorymoveJobMainApi.executeInventorymoveMain(row.masterId) } else if (val == 'mainJobAba') { // 放弃 await InventorymoveJobMainApi.abandonInventorymoveMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await InventorymoveJobMainApi.closeInventorymoveMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await InventorymoveJobMainApi.acceptInventorymoveMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index d7c1d4a8c..499e908c3 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -510,7 +510,7 @@ const buttonTableClick = async (val, row) => { InventorymoveRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -521,7 +521,7 @@ const buttonTableClick = async (val, row) => { InventorymoveRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -532,7 +532,7 @@ const buttonTableClick = async (val, row) => { InventorymoveRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -543,7 +543,7 @@ const buttonTableClick = async (val, row) => { InventorymoveRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -554,7 +554,7 @@ const buttonTableClick = async (val, row) => { InventorymoveRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -565,7 +565,7 @@ const buttonTableClick = async (val, row) => { InventorymoveRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -627,7 +627,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -743,7 +743,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue index 70e5f5693..c107abc6d 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue @@ -316,7 +316,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.open(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -327,7 +327,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -342,7 +342,7 @@ const buttonTableClick = async (val, row) => { } // message.success(t('common.updateSuccess')) // tableObject.loading = false - // getList() + // buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -353,7 +353,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.reject(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -365,7 +365,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -397,7 +397,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.publish(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -408,7 +408,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.resetting(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -420,7 +420,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { message.success(t('common.createSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) // 生成发料申请 ProductionMainApi.generateIssueRequest(PreparetoissueRes.number) }).catch(err => { @@ -434,7 +434,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { message.success(t('common.createSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -481,7 +481,7 @@ const autoCreatePlanRequest = async (row)=>{ } finally { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) } } } @@ -534,7 +534,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -607,7 +607,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index db022f33e..d9923a922 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -314,7 +314,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.open(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -325,7 +325,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -342,7 +342,7 @@ const buttonTableClick = async (val, row) => { } // message.success(t('common.updateSuccess')) // tableObject.loading = false - // getList() + // buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -353,7 +353,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.reject(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -365,7 +365,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -398,7 +398,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.publish(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -409,7 +409,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.resetting(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -421,7 +421,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { message.success(t('common.createSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) // 生成发料申请 ProductionMainApi.generateIssueRequest(PreparetoissueRes.number) }).catch(err => { @@ -435,7 +435,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { message.success(t('common.createSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -497,7 +497,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -572,7 +572,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } @@ -609,7 +613,7 @@ const autoCreatePlanRequest = async (row)=>{ } finally { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) } } } diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue index f18d7babd..f289523a4 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/index.vue @@ -306,7 +306,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.open(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -317,7 +317,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -332,7 +332,7 @@ const buttonTableClick = async (val, row) => { } // message.success(t('common.updateSuccess')) // tableObject.loading = false - // getList() + // buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -343,7 +343,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.reject(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -355,7 +355,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -386,7 +386,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.publish(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -397,7 +397,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.resetting(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -409,7 +409,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { message.success(t('common.createSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) // 生成发料申请 ProductionMainApi.generateIssueRequest(PreparetoissueRes.number) }).catch(err => { @@ -423,7 +423,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { message.success(t('common.createSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -485,7 +485,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -559,7 +559,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } @@ -598,7 +602,7 @@ const autoCreatePlanRequest = async (row)=>{ } finally { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) } } } diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue index 37d343540..3585c8f56 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/index.vue @@ -306,7 +306,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.open(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -317,7 +317,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -332,7 +332,8 @@ const buttonTableClick = async (val, row) => { } // message.success(t('common.updateSuccess')) // tableObject.loading = false - // getList() + // buttonBaseClick('refresh',null) + }).catch(err => { tableObject.loading = false console.log(err) @@ -343,7 +344,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.reject(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -355,7 +356,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -387,7 +388,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.publish(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -398,7 +399,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.resetting(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -410,7 +411,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.generatePreparetoissue(row.number).then((PreparetoissueRes) => { message.success(t('common.createSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) // 生成发料申请 ProductionMainApi.generateIssueRequest(PreparetoissueRes.number) }).catch(err => { @@ -424,7 +425,7 @@ const buttonTableClick = async (val, row) => { await ProductionMainApi.generateProductreceiptRequest(row.number).then(() => { message.success(t('common.createSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -486,7 +487,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -562,7 +563,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } @@ -600,7 +605,7 @@ const autoCreatePlanRequest = async (row)=>{ } finally { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) } } } diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue b/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue index 333e11c55..8897f1807 100644 --- a/src/views/wms/productionManage/productionplan/qadproductionplan/index.vue +++ b/src/views/wms/productionManage/productionplan/qadproductionplan/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) @@ -173,7 +179,11 @@ const formsSuccess = async (formType,data) => { message.success(t('common.updateSuccess')) } basicFormRef.value.dialogVisible = false - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } /** 详情操作 */ diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue index 57a431d19..c14093312 100644 --- a/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/index.vue @@ -202,13 +202,13 @@ const buttonTableClick = async (val, row) => { // ProductputawayJobMainApi.executeProductputawayMain(aaa) } else if (val == 'mainJobAba') { // 放弃 await ProductputawayJobMainApi.abandonProductputawayMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await ProductputawayJobMainApi.closeProductputawayMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await ProductputawayJobMainApi.acceptProductputawayMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'documentPrint') { // 单据打印 handleDocumentPrint(row) diff --git a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue index 5e3567de0..f1d1619f0 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue +++ b/src/views/wms/productionManage/productputaway/productputawayRequestMain/index.vue @@ -232,7 +232,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -243,7 +243,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -254,7 +254,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -265,7 +265,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -276,7 +276,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -287,7 +287,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -327,7 +327,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -397,7 +397,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue index a7ba72a23..e0fe5c54a 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue @@ -203,13 +203,13 @@ const buttonTableClick = async (val, row) => { // ProductputawayJobMainApi.executeProductputawayMain(aaa) } else if (val == 'mainJobAba') { // 放弃 await ProductputawayJobMainApi.abandonProductputawayMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await ProductputawayJobMainApi.closeProductputawayMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await ProductputawayJobMainApi.acceptProductputawayMain(row.masterId) - getList() + buttonBaseClick('refresh',null) }else if (val == 'documentPrint') { // 单据打印 handleDocumentPrint(row) diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue index d3082f024..4f61b7c34 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/index.vue @@ -234,7 +234,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -245,7 +245,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -256,7 +256,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -267,7 +267,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -278,7 +278,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -289,7 +289,7 @@ const buttonTableClick = async (val, row) => { ProductputawayRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -329,7 +329,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -398,7 +398,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue index b9a0ae9fa..253fb0f49 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue @@ -322,13 +322,13 @@ const buttonTableClick = async (val, row) => { ProductreceiptJobMainApi.executeProductreceiptMain(aaa) } else if (val == 'mainJobAba') { // 放弃 await ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index 3811c3b89..d418f49b3 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -279,7 +279,7 @@ const handleCreateInspectRequest = async (number:string) => { tableObject.loading = true await ProductreceiptRecordMainApi.createInspectRequest(number) message.success(t('ts.到货检验申请生成成功')) - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 61f4c5984..f5f87a731 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -356,7 +356,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -367,7 +367,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -378,7 +378,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -389,7 +389,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -400,7 +400,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -493,7 +493,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { console.log(err) }) @@ -552,7 +552,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -626,7 +626,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue index 195d84712..dac357f0d 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleJobMain/index.vue @@ -262,13 +262,13 @@ const buttonTableClick = async (val, row) => { ProductreceiptJobMainApi.executeProductreceiptMain(aaa) } else if (val == 'mainJobAba') { // 放弃 await ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index 5bc4a178a..67e177c28 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -255,7 +255,7 @@ const handleCreateInspectRequest = async (number:string) => { tableObject.loading = true await ProductreceiptRecordMainApi.createInspectRequest(number) message.success(t('ts.到货检验申请生成成功')) - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -268,7 +268,7 @@ const handleCreatePutawayRequest = async (number:string) => { tableObject.loading = true await ProductreceiptRecordMainApi.createPutawayRequest(number) message.success(t('ts.上架申请生成成功')) - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index 4864d6187..37b729e3f 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -355,7 +355,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -366,7 +366,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -377,7 +377,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -388,7 +388,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -399,7 +399,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -493,7 +493,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { console.log(err) }) @@ -552,7 +552,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -627,7 +627,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue index 7a96fc26d..a6a53d070 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapJobMain/index.vue @@ -259,13 +259,13 @@ const buttonTableClick = async (val, row) => { ProductreceiptJobMainApi.executeProductreceiptMain(aaa) } else if (val == 'mainJobAba') { // 放弃 await ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } // 获取部门 用于详情 部门回显 diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index a0398bac6..6800b67e8 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -343,7 +343,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -354,7 +354,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -365,7 +365,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -376,7 +376,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -387,7 +387,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -480,7 +480,7 @@ const buttonTableClick = async (val, row) => { ProductreceiptRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { console.log(err) }) @@ -539,7 +539,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -612,7 +612,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue index 51e97a100..19de72466 100644 --- a/src/views/wms/productionManage/productredress/productredressJobMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressJobMain/index.vue @@ -96,7 +96,13 @@ const buttonBaseClick = (val, item) => { 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) @@ -133,13 +139,13 @@ const buttonTableClick = async (val, row) => { handleDelete(row.masterId) } else if (val == 'mainJobAba') { // 放弃 await ProductredressJobMainApi.abandonProductredressJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobClo') { // 关闭 await ProductredressJobMainApi.closeProductredressJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } else if (val == 'mainJobAcc') { // 承接 await ProductredressJobMainApi.acceptProductredressJobMain(row.masterId) - getList() + buttonBaseClick('refresh',null) } } @@ -176,7 +182,7 @@ const handleDelete = async (id: number) => { await ProductredressJobMainApi.deleteProductredressJobMain(id) message.success(t('common.delSuccess')) // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue index 9cf2196de..f85fe1943 100644 --- a/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRecordMain/index.vue @@ -94,7 +94,13 @@ const buttonBaseClick = (val, item) => { 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) diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue index a58f08d13..8a9c000a3 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/index.vue @@ -208,7 +208,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) @@ -249,7 +255,7 @@ const buttonTableClick = async (val, row) => { ProductredressRequestMainApi.close(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -260,7 +266,7 @@ const buttonTableClick = async (val, row) => { ProductredressRequestMainApi.reAdd(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -271,7 +277,7 @@ const buttonTableClick = async (val, row) => { ProductredressRequestMainApi.submit(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -282,7 +288,7 @@ const buttonTableClick = async (val, row) => { ProductredressRequestMainApi.refused(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -293,7 +299,7 @@ const buttonTableClick = async (val, row) => { ProductredressRequestMainApi.agree(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { tableObject.loading = false console.log(err) @@ -304,7 +310,7 @@ const buttonTableClick = async (val, row) => { ProductredressRequestMainApi.handle(row.masterId).then(() => { message.success(t('common.updateSuccess')) tableObject.loading = false - getList() + buttonBaseClick('refresh',null) }).catch(err => { console.log(err) }) @@ -361,7 +367,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {}finally{ tableObject.loading = false } @@ -432,7 +438,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false } diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index 29439169f..31d59a712 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -528,7 +528,7 @@ const handleClose = async (id: number) => { await ProductscrapRequestMainApi.closeProductscrapRequestMain(id) message.success(t('common.closeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -542,7 +542,7 @@ const handleReAdd = async (id: number) => { await ProductscrapRequestMainApi.reAddProductscrapRequestMain(id) message.success(t('common.reAddSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -556,7 +556,7 @@ const handleSubmit = async (id: number) => { await ProductscrapRequestMainApi.submitProductscrapRequestMain(id) message.success(t('common.submitSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -570,7 +570,7 @@ const handleRefused = async (id: number) => { await ProductscrapRequestMainApi.refusedProductscrapRequestMain(id) message.success(t('common.refusedSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -584,7 +584,7 @@ const handleAgree = async (id: number) => { await ProductscrapRequestMainApi.agreeProductscrapRequestMain(id) message.success(t('common.agreeSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -598,7 +598,7 @@ const handleHandle = async (id: number) => { await ProductscrapRequestMainApi.handleProductscrapRequestMain(id) message.success(t('common.handleSuccess')) tableObject.loading = false - await getList() + buttonBaseClick('refresh',null) }catch{}finally{ tableObject.loading = false } @@ -663,7 +663,7 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) tableObject.loading = false // 刷新列表 - await getList() + buttonBaseClick('refresh',null) } catch {} } @@ -756,7 +756,11 @@ const submitForm = async (formType, submitData) => { } formRef.value.dialogVisible = false // 刷新当前列表 - getList() + if (formType === 'create') { + getList() + }else{ + buttonBaseClick('refresh',null) + } } finally { formRef.value.formLoading = false }