From 7bb1984b3bf70f5f3fcf6dee49471b7b4e549056 Mon Sep 17 00:00:00 2001
From: lq <121091329@qq.com>
Date: Wed, 24 Sep 2025 16:27:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/draw-popup.vue                 |  1 +
 .../components/finished-product-drawer.vue    |  1 +
 .../components/raw-material-drawer.vue        |  1 +
 .../components/task-item.vue                  | 19 +++++++++++++------
 4 files changed, 16 insertions(+), 6 deletions(-)

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 53e87ba..9e5e2f0 100644
--- a/src/views/property-marketing/assignment-management/components/draw-popup.vue
+++ b/src/views/property-marketing/assignment-management/components/draw-popup.vue
@@ -393,6 +393,7 @@ const handleProductDrawerVisibleChange = (visible: boolean) => {
 // 处理筛选条件变化
 const handleChange = (field, value) => {
   localQuery.value[field] = value;
+  localQuery.value.ids = [value];
   emit('filter-change', {
     accounts: localQuery.value.accounts,
   });
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 49e5839..97c7609 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
@@ -244,6 +244,7 @@ const onAfterVisibleChange = (visible: boolean) => {
 // 抽屉关闭事件处理
 const handleClose = () => {
   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 18e5688..aca89b1 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
@@ -265,6 +265,7 @@ const onAfterVisibleChange = (visible: boolean) => {
 // 抽屉关闭事件处理
 const handleClose = () => {
   emit('update:visible', false);
+  emit('cancel');
 };
 
 // 取消按钮处理
diff --git a/src/views/property-marketing/assignment-management/components/task-item.vue b/src/views/property-marketing/assignment-management/components/task-item.vue
index 4b75cfb..964ecd4 100644
--- a/src/views/property-marketing/assignment-management/components/task-item.vue
+++ b/src/views/property-marketing/assignment-management/components/task-item.vue
@@ -76,9 +76,9 @@
               修改发布时间
             </button> -->
             <a-date-picker
-              v-model="datePickerValue"
+              v-model:value="datePickerValue"
               placeholder="修改发布时间"
-              show-time
+              :show-time="{ format: 'HH:mm' }"
               format="YYYY-MM-DD HH:mm"
               value-format="YYYY-MM-DD HH:mm"
               @change="onChange"
@@ -149,11 +149,14 @@ const getTaskDetail = async () => {
 
 const onChange = (date, dateString) => {
   console.log('Selected Date: ', date, dateString);
+  if (date) {
+    emit('handle-task', 'edit-time', props.task, dateString);
+  }
 };
 
 const onOk = (value) => {
+  console.log('DatePicker OK: ', value);
   if (value) {
-    console.log('DatePicker OK: ', value);
     emit('handle-task', 'edit-time', props.task, value);
   }
 };
@@ -171,7 +174,11 @@ const gotoDetail = () => {
   console.log('跳转详情');
   emit('handle-task', 'goto-detail', props.task, props.record);
 };
-
+const handleTimeChange = (time: string) => {
+  // if (time) {
+  //   emit('handle-task', 'edit-time', props.task, timestampToTime1() + ' ' + time + ':00');
+  // }
+};
 const handleAICreate = () => {
   emit('handle-task', 'ai-create', props.task, props.record);
 };
@@ -193,7 +200,7 @@ const timestampToTime1 = (timestamp: number): string => {
   if (!timestamp) {
     timestamp = Date.now() / 1000; // 使用秒级时间戳保持一致性
   }
-
+  
   const date = new Date(timestamp * 1000);
   const year = date.getFullYear();
   const month = String(date.getMonth() + 1).padStart(2, '0'); // 补零
@@ -205,7 +212,7 @@ const timestampToTime1 = (timestamp: number): string => {
 const emit = defineEmits(['filter-change', 'handle-task']);
 
 // 日期选择器的值
-const datePickerValue = ref('2025-09-25 16:18');
+const datePickerValue = ref(null);
 
 // 平台配置
 const platformConfig = {