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/HrManage/regular-apply/index.vue | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/src/views/officeProcessAutomation/HrManage/regular-apply/index.vue b/src/views/officeProcessAutomation/HrManage/regular-apply/index.vue
index 83bfefb..291d57d 100644
--- a/src/views/officeProcessAutomation/HrManage/regular-apply/index.vue
+++ b/src/views/officeProcessAutomation/HrManage/regular-apply/index.vue
@@ -3,7 +3,15 @@
<div class="app-container">
<div class="search_form mb20">
<div>
- <span class="search_title">鐢宠浜猴細</span>
+ <span class="search_title">瀹℃壒鍗曞彿锛�</span>
+ <el-input
+ v-model="searchForm.instanceNo"
+ style="width: 220px"
+ placeholder="璇疯緭鍏ュ鎵瑰崟鍙�"
+ clearable
+ @keyup.enter="onSearch"
+ />
+ <span class="search_title" style="margin-left: 12px">鐢宠浜猴細</span>
<el-input
v-model="searchForm.applicantName"
style="width: 220px"
@@ -11,18 +19,6 @@
clearable
:prefix-icon="Search"
@keyup.enter="onSearch"
- />
- <span class="search_title" style="margin-left: 12px">鐢宠鏃ユ湡锛�</span>
- <el-date-picker
- v-model="searchForm.applyDateRange"
- type="daterange"
- range-separator="鑷�"
- start-placeholder="寮�濮�"
- end-placeholder="缁撴潫"
- format="YYYY-MM-DD"
- value-format="YYYY-MM-DD"
- style="width: 260px"
- clearable
/>
<el-button type="primary" style="margin-left: 10px" @click="onSearch">鎼滅储</el-button>
<el-button @click="resetSearch">閲嶇疆</el-button>
@@ -88,18 +84,17 @@
import { useFlowUserOptions } from "../../ApproveManage/approve-shared/useFlowUserOptions.js";
const searchForm = reactive({
+ instanceNo: "",
applicantName: "",
- applyDateRange: null,
});
const mod = useApprovalInstanceModule({
moduleKey: APPROVAL_MODULE_KEYS.REGULAR,
buildExtraListParams(sf) {
- const range = sf?.applyDateRange;
- if (Array.isArray(range) && range[0]) {
- return { createTime: range[0], createTimeEnd: range[1] };
- }
- return {};
+ const extra = {};
+ const name = (sf?.applicantName || "").trim();
+ if (name) extra.applicantName = name;
+ return extra;
},
});
@@ -132,15 +127,17 @@
const { flowUserOptions, loadFlowUsers } = useFlowUserOptions();
-const tableColumn = buildInstanceTableColumns(tableData, buildTableActions);
+const tableColumn = buildInstanceTableColumns(tableData, buildTableActions, {
+ moduleKey: APPROVAL_MODULE_KEYS.REGULAR,
+});
function onSearch() {
handleQuery(searchForm);
}
function resetSearch() {
+ searchForm.instanceNo = "";
searchForm.applicantName = "";
- searchForm.applyDateRange = null;
onSearch();
}
--
Gitblit v1.9.3