diff --git a/src/views/mes/orderDay/components/schedule.vue b/src/views/mes/orderDay/components/schedule.vue index 1373e120d..3dd728f6e 100644 --- a/src/views/mes/orderDay/components/schedule.vue +++ b/src/views/mes/orderDay/components/schedule.vue @@ -201,7 +201,7 @@ @@ -470,6 +470,10 @@ const opensearchTable = ( ) } +const handleClose=()=>{ + dialogVisible.value = false, + emit('close') +} const publishPlan=()=>{ message.confirm("确认发布当前计划?","question").then(async () => { //isPublish.value=true @@ -478,10 +482,7 @@ const publishPlan=()=>{ doPublishPlan() }finally{ formLoading.value=false; } - // loading.value = false, - dialogVisible.value = false, - //isPublish.value=false, - emit('close') + handleClose() }).catch(() => { message.info("已取消发布") }) diff --git a/src/views/mes/orderDay/index.vue b/src/views/mes/orderDay/index.vue index 134854079..6c4e7e617 100644 --- a/src/views/mes/orderDay/index.vue +++ b/src/views/mes/orderDay/index.vue @@ -82,6 +82,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import orderDetail from './components/orderDetail.vue' import scheduleDetail from './components/schedule.vue' +import { async } from '@antv/x6/lib/registry/marker/async' defineOptions({ name: 'MesOrderDay' }) @@ -196,8 +197,11 @@ const buttonBaseClick = (val, item) => { } } const publishClosed=()=>{ - //console.log('publishClosed') - getList() + console.log('orderday-publishClosed-200') + nextTick(() => { + getList() + }) + } // 根据状态返回该按钮是否显示 const isShowMainButton = (row,val) => { @@ -242,7 +246,7 @@ const butttondata = (row) => { // 列表-操作按钮事件 -const buttonTableClick = async (val, row) => { +const buttonTableClick = (val, row) => { if (val == 'edit') { // 编辑 openForm('update', row) } else if (val == 'delete') { // 删除 @@ -252,6 +256,7 @@ const buttonTableClick = async (val, row) => { }else if(val=='stopPlan'){ //终止计划 stopPlan(row.id) } + getList() } /** 添加/修改操作 */ @@ -325,7 +330,7 @@ const handleExport = async () => { } const stopPlan = async (id) => { await OrderDayApi.stopPlan(id) - getList() + //getList() } /** 导入 */ const importFormRef = ref() diff --git a/src/views/mes/workScheduling/index.vue b/src/views/mes/workScheduling/index.vue index 3982490fe..d7a9a97cd 100644 --- a/src/views/mes/workScheduling/index.vue +++ b/src/views/mes/workScheduling/index.vue @@ -200,6 +200,7 @@ const buttonTableClick = async (val, row) => { } else if(val=='callMaterial'){ } + getList() } /** 添加/修改操作 */