Merge branch 'dev_NEW_pro' into dev_宁夏_英泽防锈

gaoluyang

2026-06-03 dcc3a4d842740f7ff6e79a58ddec945f50ea9b5d

 src/views/officeProcessAutomation/ApproveManage/approve-list/index.vue

@@ -48,6 +48,7 @@
        <el-button :icon="RefreshRight" @click="resetSearch">重置</el-button>
      </div>
      <div class="search_actions">
        <el-button type="danger" :disabled="!selectedRows?.length" @click="batchDelete">批量删除</el-button>
        <el-button type="primary" :icon="Plus" @click="openSubmitDialog">提交审批</el-button>
      </div>
    </div>
@@ -58,10 +59,11 @@
        :column="tableColumn"
        :tableData="tableData"
        :page="page"
        :isSelection="false"
        :isSelection="true"
        :tableLoading="tableLoading"
        :total="page.total"
        @pagination="pagination"
        @selection-change="(rows) => selectedRows = rows"
      >
        <template #approveType="{ row }">
          <span class="approve-type-cell" :style="approvalTypeStyle(row.approvalType)">
@@ -172,7 +174,7 @@
      class="approve-detail-dialog"
    >
      <div class="approve-detail-body">
        <ApproveDetailPanel :row="detailRow" />
        <ApproveDetailPanel :row="detailRow" :detail-data="detailData" />
        <div class="detail-block">
          <div class="detail-block-title">
            审批流程（{{ detailRow.tasks?.length || detailRow.flowNodes?.length || 0 }} 项）
@@ -290,7 +292,7 @@
      destroy-on-close
      @closed="approveOpinion = ''"
    >
      <ApproveDetailPanel :row="approveDialog.row" />
      <ApproveDetailPanel :row="approveDialog.row" :detail-data="detailData" />
      <div class="detail-block mt16">
        <div class="detail-block-title">
          审批流程（{{ approveDialog.row?.tasks?.length || approveDialog.row?.flowNodes?.length || 0 }} 项）
@@ -369,6 +371,7 @@
  tableColumn,
  detailDialog,
  detailRow,
  detailData,
  reimburseDialog,
  approveDialog,
  approveOpinion,
@@ -395,6 +398,8 @@
  submitApprove,
  openDetail,
  openApprove,
  selectedRows,
  batchDelete,
} = al;

const { flowUserOptions, loadFlowUsers } = useFlowUserOptions();
@@ -610,4 +615,4 @@
  border-left: 3px solid var(--el-color-primary);
  line-height: 1.4;
}
</style>
</style>