Merge branch 'cc-dev' into 'dev'

修改走查文档

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

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

@@ -209,7 +209,7 @@
     
     // 特殊处理：如果高亮行是或签，且当前行与高亮行属于同一流程步骤，也高亮
     const highlightRow = approvalProcessData.value[highlightRowIndex];
-    if (highlightRow && highlightRow.approvalType === APPROVAL_TYPE.ORDINARY_SIGN) {
+    if (highlightRow) {
       // 检查当前行是否与高亮行属于同一流程步骤
       const currentRow = approvalProcessData.value[rowIndex];
       if (currentRow && currentRow.approvalOrder === highlightRow.approvalOrder) {

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

@@ -74,13 +74,11 @@ export const SUPPLY_LIST_TABLE_COLUMNS: TableColumnProps[] = [
     label: '应备数量',
     prop: 'requiredQuantity',
     minWidth: '120px',
-    align: 'right',
   },
   {
     label: '当前数量',
     prop: 'currentQuantity',
     minWidth: '120px',
-    align: 'right',
   },
   {
     label: '数量单位',
@@ -114,7 +112,6 @@ export const SUPPLY_LIST_TABLE_COLUMNS: TableColumnProps[] = [
     label: '需补充数量',
     prop: 'supplementQuantity',
     minWidth: '120px',
-    align: 'right',
   },
   BASIC_TABLE_COLUMNS.REMARK,
   BASIC_TABLE_COLUMNS.ACTION,
@@ -144,7 +141,6 @@ export const CHANGE_RECORD_TABLE_COLUMNS: TableColumnProps[] = [
     label: '变更后数量',
     prop: 'afterQuantity',
     minWidth: '120px',
-    align: 'right',
   },
   {
     label: '变更人',
@@ -191,19 +187,16 @@ export const INVENTORY_CHECK_TABLE_COLUMNS: TableColumnProps[] = [
         label: '盘点前',
         prop: 'beforeQuantity',
         minWidth: '120px',
-        align: 'right',
       },
       {
         label: '盘点后',
         slot: 'afterQuantity',
         minWidth: '120px',
-        align: 'right',
       },
       {
         label: '需补充',
         slot: 'supplementQuantity',
         minWidth: '120px',
-        align: 'right',
       },
     ],
   },