Merge branch 'dev_NEW_pro' into dev_天津_宝东

gaoluyang

2026-05-15 a9f70566970293fdb065075610dea1bb6ab386f0

 src/views/collaborativeApproval/approvalProcess/index.vue

@@ -33,9 +33,9 @@
          </div>
          <div class="filter-item">
            <span class="filter-label">审批状态</span>
            <el-select 
              v-model="searchForm.approveStatus" 
              clearable 
            <el-select
              v-model="searchForm.approveStatus"
              clearable
              @change="handleQuery"
              placeholder="请选择状态"
              class="search-select"
@@ -109,19 +109,18 @@
          </div>
        </div>
      </template>
      <div class="custom-table">
        <PIMTable
          rowKey="id"
          :column="tableColumnCopy"
          :tableData="tableData"
          :page="page"
          :isSelection="true"
          @selection-change="handleSelectionChange"
          :tableLoading="tableLoading"
          @pagination="pagination"
          :total="page.total"
        ></PIMTable>
      </div>
      <PIMTable
        rowKey="id"
        :column="tableColumnCopy"
        :tableData="tableData"
        :page="page"
        :isSelection="true"
        @selection-change="handleSelectionChange"
        :tableLoading="tableLoading"
        @pagination="pagination"
        :total="page.total"
        class="custom-table"
      ></PIMTable>
    </el-card>

    <!-- 弹窗组件 -->