Merge remote-tracking branch 'origin/master'

src/styles/tasks/message.scss

@@ -16,3 +16,10 @@
         margin-left: 24px;
     }
 }
+html.dark {
+    .hc-layout-box {
+        .hc-layout-left-box {
+            background-color: transparent;
+        }
+    }
+}

src/views/file/collection.vue

@@ -74,6 +74,15 @@
                         </span>
                     </HcTooltip>
                 </template>
+                
+                <template #isApprovalValue="{ row }">
+                    <el-tag
+                        v-if="row?.isApprovalValue"
+                        :type="`${row.isApprovalValue === '已审批' ? 'success' : row.isApprovalValue === '待审批' ? 'warning' : row.isApprovalValue === '已废除' ? 'danger' : 'info'}`" class="mx-1" effect="dark"
+                    >
+                        {{ row.isApprovalValue }}
+                    </el-tag>
+                </template>
                 <template #fileName="{ row }">
                     <span class="text-link" @click="tableRowName(row)">{{ row?.fileName }}</span>
                 </template>
@@ -1591,9 +1600,10 @@ const reportModalClick = () => {
             return false
         }
     }
-
+    rows.sort((a, b) => a.sort - b.sort)
     //展示上报弹窗
     reportData.value = rows
+    console.log( reportData.value, ' reportData.valu')
     isReport.value = true
 }