diff --git a/src/views/property-marketing/assignment-management/components/draw-popup.vue b/src/views/property-marketing/assignment-management/components/draw-popup.vue index 16acce9..5ac260f 100644 --- a/src/views/property-marketing/assignment-management/components/draw-popup.vue +++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue @@ -168,7 +168,6 @@ { // 处理原料库取消 const handleMaterialCancel = () => { // 取消逻辑 + showDrawer2.value = false; }; // 处理成品库选择确认 @@ -402,6 +402,7 @@ const handleProductConfirm = (result) => { // 处理成品库取消 const handleProductCancel = () => { // 取消逻辑 + showDrawer3.value = false; }; // 处理发布类型变化 diff --git a/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue b/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue index 97c7609..835d499 100644 --- a/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue +++ b/src/views/property-marketing/assignment-management/components/finished-product-drawer.vue @@ -6,7 +6,7 @@ placement="right" :visible="visible" @after-visible-change="onAfterVisibleChange" - @close="handleClose" + @cancel="handleCancel" width="904px" class="task-drawer" style="right: 481px" @@ -241,15 +241,8 @@ const onAfterVisibleChange = (visible: boolean) => { } }; -// 抽屉关闭事件处理 -const handleClose = () => { - emit('update:visible', false); - emit('cancel'); -}; - // 取消按钮处理 const handleCancel = () => { - emit('update:visible', false); emit('cancel'); }; diff --git a/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue b/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue index aca89b1..df5253f 100644 --- a/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue +++ b/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue @@ -6,7 +6,7 @@ placement="right" :visible="visible" @after-visible-change="onAfterVisibleChange" - @close="handleClose" + @cancel="handleCancel" width="904px" class="task-drawer" style="right: 481px" @@ -150,7 +150,6 @@ const getOrigin = (origin: number): string => { // 定义Emits类型 const emit = defineEmits<{ (e: 'update:visible', value: boolean): void; - (e: 'after-visible-change', visible: boolean): void; ( e: 'confirm', data: { @@ -262,15 +261,9 @@ const onAfterVisibleChange = (visible: boolean) => { } }; -// 抽屉关闭事件处理 -const handleClose = () => { - emit('update:visible', false); - emit('cancel'); -}; - // 取消按钮处理 const handleCancel = () => { - emit('update:visible', false); + console.log('取消'); emit('cancel'); };