Merge branch 'cc-dev' into 'dev'

去除他人已审批的时间显示

See merge request product-group-fe/sfy-safety-group/sfy-safety!168

src/views/emergency/emergency-plan/PageManagement.vue

@@ -94,6 +94,9 @@
         <template #approvalStatus="scope">
           <span>{{ APPROVAL_STATUS_MAP[scope.row.approvalStatus] }}</span>
         </template>
+        <template #approvalTime="scope">
+          <span v-if="scope.row.approvalStatus !== APPROVAL_STATUS.OHTER">{{ scope.row.approvalTime }}</span>
+        </template>
       </BasicTable>
     </template>
   </BasicDialog>

src/views/emergency/emergency-plan/src/config/table.ts

@@ -138,6 +138,7 @@ export const APPROVAL_PROCESS_TABLE_COLUMNS: TableColumnProps[] = [
     label: '审批时间',
     prop: 'approvalTime',
     width: '200px',
+    slot: 'approvalTime'
   },
   {
     label: '审批内容',