From 4ab0be7d4441f378add1f242b168d80fb27e65fe Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 22 五月 2026 17:57:44 +0800
Subject: [PATCH] OA部分查询条件变更
---
src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/index.vue | 27 +++++----------------------
1 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/index.vue b/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/index.vue
index 4b33707..c9da4fc 100644
--- a/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/index.vue
+++ b/src/views/officeProcessAutomation/ReimburseManage/cost-reimburse/index.vue
@@ -12,26 +12,6 @@
:prefix-icon="Search"
@keyup.enter="handleQuery"
/>
- <span class="search_title" style="margin-left: 12px">鐢宠鏃堕棿锛�</span>
- <el-date-picker
- v-model="searchForm.applyTimeFrom"
- type="date"
- placeholder="寮�濮嬫棩鏈�"
- format="YYYY-MM-DD"
- value-format="YYYY-MM-DD"
- style="width: 150px"
- clearable
- />
- <span class="search_title" style="margin-left: 8px">鑷�</span>
- <el-date-picker
- v-model="searchForm.applyTimeTo"
- type="date"
- placeholder="缁撴潫鏃ユ湡"
- format="YYYY-MM-DD"
- value-format="YYYY-MM-DD"
- style="width: 150px; margin-left: 8px"
- clearable
- />
<el-button type="primary" style="margin-left: 10px" @click="handleQuery">鎼滅储</el-button>
<el-button @click="resetSearch">閲嶇疆</el-button>
</div>
@@ -335,7 +315,10 @@
<div v-loading="detailLoading">
<DetailPanel :row="detailRow" />
<el-divider content-position="left">瀹℃壒娴佺▼</el-divider>
- <ApprovalFlowProgress :nodes="detailRow.approvalFlowNodes" :current-index="detailRow.currentNodeIndex ?? 0" />
+ <ApprovalFlowProgress
+ :nodes="detailRow.approvalFlowProgressNodes ?? detailRow.approvalFlowNodes"
+ :current-index="detailRow.currentNodeIndex ?? 0"
+ />
<el-divider content-position="left">瀹℃壒璁板綍</el-divider>
<el-timeline v-if="detailRow.approvalRecords?.length">
<el-timeline-item
@@ -366,7 +349,7 @@
<DetailPanel :row="approveDialog.row" />
<el-divider content-position="left">娴佺▼杩涘害</el-divider>
<ApprovalFlowProgress
- :nodes="approveDialog.row?.approvalFlowNodes"
+ :nodes="approveDialog.row?.approvalFlowProgressNodes ?? approveDialog.row?.approvalFlowNodes"
:current-index="approveDialog.row?.currentNodeIndex ?? 0"
/>
<el-form label-width="100px" class="mt16">
--
Gitblit v1.9.3