From a9f70566970293fdb065075610dea1bb6ab386f0 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 15 五月 2026 14:49:23 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' into dev_天津_宝东
---
src/views/collaborativeApproval/approvalProcess/index.vue | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index 5ea23ca..a2e6815 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/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>
<!-- 寮圭獥缁勪欢 -->
--
Gitblit v1.9.3