修改徐退回订单的备注添加报错问题

src/views/recycleOrder/components/order-page-all.vue

@@ -517,7 +517,6 @@
   const remarkPopoverRef = ref(null);
   function handleShowPopover(row) {
     nextTick(() => {
-      console.log(remarkPopoverRef.value, 'row.orderId');
       remarkPopoverRef.value?.getRemarks(row.orderId);
     });
 

src/views/recycleOrder/components/order-remarks.vue

@@ -51,7 +51,7 @@ const form = ref({
 const handleOpen = (data) => {
     visible.value = true;
     nextTick(() => {
-        data && (form.value.orderId = data.orderId);
+        data && (form.value.orderId = data.orderId || data.refundOrderId);
     });
 };
 

src/views/recycleOrder/needReturned/index.vue

@@ -76,6 +76,7 @@
             <orderTimeline
               :orderId="showOrderId"
               title="备注历史记录"
+              ref="remarkPopoverRef"
             ></orderTimeline>
           </el-popover>
         </template>
@@ -304,7 +305,14 @@
 
   //备注弹窗显示
   const showOrderId = ref();
+  const remarkPopoverRef = ref(null);
   function handleShowPopover(row) {
-    showOrderId.value = row.originOrderId;
+    nextTick(() => {
+      remarkPopoverRef.value?.getRemarks(row.refundOrderId);
+    });
+
+    if (showOrderId.value !== row.refundOrderId) {
+      showOrderId.value = row.refundOrderId;
+    }
   }
 </script>