Merge remote-tracking branch 'origin/main'

# Conflicts:
#	ruoyi-ui/src/views/oa/project/dashboard2/index.vue
#	ruoyi-ui/src/views/oa/project/pace/components/xmind.vue

ruoyi-ui/src/api/hrm/cc.js

@@ -16,7 +16,13 @@ export function readCc(ccId) {
     method: 'post'
   })
 }
-
+// 标记抄送为未读
+export function unreadCc(ccId) {
+  return request({
+    url: `/hrm/flow/cc/${ccId}/unread`,
+    method: 'post'
+  })
+}
 // 手动抄送
 export function addCc(data) {
   return request({

ruoyi-ui/src/views/hrm/flow/cc.vue

@@ -56,8 +56,8 @@
 </template>
 
 <script>
-import { listCc, readCc } from '@/api/hrm/cc';
 import applyTypeMinix from '@/views/hrm/minix/applyTypeMinix.js';
+import { listCc, readCc, unreadCc } from '@/api/hrm/cc';
 
 export default {
   name: 'HrmFlowCc',
@@ -115,6 +115,14 @@ export default {
         this.getList()
       })
     },
+    // 标记未读
+handleUnread(row) {
+  unreadCc(row.ccId).then(() => {
+    this.$modal.msgSuccess('已标记为未读')
+    // 刷新当前列表（这条记录会移到未读列表）
+    this.getList()
+  })
+},
     handleRefresh () {
       this.getList()
     }